diff options
| author | Luke Bennett <lukeeeebennettplus@gmail.com> | 2016-07-27 17:43:36 +0100 |
|---|---|---|
| committer | Luke Bennett <lukeeeebennettplus@gmail.com> | 2016-07-29 00:19:50 +0100 |
| commit | a71db022932b92e83977f81c3d94899ba2f7baeb (patch) | |
| tree | ec67c294d70929db47e8115b683309ed9ff362bd /spec | |
| parent | a330b29b701b2de49206f864e654a01ad1a031c7 (diff) | |
| download | gitlab-ce-a71db022932b92e83977f81c3d94899ba2f7baeb.tar.gz | |
Added es6 regex to teaspoon matchers, still doesnt fix it, problem with sprockets-es6
Diffstat (limited to 'spec')
| -rw-r--r-- | spec/teaspoon_env.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/teaspoon_env.rb b/spec/teaspoon_env.rb index 69b2b9b6d5b..1497a4eb710 100644 --- a/spec/teaspoon_env.rb +++ b/spec/teaspoon_env.rb @@ -38,7 +38,7 @@ Teaspoon.configure do |config| # Specify a file matcher as a regular expression and all matching files will be loaded when the suite is run. These # files need to be within an asset path. You can add asset paths using the `config.asset_paths`. - suite.matcher = "{spec/javascripts,app/assets}/**/*_spec.{js,js.coffee,coffee}" + suite.matcher = "{spec/javascripts,app/assets}/**/*_spec.{js,js.coffee,coffee,js.es6,es6}" # Load additional JS files, but requiring them in your spec helper is the preferred way to do this. # suite.javascripts = [] |