diff options
Diffstat (limited to 'spec/controllers/projects/merge_requests_controller_spec.rb')
| -rw-r--r-- | spec/controllers/projects/merge_requests_controller_spec.rb | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/spec/controllers/projects/merge_requests_controller_spec.rb b/spec/controllers/projects/merge_requests_controller_spec.rb index 8b9a26aabff..9fa509c339e 100644 --- a/spec/controllers/projects/merge_requests_controller_spec.rb +++ b/spec/controllers/projects/merge_requests_controller_spec.rb @@ -1179,8 +1179,8 @@ describe Projects::MergeRequestsController do end end - describe 'GET status.json' do - context 'when accessing status' do + describe 'GET pipeline_status.json' do + context 'when accessing pipeline_status' do let(:status) do Gitlab::Ci::Status::Success.new(double('object'), double('user')) end @@ -1190,10 +1190,10 @@ describe Projects::MergeRequestsController do ref: merge_request.source_branch, sha: merge_request.diff_head_sha, status: :success) - get :status, namespace_id: project.namespace, - project_id: project, - id: merge_request.iid, - format: :json + get :pipeline_status, namespace_id: project.namespace, + project_id: project, + id: merge_request.iid, + format: :json end it 'return a correct pipeline status' do |