Revert "Automatic merge of gitlab-org/gitlab-ce master"

This reverts commit 44449c7b, reversing
changes made to a898b0a7.

spec/finders/group_projects_finder_spec.rb

 require 'spec_helper'
 
 describe GroupProjectsFinder do
-  include_context 'GroupProjectsFinder context'
+  let(:group) { create(:group) }
+  let(:subgroup) { create(:group, parent: group) }
+  let(:current_user) { create(:user) }
+  let(:options) { {} }
+
+  let(:finder) { described_class.new(group: group, current_user: current_user, options: options) }
+
+  let!(:public_project) { create(:project, :public, group: group, path: '1') }
+  let!(:private_project) { create(:project, :private, group: group, path: '2') }
+  let!(:shared_project_1) { create(:project, :public, path: '3') }
+  let!(:shared_project_2) { create(:project, :private, path: '4') }
+  let!(:shared_project_3) { create(:project, :internal, path: '5') }
+  let!(:subgroup_project) { create(:project, :public, path: '6', group: subgroup) }
+  let!(:subgroup_private_project) { create(:project, :private, path: '7', group: subgroup) }
+
+  before do
+    shared_project_1.project_group_links.create(group_access: Gitlab::Access::MAINTAINER, group: group)
+    shared_project_2.project_group_links.create(group_access: Gitlab::Access::MAINTAINER, group: group)
+    shared_project_3.project_group_links.create(group_access: Gitlab::Access::MAINTAINER, group: group)
+  end
 
   subject { finder.execute }
 

spec/finders/issues_finder_spec.rb

 require 'spec_helper'
 
 describe IssuesFinder do
-  include_context 'IssuesFinder context'
+  set(:user) { create(:user) }
+  set(:user2) { create(:user) }
+  set(:group) { create(:group) }
+  set(:subgroup) { create(:group, parent: group) }
+  set(:project1) { create(:project, group: group) }
+  set(:project2) { create(:project) }
+  set(:project3) { create(:project, group: subgroup) }
+  set(:milestone) { create(:milestone, project: project1) }
+  set(:label) { create(:label, project: project2) }
+  set(:issue1) { create(:issue, author: user, assignees: [user], project: project1, milestone: milestone, title: 'gitlab', created_at: 1.week.ago, updated_at: 1.week.ago) }
+  set(:issue2) { create(:issue, author: user, assignees: [user], project: project2, description: 'gitlab', created_at: 1.week.from_now, updated_at: 1.week.from_now) }
+  set(:issue3) { create(:issue, author: user2, assignees: [user2], project: project2, title: 'tanuki', description: 'tanuki', created_at: 2.weeks.from_now, updated_at: 2.weeks.from_now) }
+  set(:issue4) { create(:issue, project: project3) }
+  set(:award_emoji1) { create(:award_emoji, name: 'thumbsup', user: user, awardable: issue1) }
+  set(:award_emoji2) { create(:award_emoji, name: 'thumbsup', user: user2, awardable: issue2) }
+  set(:award_emoji3) { create(:award_emoji, name: 'thumbsdown', user: user, awardable: issue3) }
 
   describe '#execute' do
-    include_context 'IssuesFinder#execute context'
+    let!(:closed_issue) { create(:issue, author: user2, assignees: [user2], project: project2, state: 'closed') }
+    let!(:label_link) { create(:label_link, label: label, target: issue2) }
+    let(:search_user) { user }
+    let(:params) { {} }
+    let(:issues) { described_class.new(search_user, params.reverse_merge(scope: scope, state: 'opened')).execute }
+
+    before(:context) do
+      project1.add_maintainer(user)
+      project2.add_developer(user)
+      project2.add_developer(user2)
+      project3.add_developer(user)
+
+      issue1
+      issue2
+      issue3
+      issue4
+
+      award_emoji1
+      award_emoji2
+      award_emoji3
+    end
 
     context 'scope: all' do
       let(:scope) { 'all' }

