diff options
| author | Yorick Peterse <yorickpeterse@gmail.com> | 2019-02-20 15:41:34 +0100 |
|---|---|---|
| committer | Yorick Peterse <yorickpeterse@gmail.com> | 2019-02-28 15:03:10 +0100 |
| commit | 9e08b71a04fe91a8dcc51368b54c4350af9e6872 (patch) | |
| tree | fdcd5242738e169cc31683e6c40ffd3c2f2c83c3 /lib/tasks | |
| parent | f26cd63b0f7e9acc29a72d81ad2ed327ac93b816 (diff) | |
| download | gitlab-ce-9e08b71a04fe91a8dcc51368b54c4350af9e6872.tar.gz | |
Backport EE changes to the Karma Rake task
There's no harm in globbing for the ee/ directory, since this will
effectively be a noop in CE.
Diffstat (limited to 'lib/tasks')
| -rw-r--r-- | lib/tasks/karma.rake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/tasks/karma.rake b/lib/tasks/karma.rake index 62a12174efa..53325d492d1 100644 --- a/lib/tasks/karma.rake +++ b/lib/tasks/karma.rake @@ -2,7 +2,7 @@ unless Rails.env.production? namespace :karma do desc 'GitLab | Karma | Generate fixtures for JavaScript tests' RSpec::Core::RakeTask.new(:fixtures, [:pattern]) do |t, args| - args.with_defaults(pattern: 'spec/javascripts/fixtures/*.rb') + args.with_defaults(pattern: '{spec,ee/spec}/javascripts/fixtures/*.rb') ENV['NO_KNAPSACK'] = 'true' t.pattern = args[:pattern] t.rspec_opts = '--format documentation' |