diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-12-11 15:13:09 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-12-11 15:13:09 +0300 |
commit | ee2024d964d1742a8ec01da89e0b34351c9303ab (patch) | |
tree | 7c8108788f3db88c579974951bb2cb1b792e871e /spec/services | |
parent | 5f6fe673fa797f46ee747df4553a9c216224bb85 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/services')
3 files changed, 3 insertions, 19 deletions
diff --git a/spec/services/projects/after_rename_service_spec.rb b/spec/services/projects/after_rename_service_spec.rb index 5d894ddc41e..228dff6aa0b 100644 --- a/spec/services/projects/after_rename_service_spec.rb +++ b/spec/services/projects/after_rename_service_spec.rb @@ -79,14 +79,6 @@ RSpec.describe Projects::AfterRenameService, feature_category: :groups_and_proje project.container_repositories << container_repository end - context 'when feature renaming_project_with_tags is disabled' do - before do - stub_feature_flags(renaming_project_with_tags: false) - end - - it_behaves_like 'logging and raising a RenameFailedError' - end - context 'when Gitlab API is not supported' do before do allow(ContainerRegistry::GitlabApiClient).to receive(:supports_gitlab_api?).and_return(false) diff --git a/spec/services/projects/refresh_build_artifacts_size_statistics_service_spec.rb b/spec/services/projects/refresh_build_artifacts_size_statistics_service_spec.rb index 591cd1cba8d..48cf963e6e1 100644 --- a/spec/services/projects/refresh_build_artifacts_size_statistics_service_spec.rb +++ b/spec/services/projects/refresh_build_artifacts_size_statistics_service_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' -RSpec.describe Projects::RefreshBuildArtifactsSizeStatisticsService, :clean_gitlab_redis_shared_state, feature_category: :build_artifacts do +RSpec.describe Projects::RefreshBuildArtifactsSizeStatisticsService, :clean_gitlab_redis_buffered_counter, feature_category: :build_artifacts do let(:service) { described_class.new } describe '#execute' do @@ -79,7 +79,7 @@ RSpec.describe Projects::RefreshBuildArtifactsSizeStatisticsService, :clean_gitl end before do - allow(Gitlab::Redis::SharedState).to receive(:with).and_raise(StandardError, 'error') + allow(Gitlab::Redis::BufferedCounter).to receive(:with).and_raise(StandardError, 'error') expect { service.execute }.to raise_error(StandardError) end diff --git a/spec/services/projects/update_service_spec.rb b/spec/services/projects/update_service_spec.rb index c393125de3f..e75a2d774a9 100644 --- a/spec/services/projects/update_service_spec.rb +++ b/spec/services/projects/update_service_spec.rb @@ -432,15 +432,7 @@ RSpec.describe Projects::UpdateService, feature_category: :groups_and_projects d end end - context 'when feature renaming_project_with_tags is disabled' do - before do - stub_feature_flags(renaming_project_with_tags: false) - end - - it_behaves_like 'renaming the project fails with message', /contains container registry tags/ - end - - context "when the GitlabAPI is not supported" do + context 'when the GitlabAPI is not supported' do before do allow(ContainerRegistry::GitlabApiClient).to receive(:supports_gitlab_api?).and_return(false) end |