spec/finders/merge_requests_finder_spec.rb

 require 'spec_helper'
 
 describe MergeRequestsFinder do
+  include ProjectForksHelper
+
+  # We need to explicitly permit Gitaly N+1s because of the specs that use
+  # :request_store. Gitaly N+1 detection is only enabled when :request_store is,
+  # but we don't care about potential N+1s when we're just creating several
+  # projects in the setup phase.
+  def create_project_without_n_plus_1(*args)
+    Gitlab::GitalyClient.allow_n_plus_1_calls do
+      create(:project, :public, *args)
+    end
+  end
+
   context "multiple projects with merge requests" do
-    include_context 'MergeRequestsFinder multiple projects with merge requests context'
+    let(:user)  { create :user }
+    let(:user2) { create :user }
+
+    let(:group) { create(:group) }
+    let(:subgroup) { create(:group, parent: group) }
+    let(:project1) { create_project_without_n_plus_1(group: group) }
+    let(:project2) do
+      Gitlab::GitalyClient.allow_n_plus_1_calls do
+        fork_project(project1, user)
+      end
+    end
+    let(:project3) do
+      Gitlab::GitalyClient.allow_n_plus_1_calls do
+        p = fork_project(project1, user)
+        p.update!(archived: true)
+        p
+      end
+    end
+    let(:project4) { create_project_without_n_plus_1(:repository, group: subgroup) }
+    let(:project5) { create_project_without_n_plus_1(group: subgroup) }
+    let(:project6) { create_project_without_n_plus_1(group: subgroup) }
+
+    let!(:merge_request1) { create(:merge_request, author: user, source_project: project2, target_project: project1, target_branch: 'merged-target') }
+    let!(:merge_request2) { create(:merge_request, :conflict, author: user, source_project: project2, target_project: project1, state: 'closed') }
+    let!(:merge_request3) { create(:merge_request, :simple, author: user, source_project: project2, target_project: project2, state: 'locked', title: 'thing WIP thing') }
+    let!(:merge_request4) { create(:merge_request, :simple, author: user, source_project: project3, target_project: project3, title: 'WIP thing') }
+    let!(:merge_request5) { create(:merge_request, :simple, author: user, source_project: project4, target_project: project4, title: '[WIP]') }
+    let!(:merge_request6) { create(:merge_request, :simple, author: user, source_project: project5, target_project: project5, title: 'WIP: thing') }
+    let!(:merge_request7) { create(:merge_request, :simple, author: user, source_project: project6, target_project: project6, title: 'wip thing') }
+    let!(:merge_request8) { create(:merge_request, :simple, author: user, source_project: project1, target_project: project1, title: '[wip] thing') }
+    let!(:merge_request9) { create(:merge_request, :simple, author: user, source_project: project1, target_project: project2, title: 'wip: thing') }
+
+    before do
+      project1.add_maintainer(user)
+      project2.add_developer(user)
+      project3.add_developer(user)
+      project2.add_developer(user2)
+      project4.add_developer(user)
+      project5.add_developer(user)
+      project6.add_developer(user)
+    end
 
     describe '#execute' do
       it 'filters by scope' do
         params = { scope: 'authored', state: 'opened' }
-
         merge_requests = described_class.new(user, params).execute
-
-        expect(merge_requests).to contain_exactly(merge_request1, merge_request4, merge_request5)
+        expect(merge_requests.size).to eq(7)
       end
 
       it 'ignores sorting by weight' do
@@ -21,10 +71,8 @@ describe MergeRequestsFinder do
 
       it 'filters by project' do
         params = { project_id: project1.id, scope: 'authored', state: 'opened' }
-
         merge_requests = described_class.new(user, params).execute
-
-        expect(merge_requests).to contain_exactly(merge_request1)
+        expect(merge_requests.size).to eq(2)
       end
 
       it 'filters by commit sha' do
