Skip to content

Commit 4416ac3

Browse files
bmishbmish
authored
Merge pull request #570 from bmish/test-simplify-parserOptions
Simplify some tests by setting `parserOptions` globally instead of in each individual test case
2 parents 3c8959e + 982c217 commit 4416ac3

21 files changed

+247
-937
lines changed

‎tests/lib/rules/alias-model-in-controller.js

+26-105
Original file line numberDiff line numberDiff line change
@@ -9,122 +9,51 @@ const RuleTester = require('eslint').RuleTester;
99
// Tests
1010
// ------------------------------------------------------------------------------
1111

12-
const eslintTester = new RuleTester();
12+
const eslintTester = new RuleTester({
13+
parserOptions: { ecmaVersion: 6, sourceType: 'module' },
14+
});
15+
1316
eslintTester.run('alias-model-in-controller', rule, {
1417
valid: [
1518
// direct alias
1619

17-
{
18-
code: 'export default Ember.Controller.extend({nail: alias("model")});',
19-
parserOptions: { ecmaVersion: 6, sourceType: 'module' },
20-
},
21-
{
22-
code: 'export default Ember.Controller.extend({nail: computed.alias("model")});',
23-
parserOptions: { ecmaVersion: 6, sourceType: 'module' },
24-
},
25-
{
26-
code: 'export default Ember.Controller.extend({nail: Ember.computed.alias("model")});',
27-
parserOptions: { ecmaVersion: 6, sourceType: 'module' },
28-
},
29-
{
30-
code: 'export default Ember.Controller.extend({nail: readOnly("model")});',
31-
parserOptions: { ecmaVersion: 6, sourceType: 'module' },
32-
},
33-
{
34-
code: 'export default Ember.Controller.extend({nail: computed.readOnly("model")});',
35-
parserOptions: { ecmaVersion: 6, sourceType: 'module' },
36-
},
37-
{
38-
code: 'export default Ember.Controller.extend({nail: Ember.computed.readOnly("model")});',
39-
parserOptions: { ecmaVersion: 6, sourceType: 'module' },
40-
},
41-
{
42-
code: 'export default Ember.Controller.extend({nail: reads("model")});',
43-
parserOptions: { ecmaVersion: 6, sourceType: 'module' },
44-
},
45-
{
46-
code: 'export default Ember.Controller.extend({nail: computed.reads("model")});',
47-
parserOptions: { ecmaVersion: 6, sourceType: 'module' },
48-
},
49-
{
50-
code: 'export default Ember.Controller.extend({nail: Ember.computed.reads("model")});',
51-
parserOptions: { ecmaVersion: 6, sourceType: 'module' },
52-
},
53-
{
54-
code:
55-
'export default Ember.Controller.extend(TestMixin, {nail: Ember.computed.alias("model")});',
56-
parserOptions: { ecmaVersion: 6, sourceType: 'module' },
57-
},
58-
{
59-
code:
60-
'export default Ember.Controller.extend(TestMixin, TestMixin2, {nail: Ember.computed.alias("model")});',
61-
parserOptions: { ecmaVersion: 6, sourceType: 'module' },
62-
},
20+
'export default Ember.Controller.extend({nail: alias("model")});',
21+
'export default Ember.Controller.extend({nail: computed.alias("model")});',
22+
'export default Ember.Controller.extend({nail: Ember.computed.alias("model")});',
23+
'export default Ember.Controller.extend({nail: readOnly("model")});',
24+
'export default Ember.Controller.extend({nail: computed.readOnly("model")});',
25+
'export default Ember.Controller.extend({nail: Ember.computed.readOnly("model")});',
26+
'export default Ember.Controller.extend({nail: reads("model")});',
27+
'export default Ember.Controller.extend({nail: computed.reads("model")});',
28+
'export default Ember.Controller.extend({nail: Ember.computed.reads("model")});',
29+
'export default Ember.Controller.extend(TestMixin, {nail: Ember.computed.alias("model")});',
30+
'export default Ember.Controller.extend(TestMixin, TestMixin2, {nail: Ember.computed.alias("model")});',
6331
{
6432
filename: 'example-app/controllers/path/to/some-feature.js',
6533
code: 'export default CustomController.extend({nail: alias("model")});',
66-
parserOptions: { ecmaVersion: 6, sourceType: 'module' },
6734
},
6835

6936
// nested alias
7037

71-
{
72-
code: 'export default Ember.Controller.extend({nail: alias("model.nail")});',
73-
parserOptions: { ecmaVersion: 6, sourceType: 'module' },
74-
},
75-
{
76-
code: 'export default Ember.Controller.extend({nail: computed.alias("model.nail")});',
77-
parserOptions: { ecmaVersion: 6, sourceType: 'module' },
78-
},
79-
{
80-
code: 'export default Ember.Controller.extend({nail: Ember.computed.alias("model.nail")});',
81-
parserOptions: { ecmaVersion: 6, sourceType: 'module' },
82-
},
83-
{
84-
code: 'export default Ember.Controller.extend({nail: readOnly("model.nail")});',
85-
parserOptions: { ecmaVersion: 6, sourceType: 'module' },
86-
},
87-
{
88-
code: 'export default Ember.Controller.extend({nail: computed.readOnly("model.nail")});',
89-
parserOptions: { ecmaVersion: 6, sourceType: 'module' },
90-
},
91-
{
92-
code:
93-
'export default Ember.Controller.extend({nail: Ember.computed.readOnly("model.nail")});',
94-
parserOptions: { ecmaVersion: 6, sourceType: 'module' },
95-
},
96-
{
97-
code: 'export default Ember.Controller.extend({nail: reads("model.nail")});',
98-
parserOptions: { ecmaVersion: 6, sourceType: 'module' },
99-
},
100-
{
101-
code: 'export default Ember.Controller.extend({nail: computed.reads("model.nail")});',
102-
parserOptions: { ecmaVersion: 6, sourceType: 'module' },
103-
},
104-
{
105-
code: 'export default Ember.Controller.extend({nail: Ember.computed.reads("model.nail")});',
106-
parserOptions: { ecmaVersion: 6, sourceType: 'module' },
107-
},
108-
{
109-
code:
110-
'export default Ember.Controller.extend(TestMixin, {nail: Ember.computed.alias("model.nail")});',
111-
parserOptions: { ecmaVersion: 6, sourceType: 'module' },
112-
},
113-
{
114-
code:
115-
'export default Ember.Controller.extend(TestMixin, TestMixin2, {nail: Ember.computed.alias("model.nail")});',
116-
parserOptions: { ecmaVersion: 6, sourceType: 'module' },
117-
},
38+
'export default Ember.Controller.extend({nail: alias("model.nail")});',
39+
'export default Ember.Controller.extend({nail: computed.alias("model.nail")});',
40+
'export default Ember.Controller.extend({nail: Ember.computed.alias("model.nail")});',
41+
'export default Ember.Controller.extend({nail: readOnly("model.nail")});',
42+
'export default Ember.Controller.extend({nail: computed.readOnly("model.nail")});',
43+
'export default Ember.Controller.extend({nail: Ember.computed.readOnly("model.nail")});',
44+
'export default Ember.Controller.extend({nail: reads("model.nail")});',
45+
'export default Ember.Controller.extend({nail: computed.reads("model.nail")});',
46+
'export default Ember.Controller.extend({nail: Ember.computed.reads("model.nail")});',
47+
'export default Ember.Controller.extend(TestMixin, {nail: Ember.computed.alias("model.nail")});',
48+
'export default Ember.Controller.extend(TestMixin, TestMixin2, {nail: Ember.computed.alias("model.nail")});',
11849
{
11950
filename: 'example-app/controllers/path/to/some-feature.js',
12051
code: 'export default CustomController.extend({nail: alias("model.nail")});',
121-
parserOptions: { ecmaVersion: 6, sourceType: 'module' },
12252
},
12353
],
12454
invalid: [
12555
{
12656
code: 'export default Ember.Controller.extend({});',
127-
parserOptions: { ecmaVersion: 6, sourceType: 'module' },
12857
output: null,
12958
errors: [
13059
{
@@ -134,7 +63,6 @@ eslintTester.run('alias-model-in-controller', rule, {
13463
},
13564
{
13665
code: 'export default Ember.Controller.extend({resetPassword: service()});',
137-
parserOptions: { ecmaVersion: 6, sourceType: 'module' },
13866
output: null,
13967
errors: [
14068
{
@@ -144,7 +72,6 @@ eslintTester.run('alias-model-in-controller', rule, {
14472
},
14573
{
14674
code: 'export default Ember.Controller.extend({resetPassword: inject.service()});',
147-
parserOptions: { ecmaVersion: 6, sourceType: 'module' },
14875
output: null,
14976
errors: [
15077
{
@@ -154,7 +81,6 @@ eslintTester.run('alias-model-in-controller', rule, {
15481
},
15582
{
15683
code: 'export default Ember.Controller.extend({resetPassword: Ember.inject.service()});',
157-
parserOptions: { ecmaVersion: 6, sourceType: 'module' },
15884
output: null,
15985
errors: [
16086
{
@@ -164,7 +90,6 @@ eslintTester.run('alias-model-in-controller', rule, {
16490
},
16591
{
16692
code: 'export default Ember.Controller.extend(TestMixin, {});',
167-
parserOptions: { ecmaVersion: 6, sourceType: 'module' },
16893
output: null,
16994
errors: [
17095
{
@@ -174,7 +99,6 @@ eslintTester.run('alias-model-in-controller', rule, {
17499
},
175100
{
176101
code: 'export default Ember.Controller.extend(TestMixin, TestMixin2, {});',
177-
parserOptions: { ecmaVersion: 6, sourceType: 'module' },
178102
output: null,
179103
errors: [
180104
{
@@ -185,7 +109,6 @@ eslintTester.run('alias-model-in-controller', rule, {
185109
{
186110
filename: 'example-app/controllers/path/to/some-feature.js',
187111
code: 'export default CustomController.extend({});',
188-
parserOptions: { ecmaVersion: 6, sourceType: 'module' },
189112
output: null,
190113
errors: [
191114
{
@@ -196,7 +119,6 @@ eslintTester.run('alias-model-in-controller', rule, {
196119
{
197120
filename: 'example-app/some-feature/controller.js',
198121
code: 'export default CustomController.extend({});',
199-
parserOptions: { ecmaVersion: 6, sourceType: 'module' },
200122
output: null,
201123
errors: [
202124
{
@@ -207,7 +129,6 @@ eslintTester.run('alias-model-in-controller', rule, {
207129
{
208130
filename: 'example-app/twisted-path/some-file.js',
209131
code: 'export default Controller.extend({});',
210-
parserOptions: { ecmaVersion: 6, sourceType: 'module' },
211132
output: null,
212133
errors: [
213134
{

‎tests/lib/rules/closure-actions.js

+6-10
Original file line numberDiff line numberDiff line change
@@ -11,23 +11,19 @@ const { ERROR_MESSAGE } = rule;
1111
// Tests
1212
// ------------------------------------------------------------------------------
1313

14-
const eslintTester = new RuleTester();
14+
const eslintTester = new RuleTester({
15+
parserOptions: { ecmaVersion: 6, sourceType: 'module' },
16+
});
17+
1518
eslintTester.run('closure-actions', rule, {
1619
valid: [
17-
{
18-
code: 'export default Component.extend();',
19-
parserOptions: { ecmaVersion: 6, sourceType: 'module' },
20-
},
21-
{
22-
code: 'export default Component.extend({actions: {pushLever() {this.attr.boom();}}});',
23-
parserOptions: { ecmaVersion: 6, sourceType: 'module' },
24-
},
20+
'export default Component.extend();',
21+
'export default Component.extend({actions: {pushLever() {this.attr.boom();}}});',
2522
],
2623
invalid: [
2724
{
2825
code:
2926
'export default Component.extend({actions: {pushLever() {this.sendAction("detonate");}}});',
30-
parserOptions: { ecmaVersion: 6, sourceType: 'module' },
3127
output: null,
3228
errors: [
3329
{

‎tests/lib/rules/jquery-ember-run.js

+5-7
Original file line numberDiff line numberDiff line change
@@ -9,20 +9,18 @@ const RuleTester = require('eslint').RuleTester;
99
// Tests
1010
// ------------------------------------------------------------------------------
1111

12-
const eslintTester = new RuleTester();
12+
const eslintTester = new RuleTester({
13+
parserOptions: { ecmaVersion: 6, sourceType: 'module' },
14+
});
15+
1316
eslintTester.run('jquery-ember-run', rule, {
1417
valid: [
15-
{
16-
code:
17-
'Ember.$("#something-rendered-by-jquery-plugin").on("click", () => {Ember.run.bind(this, this._handlerActionFromController);});',
18-
parserOptions: { ecmaVersion: 6, sourceType: 'module' },
19-
},
18+
'Ember.$("#something-rendered-by-jquery-plugin").on("click", () => {Ember.run.bind(this, this._handlerActionFromController);});',
2019
],
2120
invalid: [
2221
{
2322
code:
2423
'Ember.$("#something-rendered-by-jquery-plugin").on("click", () => {this._handlerActionFromController();});',
25-
parserOptions: { ecmaVersion: 6, sourceType: 'module' },
2624
output: null,
2725
errors: [
2826
{

0 commit comments

Comments
 (0)