diff options
| author | Alfredo Sumaran <alfredo@gitlab.com> | 2016-11-23 03:12:33 +0000 |
|---|---|---|
| committer | Alfredo Sumaran <alfredo@gitlab.com> | 2016-11-23 03:12:33 +0000 |
| commit | 536ec509d57705e7e62518dfba82e5727499bc8a (patch) | |
| tree | 020306a3681dce4fbe1c18ebfad020bd763a47f8 /spec | |
| parent | ead44226e00016e63029c37c8365932459053f81 (diff) | |
| parent | a571a61f0a1e381b438034c44ddc240ddb965b83 (diff) | |
| download | gitlab-ce-536ec509d57705e7e62518dfba82e5727499bc8a.tar.gz | |
Merge branch '24756-clean-up-eslintrc-globals' into 'master'
Clean up globals exemptions within .eslintrc
## What does this MR do?
Removes unnecessarily-exempted globals from `.eslintrc` where possible.
## Are there points in the code the reviewer needs to double check?
`npm run eslint` should return 0 errors.
## Why was this MR needed?
see Issue #24756
## Does this MR meet the acceptance criteria?
- Tests
- [x] All builds are passing
- [x] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html)
- [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [x] Branch has no merge conflicts with `master` (if it does - rebase it please)
- [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
## What are the relevant issue numbers?
Closes #24756
See merge request !7642
Diffstat (limited to 'spec')
| -rw-r--r-- | spec/javascripts/.eslintrc | 4 | ||||
| -rw-r--r-- | spec/javascripts/build_spec.js.es6 | 4 | ||||
| -rw-r--r-- | spec/javascripts/environments/environments_store_spec.js.es6 | 4 |
3 files changed, 10 insertions, 2 deletions
diff --git a/spec/javascripts/.eslintrc b/spec/javascripts/.eslintrc index 90388929612..7792acffac2 100644 --- a/spec/javascripts/.eslintrc +++ b/spec/javascripts/.eslintrc @@ -7,5 +7,9 @@ "rules": { "prefer-arrow-callback": 0, "func-names": 0 + }, + "globals": { + "fixture": false, + "spyOnEvent": false } } diff --git a/spec/javascripts/build_spec.js.es6 b/spec/javascripts/build_spec.js.es6 index e21e5844a26..ee192c4f18a 100644 --- a/spec/javascripts/build_spec.js.es6 +++ b/spec/javascripts/build_spec.js.es6 @@ -1,5 +1,7 @@ -/* global Build */ /* eslint-disable no-new */ +/* global Build */ +/* global Turbolinks */ + //= require lib/utils/timeago //= require lib/utils/datetime_utility //= require build diff --git a/spec/javascripts/environments/environments_store_spec.js.es6 b/spec/javascripts/environments/environments_store_spec.js.es6 index 82d9599f372..9b0b3cb1c65 100644 --- a/spec/javascripts/environments/environments_store_spec.js.es6 +++ b/spec/javascripts/environments/environments_store_spec.js.es6 @@ -1,7 +1,9 @@ +/* global environmentsList */ + //= require vue //= require environments/stores/environments_store //= require ./mock_data -/* globals environmentsList */ + (() => { beforeEach(() => { gl.environmentsList.EnvironmentsStore.create(); |