@@ -37,15 +85,24 @@ describe MergeRequestsFinder do
       end
 
       context 'filtering by group' do
-        it 'includes all merge requests when user has access exceluding merge requests from projects the user does not have access to' do
-          private_project = allow_gitaly_n_plus_1 { create(:project, :private, group: group) }
-          private_project.add_guest(user)
-          create(:merge_request, :simple, author: user, source_project: private_project, target_project: private_project)
+        it 'includes all merge requests when user has access' do
           params = { group_id: group.id }
 
           merge_requests = described_class.new(user, params).execute
 
-          expect(merge_requests).to contain_exactly(merge_request1, merge_request2)
+          expect(merge_requests.size).to eq(3)
+        end
+
+        it 'excludes merge requests from projects the user does not have access to' do
+          private_project = create_project_without_n_plus_1(:private, group: group)
+          private_mr = create(:merge_request, :simple, author: user, source_project: private_project, target_project: private_project)
+          params = { group_id: group.id }
+
+          private_project.add_guest(user)
+          merge_requests = described_class.new(user, params).execute
+
+          expect(merge_requests.size).to eq(3)
+          expect(merge_requests).not_to include(private_mr)
         end
 
         it 'filters by group including subgroups', :nested_groups do
@@ -53,16 +110,14 @@ describe MergeRequestsFinder do
 
           merge_requests = described_class.new(user, params).execute
 
-          expect(merge_requests).to contain_exactly(merge_request1, merge_request2, merge_request5)
+          expect(merge_requests.size).to eq(6)
         end
       end
 
       it 'filters by non_archived' do
         params = { non_archived: true }
-
         merge_requests = described_class.new(user, params).execute
-
-        expect(merge_requests).to contain_exactly(merge_request1, merge_request2, merge_request3, merge_request5)
+        expect(merge_requests.size).to eq(8)
       end
 
       it 'filters by iid' do
@@ -97,18 +152,12 @@ describe MergeRequestsFinder do
         expect(merge_requests).to contain_exactly(merge_request3)
       end
 
-      describe 'WIP state' do
-        let!(:wip_merge_request1) { create(:merge_request, :simple, author: user, source_project: project5, target_project: project5, title: 'WIP: thing') }
-        let!(:wip_merge_request2) { create(:merge_request, :simple, author: user, source_project: project6, target_project: project6, title: 'wip thing') }
-        let!(:wip_merge_request3) { create(:merge_request, :simple, author: user, source_project: project1, target_project: project1, title: '[wip] thing') }
-        let!(:wip_merge_request4) { create(:merge_request, :simple, author: user, source_project: project1, target_project: project2, title: 'wip: thing') }
-
       it 'filters by wip' do
         params = { wip: 'yes' }
 
         merge_requests = described_class.new(user, params).execute
 
-          expect(merge_requests).to contain_exactly(merge_request4, merge_request5, wip_merge_request1, wip_merge_request2, wip_merge_request3, wip_merge_request4)
+        expect(merge_requests).to contain_exactly(merge_request4, merge_request5, merge_request6, merge_request7, merge_request8, merge_request9)
       end
 
       it 'filters by not wip' do
@@ -124,7 +173,7 @@ describe MergeRequestsFinder do
 
         merge_requests = described_class.new(user, params).execute
 
-          expect(merge_requests).to contain_exactly(merge_request1, merge_request2, merge_request3, merge_request4, merge_request5, wip_merge_request1, wip_merge_request2, wip_merge_request3, wip_merge_request4)
+        expect(merge_requests).to contain_exactly(merge_request1, merge_request2, merge_request3, merge_request4, merge_request5, merge_request6, merge_request7, merge_request8, merge_request9)
       end
 
       it 'adds wip to scalar params' do
@@ -132,10 +181,12 @@ describe MergeRequestsFinder do
 
         expect(scalar_params).to include(:wip, :assignee_id)
       end
