summaryrefslogtreecommitdiff
path: root/spec
diff options
context:
space:
mode:
authorShinya Maeda <gitlab.shinyamaeda@gmail.com>2017-03-11 02:44:41 +0900
committerShinya Maeda <gitlab.shinyamaeda@gmail.com>2017-03-23 17:11:49 +0900
commit38b1ec2cc04e850ff4898615cf9596de0f6235e1 (patch)
tree881a8644f9f89362a450876f69937cc48e0dabf5 /spec
parentea08e2c8afa468afecede56836b5ceb5dcd1f63e (diff)
downloadgitlab-ce-38b1ec2cc04e850ff4898615cf9596de0f6235e1.tar.gz
Fix rspec failure
Diffstat (limited to 'spec')
-rw-r--r--spec/controllers/projects/builds_controller_spec.rb8
-rw-r--r--spec/controllers/projects/merge_requests_controller_spec.rb8
-rw-r--r--spec/controllers/projects/pipelines_controller_spec.rb8
3 files changed, 18 insertions, 6 deletions
diff --git a/spec/controllers/projects/builds_controller_spec.rb b/spec/controllers/projects/builds_controller_spec.rb
index 4411069918a..c6a3bce93da 100644
--- a/spec/controllers/projects/builds_controller_spec.rb
+++ b/spec/controllers/projects/builds_controller_spec.rb
@@ -12,9 +12,13 @@ describe Projects::BuildsController do
describe 'GET status.json' do
context 'when accessing status' do
+ let(:status) do
+ Gitlab::Ci::Status::Success.new(double('object'), double('user'))
+ end
+
before do
pipeline = create(:ci_pipeline, project: project)
- build = create(:ci_build, pipeline: pipeline, status: 'success')
+ build = create(:ci_build, pipeline: pipeline, status: :success)
get :status, namespace_id: project.namespace,
project_id: project,
id: build.id,
@@ -23,7 +27,7 @@ describe Projects::BuildsController do
it 'return a correct pipeline status' do
expect(response).to have_http_status(:ok)
- expect(json_response['details']['status']['text']).to eq 'passed'
+ expect(json_response['favicon']).to eq status.favicon
end
end
end
diff --git a/spec/controllers/projects/merge_requests_controller_spec.rb b/spec/controllers/projects/merge_requests_controller_spec.rb
index 3bcea2b6517..19c4ba25d1b 100644
--- a/spec/controllers/projects/merge_requests_controller_spec.rb
+++ b/spec/controllers/projects/merge_requests_controller_spec.rb
@@ -1181,11 +1181,15 @@ describe Projects::MergeRequestsController do
describe 'GET status.json' do
context 'when accessing status' do
+ let(:status) do
+ Gitlab::Ci::Status::Success.new(double('object'), double('user'))
+ end
+
before do
create(:ci_pipeline, project: merge_request.source_project,
ref: merge_request.source_branch,
sha: merge_request.diff_head_sha,
- status: 'success')
+ status: :success)
get :status, namespace_id: project.namespace,
project_id: project,
id: merge_request.iid,
@@ -1194,7 +1198,7 @@ describe Projects::MergeRequestsController do
it 'return a correct pipeline status' do
expect(response).to have_http_status(:ok)
- expect(json_response['details']['status']['text']).to eq 'passed'
+ expect(json_response['favicon']).to eq status.favicon
end
end
end
diff --git a/spec/controllers/projects/pipelines_controller_spec.rb b/spec/controllers/projects/pipelines_controller_spec.rb
index aa6415d58e8..53d0ebda2d5 100644
--- a/spec/controllers/projects/pipelines_controller_spec.rb
+++ b/spec/controllers/projects/pipelines_controller_spec.rb
@@ -72,8 +72,12 @@ describe Projects::PipelinesController do
describe 'GET status.json' do
context 'when accessing status' do
+ let(:status) do
+ Gitlab::Ci::Status::Success.new(double('object'), double('user'))
+ end
+
before do
- pipeline = create(:ci_pipeline, project: project, status: 'success')
+ pipeline = create(:ci_pipeline, project: project, status: :success)
get :status, namespace_id: project.namespace,
project_id: project,
id: pipeline.id,
@@ -82,7 +86,7 @@ describe Projects::PipelinesController do
it 'return a correct pipeline status' do
expect(response).to have_http_status(:ok)
- expect(json_response['details']['status']['text']).to eq 'passed'
+ expect(json_response['favicon']).to eq status.favicon
end
end
end