diff options
| author | Alfredo Sumaran <alfredo@gitlab.com> | 2017-03-30 02:29:38 +0300 |
|---|---|---|
| committer | Alfredo Sumaran <alfredo@gitlab.com> | 2017-03-30 02:29:38 +0300 |
| commit | 1ccf4af3c50ae965374bc357f93382e1a02f810a (patch) | |
| tree | 6ecfedb8be87fc49f6fd2f56aa01b39f52f42a8a /lib/tasks | |
| parent | f7fefe82e5e6c72f15e2089816460d704c3ac783 (diff) | |
| parent | 880b53e0b44909b255008ca32df62120cc435595 (diff) | |
Merge branch '29539-fix-pipelines-container-width-with-parallel-diff' into 'master'
Reset container width when switching to pipelines MR tab
Closes #29539
See merge request !10169
Diffstat (limited to 'lib/tasks')
| -rw-r--r-- | lib/tasks/karma.rake | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/tasks/karma.rake b/lib/tasks/karma.rake index 40465ea3bf0..62a12174efa 100644 --- a/lib/tasks/karma.rake +++ b/lib/tasks/karma.rake @@ -1,9 +1,10 @@ unless Rails.env.production? namespace :karma do desc 'GitLab | Karma | Generate fixtures for JavaScript tests' - RSpec::Core::RakeTask.new(:fixtures) do |t| + RSpec::Core::RakeTask.new(:fixtures, [:pattern]) do |t, args| + args.with_defaults(pattern: 'spec/javascripts/fixtures/*.rb') ENV['NO_KNAPSACK'] = 'true' - t.pattern = 'spec/javascripts/fixtures/*.rb' + t.pattern = args[:pattern] t.rspec_opts = '--format documentation' end |