Commit a01fb250 authored by Robert Speicher's avatar Robert Speicher

Merge branch 'detect-ee-namespaced-background-migration-as-migration-in-test-level' into 'master'

Properly detect EE-namespaced background migration in TestLevel

See merge request gitlab-org/gitlab!25909
parents 1df62a12 bd2eb420
...@@ -8,6 +8,7 @@ module Quality ...@@ -8,6 +8,7 @@ module Quality
migration: %w[ migration: %w[
migrations migrations
lib/gitlab/background_migration lib/gitlab/background_migration
lib/ee/gitlab/background_migration
], ],
unit: %w[ unit: %w[
bin bin
......
...@@ -28,7 +28,7 @@ RSpec.describe Quality::TestLevel do ...@@ -28,7 +28,7 @@ RSpec.describe Quality::TestLevel do
context 'when level is migration' do context 'when level is migration' do
it 'returns a pattern' do it 'returns a pattern' do
expect(subject.pattern(:migration)) expect(subject.pattern(:migration))
.to eq("spec/{migrations,lib/gitlab/background_migration}{,/**/}*_spec.rb") .to eq("spec/{migrations,lib/gitlab/background_migration,lib/ee/gitlab/background_migration}{,/**/}*_spec.rb")
end end
end end
...@@ -89,7 +89,7 @@ RSpec.describe Quality::TestLevel do ...@@ -89,7 +89,7 @@ RSpec.describe Quality::TestLevel do
context 'when level is migration' do context 'when level is migration' do
it 'returns a regexp' do it 'returns a regexp' do
expect(subject.regexp(:migration)) expect(subject.regexp(:migration))
.to eq(%r{spec/(migrations|lib/gitlab/background_migration)}) .to eq(%r{spec/(migrations|lib/gitlab/background_migration|lib/ee/gitlab/background_migration)})
end end
end end
...@@ -134,7 +134,7 @@ RSpec.describe Quality::TestLevel do ...@@ -134,7 +134,7 @@ RSpec.describe Quality::TestLevel do
expect(subject.level_for('spec/migrations/add_default_and_free_plans_spec.rb')).to eq(:migration) expect(subject.level_for('spec/migrations/add_default_and_free_plans_spec.rb')).to eq(:migration)
end end
it 'returns the correct level for a background_migration test' do it 'returns the correct level for a background migration test' do
expect(subject.level_for('spec/lib/gitlab/background_migration/archive_legacy_traces_spec.rb')).to eq(:migration) expect(subject.level_for('spec/lib/gitlab/background_migration/archive_legacy_traces_spec.rb')).to eq(:migration)
end end
...@@ -142,6 +142,10 @@ RSpec.describe Quality::TestLevel do ...@@ -142,6 +142,10 @@ RSpec.describe Quality::TestLevel do
expect(described_class.new('ee/').level_for('ee/spec/migrations/geo/migrate_ci_job_artifacts_to_separate_registry_spec.rb')).to eq(:migration) expect(described_class.new('ee/').level_for('ee/spec/migrations/geo/migrate_ci_job_artifacts_to_separate_registry_spec.rb')).to eq(:migration)
end end
it 'returns the correct level for a EE-namespaced background migration test' do
expect(described_class.new('ee/').level_for('ee/spec/lib/ee/gitlab/background_migration/prune_orphaned_geo_events_spec.rb')).to eq(:migration)
end
it 'returns the correct level for an integration test' do it 'returns the correct level for an integration test' do
expect(subject.level_for('spec/mailers/abuse_report_mailer_spec.rb')).to eq(:integration) expect(subject.level_for('spec/mailers/abuse_report_mailer_spec.rb')).to eq(:integration)
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment