Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFilipa Lacerda <filipa@gitlab.com>2017-02-15 17:06:00 +0300
committerFilipa Lacerda <filipa@gitlab.com>2017-02-17 01:25:01 +0300
commit0f36cfd7f58977becea9d3ecf410d3669440fbe9 (patch)
tree823283da83e245917a56208dfbe28111b2879a9a /spec/controllers/projects/pipelines_controller_spec.rb
parentb632bdddee8a0801c61186e2dbe8188304df40ef (diff)
Adds Pending and Finished tabs to pipelines page
Fix broken test
Diffstat (limited to 'spec/controllers/projects/pipelines_controller_spec.rb')
-rw-r--r--spec/controllers/projects/pipelines_controller_spec.rb4
1 files changed, 3 insertions, 1 deletions
diff --git a/spec/controllers/projects/pipelines_controller_spec.rb b/spec/controllers/projects/pipelines_controller_spec.rb
index 1ed2ee3ab4a..242cf18c42b 100644
--- a/spec/controllers/projects/pipelines_controller_spec.rb
+++ b/spec/controllers/projects/pipelines_controller_spec.rb
@@ -25,7 +25,9 @@ describe Projects::PipelinesController do
expect(json_response).to include('pipelines')
expect(json_response['pipelines'].count).to eq 2
expect(json_response['count']['all']).to eq 2
- expect(json_response['count']['running_or_pending']).to eq 2
+ expect(json_response['count']['running']).to eq 0
+ expect(json_response['count']['pending']).to eq 2
+ expect(json_response['count']['finished']).to eq 0
end
end