Merge branch '6543-extract-ee-specific-files-lines-for-some-discussion-tests' into 'master'

Resolve "Extract EE specific files/lines for some discussion tests"

Closes #6543

See merge request gitlab-org/gitlab-ee!10407

ee/spec/services/ee/boards/issues/create_service_spec.rb

@@ -15,6 +15,28 @@ describe Boards::Issues::CreateService do
       project.add_developer(user)
     end
 
+    context 'saved board configuration' do
+      let(:list) { create(:list, board: board, label: label, position: 0) }
+
+      it 'adds the board assignee, weight, labels and milestone to the issue' do
+        board_assignee = create(:user)
+        project.add_developer(board_assignee)
+        board_milestone = create(:milestone, project: project)
+        board_label = create(:label, project: project)
+        board.update!(assignee: board_assignee,
+                      milestone: board_milestone,
+                      label_ids: [board_label.id],
+                      weight: 4)
+
+        issue = service.execute
+
+        expect(issue.assignees).to eq([board_assignee])
+        expect(issue.weight).to eq(board.weight)
+        expect(issue.milestone).to eq(board_milestone)
+        expect(issue.labels).to contain_exactly(label, board_label)
+      end
+    end
+
     context 'assignees list' do
       before do
         stub_licensed_features(board_assignee_lists: true)

ee/spec/services/ee/issues/move_service_spec.rb

@@ -7,14 +7,33 @@ describe Issues::MoveService do
   let(:old_issue) { create(:issue, project: old_project, author: user) }
   let(:move_service) { described_class.new(old_project, user) }
 
+  before do
+    old_project.add_reporter(user)
+    new_project.add_reporter(user)
+  end
+
+  describe '#execute' do
+    context 'group issue hooks' do
+      let!(:hook) { create(:group_hook, group: new_project.group, issues_events: true) }
+
+      it 'executes group issue hooks' do
+        allow_any_instance_of(WebHookService).to receive(:execute)
+
+        # Ideally, we'd test that `WebHookWorker.jobs.size` increased by 1,
+        # but since the entire spec run takes place in a transaction, we never
+        # actually get to the `after_commit` hook that queues these jobs.
+        expect { move_service.execute(old_issue, new_project) }
+          .not_to raise_error # Sidekiq::Worker::EnqueueFromTransactionError
+      end
+    end
+  end
+
   describe '#rewrite_epic_issue' do
     context 'issue assigned to epic' do
       let!(:epic_issue) { create(:epic_issue, issue: old_issue) }
 
       before do
         stub_licensed_features(epics: true)
-        old_project.add_reporter(user)
-        new_project.add_reporter(user)
       end
 
       it 'updates epic issue reference' do

spec/presenters/merge_request_presenter_spec.rb

 require 'spec_helper'
 
 describe MergeRequestPresenter do
-  let(:resource) { create :merge_request, source_project: project }
-  let(:project) { create(:project, :repository) }
+  let(:resource) { create(:merge_request, source_project: project) }
+  let(:project) { create(:project) }
   let(:user) { create(:user) }
 
   describe '#ci_status' do
@@ -416,45 +416,48 @@ describe MergeRequestPresenter do
     end
   end
 
-  describe '#can_push_to_source_branch' do
-    before do
-      allow(resource).to receive(:source_branch_exists?) { source_branch_exists }
-
-      allow_any_instance_of(Gitlab::UserAccess::RequestCacheExtension)
-        .to receive(:can_push_to_branch?)
-        .with(resource.source_branch)
-        .and_return(can_push_to_branch)
-    end
-
+  describe '#target_branch_path' do
     subject do
-      described_class.new(resource, current_user: user).can_push_to_source_branch?
+      described_class.new(resource, current_user: user).target_branch_path
     end
 
-    context 'when source branch exists AND user can push to source branch' do
-      let(:source_branch_exists) { true }
-      let(:can_push_to_branch) { true }
+    context 'when target branch exists' do
+      it 'returns path' do
+        allow(resource).to receive(:target_branch_exists?) { true }
 
-      it 'returns true' do
-        is_expected.to eq(true)
+        is_expected
+          .to eq("/#{resource.source_project.full_path}/branches/#{resource.target_branch}")
       end
     end
 
-    context 'when source branch does not exists' do
-      let(:source_branch_exists) { false }
-      let(:can_push_to_branch) { true }
+    context 'when target branch does not exist' do
+      it 'returns nil' do
+        allow(resource).to receive(:target_branch_exists?) { false }
 
-      it 'returns false' do
-        is_expected.to eq(false)
+        is_expected.to be_nil
       end
     end
+  end
 
-    context 'when user cannot push to source branch' do
-      let(:source_branch_exists) { true }
-      let(:can_push_to_branch) { false }
+  describe '#source_branch_with_namespace_link' do
+    subject do
+      described_class.new(resource, current_user: user).source_branch_with_namespace_link
+    end
 
-      it 'returns false' do
-        is_expected.to eq(false)
-      end
+    it 'returns link' do
+      allow(resource).to receive(:source_branch_exists?) { true }
+
+      is_expected
+        .to eq("<a href=\"/#{resource.source_project.full_path}/tree/#{resource.source_branch}\">#{resource.source_branch}</a>")
+    end
+
+    it 'escapes html, when source_branch does not exist' do
+      xss_attempt = "<img src='x' onerror=alert('bad stuff') />"
+
+      allow(resource).to receive(:source_branch) { xss_attempt }
+      allow(resource).to receive(:source_branch_exists?) { false }
+
+      is_expected.to eq(ERB::Util.html_escape(xss_attempt))
     end
   end
 
