From fb58d337f0b8b6f685c1e94a9327d8d12ebfbf81 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Wed, 1 Sep 2021 07:13:49 +0000 Subject: Add latest changes from gitlab-org/gitlab@14-2-stable-ee --- .../orphaned_invite_tokens_cleanup_spec.rb | 20 ++++++++++++- .../reset_severity_levels_to_new_default_spec.rb | 33 ++++++++++++++++++++++ 2 files changed, 52 insertions(+), 1 deletion(-) create mode 100644 spec/migrations/reset_severity_levels_to_new_default_spec.rb (limited to 'spec/migrations') diff --git a/spec/migrations/orphaned_invite_tokens_cleanup_spec.rb b/spec/migrations/orphaned_invite_tokens_cleanup_spec.rb index 889c04700c7..be5e7756514 100644 --- a/spec/migrations/orphaned_invite_tokens_cleanup_spec.rb +++ b/spec/migrations/orphaned_invite_tokens_cleanup_spec.rb @@ -16,7 +16,7 @@ RSpec.describe OrphanedInviteTokensCleanup, :migration do table(:members).create!(defaults.merge(extra_attributes)) end - describe '#up', :aggregate_failures do + shared_examples 'removes orphaned invite tokens' do it 'removes invite tokens for accepted records with invite_accepted_at < created_at' do record1 = create_member(invite_token: 'foo', invite_accepted_at: 1.day.ago, created_at: 1.hour.ago) record2 = create_member(invite_token: 'foo2', invite_accepted_at: nil, created_at: 1.hour.ago) @@ -29,4 +29,22 @@ RSpec.describe OrphanedInviteTokensCleanup, :migration do expect(table(:members).find(record3.id).invite_token).to eq 'foo3' end end + + describe '#up', :aggregate_failures do + it_behaves_like 'removes orphaned invite tokens' + end + + context 'when there is a mix of timestamptz and timestamp types' do + around do |example| + ActiveRecord::Base.connection.execute "ALTER TABLE members alter created_at type timestamp with time zone" + + example.run + + ActiveRecord::Base.connection.execute "ALTER TABLE members alter created_at type timestamp without time zone" + end + + describe '#up', :aggregate_failures do + it_behaves_like 'removes orphaned invite tokens' + end + end end diff --git a/spec/migrations/reset_severity_levels_to_new_default_spec.rb b/spec/migrations/reset_severity_levels_to_new_default_spec.rb new file mode 100644 index 00000000000..18dc001db16 --- /dev/null +++ b/spec/migrations/reset_severity_levels_to_new_default_spec.rb @@ -0,0 +1,33 @@ +# frozen_string_literal: true + +require 'spec_helper' + +require_migration! + +RSpec.describe ResetSeverityLevelsToNewDefault do + let(:approval_project_rules) { table(:approval_project_rules) } + let(:projects) { table(:projects)} + let(:namespaces) { table(:namespaces)} + let(:namespace) { namespaces.create!(name: 'namespace', path: 'namespace')} + let(:project) { projects.create!(name: 'project', path: 'project', namespace_id: namespace.id)} + let(:approval_project_rule) { approval_project_rules.create!(name: 'rule', project_id: project.id, severity_levels: severity_levels) } + + context 'without having all severity levels selected' do + let(:severity_levels) { ['high'] } + + it 'does not change severity_levels' do + expect(approval_project_rule.severity_levels).to eq(severity_levels) + expect { migrate! }.not_to change { approval_project_rule.reload.severity_levels } + end + end + + context 'with all scanners selected' do + let(:severity_levels) { ::Enums::Vulnerability::SEVERITY_LEVELS.keys } + let(:default_levels) { %w(unknown high critical) } + + it 'changes severity_levels to the default value' do + expect(approval_project_rule.severity_levels).to eq(severity_levels) + expect { migrate! }.to change {approval_project_rule.reload.severity_levels}.from(severity_levels).to(default_levels) + end + end +end -- cgit v1.2.3