Add latest changes from gitlab-org/gitlab@master

3 files changed, 16 insertions, 8 deletions

diff --git a/spec/features/issuables/markdown_references/internal_references_spec.rb b/spec/features/issuables/markdown_references/internal_references_spec.rb
index ab7c0ce2891..c5a8e9f367c 100644
--- a/spec/features/issuables/markdown_references/internal_references_spec.rb
+++ b/spec/features/issuables/markdown_references/internal_references_spec.rb
@@ -21,15 +21,17 @@ RSpec.describe "Internal references", :js do
           sign_in(private_project_user)
 
           visit(project_issue_path(private_project, private_project_issue))
+          wait_for_requests
 
           add_note("##{public_project_issue.to_reference(private_project)}")
         end
 
-        context "when user doesn't have access to private project", quarantine: 'https://gitlab.com/gitlab-org/gitlab/-/issues/257832' do
+        context "when user doesn't have access to private project" do
           before do
             sign_in(public_project_user)
 
             visit(project_issue_path(public_project, public_project_issue))
+            wait_for_requests
           end
 
           it { expect(page).not_to have_css(".note") }
@@ -41,6 +43,7 @@ RSpec.describe "Internal references", :js do
           sign_in(private_project_user)
 
           visit(project_merge_request_path(private_project, private_project_merge_request))
+          wait_for_requests
 
           add_note("##{public_project_issue.to_reference(private_project)}")
         end
@@ -50,9 +53,10 @@ RSpec.describe "Internal references", :js do
             sign_in(public_project_user)
 
             visit(project_issue_path(public_project, public_project_issue))
+            wait_for_requests
           end
 
-          it "doesn't show any references", quarantine: 'https://gitlab.com/gitlab-org/gitlab/-/issues/257832' do
+          it "doesn't show any references" do
             expect(page).not_to have_text 'Related merge requests'
           end
         end
@@ -60,6 +64,7 @@ RSpec.describe "Internal references", :js do
         context "when user has access to private project" do
           before do
             visit(project_issue_path(public_project, public_project_issue))
+            wait_for_requests
           end
 
           it "shows references", :sidekiq_might_not_need_inline do
@@ -85,15 +90,17 @@ RSpec.describe "Internal references", :js do
           sign_in(private_project_user)
 
           visit(project_issue_path(private_project, private_project_issue))
+          wait_for_requests
 
           add_note("##{public_project_merge_request.to_reference(private_project)}")
         end
 
-        context "when user doesn't have access to private project", quarantine: 'https://gitlab.com/gitlab-org/gitlab/-/issues/257832' do
+        context "when user doesn't have access to private project" do
           before do
             sign_in(public_project_user)
 
             visit(project_merge_request_path(public_project, public_project_merge_request))
+            wait_for_requests
           end
 
           it { expect(page).not_to have_css(".note") }
@@ -105,6 +112,7 @@ RSpec.describe "Internal references", :js do
           sign_in(private_project_user)
 
           visit(project_merge_request_path(private_project, private_project_merge_request))
+          wait_for_requests
 
           add_note("##{public_project_merge_request.to_reference(private_project)}")
         end
@@ -114,9 +122,10 @@ RSpec.describe "Internal references", :js do
             sign_in(public_project_user)
 
             visit(project_merge_request_path(public_project, public_project_merge_request))
+            wait_for_requests
           end
 
-          it "doesn't show any references", quarantine: 'https://gitlab.com/gitlab-org/gitlab/-/issues/257832' do
+          it "doesn't show any references" do
             expect(page).not_to have_text 'Related merge requests'
           end
         end
@@ -124,6 +133,7 @@ RSpec.describe "Internal references", :js do
         context "when user has access to private project" do
           before do
             visit(project_merge_request_path(public_project, public_project_merge_request))
+            wait_for_requests
           end
 
           it "shows references", :sidekiq_might_not_need_inline do
diff --git a/spec/features/issues/user_sees_empty_state_spec.rb b/spec/features/issues/user_sees_empty_state_spec.rb
index 0e2a7cb4358..b4c5a57de4f 100644
--- a/spec/features/issues/user_sees_empty_state_spec.rb
+++ b/spec/features/issues/user_sees_empty_state_spec.rb
@@ -22,9 +22,9 @@ RSpec.describe 'Issues > User sees empty state', :js do
       it 'user sees empty state' do
         visit project_issues_path(project)
 
+        expect(page).to have_content('Use issues to collaborate on ideas, solve problems, and plan work')
+        expect(page).to have_content('Learn more about issues.')
         expect(page).to have_content('Register / Sign In')
-        expect(page).to have_content('The Issue Tracker is the place to add things that need to be improved or solved in a project.')
-        expect(page).to have_content('You can register or sign in to create issues for this project.')
       end
 
       it_behaves_like 'empty state with filters'
diff --git a/spec/features/projects/import_export/import_file_spec.rb b/spec/features/projects/import_export/import_file_spec.rb
index c7fbaa85483..6f015f9cd22 100644
--- a/spec/features/projects/import_export/import_file_spec.rb
+++ b/spec/features/projects/import_export/import_file_spec.rb
@@ -3,8 +3,6 @@
 require 'spec_helper'
 
 RSpec.describe 'Import/Export - project import integration test', :js do
-  include GitHelpers
-
   let(:user) { create(:user) }
   let(:file) { File.join(Rails.root, 'spec', 'features', 'projects', 'import_export', 'test_project_export.tar.gz') }
   let(:export_path) { "#{Dir.tmpdir}/import_file_spec" }