-      end
 
       context 'filtering by group milestone' do
+        let!(:group) { create(:group, :public) }
         let(:group_milestone) { create(:milestone, group: group) }
+        let!(:group_member) { create(:group_member, group: group, user: user) }
+        let(:params) { { milestone_title: group_milestone.title } }
 
         before do
           project2.update(namespace: group)
@@ -143,9 +194,7 @@ describe MergeRequestsFinder do
           merge_request3.update(milestone: group_milestone)
         end
 
-        it 'returns merge requests assigned to that group milestone' do
-          params = { milestone_title: group_milestone.title }
-
+        it 'returns issues assigned to that group milestone' do
           merge_requests = described_class.new(user, params).execute
 
           expect(merge_requests).to contain_exactly(merge_request2, merge_request3)
@@ -242,7 +291,7 @@ describe MergeRequestsFinder do
       it 'returns the number of rows for the default state' do
         finder = described_class.new(user)
 
-        expect(finder.row_count).to eq(3)
+        expect(finder.row_count).to eq(7)
       end
 
       it 'returns the number of rows for a given state' do

spec/finders/users_finder_spec.rb

@@ -2,7 +2,10 @@ require 'spec_helper'
 
 describe UsersFinder do
   describe '#execute' do
-    include_context 'UsersFinder#execute filter by project context'
+    let!(:user1) { create(:user, username: 'johndoe') }
+    let!(:user2) { create(:user, :blocked, username: 'notsorandom') }
+    let!(:external_user) { create(:user, :external) }
+    let!(:omniauth_user) { create(:omniauth_user, provider: 'twitter', extern_uid: '123456') }
 
     context 'with a normal user' do
       let(:user) { create(:user) }
@@ -10,43 +13,43 @@ describe UsersFinder do
       it 'returns all users' do
         users = described_class.new(user).execute
 
-        expect(users).to contain_exactly(user, normal_user, blocked_user, omniauth_user)
+        expect(users).to contain_exactly(user, user1, user2, omniauth_user)
       end
 
       it 'filters by username' do
         users = described_class.new(user, username: 'johndoe').execute
 
-        expect(users).to contain_exactly(normal_user)
+        expect(users).to contain_exactly(user1)
       end
 
       it 'filters by username (case insensitive)' do
         users = described_class.new(user, username: 'joHNdoE').execute
 
-        expect(users).to contain_exactly(normal_user)
+        expect(users).to contain_exactly(user1)
       end
 
       it 'filters by search' do
         users = described_class.new(user, search: 'orando').execute
 
-        expect(users).to contain_exactly(blocked_user)
+        expect(users).to contain_exactly(user2)
       end
 
       it 'filters by blocked users' do
         users = described_class.new(user, blocked: true).execute
 
-        expect(users).to contain_exactly(blocked_user)
+        expect(users).to contain_exactly(user2)
       end
 
       it 'filters by active users' do
         users = described_class.new(user, active: true).execute
 
-        expect(users).to contain_exactly(user, normal_user, omniauth_user)
+        expect(users).to contain_exactly(user, user1, omniauth_user)
       end
 
       it 'returns no external users' do
         users = described_class.new(user, external: true).execute
 
-        expect(users).to contain_exactly(user, normal_user, blocked_user, omniauth_user)
+        expect(users).to contain_exactly(user, user1, user2, omniauth_user)
       end
 
       context 'with LDAP users' do
@@ -82,7 +85,7 @@ describe UsersFinder do
           custom_attributes: { foo: 'bar' }
         ).execute
 
-        expect(users).to contain_exactly(user, normal_user, blocked_user, omniauth_user)
+        expect(users).to contain_exactly(user, user1, user2, omniauth_user)
       end
     end
 
@@ -98,20 +101,20 @@ describe UsersFinder do
       it 'returns all users' do
         users = described_class.new(admin).execute
 
