Add latest changes from gitlab-org/gitlab@master

6 files changed, 24 insertions, 2 deletions

diff --git a/spec/features/groups/issues_spec.rb b/spec/features/groups/issues_spec.rb
index 9f6fa146972..6d0d768d356 100644
--- a/spec/features/groups/issues_spec.rb
+++ b/spec/features/groups/issues_spec.rb
@@ -23,6 +23,10 @@ RSpec.describe 'Group issues page', feature_category: :subgroups do
     context 'rss feed' do
       let(:access_level) { ProjectFeature::ENABLED }
 
+      before do
+        click_button 'Actions'
+      end
+
       context 'when signed in' do
         let(:user) do
           user_in_group.ensure_feed_token
diff --git a/spec/features/issues/csv_spec.rb b/spec/features/issues/csv_spec.rb
index 8629201459f..21d5041b210 100644
--- a/spec/features/issues/csv_spec.rb
+++ b/spec/features/issues/csv_spec.rb
@@ -16,6 +16,7 @@ RSpec.describe 'Issues csv', :js, feature_category: :team_planning do
 
   def request_csv(params = {})
     visit project_issues_path(project, params)
+    click_button 'Actions'
     click_button 'Export as CSV'
     click_on 'Export issues'
   end
diff --git a/spec/features/issues/rss_spec.rb b/spec/features/issues/rss_spec.rb
index 75e7cd03a65..eb45d3c8d8b 100644
--- a/spec/features/issues/rss_spec.rb
+++ b/spec/features/issues/rss_spec.rb
@@ -23,6 +23,7 @@ RSpec.describe 'Project Issues RSS', :js, feature_category: :team_planning do
     before do
       sign_in(user)
       visit path
+      click_button 'Actions'
     end
 
     it_behaves_like "it has an RSS link with current_user's feed token"
@@ -32,6 +33,7 @@ RSpec.describe 'Project Issues RSS', :js, feature_category: :team_planning do
   context 'when signed out' do
     before do
       visit path
+      click_button 'Actions'
     end
 
     it_behaves_like "it has an RSS link without a feed token"
diff --git a/spec/features/merge_requests/rss_spec.rb b/spec/features/merge_requests/rss_spec.rb
index 9c9f46278f6..5f697a4f79d 100644
--- a/spec/features/merge_requests/rss_spec.rb
+++ b/spec/features/merge_requests/rss_spec.rb
@@ -25,7 +25,7 @@ RSpec.describe 'Project Merge Requests RSS', feature_category: :code_review_work
       visit path
     end
 
-    it_behaves_like "it has an RSS button with current_user's feed token"
+    it_behaves_like "it has an RSS link with current_user's feed token"
     it_behaves_like "an autodiscoverable RSS feed with current_user's feed token"
   end
 
@@ -34,7 +34,7 @@ RSpec.describe 'Project Merge Requests RSS', feature_category: :code_review_work
       visit path
     end
 
-    it_behaves_like "it has an RSS button without a feed token"
+    it_behaves_like "it has an RSS link without a feed token"
     it_behaves_like "an autodiscoverable RSS feed without a feed token"
   end
 
diff --git a/spec/features/merge_requests/user_exports_as_csv_spec.rb b/spec/features/merge_requests/user_exports_as_csv_spec.rb
index 23ac1b264ad..57d6ee69923 100644
--- a/spec/features/merge_requests/user_exports_as_csv_spec.rb
+++ b/spec/features/merge_requests/user_exports_as_csv_spec.rb
@@ -14,6 +14,7 @@ RSpec.describe 'Merge Requests > Exports as CSV', :js, feature_category: :code_r
 
   context 'button is clicked' do
     before do
+      click_button 'Actions'
       click_button 'Export as CSV'
     end
 
diff --git a/spec/features/projects/container_registry_spec.rb b/spec/features/projects/container_registry_spec.rb
index e8ac34d4355..5306a9f15c6 100644
--- a/spec/features/projects/container_registry_spec.rb
+++ b/spec/features/projects/container_registry_spec.rb
@@ -30,6 +30,20 @@ RSpec.describe 'Container Registry', :js, feature_category: :projects do
     expect(page).to have_title _('Container Registry')
   end
 
+  it 'does not have link to settings' do
+    visit_container_registry
+
+    expect(page).not_to have_link _('Configure in settings')
+  end
+
+  it 'has link to settings when user is maintainer' do
+    project.add_maintainer(user)
+
+    visit_container_registry
+
+    expect(page).to have_link _('Configure in settings')
+  end
+
   context 'when there are no image repositories' do
     it 'list page has no container title' do
       visit_container_registry