diff options
author | Fatih Acet <acetfatih@gmail.com> | 2016-08-02 14:54:59 +0000 |
---|---|---|
committer | Fatih Acet <acetfatih@gmail.com> | 2016-08-02 14:54:59 +0000 |
commit | 6d2d53b98e508fbea429afbcb626869e7a9190bb (patch) | |
tree | f70d19ad47317302da6e069c363cdf125af7bf92 | |
parent | 97163340403db355df80eec37002e54feb2ba952 (diff) | |
parent | 42352d4b367d9d432bd92838171260d4559ba42e (diff) | |
download | gitlab-ce-6d2d53b98e508fbea429afbcb626869e7a9190bb.tar.gz |
Merge branch 'es6-specs-pls' into 'master'
Add es6 to teaspoon
## What does this MR do?
Adds the `es6` file extensions to teaspoon matchers so it can load those specs.
This also removes the current coffee matchers.
## Are there points in the code the reviewer needs to double check?
## Why was this MR needed?
We need to accept `.js.es6` specs.
## What are the relevant issue numbers?
## Screenshots (if relevant)
## Does this MR meet the acceptance criteria?
- [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)
- [ ] API support added
- Tests
- [ ] Added for this feature/bug
- [ ] All builds are passing
- [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [ ] Branch has no merge conflicts with `master` (if you do - rebase it please)
- [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
See merge request !5524
-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..1a3bbb9c8cc 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.es6,es6}" # Load additional JS files, but requiring them in your spec helper is the preferred way to do this. # suite.javascripts = [] |