-        expect(users).to contain_exactly(admin, normal_user, blocked_user, external_user, omniauth_user)
+        expect(users).to contain_exactly(admin, user1, user2, external_user, omniauth_user)
       end
 
       it 'filters by custom attributes' do
-        create :user_custom_attribute, user: normal_user, key: 'foo', value: 'foo'
-        create :user_custom_attribute, user: normal_user, key: 'bar', value: 'bar'
-        create :user_custom_attribute, user: blocked_user, key: 'foo', value: 'foo'
+        create :user_custom_attribute, user: user1, key: 'foo', value: 'foo'
+        create :user_custom_attribute, user: user1, key: 'bar', value: 'bar'
+        create :user_custom_attribute, user: user2, key: 'foo', value: 'foo'
 
         users = described_class.new(
           admin,
           custom_attributes: { foo: 'foo', bar: 'bar' }
         ).execute
 
-        expect(users).to contain_exactly(normal_user)
+        expect(users).to contain_exactly(user1)
       end
     end
   end

spec/support/shared_contexts/finders/group_projects_finder_shared_contexts.rb

-require 'spec_helper'
-
-RSpec.shared_context 'GroupProjectsFinder context' do
-  let(:group) { create(:group) }
-  let(:subgroup) { create(:group, parent: group) }
-  let(:current_user) { create(:user) }
-  let(:options) { {} }
-
-  let(:finder) { described_class.new(group: group, current_user: current_user, options: options) }
-
-  let!(:public_project) { create(:project, :public, group: group, path: '1') }
-  let!(:private_project) { create(:project, :private, group: group, path: '2') }
-  let!(:shared_project_1) { create(:project, :public, path: '3') }
-  let!(:shared_project_2) { create(:project, :private, path: '4') }
-  let!(:shared_project_3) { create(:project, :internal, path: '5') }
-  let!(:subgroup_project) { create(:project, :public, path: '6', group: subgroup) }
-  let!(:subgroup_private_project) { create(:project, :private, path: '7', group: subgroup) }
-
-  before do
-    shared_project_1.project_group_links.create(group_access: Gitlab::Access::MAINTAINER, group: group)
-    shared_project_2.project_group_links.create(group_access: Gitlab::Access::MAINTAINER, group: group)
-    shared_project_3.project_group_links.create(group_access: Gitlab::Access::MAINTAINER, group: group)
-  end
-end

spec/support/shared_contexts/finders/issues_finder_shared_contexts.rb

-require 'spec_helper'
-
-RSpec.shared_context 'IssuesFinder context' do
-  set(:user) { create(:user) }
-  set(:user2) { create(:user) }
-  set(:group) { create(:group) }
-  set(:subgroup) { create(:group, parent: group) }
-  set(:project1) { create(:project, group: group) }
-  set(:project2) { create(:project) }
-  set(:project3) { create(:project, group: subgroup) }
-  set(:milestone) { create(:milestone, project: project1) }
-  set(:label) { create(:label, project: project2) }
-  set(:issue1) { create(:issue, author: user, assignees: [user], project: project1, milestone: milestone, title: 'gitlab', created_at: 1.week.ago, updated_at: 1.week.ago) }
-  set(:issue2) { create(:issue, author: user, assignees: [user], project: project2, description: 'gitlab', created_at: 1.week.from_now, updated_at: 1.week.from_now) }
-  set(:issue3) { create(:issue, author: user2, assignees: [user2], project: project2, title: 'tanuki', description: 'tanuki', created_at: 2.weeks.from_now, updated_at: 2.weeks.from_now) }
-  set(:issue4) { create(:issue, project: project3) }
-  set(:award_emoji1) { create(:award_emoji, name: 'thumbsup', user: user, awardable: issue1) }
-  set(:award_emoji2) { create(:award_emoji, name: 'thumbsup', user: user2, awardable: issue2) }
-  set(:award_emoji3) { create(:award_emoji, name: 'thumbsdown', user: user, awardable: issue3) }
-end
-
-RSpec.shared_context 'IssuesFinder#execute context' do
-  let!(:closed_issue) { create(:issue, author: user2, assignees: [user2], project: project2, state: 'closed') }
-  let!(:label_link) { create(:label_link, label: label, target: issue2) }
-  let(:search_user) { user }
-  let(:params) { {} }
-  let(:issues) { described_class.new(search_user, params.reverse_merge(scope: scope, state: 'opened')).execute }
-
-  before(:context) do
-    project1.add_maintainer(user)
-    project2.add_developer(user)
-    project2.add_developer(user2)
-    project3.add_developer(user)
-
-    issue1
-    issue2
-    issue3
-    issue4
-
-    award_emoji1
-    award_emoji2
-    award_emoji3
-  end
-end

