diff options
author | Robert Speicher <robert@gitlab.com> | 2018-10-08 18:49:41 +0000 |
---|---|---|
committer | Robert Speicher <robert@gitlab.com> | 2018-10-08 18:49:41 +0000 |
commit | dbab210fe75fc5005490652c59f2391075d732e4 (patch) | |
tree | fc252c924f506d698f1f6c18cb794e8941c90d61 /spec/controllers/projects/merge_requests_controller_spec.rb | |
parent | 1540d51a54f6c2e63335824deb93dad75aba1aec (diff) | |
parent | 72273d3d508c858710a0eb45920c41f6cfc31112 (diff) | |
download | gitlab-ce-dbab210fe75fc5005490652c59f2391075d732e4.tar.gz |
Merge branch 'osw-remove-dead-code-on-mr-show' into 'master'
Removes expensive dead code on main MR page request
Closes #51172
See merge request gitlab-org/gitlab-ce!22153
Diffstat (limited to 'spec/controllers/projects/merge_requests_controller_spec.rb')
-rw-r--r-- | spec/controllers/projects/merge_requests_controller_spec.rb | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/spec/controllers/projects/merge_requests_controller_spec.rb b/spec/controllers/projects/merge_requests_controller_spec.rb index f2467bfd525..73b62dc1151 100644 --- a/spec/controllers/projects/merge_requests_controller_spec.rb +++ b/spec/controllers/projects/merge_requests_controller_spec.rb @@ -76,28 +76,6 @@ describe Projects::MergeRequestsController do expect(response).to be_success end - context "loads notes" do - let(:first_contributor) { create(:user) } - let(:contributor) { create(:user) } - let(:merge_request) { create(:merge_request, author: first_contributor, target_project: project, source_project: project) } - let(:contributor_merge_request) { create(:merge_request, :merged, author: contributor, target_project: project, source_project: project) } - # the order here is important - # as the controller reloads these from DB, references doesn't correspond after - let!(:first_contributor_note) { create(:note, author: first_contributor, noteable: merge_request, project: project) } - let!(:contributor_note) { create(:note, author: contributor, noteable: merge_request, project: project) } - let!(:owner_note) { create(:note, author: user, noteable: merge_request, project: project) } - - it "with special_role FIRST_TIME_CONTRIBUTOR" do - go(format: :html) - - notes = assigns(:notes) - expect(notes).to match(a_collection_containing_exactly(an_object_having_attributes(special_role: Note::SpecialRole::FIRST_TIME_CONTRIBUTOR), - an_object_having_attributes(special_role: nil), - an_object_having_attributes(special_role: nil) - )) - end - end - context "that is invalid" do let(:merge_request) { create(:invalid_merge_request, target_project: project, source_project: project) } |