Add latest changes from gitlab-org/gitlab@15-8-stable-eev15.8.0-rc42

2 files changed, 1 insertions, 5 deletions

diff --git a/spec/controllers/groups/clusters_controller_spec.rb b/spec/controllers/groups/clusters_controller_spec.rb
index eb3fe4bc330..46f507c34ba 100644
--- a/spec/controllers/groups/clusters_controller_spec.rb
+++ b/spec/controllers/groups/clusters_controller_spec.rb
@@ -180,8 +180,6 @@ RSpec.describe Groups::ClustersController do
     describe 'functionality' do
       context 'when creates a cluster' do
         it 'creates a new cluster' do
-          expect(ClusterProvisionWorker).to receive(:perform_async)
-
           expect { go }.to change { Clusters::Cluster.count }
             .and change { Clusters::Platforms::Kubernetes.count }
 
@@ -210,8 +208,6 @@ RSpec.describe Groups::ClustersController do
         end
 
         it 'creates a new cluster' do
-          expect(ClusterProvisionWorker).to receive(:perform_async)
-
           expect { go }.to change { Clusters::Cluster.count }
             .and change { Clusters::Platforms::Kubernetes.count }
 
diff --git a/spec/controllers/groups/imports_controller_spec.rb b/spec/controllers/groups/imports_controller_spec.rb
index 7372c2e9575..24dc33b2cf1 100644
--- a/spec/controllers/groups/imports_controller_spec.rb
+++ b/spec/controllers/groups/imports_controller_spec.rb
@@ -45,7 +45,7 @@ RSpec.describe Groups::ImportsController do
         it 'sets a flash error' do
           get :show, params: { group_id: group }
 
-          expect(flash[:alert]).to eq 'Failed to import group.'
+          expect(flash[:alert]).to eq 'Failed to import group: '
         end
       end