diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-04 18:06:38 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-04 18:06:38 +0300 |
| commit | 5ecacec30458330df5fa6d591dc58e37afb41cd4 (patch) | |
| tree | 58a9c004fdae78cbedbcc616dcfa783a1172eea3 /lib/tasks | |
| parent | 0d46bf06388d485824bc2f1e736b92b2a8a397e4 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/tasks')
| -rw-r--r-- | lib/tasks/frontend.rake | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/tasks/frontend.rake b/lib/tasks/frontend.rake index 1cac7520227..6e90229830d 100644 --- a/lib/tasks/frontend.rake +++ b/lib/tasks/frontend.rake @@ -2,7 +2,10 @@ unless Rails.env.production? namespace :frontend do desc 'GitLab | Frontend | Generate fixtures for JavaScript tests' RSpec::Core::RakeTask.new(:fixtures, [:pattern]) do |t, args| - args.with_defaults(pattern: '{spec,ee/spec}/frontend/fixtures/*.rb') + directories = %w[spec] + directories << 'ee/spec' if Gitlab.ee? + directory_glob = "{#{directories.join(',')}}" + args.with_defaults(pattern: "#{directory_glob}/frontend/fixtures/*.rb") ENV['NO_KNAPSACK'] = 'true' t.pattern = args[:pattern] t.rspec_opts = '--format documentation' |