diff options
Diffstat (limited to 'spec/controllers/projects/merge_requests_controller_spec.rb')
-rw-r--r-- | spec/controllers/projects/merge_requests_controller_spec.rb | 34 |
1 files changed, 12 insertions, 22 deletions
diff --git a/spec/controllers/projects/merge_requests_controller_spec.rb b/spec/controllers/projects/merge_requests_controller_spec.rb index 7d9e42fcc2d..382593fd7cb 100644 --- a/spec/controllers/projects/merge_requests_controller_spec.rb +++ b/spec/controllers/projects/merge_requests_controller_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -describe Projects::MergeRequestsController do +RSpec.describe Projects::MergeRequestsController do include ProjectForksHelper include Gitlab::Routing @@ -1183,15 +1183,19 @@ describe Projects::MergeRequestsController do subject expect(response).to have_gitlab_http_status(:ok) - expect(json_response).to match( - a_hash_including( - 'tfplan.json' => hash_including( - 'create' => 0, - 'delete' => 0, - 'update' => 1 + + pipeline.builds.each do |build| + expect(json_response).to match( + a_hash_including( + build.id.to_s => hash_including( + 'create' => 0, + 'delete' => 0, + 'update' => 1, + 'job_name' => build.options.dig(:artifacts, :name).to_s + ) ) ) - ) + end end end @@ -1409,20 +1413,6 @@ describe Projects::MergeRequestsController do end end - context 'when feature flag is disabled' do - let(:accessibility_comparison) { { status: :parsed, data: { summary: 1 } } } - - before do - stub_feature_flags(accessibility_report_view: false) - end - - it 'returns 204 HTTP status' do - subject - - expect(response).to have_gitlab_http_status(:no_content) - end - end - context 'when pipeline has jobs with accessibility reports' do before do allow_any_instance_of(MergeRequest) |