Skip to content

Commit 66e54cf

Browse files
authored
Merge pull request #613 from bmish/no-restricted-resolver-tests-simplify-tests
Simplify tests for `no-restricted-resolver-tests` rule by using global `parserOptions`
2 parents d9f6b41 + cb70d06 commit 66e54cf

File tree

1 file changed

+45
-93
lines changed

1 file changed

+45
-93
lines changed

tests/lib/rules/no-restricted-resolver-tests.js

+45-93
Original file line numberDiff line numberDiff line change
@@ -5,92 +5,67 @@
55
const rule = require('../../../lib/rules/no-restricted-resolver-tests');
66
const RuleTester = require('eslint').RuleTester;
77

8-
const parserOptions = { ecmaVersion: 6, sourceType: 'module' };
98
const { ERROR_MESSAGES } = rule;
109

1110
//------------------------------------------------------------------------------
1211
// Tests
1312
//------------------------------------------------------------------------------
1413

15-
const ruleTester = new RuleTester();
14+
const ruleTester = new RuleTester({
15+
parserOptions: { ecmaVersion: 6, sourceType: 'module' },
16+
});
1617
ruleTester.run('no-restricted-resolver-tests', rule, {
1718
valid: [
18-
{
19-
code: `
20-
moduleFor('service:session', {
21-
integration: true
22-
});
23-
`,
24-
parserOptions,
25-
},
26-
{
27-
code: `
28-
moduleForComponent('display-page', {
29-
integration: true
30-
});
31-
`,
32-
parserOptions,
33-
},
34-
{
35-
code: `
36-
moduleForModel('post', {
37-
integration: true
38-
});
39-
`,
40-
parserOptions,
41-
},
42-
{
43-
code: `
44-
setupTest('service:session', {
45-
integration: true
46-
});
47-
`,
48-
parserOptions,
49-
},
50-
{
51-
code: `
52-
setupComponentTest('display-page', {
53-
integration: true
54-
});
55-
`,
56-
parserOptions,
57-
},
58-
{
59-
code: `
60-
setupModelTest('post', {
61-
integration: true
62-
});
63-
`,
64-
parserOptions,
65-
},
66-
{
67-
code: `
68-
module('foo', function(hooks) {
69-
setupTest(hooks);
70-
});
71-
`,
72-
parserOptions,
73-
},
74-
{
75-
code: "import { setupTest } from 'ember-qunit';",
76-
parserOptions,
77-
},
78-
{
79-
code: `const setupTest = require('ember-fastboot-addon-tests').setupTest;
19+
`
20+
moduleFor('service:session', {
21+
integration: true
22+
});
23+
`,
24+
`
25+
moduleForComponent('display-page', {
26+
integration: true
27+
});
28+
`,
29+
`
30+
moduleForModel('post', {
31+
integration: true
32+
});
33+
`,
34+
`
35+
setupTest('service:session', {
36+
integration: true
37+
});
38+
`,
39+
`
40+
setupComponentTest('display-page', {
41+
integration: true
42+
});
43+
`,
44+
`
45+
setupModelTest('post', {
46+
integration: true
47+
});
48+
`,
49+
`
50+
module('foo', function(hooks) {
51+
setupTest(hooks);
52+
});
53+
`,
54+
"import { setupTest } from 'ember-qunit';",
55+
`
56+
const setupTest = require('ember-fastboot-addon-tests').setupTest;
8057
81-
describe('Integration tests', function() {
82-
setupTest('fastboot-ready-app');
83-
});`,
84-
parserOptions,
85-
},
58+
describe('Integration tests', function() {
59+
setupTest('fastboot-ready-app');
60+
});
61+
`,
8662
],
8763
invalid: [
8864
{
8965
code: `import { moduleFor } from 'ember-qunit';
9066
9167
moduleFor('service:session');
9268
`,
93-
parserOptions,
9469
output: null,
9570
errors: [
9671
{
@@ -105,7 +80,6 @@ ruleTester.run('no-restricted-resolver-tests', rule, {
10580
unit: true
10681
});
10782
`,
108-
parserOptions,
10983
output: null,
11084
errors: [
11185
{
@@ -120,7 +94,6 @@ ruleTester.run('no-restricted-resolver-tests', rule, {
12094
needs: ['type:thing']
12195
});
12296
`,
123-
parserOptions,
12497
output: null,
12598
errors: [
12699
{
@@ -133,7 +106,6 @@ ruleTester.run('no-restricted-resolver-tests', rule, {
133106
134107
moduleFor('service:session', arg2, {});
135108
`,
136-
parserOptions,
137109
output: null,
138110
errors: [
139111
{
@@ -146,7 +118,6 @@ ruleTester.run('no-restricted-resolver-tests', rule, {
146118
147119
moduleForComponent('display-page');
148120
`,
149-
parserOptions,
150121
output: null,
151122
errors: [
152123
{
@@ -161,7 +132,6 @@ ruleTester.run('no-restricted-resolver-tests', rule, {
161132
unit: true
162133
});
163134
`,
164-
parserOptions,
165135
output: null,
166136
errors: [
167137
{
@@ -176,7 +146,6 @@ ruleTester.run('no-restricted-resolver-tests', rule, {
176146
needs: ['type:thing']
177147
});
178148
`,
179-
parserOptions,
180149
output: null,
181150
errors: [
182151
{
@@ -189,7 +158,6 @@ ruleTester.run('no-restricted-resolver-tests', rule, {
189158
190159
moduleForComponent('display-page', arg2, {});
191160
`,
192-
parserOptions,
193161
output: null,
194162
errors: [
195163
{
@@ -202,7 +170,6 @@ ruleTester.run('no-restricted-resolver-tests', rule, {
202170
203171
moduleForModel('post');
204172
`,
205-
parserOptions,
206173
output: null,
207174
errors: [
208175
{
@@ -217,7 +184,6 @@ ruleTester.run('no-restricted-resolver-tests', rule, {
217184
unit: true
218185
});
219186
`,
220-
parserOptions,
221187
output: null,
222188
errors: [
223189
{
@@ -232,7 +198,6 @@ ruleTester.run('no-restricted-resolver-tests', rule, {
232198
needs: ['type:thing']
233199
});
234200
`,
235-
parserOptions,
236201
output: null,
237202
errors: [
238203
{
@@ -245,7 +210,6 @@ ruleTester.run('no-restricted-resolver-tests', rule, {
245210
246211
moduleForModel('post', arg2, {});
247212
`,
248-
parserOptions,
249213
output: null,
250214
errors: [
251215
{
@@ -258,7 +222,6 @@ ruleTester.run('no-restricted-resolver-tests', rule, {
258222
259223
setupTest('service:session');
260224
`,
261-
parserOptions,
262225
output: null,
263226
errors: [
264227
{
@@ -273,7 +236,6 @@ ruleTester.run('no-restricted-resolver-tests', rule, {
273236
unit: true
274237
});
275238
`,
276-
parserOptions,
277239
output: null,
278240
errors: [
279241
{
@@ -288,7 +250,6 @@ ruleTester.run('no-restricted-resolver-tests', rule, {
288250
needs: ['type:thing']
289251
});
290252
`,
291-
parserOptions,
292253
output: null,
293254
errors: [
294255
{
@@ -301,7 +262,6 @@ ruleTester.run('no-restricted-resolver-tests', rule, {
301262
302263
setupTest('service:session', arg2, {});
303264
`,
304-
parserOptions,
305265
output: null,
306266
errors: [
307267
{
@@ -314,7 +274,6 @@ ruleTester.run('no-restricted-resolver-tests', rule, {
314274
315275
setupComponentTest('display-page');
316276
`,
317-
parserOptions,
318277
output: null,
319278
errors: [
320279
{
@@ -329,7 +288,6 @@ ruleTester.run('no-restricted-resolver-tests', rule, {
329288
unit: true
330289
});
331290
`,
332-
parserOptions,
333291
output: null,
334292
errors: [
335293
{
@@ -344,7 +302,6 @@ ruleTester.run('no-restricted-resolver-tests', rule, {
344302
needs: ['type:thing']
345303
});
346304
`,
347-
parserOptions,
348305
output: null,
349306
errors: [
350307
{
@@ -357,7 +314,6 @@ ruleTester.run('no-restricted-resolver-tests', rule, {
357314
358315
setupComponentTest('display-page', arg2, {});
359316
`,
360-
parserOptions,
361317
output: null,
362318
errors: [
363319
{
@@ -370,7 +326,6 @@ ruleTester.run('no-restricted-resolver-tests', rule, {
370326
371327
setupModelTest('post');
372328
`,
373-
parserOptions,
374329
output: null,
375330
errors: [
376331
{
@@ -385,7 +340,6 @@ ruleTester.run('no-restricted-resolver-tests', rule, {
385340
unit: true
386341
});
387342
`,
388-
parserOptions,
389343
output: null,
390344
errors: [
391345
{
@@ -400,7 +354,6 @@ ruleTester.run('no-restricted-resolver-tests', rule, {
400354
needs: ['type:thing']
401355
});
402356
`,
403-
parserOptions,
404357
output: null,
405358
errors: [
406359
{
@@ -413,7 +366,6 @@ ruleTester.run('no-restricted-resolver-tests', rule, {
413366
414367
setupModelTest('post', arg2, {});
415368
`,
416-
parserOptions,
417369
output: null,
418370
errors: [
419371
{

0 commit comments

Comments
 (0)