summaryrefslogtreecommitdiff
path: root/spec/controllers
diff options
context:
space:
mode:
authorKamil Trzcinski <ayufan@ayufan.eu>2017-06-21 13:23:16 +0200
committerKamil Trzcinski <ayufan@ayufan.eu>2017-06-21 14:10:37 +0200
commit91a550f583dbc6b6e6ad8780d9d9b6a7debb0b88 (patch)
tree857ad3faf51f107b704e23072f501267a8cc6410 /spec/controllers
parent4b0b2f1525be5feac0ae0953eb573ff24cc7b9c5 (diff)
downloadgitlab-ce-91a550f583dbc6b6e6ad8780d9d9b6a7debb0b88.tar.gz
Disable environment list polling as it breaks deployboard
Diffstat (limited to 'spec/controllers')
-rw-r--r--spec/controllers/projects/environments_controller_spec.rb6
1 files changed, 4 insertions, 2 deletions
diff --git a/spec/controllers/projects/environments_controller_spec.rb b/spec/controllers/projects/environments_controller_spec.rb
index f6840578145..fcc79902a3c 100644
--- a/spec/controllers/projects/environments_controller_spec.rb
+++ b/spec/controllers/projects/environments_controller_spec.rb
@@ -58,9 +58,11 @@ describe Projects::EnvironmentsController do
expect(json_response['stopped_count']).to eq 1
end
- it 'sets the polling interval header' do
+ it 'does not set the polling interval header' do
+ # TODO, this is a temporary fix, see follow up issue:
+ # https://gitlab.com/gitlab-org/gitlab-ee/issues/2677
expect(response).to have_http_status(:ok)
- expect(response.headers['Poll-Interval']).to eq("3000")
+ expect(response.headers['Poll-Interval']).to be_nil
end
end