spec/support/shared_contexts/finders/merge_requests_finder_shared_contexts.rb

-require 'spec_helper'
-
-RSpec.shared_context 'MergeRequestsFinder multiple projects with merge requests context' do
-  include ProjectForksHelper
-
-  # We need to explicitly permit Gitaly N+1s because of the specs that use
-  # :request_store. Gitaly N+1 detection is only enabled when :request_store is,
-  # but we don't care about potential N+1s when we're just creating several
-  # projects in the setup phase.
-  def allow_gitaly_n_plus_1
-    Gitlab::GitalyClient.allow_n_plus_1_calls do
-      yield
-    end
-  end
-
-  set(:user)  { create(:user) }
-  set(:user2) { create(:user) }
-
-  set(:group) { create(:group) }
-  set(:subgroup) { create(:group, parent: group) }
-  set(:project1) do
-    allow_gitaly_n_plus_1 { create(:project, :public, group: group) }
-  end
-  # We cannot use `set` 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
-    allow_gitaly_n_plus_1 do
-      fork_project(project1, user)
-    end
-  end
-  let(:project3) do
-    allow_gitaly_n_plus_1 do
-      fork_project(project1, user).tap do |project|
-        project.update!(archived: true)
-      end
-    end
-  end
-  set(:project4) do
-    allow_gitaly_n_plus_1 { create(:project, :repository, group: subgroup) }
-  end
-  set(:project5) do
-    allow_gitaly_n_plus_1 { create(:project, group: subgroup) }
-  end
-  set(:project6) do
-    allow_gitaly_n_plus_1 { create(:project, group: subgroup) }
-  end
-
-  let!(:merge_request1) { create(:merge_request, author: user, source_project: project2, target_project: project1, target_branch: 'merged-target') }
-  let!(:merge_request2) { create(:merge_request, :conflict, author: user, source_project: project2, target_project: project1, state: 'closed') }
-  let!(:merge_request3) { create(:merge_request, :simple, author: user, source_project: project2, target_project: project2, state: 'locked', title: 'thing WIP thing') }
-  let!(:merge_request4) { create(:merge_request, :simple, author: user, source_project: project3, target_project: project3, title: 'WIP thing') }
-  let!(:merge_request5) { create(:merge_request, :simple, author: user, source_project: project4, target_project: project4, title: '[WIP]') }
-
-  before do
-    project1.add_maintainer(user)
-    project2.add_developer(user)
-    project3.add_developer(user)
-    project4.add_developer(user)
-    project5.add_developer(user)
-    project6.add_developer(user)
-
-    project2.add_developer(user2)
-  end
-end

spec/support/shared_contexts/finders/users_finder_shared_contexts.rb

-require 'spec_helper'
-
-RSpec.shared_context 'UsersFinder#execute filter by project context' do
-  set(:normal_user) { create(:user, username: 'johndoe') }
-  set(:blocked_user) { create(:user, :blocked, username: 'notsorandom') }
-  set(:external_user) { create(:user, :external) }
-  set(:omniauth_user) { create(:omniauth_user, provider: 'twitter', extern_uid: '123456') }
-end