Skip to content

Commit 079e447

Browse files
banticbantic
committed
Make all test fixtures for helpers include imports
This makes the helpers a little more like what might be encountered in reality. This uses the `stripIndents` tag function to make it easier to do multi-line files.
1 parent d00ed22 commit 079e447

7 files changed

Lines changed: 110 additions & 24 deletions

File tree

‎test/fixtures/classic-acceptance/input.js‎

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
var stripIndents = require('common-tags').stripIndents;
2+
13
module.exports = {
24
'app': {
35
'app.js': '"app.js"',
@@ -19,10 +21,22 @@ module.exports = {
1921
}
2022
},
2123
'helpers': {
22-
'i18n.js': '"i18n helper"',
23-
'blerg.js': '"blerg helper"',
24-
'main-greeting-text.js': '"main-greeting-text helper"',
25-
'show-default-title.js': '"show-default-title helper"'
24+
'i18n.js': stripIndents`
25+
import { helper } from '@ember/component/helper';
26+
export default helper(i18n);
27+
`,
28+
'blerg.js': stripIndents`
29+
import { helper } from '@ember/component/helper';
30+
export default helper(blerg);
31+
`,
32+
'main-greeting-text.js': stripIndents`
33+
import { helper } from '@ember/component/helper';
34+
export default helper(mainGreetingText);
35+
`,
36+
'show-default-title.js': stripIndents`
37+
import { helper } from '@ember/component/helper';
38+
export default helper(showDefaultTitle);
39+
`,
2640
},
2741
'routes': {
2842
'index.js': '"index route"',

‎test/fixtures/classic-acceptance/output.js‎

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
var stripIndents = require('common-tags').stripIndents;
2+
13
module.exports = {
24
'src': {
35
'main.js': '"app.js"',
@@ -22,13 +24,22 @@ module.exports = {
2224
'component.js': '"baz-derp component"',
2325
'template.hbs': 'baz-derp template'
2426
},
25-
'i18n.js': '"i18n helper"',
26-
'blerg.js': '"blerg helper"'
27+
'i18n.js': stripIndents`
28+
import { helper as buildHelper } from '@ember/component/helper';
29+
export const helper = buildHelper(i18n);
30+
`,
31+
'blerg.js': stripIndents`
32+
import { helper as buildHelper } from '@ember/component/helper';
33+
export const helper = buildHelper(blerg);
34+
`,
2735
},
2836
'routes': {
2937
'index': {
3038
'-components': {
31-
'main-greeting-text.js': '"main-greeting-text helper"'
39+
'main-greeting-text.js': stripIndents`
40+
import { helper as buildHelper } from '@ember/component/helper';
41+
export const helper = buildHelper(mainGreetingText);
42+
`
3243
},
3344
'controller.js': '"index controller"',
3445
'route.js': '"index route"',
@@ -72,7 +83,10 @@ module.exports = {
7283
'new': {
7384
'-components': {
7485
'show-default-title': {
75-
'helper.js': '"show-default-title helper"',
86+
'helper.js': stripIndents`
87+
import { helper as buildHelper } from '@ember/component/helper';
88+
export default buildHelper(showDefaultTitle);
89+
`,
7690
'helper-integration-test.js': '"show-default-title helper integration test"'
7791
}
7892
},

‎test/fixtures/classic-named-exports/input.js‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,19 @@
1+
var stripIndents = require('common-tags').stripIndents;
2+
13
module.exports = {
24
app: {
35
// ensure we do not rewrite main files
46
'app.js': 'export default App',
57
'router.js': 'export default Router',
68
helpers: {
7-
'titleize.js': 'import { helper } from \'@ember/component/helper\';\nexport default helper(function() { });',
8-
'capitalize.js': 'import { helper } from \'@ember/component/helper\';\nexport default helper(function() { });'
9+
'titleize.js': stripIndents`
10+
import { helper } from '@ember/component/helper';
11+
export default helper(function() { });
12+
`,
13+
'capitalize.js': stripIndents`
14+
import { helper } from '@ember/component/helper';
15+
export default helper(function() { });
16+
`
917
}
1018
},
1119

‎test/fixtures/classic-named-exports/output.js‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,20 @@
1+
var stripIndents = require('common-tags').stripIndents;
2+
13
module.exports = {
24
src: {
35
'main.js': 'export default App',
46
'router.js': 'export default Router',
57
ui: {
68
components: {
7-
'titleize.js': 'import { helper as buildHelper } from \'@ember/component/helper\';\nexport const helper = buildHelper(function() { });',
9+
'titleize.js': stripIndents`
10+
import { helper as buildHelper } from '@ember/component/helper';
11+
export const helper = buildHelper(function() { });
12+
`,
813
'capitalize': {
9-
'helper.js': 'import { helper as buildHelper } from \'@ember/component/helper\';\nexport default buildHelper(function() { });',
14+
'helper.js': stripIndents`
15+
import { helper as buildHelper } from '@ember/component/helper';
16+
export default buildHelper(function() { });
17+
`,
1018
'helper-integration-test.js': '"capitalize helper test"'
1119
}
1220
}

‎test/fixtures/pods-acceptance/input.js‎

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
var stripIndents = require('common-tags').stripIndents;
2+
13
module.exports = {
24
'app': {
35
'app.js': '"app.js"',
@@ -56,10 +58,22 @@ module.exports = {
5658
},
5759
},
5860
'helpers': {
59-
'i18n.js': '"i18n helper"',
60-
'blerg.js': '"blerg helper"',
61-
'main-greeting-text.js': '"main-greeting-text helper"',
62-
'show-default-title.js': '"show-default-title helper"'
61+
'i18n.js': stripIndents`
62+
import { helper } from '@ember/component/helper';
63+
export default helper(i18n);
64+
`,
65+
'blerg.js': stripIndents`
66+
import { helper } from '@ember/component/helper';
67+
export default helper(blerg);
68+
`,
69+
'main-greeting-text.js': stripIndents`
70+
import { helper } from '@ember/component/helper';
71+
export default helper(mainGreetingText);
72+
`,
73+
'show-default-title.js': stripIndents`
74+
import { helper } from '@ember/component/helper';
75+
export default helper(showDefaultTitle);
76+
`,
6377
},
6478
'adapters': {
6579
'application.js': '"application adapter"',

‎test/fixtures/pods-custom-name-acceptance/input.js‎

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
var stripIndents = require('common-tags').stripIndents;
2+
13
module.exports = {
24
'app': {
35
'app.js': '"app.js"',
@@ -56,10 +58,22 @@ module.exports = {
5658
},
5759
},
5860
'helpers': {
59-
'i18n.js': '"i18n helper"',
60-
'blerg.js': '"blerg helper"',
61-
'main-greeting-text.js': '"main-greeting-text helper"',
62-
'show-default-title.js': '"show-default-title helper"'
61+
'i18n.js': stripIndents`
62+
import { helper } from '@ember/component/helper';
63+
export default helper(i18n);
64+
`,
65+
'blerg.js': stripIndents`
66+
import { helper } from '@ember/component/helper';
67+
export default helper(blerg);
68+
`,
69+
'main-greeting-text.js': stripIndents`
70+
import { helper } from '@ember/component/helper';
71+
export default helper(mainGreetingText);
72+
`,
73+
'show-default-title.js': stripIndents`
74+
import { helper } from '@ember/component/helper';
75+
export default helper(showDefaultTitle);
76+
`,
6377
},
6478
'adapters': {
6579
'application.js': '"application adapter"',

‎test/fixtures/pods-without-namespace-acceptance/input.js‎

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
var stripIndents = require('common-tags').stripIndents;
2+
13
module.exports = {
24
'app': {
35
'app.js': '"app.js"',
@@ -54,10 +56,22 @@ module.exports = {
5456
},
5557
},
5658
'helpers': {
57-
'i18n.js': '"i18n helper"',
58-
'blerg.js': '"blerg helper"',
59-
'main-greeting-text.js': '"main-greeting-text helper"',
60-
'show-default-title.js': '"show-default-title helper"'
59+
'i18n.js': stripIndents`
60+
import { helper } from '@ember/component/helper';
61+
export default helper(i18n);
62+
`,
63+
'blerg.js': stripIndents`
64+
import { helper } from '@ember/component/helper';
65+
export default helper(blerg);
66+
`,
67+
'main-greeting-text.js': stripIndents`
68+
import { helper } from '@ember/component/helper';
69+
export default helper(mainGreetingText);
70+
`,
71+
'show-default-title.js': stripIndents`
72+
import { helper } from '@ember/component/helper';
73+
export default helper(showDefaultTitle);
74+
`,
6175
},
6276
'post': {
6377
'adapter.js': '"post adapter"',

0 commit comments

Comments
 (0)