diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-09-20 14:18:08 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-09-20 14:18:08 +0300 |
commit | 5afcbe03ead9ada87621888a31a62652b10a7e4f (patch) | |
tree | 9918b67a0d0f0bafa6542e839a8be37adf73102d /spec/tasks | |
parent | c97c0201564848c1f53226fe19d71fdcc472f7d0 (diff) |
Add latest changes from gitlab-org/gitlab@16-4-stable-eev16.4.0-rc42
Diffstat (limited to 'spec/tasks')
27 files changed, 80 insertions, 96 deletions
diff --git a/spec/tasks/gitlab/audit_event_types/check_docs_task_spec.rb b/spec/tasks/gitlab/audit_event_types/check_docs_task_spec.rb index 5dd7599696b..b492289e99e 100644 --- a/spec/tasks/gitlab/audit_event_types/check_docs_task_spec.rb +++ b/spec/tasks/gitlab/audit_event_types/check_docs_task_spec.rb @@ -1,13 +1,13 @@ # frozen_string_literal: true -require 'spec_helper' +require 'rake_helper' require_relative '../../../../lib/tasks/gitlab/audit_event_types/check_docs_task' require_relative '../../../../lib/tasks/gitlab/audit_event_types/compile_docs_task' RSpec.describe Tasks::Gitlab::AuditEventTypes::CheckDocsTask, feature_category: :audit_events do - let_it_be(:docs_dir) { Rails.root.join("tmp/tests/doc/administration/audit_event_streaming") } - let_it_be(:docs_path) { Rails.root.join(docs_dir, 'audit_event_types.md') } - let_it_be(:template_erb_path) { Rails.root.join("tooling/audit_events/docs/templates/audit_event_types.md.erb") } + let(:docs_dir) { Rails.root.join("tmp/tests/doc/administration/audit_event_streaming") } + let(:docs_path) { Rails.root.join(docs_dir, 'audit_event_types.md') } + let(:template_erb_path) { Rails.root.join("tooling/audit_events/docs/templates/audit_event_types.md.erb") } subject(:check_docs_task) { described_class.new(docs_dir, docs_path, template_erb_path) } @@ -37,7 +37,7 @@ RSpec.describe Tasks::Gitlab::AuditEventTypes::CheckDocsTask, feature_category: end context 'when an existing audit event type is removed' do - let_it_be(:updated_definition) { Gitlab::Audit::Type::Definition.definitions.except(:feature_flag_created) } + let(:updated_definition) { Gitlab::Audit::Type::Definition.definitions.except(:feature_flag_created) } it 'raises an error' do expect(Gitlab::Audit::Type::Definition).to receive(:definitions).and_return(updated_definition) @@ -50,7 +50,7 @@ RSpec.describe Tasks::Gitlab::AuditEventTypes::CheckDocsTask, feature_category: end context 'when an existing audit event type is updated' do - let_it_be(:updated_definition) { Gitlab::Audit::Type::Definition.definitions } + let(:updated_definition) { Gitlab::Audit::Type::Definition.definitions } it 'raises an error' do updated_definition[:feature_flag_created].attributes[:streamed] = false diff --git a/spec/tasks/gitlab/audit_event_types/compile_docs_task_spec.rb b/spec/tasks/gitlab/audit_event_types/compile_docs_task_spec.rb index a881d17d3b8..0ee85b1283b 100644 --- a/spec/tasks/gitlab/audit_event_types/compile_docs_task_spec.rb +++ b/spec/tasks/gitlab/audit_event_types/compile_docs_task_spec.rb @@ -1,12 +1,12 @@ # frozen_string_literal: true -require 'spec_helper' +require 'rake_helper' require_relative '../../../../lib/tasks/gitlab/audit_event_types/compile_docs_task' RSpec.describe Tasks::Gitlab::AuditEventTypes::CompileDocsTask, feature_category: :audit_events do - let_it_be(:docs_dir) { Rails.root.join("tmp/tests/doc/administration/audit_event_streaming") } - let_it_be(:docs_path) { Rails.root.join(docs_dir, 'audit_event_types.md') } - let_it_be(:template_erb_path) { Rails.root.join("tooling/audit_events/docs/templates/audit_event_types.md.erb") } + let(:docs_dir) { Rails.root.join("tmp/tests/doc/administration/audit_event_streaming") } + let(:docs_path) { Rails.root.join(docs_dir, 'audit_event_types.md') } + let(:template_erb_path) { Rails.root.join("tooling/audit_events/docs/templates/audit_event_types.md.erb") } subject(:compile_docs_task) { described_class.new(docs_dir, docs_path, template_erb_path) } diff --git a/spec/tasks/gitlab/backup_rake_spec.rb b/spec/tasks/gitlab/backup_rake_spec.rb index 04634af12a8..fda27d5827f 100644 --- a/spec/tasks/gitlab/backup_rake_spec.rb +++ b/spec/tasks/gitlab/backup_rake_spec.rb @@ -38,7 +38,7 @@ RSpec.describe 'gitlab:backup namespace rake tasks', :delete, feature_category: %w[db repositories] end - before(:all) do # rubocop:disable RSpec/BeforeAll + before(:all) do Rake.application.rake_require 'active_record/railties/databases' Rake.application.rake_require 'tasks/gitlab/backup' Rake.application.rake_require 'tasks/gitlab/shell' @@ -222,7 +222,7 @@ RSpec.describe 'gitlab:backup namespace rake tasks', :delete, feature_category: # We only need a backup of the repositories for this test stub_env('SKIP', 'db,uploads,builds,artifacts,lfs,terraform_state,registry') - create(:project, :repository) + create(:project_with_design, :repository) end it 'removes stale data' do @@ -241,7 +241,7 @@ RSpec.describe 'gitlab:backup namespace rake tasks', :delete, feature_category: end context 'when the backup is restored' do - let!(:included_project) { create(:project, :repository) } + let!(:included_project) { create(:project_with_design, :repository) } let!(:original_checksum) { included_project.repository.checksum } before do @@ -286,7 +286,7 @@ RSpec.describe 'gitlab:backup namespace rake tasks', :delete, feature_category: allow(Ci::ApplicationRecord.connection).to receive(:reconnect!) end - let!(:project) { create(:project, :repository) } + let!(:project) { create(:project_with_design, :repository) } context 'with specific backup tasks' do before do @@ -463,9 +463,9 @@ RSpec.describe 'gitlab:backup namespace rake tasks', :delete, feature_category: shared_examples 'includes repositories in all repository storages' do specify :aggregate_failures do - project_a = create(:project, :repository) + project_a = create(:project_with_design, :repository) project_snippet_a = create(:project_snippet, :repository, project: project_a, author: project_a.first_owner) - project_b = create(:project, :repository, repository_storage: second_storage_name) + project_b = create(:project_with_design, :repository, repository_storage: second_storage_name) project_snippet_b = create( :project_snippet, :repository, @@ -474,7 +474,6 @@ RSpec.describe 'gitlab:backup namespace rake tasks', :delete, feature_category: repository_storage: second_storage_name ) create(:wiki_page, container: project_a) - create(:design, :with_file, issue: create(:issue, project: project_a)) expect { run_rake_task('gitlab:backup:create') }.to output.to_stdout_from_any_process @@ -517,9 +516,9 @@ RSpec.describe 'gitlab:backup namespace rake tasks', :delete, feature_category: end it 'includes repositories in default repository storage', :aggregate_failures do - project_a = create(:project, :repository) + project_a = create(:project_with_design, :repository) project_snippet_a = create(:project_snippet, :repository, project: project_a, author: project_a.first_owner) - project_b = create(:project, :repository, repository_storage: second_storage_name) + project_b = create(:project_with_design, :repository, repository_storage: second_storage_name) project_snippet_b = create( :project_snippet, :repository, @@ -528,7 +527,6 @@ RSpec.describe 'gitlab:backup namespace rake tasks', :delete, feature_category: repository_storage: second_storage_name ) create(:wiki_page, container: project_a) - create(:design, :with_file, issue: create(:issue, project: project_a)) expect { run_rake_task('gitlab:backup:create') }.to output.to_stdout_from_any_process @@ -564,7 +562,7 @@ RSpec.describe 'gitlab:backup namespace rake tasks', :delete, feature_category: # We only need a backup of the repositories for this test stub_env('SKIP', 'db,uploads,builds,artifacts,lfs,terraform_state,registry') - create(:project, :repository) + create(:project_with_design, :repository) end it 'passes through concurrency environment variables' do @@ -602,7 +600,7 @@ RSpec.describe 'gitlab:backup namespace rake tasks', :delete, feature_category: before do stub_env('SKIP', 'an-unknown-type,repositories,uploads,anotherunknowntype') - create(:project, :repository) + create(:project_with_design, :repository) end it "does not contain repositories and uploads" do @@ -660,7 +658,7 @@ RSpec.describe 'gitlab:backup namespace rake tasks', :delete, feature_category: before do stub_env('SKIP', 'tar') - create(:project, :repository) + create(:project_with_design, :repository) end it 'created files with backup content and no tar archive' do diff --git a/spec/tasks/gitlab/ci_secure_files/check_rake_spec.rb b/spec/tasks/gitlab/ci_secure_files/check_rake_spec.rb index b3bd6be8fde..fc9aae3597e 100644 --- a/spec/tasks/gitlab/ci_secure_files/check_rake_spec.rb +++ b/spec/tasks/gitlab/ci_secure_files/check_rake_spec.rb @@ -4,7 +4,7 @@ require 'rake_helper' RSpec.describe 'gitlab:ci_secure_files', factory_default: :keep, feature_category: :mobile_devops do describe 'check' do - let_it_be(:project) { create_default(:project).freeze } + let!(:project) { create_default(:project).freeze } let!(:secure_file) { create(:ci_secure_file) } before do diff --git a/spec/tasks/gitlab/ci_secure_files/migrate_rake_spec.rb b/spec/tasks/gitlab/ci_secure_files/migrate_rake_spec.rb index 37ae0d694eb..f3856969a6e 100644 --- a/spec/tasks/gitlab/ci_secure_files/migrate_rake_spec.rb +++ b/spec/tasks/gitlab/ci_secure_files/migrate_rake_spec.rb @@ -3,12 +3,12 @@ require 'rake_helper' RSpec.describe 'gitlab:ci_secure_files', feature_category: :mobile_devops do - let_it_be(:local_file) { create(:ci_secure_file) } + let!(:local_file) { create(:ci_secure_file) } let(:logger) { instance_double(Logger) } let(:helper) { double } - before_all do + before(:all) do Rake.application.rake_require 'tasks/gitlab/ci_secure_files/migrate' end diff --git a/spec/tasks/gitlab/container_registry_rake_spec.rb b/spec/tasks/gitlab/container_registry_rake_spec.rb index f4bd8560cd0..d0c728bf36d 100644 --- a/spec/tasks/gitlab/container_registry_rake_spec.rb +++ b/spec/tasks/gitlab/container_registry_rake_spec.rb @@ -3,9 +3,9 @@ require 'rake_helper' RSpec.describe 'gitlab:container_registry namespace rake tasks', :silence_stdout do - let_it_be(:api_url) { 'http://registry.gitlab' } + let(:api_url) { 'http://registry.gitlab' } - before_all do + before(:all) do Rake.application.rake_require 'tasks/gitlab/container_registry' end diff --git a/spec/tasks/gitlab/db/cells/bump_cell_sequences_rake_spec.rb b/spec/tasks/gitlab/db/cells/bump_cell_sequences_rake_spec.rb index a5dd7c0ff09..a1725d6fed7 100644 --- a/spec/tasks/gitlab/db/cells/bump_cell_sequences_rake_spec.rb +++ b/spec/tasks/gitlab/db/cells/bump_cell_sequences_rake_spec.rb @@ -4,7 +4,7 @@ require 'rake_helper' RSpec.describe 'gitlab:db:cells:bump_cell_sequences', :silence_stdout, :suppress_gitlab_schemas_validate_connection, feature_category: :cell, query_analyzers: false do - before_all do + before(:all) do Rake.application.rake_require 'tasks/gitlab/db/cells/bump_cell_sequences' # empty task as env is already loaded diff --git a/spec/tasks/gitlab/db/decomposition/connection_status_rake_spec.rb b/spec/tasks/gitlab/db/decomposition/connection_status_rake_spec.rb index 5116ee5663e..352e3d944fc 100644 --- a/spec/tasks/gitlab/db/decomposition/connection_status_rake_spec.rb +++ b/spec/tasks/gitlab/db/decomposition/connection_status_rake_spec.rb @@ -8,7 +8,7 @@ RSpec.describe 'gitlab:db:decomposition:connection_status', feature_category: :c subject { run_rake_task('gitlab:db:decomposition:connection_status') } - before_all do + before(:all) do Rake.application.rake_require 'tasks/gitlab/db/decomposition/connection_status' end diff --git a/spec/tasks/gitlab/db/decomposition/rollback/bump_ci_sequences_rake_spec.rb b/spec/tasks/gitlab/db/decomposition/rollback/bump_ci_sequences_rake_spec.rb index f923d09bdaa..3d4b977644f 100644 --- a/spec/tasks/gitlab/db/decomposition/rollback/bump_ci_sequences_rake_spec.rb +++ b/spec/tasks/gitlab/db/decomposition/rollback/bump_ci_sequences_rake_spec.rb @@ -4,7 +4,7 @@ require 'rake_helper' RSpec.describe 'gitlab:db:decomposition:rollback:bump_ci_sequences', :silence_stdout, :suppress_gitlab_schemas_validate_connection, feature_category: :cell, query_analyzers: false do - before_all do + before(:all) do Rake.application.rake_require 'tasks/gitlab/db/decomposition/rollback/bump_ci_sequences' # empty task as env is already loaded diff --git a/spec/tasks/gitlab/db/lock_writes_rake_spec.rb b/spec/tasks/gitlab/db/lock_writes_rake_spec.rb index 069f5dc7d84..5baf13b9847 100644 --- a/spec/tasks/gitlab/db/lock_writes_rake_spec.rb +++ b/spec/tasks/gitlab/db/lock_writes_rake_spec.rb @@ -3,7 +3,7 @@ require 'rake_helper' RSpec.describe 'gitlab:db:lock_writes', :reestablished_active_record_base, feature_category: :cell do - before_all do + before(:all) do Rake.application.rake_require 'active_record/railties/databases' Rake.application.rake_require 'tasks/seed_fu' Rake.application.rake_require 'tasks/gitlab/db/validate_config' diff --git a/spec/tasks/gitlab/db/migration_fix_15_11_rake_spec.rb b/spec/tasks/gitlab/db/migration_fix_15_11_rake_spec.rb index 41d77d6efc7..9a101921b68 100644 --- a/spec/tasks/gitlab/db/migration_fix_15_11_rake_spec.rb +++ b/spec/tasks/gitlab/db/migration_fix_15_11_rake_spec.rb @@ -7,7 +7,7 @@ RSpec.describe 'migration_fix_15_11', :reestablished_active_record_base, feature let(:target_init_schema) { '20220314184009' } let(:earlier_init_schema) { '20210101010101' } - before_all do + before(:all) do Rake.application.rake_require 'active_record/railties/databases' Rake.application.rake_require 'tasks/gitlab/db/migration_fix_15_11' diff --git a/spec/tasks/gitlab/db/truncate_legacy_tables_rake_spec.rb b/spec/tasks/gitlab/db/truncate_legacy_tables_rake_spec.rb index 78d2bcba8a2..518acfc5d81 100644 --- a/spec/tasks/gitlab/db/truncate_legacy_tables_rake_spec.rb +++ b/spec/tasks/gitlab/db/truncate_legacy_tables_rake_spec.rb @@ -9,7 +9,7 @@ RSpec.describe 'gitlab:db:truncate_legacy_tables', :silence_stdout, :reestablish let(:test_gitlab_main_table) { '_test_gitlab_main_table' } let(:test_gitlab_ci_table) { '_test_gitlab_ci_table' } - before_all do + before(:all) do Rake.application.rake_require 'active_record/railties/databases' Rake.application.rake_require 'tasks/seed_fu' Rake.application.rake_require 'tasks/gitlab/db/validate_config' diff --git a/spec/tasks/gitlab/db/validate_config_rake_spec.rb b/spec/tasks/gitlab/db/validate_config_rake_spec.rb index e2e1cf249f0..e58667578b2 100644 --- a/spec/tasks/gitlab/db/validate_config_rake_spec.rb +++ b/spec/tasks/gitlab/db/validate_config_rake_spec.rb @@ -7,7 +7,7 @@ RSpec.describe 'gitlab:db:validate_config', :silence_stdout, :suppress_gitlab_sc # which would not be cleaned either by `DbCleaner` self.use_transactional_tests = false - before_all do + before(:all) do Rake.application.rake_require 'active_record/railties/databases' Rake.application.rake_require 'tasks/seed_fu' Rake.application.rake_require 'tasks/gitlab/db/validate_config' diff --git a/spec/tasks/gitlab/db_rake_spec.rb b/spec/tasks/gitlab/db_rake_spec.rb index 344429dc6ec..c35c162c99a 100644 --- a/spec/tasks/gitlab/db_rake_spec.rb +++ b/spec/tasks/gitlab/db_rake_spec.rb @@ -1,10 +1,9 @@ # frozen_string_literal: true -require 'spec_helper' -require 'rake' +require 'rake_helper' RSpec.describe 'gitlab:db namespace rake task', :silence_stdout, feature_category: :database do - before(:all) do # rubocop:disable RSpec/BeforeAll + before(:all) do Rake.application.rake_require 'active_record/railties/databases' Rake.application.rake_require 'tasks/seed_fu' Rake.application.rake_require 'tasks/gitlab/db' @@ -18,6 +17,7 @@ RSpec.describe 'gitlab:db namespace rake task', :silence_stdout, feature_categor allow(Rake::Task['db:migrate']).to receive(:invoke).and_return(true) allow(Rake::Task['db:schema:load']).to receive(:invoke).and_return(true) allow(Rake::Task['db:seed_fu']).to receive(:invoke).and_return(true) + stub_feature_flags(disallow_database_ddl_feature_flags: false) end describe 'mark_migration_complete' do @@ -551,9 +551,9 @@ RSpec.describe 'gitlab:db namespace rake task', :silence_stdout, feature_categor end describe 'clean_structure_sql' do - let_it_be(:clean_rake_task) { 'gitlab:db:clean_structure_sql' } - let_it_be(:test_task_name) { 'gitlab:db:_test_multiple_structure_cleans' } - let_it_be(:input) { 'this is structure data' } + let(:clean_rake_task) { 'gitlab:db:clean_structure_sql' } + let(:test_task_name) { 'gitlab:db:_test_multiple_structure_cleans' } + let(:input) { 'this is structure data' } let(:output) { StringIO.new } @@ -882,6 +882,16 @@ RSpec.describe 'gitlab:db namespace rake task', :silence_stdout, feature_categor end end + context 'when database ddl feature flag is enabled' do + it 'is a no-op' do + stub_feature_flags(disallow_database_ddl_feature_flags: true) + + expect(Gitlab::Database::AsyncIndexes).not_to receive(:execute_pending_actions!) + + expect { run_rake_task('gitlab:db:execute_async_index_operations:main') }.to raise_error(SystemExit) + end + end + context 'with geo configured' do before do skip_unless_geo_configured @@ -956,6 +966,16 @@ RSpec.describe 'gitlab:db namespace rake task', :silence_stdout, feature_categor end end + context 'when database ddl feature flag is enabled' do + it 'is a no-op' do + stub_feature_flags(disallow_database_ddl_feature_flags: true) + + expect(Gitlab::Database::AsyncConstraints).not_to receive(:validate_pending_entries!) + + expect { run_rake_task('gitlab:db:validate_async_constraints:main') }.to raise_error(SystemExit) + end + end + context 'with geo configured' do before do skip_unless_geo_configured diff --git a/spec/tasks/gitlab/dependency_proxy/migrate_rake_spec.rb b/spec/tasks/gitlab/dependency_proxy/migrate_rake_spec.rb index e1504a8aaf5..0bda879bd7c 100644 --- a/spec/tasks/gitlab/dependency_proxy/migrate_rake_spec.rb +++ b/spec/tasks/gitlab/dependency_proxy/migrate_rake_spec.rb @@ -3,7 +3,7 @@ require 'rake_helper' RSpec.describe 'gitlab:dependency_proxy namespace rake task', :silence_stdout do - before_all do + before(:all) do Rake.application.rake_require 'tasks/gitlab/dependency_proxy/migrate' end diff --git a/spec/tasks/gitlab/generate_sample_prometheus_data_rake_spec.rb b/spec/tasks/gitlab/generate_sample_prometheus_data_rake_spec.rb deleted file mode 100644 index 67bf512c6da..00000000000 --- a/spec/tasks/gitlab/generate_sample_prometheus_data_rake_spec.rb +++ /dev/null @@ -1,34 +0,0 @@ -# frozen_string_literal: true - -require 'rake_helper' - -RSpec.describe 'gitlab:generate_sample_prometheus_data rake task', :silence_stdout do - let(:cluster) { create(:cluster, :provided_by_user, :project) } - let(:environment) { create(:environment, project: cluster.project) } - let(:sample_query_file) { File.join(Rails.root, Metrics::SampleMetricsService::DIRECTORY, 'test_query_result.yml') } - let!(:metric) { create(:prometheus_metric, project: cluster.project, identifier: 'test_query_result') } - - around do |example| - example.run - ensure - FileUtils.rm(sample_query_file) - end - - it 'creates the file correctly' do - Rake.application.rake_require 'tasks/gitlab/generate_sample_prometheus_data' - allow(Environment).to receive(:find).and_return(environment) - allow(environment).to receive_message_chain(:prometheus_adapter, :prometheus_client, :query_range) { sample_query_result[30] } - run_rake_task('gitlab:generate_sample_prometheus_data', [environment.id]) - - expect(File.exist?(sample_query_file)).to be true - - query_file_content = YAML.load_file(sample_query_file) - - expect(query_file_content).to eq(sample_query_result) - end -end - -def sample_query_result - file = File.join(Rails.root, 'spec/fixtures/gitlab/sample_metrics', 'sample_metric_query_result.yml') - YAML.load_file(File.expand_path(file, __dir__)) -end diff --git a/spec/tasks/gitlab/gitaly_rake_spec.rb b/spec/tasks/gitlab/gitaly_rake_spec.rb index 7eca2773cf2..5a395c8f6ef 100644 --- a/spec/tasks/gitlab/gitaly_rake_spec.rb +++ b/spec/tasks/gitlab/gitaly_rake_spec.rb @@ -3,7 +3,7 @@ require 'rake_helper' RSpec.describe 'gitlab:gitaly namespace rake task', :silence_stdout do - before_all do + before(:all) do Rake.application.rake_require 'tasks/gitlab/gitaly' end diff --git a/spec/tasks/gitlab/lfs/migrate_rake_spec.rb b/spec/tasks/gitlab/lfs/migrate_rake_spec.rb index 09c95783867..cbc39c6b093 100644 --- a/spec/tasks/gitlab/lfs/migrate_rake_spec.rb +++ b/spec/tasks/gitlab/lfs/migrate_rake_spec.rb @@ -3,7 +3,7 @@ require 'rake_helper' RSpec.describe 'gitlab:lfs namespace rake task', :silence_stdout do - before_all do + before(:all) do Rake.application.rake_require 'tasks/gitlab/lfs/migrate' end diff --git a/spec/tasks/gitlab/packages/migrate_rake_spec.rb b/spec/tasks/gitlab/packages/migrate_rake_spec.rb index be69990a745..cdc817cdf38 100644 --- a/spec/tasks/gitlab/packages/migrate_rake_spec.rb +++ b/spec/tasks/gitlab/packages/migrate_rake_spec.rb @@ -3,7 +3,7 @@ require 'rake_helper' RSpec.describe 'gitlab:packages namespace rake task', :silence_stdout do - before_all do + before(:all) do Rake.application.rake_require 'tasks/gitlab/packages/migrate' end diff --git a/spec/tasks/gitlab/password_rake_spec.rb b/spec/tasks/gitlab/password_rake_spec.rb index 5d5e5af2536..21a6dc102e6 100644 --- a/spec/tasks/gitlab/password_rake_spec.rb +++ b/spec/tasks/gitlab/password_rake_spec.rb @@ -3,8 +3,8 @@ require 'rake_helper' RSpec.describe 'gitlab:password rake tasks', :silence_stdout do - let_it_be(:user_1) { create(:user, username: 'foobar', password: User.random_password) } - let_it_be(:password) { User.random_password } + let!(:user_1) { create(:user, username: 'foobar', password: User.random_password) } + let(:password) { User.random_password } def stub_username(username) allow(Gitlab::TaskHelpers).to receive(:prompt).with('Enter username: ').and_return(username) diff --git a/spec/tasks/gitlab/refresh_project_statistics_build_artifacts_size_rake_spec.rb b/spec/tasks/gitlab/refresh_project_statistics_build_artifacts_size_rake_spec.rb index f0fc3c501c5..60c0d80223e 100644 --- a/spec/tasks/gitlab/refresh_project_statistics_build_artifacts_size_rake_spec.rb +++ b/spec/tasks/gitlab/refresh_project_statistics_build_artifacts_size_rake_spec.rb @@ -6,9 +6,9 @@ RSpec.describe 'gitlab:refresh_project_statistics_build_artifacts_size rake task let(:rake_task) { 'gitlab:refresh_project_statistics_build_artifacts_size' } describe 'enqueuing build artifacts size statistics refresh for given list of project IDs' do - let_it_be(:project_1) { create(:project) } - let_it_be(:project_2) { create(:project) } - let_it_be(:project_3) { create(:project) } + let!(:project_1) { create(:project) } + let!(:project_2) { create(:project) } + let!(:project_3) { create(:project) } let(:csv_body) do <<~BODY diff --git a/spec/tasks/gitlab/snippets_rake_spec.rb b/spec/tasks/gitlab/snippets_rake_spec.rb index f0ba5ac2d92..231c2dae006 100644 --- a/spec/tasks/gitlab/snippets_rake_spec.rb +++ b/spec/tasks/gitlab/snippets_rake_spec.rb @@ -3,13 +3,13 @@ require 'rake_helper' RSpec.describe 'gitlab:snippets namespace rake task', :silence_stdout do - let_it_be(:user) { create(:user) } - let_it_be(:migrated) { create(:personal_snippet, :repository, author: user) } + let!(:user) { create(:user) } + let!(:migrated) { create(:personal_snippet, :repository, author: user) } let(:non_migrated) { create_list(:personal_snippet, 3, author: user) } let(:non_migrated_ids) { non_migrated.pluck(:id) } - before_all do + before(:all) do Rake.application.rake_require 'tasks/gitlab/snippets' end diff --git a/spec/tasks/gitlab/terraform/migrate_rake_spec.rb b/spec/tasks/gitlab/terraform/migrate_rake_spec.rb index 0547d351065..3797c01a9cb 100644 --- a/spec/tasks/gitlab/terraform/migrate_rake_spec.rb +++ b/spec/tasks/gitlab/terraform/migrate_rake_spec.rb @@ -3,12 +3,12 @@ require 'rake_helper' RSpec.describe 'gitlab:terraform_states', :silence_stdout do - let_it_be(:version) { create(:terraform_state_version) } + let!(:version) { create(:terraform_state_version) } let(:logger) { instance_double(Logger) } let(:helper) { double } - before_all do + before(:all) do Rake.application.rake_require 'tasks/gitlab/terraform/migrate' end diff --git a/spec/tasks/gitlab/web_hook_rake_spec.rb b/spec/tasks/gitlab/web_hook_rake_spec.rb index cb6a6e72ab1..6ad65f55142 100644 --- a/spec/tasks/gitlab/web_hook_rake_spec.rb +++ b/spec/tasks/gitlab/web_hook_rake_spec.rb @@ -3,10 +3,10 @@ require 'rake_helper' RSpec.describe 'gitlab:web_hook namespace rake tasks', :silence_stdout do - let_it_be(:group, refind: true) { create(:group) } - let_it_be(:project1, reload: true) { create(:project, namespace: group) } - let_it_be(:project2, reload: true) { create(:project, namespace: group) } - let_it_be(:other_group_project, reload: true) { create(:project) } + let!(:group) { create(:group) } + let!(:project1) { create(:project, namespace: group) } + let!(:project2) { create(:project, namespace: group) } + let!(:other_group_project) { create(:project) } let(:url) { 'http://example.com' } let(:hook_urls) { (project1.hooks + project2.hooks).map(&:url) } diff --git a/spec/tasks/gitlab/workhorse_rake_spec.rb b/spec/tasks/gitlab/workhorse_rake_spec.rb index 17f3133ecdc..e87bef9f01f 100644 --- a/spec/tasks/gitlab/workhorse_rake_spec.rb +++ b/spec/tasks/gitlab/workhorse_rake_spec.rb @@ -3,7 +3,7 @@ require 'rake_helper' RSpec.describe 'gitlab:workhorse namespace rake task', :silence_stdout, feature_category: :source_code_management do - before_all do + before(:all) do Rake.application.rake_require 'tasks/gitlab/workhorse' end diff --git a/spec/tasks/gitlab/x509/update_rake_spec.rb b/spec/tasks/gitlab/x509/update_rake_spec.rb index abf8316d978..118b0b2b960 100644 --- a/spec/tasks/gitlab/x509/update_rake_spec.rb +++ b/spec/tasks/gitlab/x509/update_rake_spec.rb @@ -3,7 +3,7 @@ require 'rake_helper' RSpec.describe 'gitlab:x509 namespace rake task', :silence_stdout do - before_all do + before(:all) do Rake.application.rake_require 'tasks/gitlab/x509/update' end diff --git a/spec/tasks/migrate/schema_check_rake_spec.rb b/spec/tasks/migrate/schema_check_rake_spec.rb index 5afad752982..4d0f59295a6 100644 --- a/spec/tasks/migrate/schema_check_rake_spec.rb +++ b/spec/tasks/migrate/schema_check_rake_spec.rb @@ -7,7 +7,7 @@ RSpec.describe 'schema_version_check rake task', :silence_stdout do include StubENV let(:valid_schema_version) { 20211004170422 } - before_all do + before(:all) do Rake.application.rake_require 'active_record/railties/databases' Rake.application.rake_require 'tasks/migrate/schema_check' |