Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
bd2eb420
Commit
bd2eb420
authored
Feb 25, 2020
by
Rémy Coutable
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Properly detect EE-namespaced background migration in TestLevel
Signed-off-by:
Rémy Coutable
<
remy@rymai.me
>
parent
becfc8bc
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
3 deletions
+8
-3
lib/quality/test_level.rb
lib/quality/test_level.rb
+1
-0
spec/lib/quality/test_level_spec.rb
spec/lib/quality/test_level_spec.rb
+7
-3
No files found.
lib/quality/test_level.rb
View file @
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
...
...
spec/lib/quality/test_level_spec.rb
View file @
bd2eb420
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment