diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-07-20 12:26:25 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-07-20 12:26:25 +0000 |
commit | a09983ae35713f5a2bbb100981116d31ce99826e (patch) | |
tree | 2ee2af7bd104d57086db360a7e6d8c9d5d43667a /spec/support/shared_contexts/finders | |
parent | 18c5ab32b738c0b6ecb4d0df3994000482f34bd8 (diff) | |
download | gitlab-ce-a09983ae35713f5a2bbb100981116d31ce99826e.tar.gz |
Add latest changes from gitlab-org/gitlab@13-2-stable-ee
Diffstat (limited to 'spec/support/shared_contexts/finders')
-rw-r--r-- | spec/support/shared_contexts/finders/merge_requests_finder_shared_contexts.rb | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/spec/support/shared_contexts/finders/merge_requests_finder_shared_contexts.rb b/spec/support/shared_contexts/finders/merge_requests_finder_shared_contexts.rb index 2b8daa80ab4..07b6b98222f 100644 --- a/spec/support/shared_contexts/finders/merge_requests_finder_shared_contexts.rb +++ b/spec/support/shared_contexts/finders/merge_requests_finder_shared_contexts.rb @@ -23,12 +23,12 @@ RSpec.shared_context 'MergeRequestsFinder multiple projects with merge requests # We cannot use `let_it_be` here otherwise we get: # Failure/Error: allow(RepositoryForkWorker).to receive(:perform_async).and_return(true) # The use of doubles or partial doubles from rspec-mocks outside of the per-test lifecycle is not supported. - let(:project2) do + let!(:project2) do allow_gitaly_n_plus_1 do fork_project(project1, user) end end - let(:project3) do + let!(:project3) do allow_gitaly_n_plus_1 do fork_project(project1, user).tap do |project| project.update!(archived: true) @@ -45,6 +45,9 @@ RSpec.shared_context 'MergeRequestsFinder multiple projects with merge requests allow_gitaly_n_plus_1 { create(:project, group: subgroup) } end + let!(:label) { create(:label, project: project1) } + let!(:label2) { create(:label, project: project1) } + let!(:merge_request1) do create(:merge_request, assignees: [user], author: user, source_project: project2, target_project: project1, @@ -72,6 +75,9 @@ RSpec.shared_context 'MergeRequestsFinder multiple projects with merge requests title: '[WIP]') end + let!(:label_link) { create(:label_link, label: label, target: merge_request2) } + let!(:label_link2) { create(:label_link, label: label2, target: merge_request3) } + before do project1.add_maintainer(user) project2.add_developer(user) |