Add latest changes from gitlab-org/gitlab@master

3 files changed, 14 insertions, 42 deletions

diff --git a/spec/features/dashboard/merge_requests_spec.rb b/spec/features/dashboard/merge_requests_spec.rb
index a47f2285e37..952a78ec79a 100644
--- a/spec/features/dashboard/merge_requests_spec.rb
+++ b/spec/features/dashboard/merge_requests_spec.rb
@@ -52,29 +52,20 @@ RSpec.describe 'Dashboard Merge Requests' do
   end
 
   context 'merge requests exist' do
-    let_it_be(:author_user) { create(:user) }
     let(:label) { create(:label) }
 
     let!(:assigned_merge_request) do
       create(:merge_request,
         assignees: [current_user],
         source_project: project,
-        author: author_user)
-    end
-
-    let!(:review_requested_merge_request) do
-      create(:merge_request,
-        reviewers: [current_user],
-        source_branch: 'review',
-        source_project: project,
-        author: author_user)
+        author: create(:user))
     end
 
     let!(:assigned_merge_request_from_fork) do
       create(:merge_request,
               source_branch: 'markdown', assignees: [current_user],
               target_project: public_project, source_project: forked_project,
-              author: author_user)
+              author: create(:user))
     end
 
     let!(:authored_merge_request) do
@@ -103,7 +94,7 @@ RSpec.describe 'Dashboard Merge Requests' do
       create(:merge_request,
               source_branch: 'fix',
               source_project: project,
-              author: author_user)
+              author: create(:user))
     end
 
     before do
@@ -120,10 +111,6 @@ RSpec.describe 'Dashboard Merge Requests' do
       expect(page).not_to have_content(labeled_merge_request.title)
     end
 
-    it 'shows review requested merge requests' do
-      expect(page).to have_content(review_requested_merge_request.title)
-    end
-
     it 'shows authored merge requests', :js do
       reset_filters
       input_filtered_search("author:=#{current_user.to_reference}")
diff --git a/spec/features/file_uploads/multipart_invalid_uploads_spec.rb b/spec/features/file_uploads/multipart_invalid_uploads_spec.rb
index e9e24c12af1..b3ace2e30ff 100644
--- a/spec/features/file_uploads/multipart_invalid_uploads_spec.rb
+++ b/spec/features/file_uploads/multipart_invalid_uploads_spec.rb
@@ -22,13 +22,13 @@ RSpec.describe 'Invalid uploads that must be rejected', :api, :js do
       )
     end
 
-    RSpec.shared_examples 'rejecting invalid keys' do |key_name:, message: nil|
+    RSpec.shared_examples 'rejecting invalid keys' do |key_name:, message: nil, status: 500|
       context "with invalid key #{key_name}" do
         let(:body) { { key_name => file, 'package[test][name]' => 'test' } }
 
         it { expect { subject }.not_to change { Packages::Package.nuget.count } }
 
-        it { expect(subject.code).to eq(500) }
+        it { expect(subject.code).to eq(status) }
 
         it { expect(subject.body).to include(message.presence || "invalid field: \"#{key_name}\"") }
       end
@@ -45,7 +45,7 @@ RSpec.describe 'Invalid uploads that must be rejected', :api, :js do
     # These keys are rejected directly by rack itself.
     # The request will not be received by multipart.rb (can't use the 'handling file uploads' shared example)
     it_behaves_like 'rejecting invalid keys', key_name: 'x' * 11000, message: 'Puma caught this error: exceeded available parameter key space (RangeError)'
-    it_behaves_like 'rejecting invalid keys', key_name: 'package[]test', message: 'Puma caught this error: expected Hash (got Array)'
+    it_behaves_like 'rejecting invalid keys', key_name: 'package[]test', status: 400, message: 'Bad Request'
 
     it_behaves_like 'handling file uploads', 'by rejecting uploads with an invalid key'
   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 63ed1cb5231..a86ff9d7335 100644
--- a/spec/features/merge_requests/user_exports_as_csv_spec.rb
+++ b/spec/features/merge_requests/user_exports_as_csv_spec.rb
@@ -9,38 +9,23 @@ RSpec.describe 'Merge Requests > Exports as CSV', :js do
 
   before do
     sign_in(user)
+    visit(project_merge_requests_path(project))
   end
 
   subject { page.find('.nav-controls') }
 
-  context 'feature is not enabled' do
-    before do
-      stub_feature_flags(export_merge_requests_as_csv: false)
-      visit(project_merge_requests_path(project))
-    end
-
-    it { is_expected.not_to have_button('Export as CSV') }
-  end
+  it { is_expected.to have_button('Export as CSV') }
 
-  context 'feature is enabled for a project' do
+  context 'button is clicked' do
     before do
-      stub_feature_flags(export_merge_requests_as_csv: project)
-      visit(project_merge_requests_path(project))
+      click_button('Export as CSV')
     end
 
-    it { is_expected.to have_button('Export as CSV') }
-
-    context 'button is clicked' do
-      before do
-        click_button('Export as CSV')
-      end
-
-      it 'shows a success message' do
-        click_link('Export merge requests')
+    it 'shows a success message' do
+      click_link('Export merge requests')
 
-        expect(page).to have_content 'Your CSV export has started.'
-        expect(page).to have_content "It will be emailed to #{user.email} when complete"
-      end
+      expect(page).to have_content 'Your CSV export has started.'
+      expect(page).to have_content "It will be emailed to #{user.email} when complete"
     end
   end
 end