Add latest changes from gitlab-org/gitlab@master

7 files changed, 28 insertions, 45 deletions

diff --git a/spec/features/groups/dependency_proxy_spec.rb b/spec/features/groups/dependency_proxy_spec.rb
index 9bbfdc488fb..51371ddc532 100644
--- a/spec/features/groups/dependency_proxy_spec.rb
+++ b/spec/features/groups/dependency_proxy_spec.rb
@@ -79,13 +79,19 @@ RSpec.describe 'Group Dependency Proxy' do
         sign_in(developer)
       end
 
-      context 'group is private' do
-        let(:group) { create(:group, :private) }
+      context 'feature flag is disabled' do
+        before do
+          stub_feature_flags(dependency_proxy_for_private_groups: false)
+        end
 
-        it 'informs user that feature is only available for public groups' do
-          visit path
+        context 'group is private' do
+          let(:group) { create(:group, :private) }
 
-          expect(page).to have_content('Dependency proxy feature is limited to public groups for now.')
+          it 'informs user that feature is only available for public groups' do
+            visit path
+
+            expect(page).to have_content('Dependency proxy feature is limited to public groups for now.')
+          end
         end
       end
 
diff --git a/spec/features/issuables/close_reopen_report_toggle_spec.rb b/spec/features/merge_request/close_reopen_report_toggle_spec.rb
index 30cabce8fa2..8a4277d87c9 100644
--- a/spec/features/issuables/close_reopen_report_toggle_spec.rb
+++ b/spec/features/merge_request/close_reopen_report_toggle_spec.rb
@@ -7,44 +7,6 @@ RSpec.describe 'Issuables Close/Reopen/Report toggle' do
 
   let(:user) { create(:user) }
 
-  shared_examples 'an issuable close/reopen/report toggle' do
-    let(:container) { find('.issuable-close-dropdown') }
-    let(:human_model_name) { issuable.model_name.human.downcase }
-
-    it 'shows toggle' do
-      expect(page).to have_button("Close #{human_model_name}")
-      expect(page).to have_selector('.issuable-close-dropdown')
-    end
-
-    it 'opens a dropdown when toggle is clicked' do
-      container.find('.dropdown-toggle').click
-
-      expect(container).to have_selector('.dropdown-menu')
-      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.")
-
-      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')
-    end
-
-    it 'links to Report Abuse' do
-      container.find('.dropdown-toggle').click
-      container.find('.report-abuse-link').click
-
-      expect(page).to have_content('Report abuse to admin')
-    end
-  end
-
   context 'on a merge request' do
     let(:container) { find('.detail-page-header-actions') }
     let(:project) { create(:project, :repository) }
@@ -60,7 +22,22 @@ RSpec.describe 'Issuables Close/Reopen/Report toggle' do
         visit project_merge_request_path(project, issuable)
       end
 
-      it_behaves_like 'an issuable close/reopen/report toggle'
+      context 'close/reopen/report toggle' do
+        it 'opens a dropdown when toggle is clicked' do
+          click_button 'Toggle dropdown'
+
+          expect(container).to have_link("Close merge request")
+          expect(container).to have_link('Report abuse')
+          expect(container).to have_text("Report merge requests that are abusive, inappropriate or spam.")
+        end
+
+        it 'links to Report Abuse' do
+          click_button 'Toggle dropdown'
+          click_link 'Report abuse'
+
+          expect(page).to have_content('Report abuse to admin')
+        end
+      end
 
       context 'when the merge request is open' do
         let(:issuable) { create(:merge_request, :opened, source_project: project) }
diff --git a/spec/features/issuables/merge_request_discussion_lock_spec.rb b/spec/features/merge_request/merge_request_discussion_lock_spec.rb
index 4e0265839f6..4e0265839f6 100644
--- a/spec/features/issuables/merge_request_discussion_lock_spec.rb
+++ b/spec/features/merge_request/merge_request_discussion_lock_spec.rb
diff --git a/spec/features/merge_request/user_reopens_merge_request_spec.rb b/spec/features/merge_request/user_reopens_merge_request_spec.rb
index 4a05a3be59a..7cb8ca280cc 100644
--- a/spec/features/merge_request/user_reopens_merge_request_spec.rb
+++ b/spec/features/merge_request/user_reopens_merge_request_spec.rb
@@ -15,7 +15,7 @@ RSpec.describe 'User reopens a merge requests', :js do
   end
 
   it 'reopens a merge request' do
-    find('.js-issuable-close-dropdown .dropdown-toggle').click
+    find('.detail-page-header .dropdown-toggle').click
 
     click_link('Reopen merge request', match: :first)
 
diff --git a/spec/features/merge_requests/user_squashes_merge_request_spec.rb b/spec/features/merge_request/user_squashes_merge_request_spec.rb
index 84964bd0637..84964bd0637 100644
--- a/spec/features/merge_requests/user_squashes_merge_request_spec.rb
+++ b/spec/features/merge_request/user_squashes_merge_request_spec.rb
diff --git a/spec/features/merge_requests/user_views_diffs_commit_spec.rb b/spec/features/merge_request/user_views_diffs_commit_spec.rb
index cf92603972e..cf92603972e 100644
--- a/spec/features/merge_requests/user_views_diffs_commit_spec.rb
+++ b/spec/features/merge_request/user_views_diffs_commit_spec.rb
diff --git a/spec/features/merge_request/user_sees_empty_state_spec.rb b/spec/features/merge_requests/user_sees_empty_state_spec.rb
index ac07b31731d..ac07b31731d 100644
--- a/spec/features/merge_request/user_sees_empty_state_spec.rb
+++ b/spec/features/merge_requests/user_sees_empty_state_spec.rb