diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-11-19 11:27:35 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-11-19 11:27:35 +0300 |
commit | 7e9c479f7de77702622631cff2628a9c8dcbc627 (patch) | |
tree | c8f718a08e110ad7e1894510980d2155a6549197 /lib/quality/test_level.rb | |
parent | e852b0ae16db4052c1c567d9efa4facc81146e88 (diff) |
Add latest changes from gitlab-org/gitlab@13-6-stable-eev13.6.0-rc42
Diffstat (limited to 'lib/quality/test_level.rb')
-rw-r--r-- | lib/quality/test_level.rb | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/lib/quality/test_level.rb b/lib/quality/test_level.rb index cd94efddc1e..b239b6812ca 100644 --- a/lib/quality/test_level.rb +++ b/lib/quality/test_level.rb @@ -12,6 +12,9 @@ module Quality lib/gitlab/background_migration lib/ee/gitlab/background_migration ], + frontend_fixture: %w[ + frontend/fixtures + ], unit: %w[ bin channels @@ -63,7 +66,7 @@ module Quality end def pattern(level) - @patterns[level] ||= "#{prefix}spec/#{folders_pattern(level)}{,/**/}*_spec.rb" + @patterns[level] ||= "#{prefix}spec/#{folders_pattern(level)}{,/**/}*#{suffix(level)}" end def regexp(level) @@ -76,6 +79,9 @@ module Quality # spec/lib/gitlab/background_migration and tests under spec/lib are unit by default when regexp(:migration), regexp(:background_migration) :migration + # Detect frontend fixture before matching other unit tests + when regexp(:frontend_fixture) + :frontend_fixture when regexp(:unit) :unit when regexp(:integration) @@ -93,6 +99,15 @@ module Quality private + def suffix(level) + case level + when :frontend_fixture + ".rb" + else + "_spec.rb" + end + end + def migration_and_background_migration_folders TEST_LEVEL_FOLDERS.fetch(:migration) + TEST_LEVEL_FOLDERS.fetch(:background_migration) end |