From b595cb0c1dec83de5bdee18284abe86614bed33b Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Wed, 20 Jul 2022 15:40:28 +0000 Subject: Add latest changes from gitlab-org/gitlab@15-2-stable-ee --- .../projects/google_cloud/gcp_regions_controller_spec.rb | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'spec/requests/projects/google_cloud/gcp_regions_controller_spec.rb') diff --git a/spec/requests/projects/google_cloud/gcp_regions_controller_spec.rb b/spec/requests/projects/google_cloud/gcp_regions_controller_spec.rb index 56474b6520d..f88273080d5 100644 --- a/spec/requests/projects/google_cloud/gcp_regions_controller_spec.rb +++ b/spec/requests/projects/google_cloud/gcp_regions_controller_spec.rb @@ -6,8 +6,8 @@ RSpec.describe Projects::GoogleCloud::GcpRegionsController do let_it_be(:project) { create(:project, :public, :repository) } let_it_be(:repository) { project.repository } - let(:user_guest) { create(:user) } - let(:user_maintainer) { create(:user) } + let_it_be(:user_guest) { create(:user) } + let_it_be(:user_maintainer) { create(:user) } RSpec.shared_examples "should track not_found event" do it "tracks event" do @@ -15,7 +15,7 @@ RSpec.describe Projects::GoogleCloud::GcpRegionsController do expect_snowplow_event( category: 'Projects::GoogleCloud', action: 'admin_project_google_cloud!', - label: 'access_denied', + label: 'error_access_denied', property: 'invalid_user', project: project, user: nil @@ -29,7 +29,7 @@ RSpec.describe Projects::GoogleCloud::GcpRegionsController do expect_snowplow_event( category: 'Projects::GoogleCloud', action: 'admin_project_google_cloud!', - label: 'access_denied', + label: 'error_access_denied', property: 'invalid_user', project: project, user: nil @@ -43,7 +43,7 @@ RSpec.describe Projects::GoogleCloud::GcpRegionsController do expect_snowplow_event( category: 'Projects::GoogleCloud', action: 'feature_flag_enabled!', - label: 'access_denied', + label: 'error_access_denied', property: 'feature_flag_not_enabled', project: project, user: user_maintainer @@ -57,7 +57,7 @@ RSpec.describe Projects::GoogleCloud::GcpRegionsController do expect_snowplow_event( category: 'Projects::GoogleCloud', action: 'google_oauth2_enabled!', - label: 'access_denied', + label: 'error_access_denied', extra: { reason: 'google_oauth2_not_configured', config: config }, project: project, user: user_maintainer @@ -144,8 +144,8 @@ RSpec.describe Projects::GoogleCloud::GcpRegionsController do sign_in(user_maintainer) end - it 'redirects to google cloud index' do - is_expected.to redirect_to(project_google_cloud_index_path(project)) + it 'redirects to google cloud configurations' do + is_expected.to redirect_to(project_google_cloud_configuration_path(project)) end end end -- cgit v1.2.1