@@ -521,87 +524,44 @@ describe MergeRequestPresenter do
     end
   end
 
-  describe '#source_branch_with_namespace_link' do
-    subject do
-      described_class.new(resource, current_user: user).source_branch_with_namespace_link
-    end
-
-    it 'returns link' do
-      allow(resource).to receive(:source_branch_exists?) { true }
-
-      is_expected
-        .to eq("<a href=\"/#{resource.source_project.full_path}/tree/#{resource.source_branch}\">#{resource.source_branch}</a>")
-    end
-
-    it 'escapes html, when source_branch does not exist' do
-      xss_attempt = "<img src='x' onerror=alert('bad stuff') />"
-
-      allow(resource).to receive(:source_branch) { xss_attempt }
-      allow(resource).to receive(:source_branch_exists?) { false }
-
-      is_expected.to eq(ERB::Util.html_escape(xss_attempt))
-    end
-  end
-
-  describe '#rebase_path' do
+  describe '#can_push_to_source_branch' do
     before do
-      allow(resource).to receive(:rebase_in_progress?) { rebase_in_progress }
-      allow(resource).to receive(:should_be_rebased?) { should_be_rebased }
+      allow(resource).to receive(:source_branch_exists?) { source_branch_exists }
 
       allow_any_instance_of(Gitlab::UserAccess::RequestCacheExtension)
         .to receive(:can_push_to_branch?)
-        .with(resource.source_branch)
-        .and_return(can_push_to_branch)
+              .with(resource.source_branch)
+              .and_return(can_push_to_branch)
     end
 
     subject do
-      described_class.new(resource, current_user: user).rebase_path
+      described_class.new(resource, current_user: user).can_push_to_source_branch?
     end
 
-    context 'when can rebase' do
-      let(:rebase_in_progress) { false }
+    context 'when source branch exists AND user can push to source branch' do
+      let(:source_branch_exists) { true }
       let(:can_push_to_branch) { true }
-      let(:should_be_rebased) { true }
-
-      before do
-        allow(resource).to receive(:source_branch_exists?) { true }
-      end
 
-      it 'returns path' do
-        is_expected
-          .to eq("/#{project.full_path}/merge_requests/#{resource.iid}/rebase")
+      it 'returns true' do
+        is_expected.to eq(true)
       end
     end
 
-    context 'when cannot rebase' do
-      context 'when rebase in progress' do
-        let(:rebase_in_progress) { true }
-        let(:can_push_to_branch) { true }
-        let(:should_be_rebased) { true }
-
-        it 'returns nil' do
-          is_expected.to be_nil
-        end
-      end
-
-      context 'when user cannot merge' do
-        let(:rebase_in_progress) { false }
-        let(:can_push_to_branch) { false }
-        let(:should_be_rebased) { true }
+    context 'when source branch does not exists' do
+      let(:source_branch_exists) { false }
+      let(:can_push_to_branch) { true }
 
-        it 'returns nil' do
-          is_expected.to be_nil
-        end
+      it 'returns false' do
+        is_expected.to eq(false)
       end
+    end
 
-      context 'should not be rebased' do
-        let(:rebase_in_progress) { false }
-        let(:can_push_to_branch) { true }
-        let(:should_be_rebased) { false }
+    context 'when user cannot push to source branch' do
+      let(:source_branch_exists) { true }
+      let(:can_push_to_branch) { false }
 
-        it 'returns nil' do
-          is_expected.to be_nil
-        end
+      it 'returns false' do
+        is_expected.to eq(false)
       end
     end
   end

spec/services/boards/issues/create_service_spec.rb

@@ -29,23 +29,5 @@ describe Boards::Issues::CreateService do
 
       expect(issue.labels).to eq [label]
     end
-
-    it 'adds the board assignee, weight, labels and milestone to the issue' do
-      board_assignee = create(:user)
-      project.add_developer(board_assignee)
-      board_milestone = create(:milestone, project: project)
-      board_label = create(:label, project: project)
-      board.update!(assignee: board_assignee,
-                    milestone: board_milestone,
-                    label_ids: [board_label.id],
-                    weight: 4)
-
-      issue = service.execute
-
-      expect(issue.assignees).to eq([board_assignee])
-      expect(issue.weight).to eq(board.weight)
-      expect(issue.milestone).to eq(board_milestone)
-      expect(issue.labels).to contain_exactly(label, board_label)
-    end
   end
 end

spec/services/issues/move_service_spec.rb

@@ -138,20 +138,6 @@ describe Issues::MoveService do
             .not_to raise_error # Sidekiq::Worker::EnqueueFromTransactionError
         end
       end
-
-      context 'group issue hooks' do
-        let!(:hook) { create(:group_hook, group: new_project.group, issues_events: true) }
-
-        it 'executes group issue hooks' do
-          allow_any_instance_of(WebHookService).to receive(:execute)
-
-          # Ideally, we'd test that `WebHookWorker.jobs.size` increased by 1,
-          # but since the entire spec run takes place in a transaction, we never
-          # actually get to the `after_commit` hook that queues these jobs.
-          expect { move_service.execute(old_issue, new_project) }
-            .not_to raise_error # Sidekiq::Worker::EnqueueFromTransactionError
-        end
-      end
     end
 
     describe 'move permissions' do