Add latest changes from gitlab-org/gitlab@13-5-stable-eev13.5.0-rc42

4 files changed, 101 insertions, 6 deletions

diff --git a/spec/features/issuables/close_reopen_report_toggle_spec.rb b/spec/features/issuables/close_reopen_report_toggle_spec.rb
index 5ea89a7984f..6e99cfb3293 100644
--- a/spec/features/issuables/close_reopen_report_toggle_spec.rb
+++ b/spec/features/issuables/close_reopen_report_toggle_spec.rb
@@ -23,7 +23,15 @@ RSpec.describe 'Issuables Close/Reopen/Report toggle' do
       expect(container).to have_content("Close #{human_model_name}")
       expect(container).to have_content('Report abuse')
       expect(container).to have_content("Report #{human_model_name.pluralize} that are abusive, inappropriate or spam.")
-      expect(container).to have_selector('.close-item.droplab-item-selected')
+
+      if issuable.is_a?(MergeRequest)
+        page.within('.js-issuable-close-dropdown') do
+          expect(page).to have_link('Close merge request')
+        end
+      else
+        expect(container).to have_selector('.close-item.droplab-item-selected')
+      end
+
       expect(container).to have_selector('.report-item')
       expect(container).not_to have_selector('.report-item.droplab-item-selected')
       expect(container).not_to have_selector('.reopen-item')
@@ -123,7 +131,7 @@ RSpec.describe 'Issuables Close/Reopen/Report toggle' do
 
           it 'shows only the `Edit` button' do
             expect(page).to have_link('Edit')
-            expect(page).not_to have_link('Report abuse')
+            expect(page).to have_link('Report abuse')
             expect(page).not_to have_button('Close merge request')
             expect(page).not_to have_button('Reopen merge request')
           end
diff --git a/spec/features/issuables/issuable_list_spec.rb b/spec/features/issuables/issuable_list_spec.rb
index b1ffaaa7c7e..3f00bdc478d 100644
--- a/spec/features/issuables/issuable_list_spec.rb
+++ b/spec/features/issuables/issuable_list_spec.rb
@@ -48,6 +48,14 @@ RSpec.describe 'issuable list', :js do
     end
   end
 
+  it 'displays a warning if counting the number of issues times out' do
+    allow_any_instance_of(IssuesFinder).to receive(:count_by_state).and_raise(ActiveRecord::QueryCanceled)
+
+    visit_issuable_list(:issue)
+
+    expect(page).to have_text('Open ? Closed ? All ?')
+  end
+
   it "counts merge requests closing issues icons for each issue" do
     visit_issuable_list(:issue)
 
diff --git a/spec/features/issuables/markdown_references/internal_references_spec.rb b/spec/features/issuables/markdown_references/internal_references_spec.rb
index aceaea8d2ed..07d4271eed7 100644
--- a/spec/features/issuables/markdown_references/internal_references_spec.rb
+++ b/spec/features/issuables/markdown_references/internal_references_spec.rb
@@ -25,7 +25,7 @@ RSpec.describe "Internal references", :js do
           add_note("##{public_project_issue.to_reference(private_project)}")
         end
 
-        context "when user doesn't have access to private project" do
+        context "when user doesn't have access to private project", quarantine: 'https://gitlab.com/gitlab-org/gitlab/-/issues/257832' do
           before do
             sign_in(public_project_user)
 
@@ -52,7 +52,7 @@ RSpec.describe "Internal references", :js do
             visit(project_issue_path(public_project, public_project_issue))
           end
 
-          it "doesn't show any references" do
+          it "doesn't show any references", quarantine: 'https://gitlab.com/gitlab-org/gitlab/-/issues/257832' do
             page.within(".issue-details") do
               expect(page).not_to have_content("#merge-requests .merge-requests-title")
             end
@@ -94,7 +94,7 @@ RSpec.describe "Internal references", :js do
           add_note("##{public_project_merge_request.to_reference(private_project)}")
         end
 
-        context "when user doesn't have access to private project" do
+        context "when user doesn't have access to private project", quarantine: 'https://gitlab.com/gitlab-org/gitlab/-/issues/257832' do
           before do
             sign_in(public_project_user)
 
@@ -121,7 +121,7 @@ RSpec.describe "Internal references", :js do
             visit(project_merge_request_path(public_project, public_project_merge_request))
           end
 
-          it "doesn't show any references" do
+          it "doesn't show any references", quarantine: 'https://gitlab.com/gitlab-org/gitlab/-/issues/257832' do
             page.within(".merge-request-details") do
               expect(page).not_to have_content("#merge-requests .merge-requests-title")
             end
diff --git a/spec/features/issuables/merge_request_discussion_lock_spec.rb b/spec/features/issuables/merge_request_discussion_lock_spec.rb
new file mode 100644
index 00000000000..4e0265839f6
--- /dev/null
+++ b/spec/features/issuables/merge_request_discussion_lock_spec.rb
@@ -0,0 +1,79 @@
+# frozen_string_literal: true
+# TODO use shared examples to merge this spec with discussion_lock_spec.rb
+# https://gitlab.com/gitlab-org/gitlab/-/issues/255910
+
+require 'spec_helper'
+
+RSpec.describe 'Merge Request Discussion Lock', :js do
+  let(:user) { create(:user) }
+  let(:project) { create(:project, :public, :repository) }
+  let(:merge_request) { create(:merge_request, source_project: project, author: user) }
+
+  before do
+    sign_in(user)
+  end
+
+  context 'when a user is a team member' do
+    before do
+      project.add_developer(user)
+    end
+
+    context 'when the discussion is unlocked' do
+      it 'the user can lock the merge_request' do
+        visit project_merge_request_path(merge_request.project, merge_request)
+
+        expect(find('.issuable-sidebar')).to have_content('Unlocked')
+
+        page.within('.issuable-sidebar') do
+          find('.lock-edit').click
+          click_button('Lock')
+        end
+
+        expect(find('[data-testid="lock-status"]')).to have_content('Locked')
+      end
+    end
+
+    context 'when the discussion is locked' do
+      before do
+        merge_request.update_attribute(:discussion_locked, true)
+        visit project_merge_request_path(merge_request.project, merge_request)
+      end
+
+      it 'the user can unlock the merge_request' do
+        expect(find('.issuable-sidebar')).to have_content('Locked')
+
+        page.within('.issuable-sidebar') do
+          find('.lock-edit').click
+          click_button('Unlock')
+        end
+
+        expect(find('[data-testid="lock-status"]')).to have_content('Unlocked')
+      end
+    end
+  end
+
+  context 'when a user is not a team member' do
+    context 'when the discussion is unlocked' do
+      before do
+        visit project_merge_request_path(merge_request.project, merge_request)
+      end
+
+      it 'the user can not lock the merge_request' do
+        expect(find('.issuable-sidebar')).to have_content('Unlocked')
+        expect(find('.issuable-sidebar')).not_to have_selector('.lock-edit')
+      end
+    end
+
+    context 'when the discussion is locked' do
+      before do
+        merge_request.update_attribute(:discussion_locked, true)
+        visit project_merge_request_path(merge_request.project, merge_request)
+      end
+
+      it 'the user can not unlock the merge_request' do
+        expect(find('.issuable-sidebar')).to have_content('Locked')
+        expect(find('.issuable-sidebar')).not_to have_selector('.lock-edit')
+      end
+    end
+  end
+end