From 9e08b71a04fe91a8dcc51368b54c4350af9e6872 Mon Sep 17 00:00:00 2001 From: Yorick Peterse Date: Wed, 20 Feb 2019 15:41:34 +0100 Subject: [PATCH] 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. --- lib/tasks/karma.rake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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'