Skip to content

Commit 083bb47

Browse files
authored
Merge pull request import-js#1295 from jeffshaver/fix-tests
[Tests] fix broken tests on master
2 parents bdc05aa + 158cd80 commit 083bb47

9 files changed

+23
-18
lines changed

tests/src/core/importType.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -90,16 +90,16 @@ describe('importType(name)', function () {
9090
})
9191

9292
it("should return 'external' for module from 'node_modules' with default config", function() {
93-
expect(importType('builtin-modules', context)).to.equal('external')
93+
expect(importType('resolve', context)).to.equal('external')
9494
})
9595

9696
it("should return 'internal' for module from 'node_modules' if 'node_modules' missed in 'external-module-folders'", function() {
9797
const foldersContext = testContext({ 'import/external-module-folders': [] })
98-
expect(importType('builtin-modules', foldersContext)).to.equal('internal')
98+
expect(importType('resolve', foldersContext)).to.equal('internal')
9999
})
100100

101101
it("should return 'external' for module from 'node_modules' if 'node_modules' contained in 'external-module-folders'", function() {
102102
const foldersContext = testContext({ 'import/external-module-folders': ['node_modules'] })
103-
expect(importType('builtin-modules', foldersContext)).to.equal('external')
103+
expect(importType('resolve', foldersContext)).to.equal('external')
104104
})
105105
})

tests/src/rules/export.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ ruleTester.run('export', rule, {
1717
test({ code: 'export var [ foo, bar ] = array;' }),
1818
test({ code: 'export var { foo, bar } = object;' }),
1919
test({ code: 'export var [ foo, bar ] = array;' }),
20-
test({ code: 'export { foo, foo as bar }' }),
21-
test({ code: 'export { bar }; export * from "./export-all"' }),
20+
test({ code: 'let foo; export { foo, foo as bar }' }),
21+
test({ code: 'let bar; export { bar }; export * from "./export-all"' }),
2222
test({ code: 'export * from "./export-all"' }),
2323
test({ code: 'export * from "./does-not-exist"' }),
2424

@@ -62,7 +62,7 @@ ruleTester.run('export', rule, {
6262
// errors: ['Parsing error: Duplicate export \'foo\''],
6363
// }),
6464
test({
65-
code: 'export { foo }; export * from "./export-all"',
65+
code: 'let foo; export { foo }; export * from "./export-all"',
6666
errors: ['Multiple exports of name \'foo\'.',
6767
'Multiple exports of name \'foo\'.'],
6868
}),

tests/src/rules/extensions.js

+4-4
Original file line numberDiff line numberDiff line change
@@ -105,14 +105,14 @@ ruleTester.run('extensions', rule, {
105105
test({
106106
code: [
107107
'export { foo } from "./foo.js"',
108-
'export { bar }',
108+
'let bar; export { bar }',
109109
].join('\n'),
110110
options: [ 'always' ],
111111
}),
112112
test({
113113
code: [
114114
'export { foo } from "./foo"',
115-
'export { bar }',
115+
'let bar; export { bar }',
116116
].join('\n'),
117117
options: [ 'never' ],
118118
}),
@@ -334,7 +334,7 @@ ruleTester.run('extensions', rule, {
334334
test({
335335
code: [
336336
'export { foo } from "./foo"',
337-
'export { bar }',
337+
'let bar; export { bar }',
338338
].join('\n'),
339339
options: [ 'always' ],
340340
errors: [
@@ -348,7 +348,7 @@ ruleTester.run('extensions', rule, {
348348
test({
349349
code: [
350350
'export { foo } from "./foo.js"',
351-
'export { bar }',
351+
'let bar; export { bar }',
352352
].join('\n'),
353353
options: [ 'never' ],
354354
errors: [

tests/src/rules/named.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ ruleTester.run('named', rule, {
6161
}),
6262

6363
// regression tests
64-
test({ code: 'export { foo as bar }'}),
64+
test({ code: 'let foo; export { foo as bar }'}),
6565

6666
// destructured exports
6767
test({ code: 'import { destructuredProp } from "./named-exports"' }),

tests/src/rules/no-default-export.js

+3-2
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ ruleTester.run('no-default-export', rule, {
2929
`,
3030
}),
3131
test({
32-
code: `export { foo, bar }`,
32+
code: `let foo, bar; export { foo, bar }`,
3333
}),
3434
test({
3535
code: `export const { foo, bar } = item;`,
@@ -42,6 +42,7 @@ ruleTester.run('no-default-export', rule, {
4242
}),
4343
test({
4444
code: `
45+
let item;
4546
export const foo = item;
4647
export { item };
4748
`,
@@ -102,7 +103,7 @@ ruleTester.run('no-default-export', rule, {
102103
}],
103104
}),
104105
test({
105-
code: 'export { foo as default }',
106+
code: 'let foo; export { foo as default }',
106107
errors: [{
107108
ruleId: 'ExportNamedDeclaration',
108109
message: 'Do not alias `foo` as `default`. Just export `foo` itself ' +

tests/src/rules/no-named-export.js

+3-2
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ ruleTester.run('no-named-export', rule, {
1010
code: 'export default function bar() {};',
1111
}),
1212
test({
13-
code: 'export { foo as default }',
13+
code: 'let foo; export { foo as default }',
1414
}),
1515
test({
1616
code: 'export default from "foo.js"',
@@ -82,7 +82,7 @@ ruleTester.run('no-named-export', rule, {
8282
}],
8383
}),
8484
test({
85-
code: `export { foo, bar }`,
85+
code: `let foo, bar; export { foo, bar }`,
8686
errors: [{
8787
ruleId: 'ExportNamedDeclaration',
8888
message: 'Named exports are not allowed.',
@@ -111,6 +111,7 @@ ruleTester.run('no-named-export', rule, {
111111
}),
112112
test({
113113
code: `
114+
let item;
114115
export const foo = item;
115116
export { item };
116117
`,

tests/src/rules/no-unresolved.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ function runResolverTests(resolver) {
3434

3535
rest({ code: 'export { foo } from "./bar"' }),
3636
rest({ code: 'export * from "./bar"' }),
37-
rest({ code: 'export { foo }' }),
37+
rest({ code: 'let foo; export { foo }' }),
3838

3939
// stage 1 proposal for export symmetry,
4040
rest({ code: 'export * as bar from "./bar"'

tests/src/rules/prefer-default-export.js

+3
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ ruleTester.run('prefer-default-export', rule, {
2828
}),
2929
test({
3030
code: `
31+
let foo, bar;
3132
export { foo, bar }`,
3233
}),
3334
test({
@@ -44,11 +45,13 @@ ruleTester.run('prefer-default-export', rule, {
4445
}),
4546
test({
4647
code: `
48+
let item;
4749
export const foo = item;
4850
export { item };`,
4951
}),
5052
test({
5153
code: `
54+
let foo;
5255
export { foo as default }`,
5356
}),
5457
test({

tests/src/utils.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@ export const SYNTAX_CASES = [
4343
test({ code: 'const { x, y, ...z } = bar', parser: 'babel-eslint' }),
4444

4545
// all the exports
46-
test({ code: 'export { x }' }),
47-
test({ code: 'export { x as y }' }),
46+
test({ code: 'let x; export { x }' }),
47+
test({ code: 'let x; export { x as y }' }),
4848

4949
// not sure about these since they reference a file
5050
// test({ code: 'export { x } from "./y.js"'}),

0 commit comments

Comments
 (0)