Skip to content

Commit 8f3a811

Browse files
committed
Attempt to fix Windows by using .to.contain instead of explicit newlines.
1 parent 977b1dd commit 8f3a811

File tree

2 files changed

+192
-216
lines changed

2 files changed

+192
-216
lines changed

node-tests/blueprints/initializer-test.js

Lines changed: 96 additions & 108 deletions
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,14 @@ describe('Blueprint: initializer', function() {
1919

2020
it('initializer foo', function() {
2121
return emberGenerateDestroy(['initializer', 'foo'], _file => {
22-
expect(_file('app/initializers/foo.ts')).to.contain(
23-
'export function initialize(/* application */) {\n' +
24-
" // application.inject('route', 'foo', 'service:foo');\n" +
25-
'}\n' +
26-
'\n' +
27-
'export default {\n' +
28-
' initialize\n' +
29-
'};'
30-
);
22+
expect(_file('app/initializers/foo.ts'))
23+
.to.contain('export function initialize(/* application */) {')
24+
.to.contain(" // application.inject('route', 'foo', 'service:foo');")
25+
.to.contain('}')
26+
.to.contain('')
27+
.to.contain('export default {')
28+
.to.contain(' initialize')
29+
.to.contain('};');
3130

3231
expect(_file('tests/unit/initializers/foo-test.ts')).to.contain(
3332
"import { initialize } from 'my-app/initializers/foo';"
@@ -37,15 +36,14 @@ describe('Blueprint: initializer', function() {
3736

3837
it('initializer foo/bar', function() {
3938
return emberGenerateDestroy(['initializer', 'foo/bar'], _file => {
40-
expect(_file('app/initializers/foo/bar.ts')).to.contain(
41-
'export function initialize(/* application */) {\n' +
42-
" // application.inject('route', 'foo', 'service:foo');\n" +
43-
'}\n' +
44-
'\n' +
45-
'export default {\n' +
46-
' initialize\n' +
47-
'};'
48-
);
39+
expect(_file('app/initializers/foo/bar.ts'))
40+
.to.contain('export function initialize(/* application */) {')
41+
.to.contain(" // application.inject('route', 'foo', 'service:foo');")
42+
.to.contain('}')
43+
.to.contain('')
44+
.to.contain('export default {')
45+
.to.contain(' initialize')
46+
.to.contain('};');
4947

5048
expect(_file('tests/unit/initializers/foo/bar-test.ts')).to.contain(
5149
"import { initialize } from 'my-app/initializers/foo/bar';"
@@ -55,29 +53,27 @@ describe('Blueprint: initializer', function() {
5553

5654
it('initializer foo --pod', function() {
5755
return emberGenerateDestroy(['initializer', 'foo', '--pod'], _file => {
58-
expect(_file('app/initializers/foo.ts')).to.contain(
59-
'export function initialize(/* application */) {\n' +
60-
" // application.inject('route', 'foo', 'service:foo');\n" +
61-
'}\n' +
62-
'\n' +
63-
'export default {\n' +
64-
' initialize\n' +
65-
'};'
66-
);
56+
expect(_file('app/initializers/foo.ts'))
57+
.to.contain('export function initialize(/* application */) {')
58+
.to.contain(" // application.inject('route', 'foo', 'service:foo');")
59+
.to.contain('}')
60+
.to.contain('')
61+
.to.contain('export default {')
62+
.to.contain(' initialize')
63+
.to.contain('};');
6764
});
6865
});
6966

7067
it('initializer foo/bar --pod', function() {
7168
return emberGenerateDestroy(['initializer', 'foo/bar', '--pod'], _file => {
72-
expect(_file('app/initializers/foo/bar.ts')).to.contain(
73-
'export function initialize(/* application */) {\n' +
74-
" // application.inject('route', 'foo', 'service:foo');\n" +
75-
'}\n' +
76-
'\n' +
77-
'export default {\n' +
78-
' initialize\n' +
79-
'};'
80-
);
69+
expect(_file('app/initializers/foo/bar.ts'))
70+
.to.contain('export function initialize(/* application */) {')
71+
.to.contain(" // application.inject('route', 'foo', 'service:foo');")
72+
.to.contain('}')
73+
.to.contain('')
74+
.to.contain('export default {')
75+
.to.contain(' initialize')
76+
.to.contain('};');
8177
});
8278
});
8379

@@ -88,29 +84,27 @@ describe('Blueprint: initializer', function() {
8884

8985
it('initializer foo --pod', function() {
9086
return emberGenerateDestroy(['initializer', 'foo', '--pod'], _file => {
91-
expect(_file('app/initializers/foo.ts')).to.contain(
92-
'export function initialize(/* application */) {\n' +
93-
" // application.inject('route', 'foo', 'service:foo');\n" +
94-
'}\n' +
95-
'\n' +
96-
'export default {\n' +
97-
' initialize\n' +
98-
'};'
99-
);
87+
expect(_file('app/initializers/foo.ts'))
88+
.to.contain('export function initialize(/* application */) {')
89+
.to.contain(" // application.inject('route', 'foo', 'service:foo');")
90+
.to.contain('}')
91+
.to.contain('')
92+
.to.contain('export default {')
93+
.to.contain(' initialize')
94+
.to.contain('};');
10095
});
10196
});
10297

10398
it('initializer foo/bar --pod', function() {
10499
return emberGenerateDestroy(['initializer', 'foo/bar', '--pod'], _file => {
105-
expect(_file('app/initializers/foo/bar.ts')).to.contain(
106-
'export function initialize(/* application */) {\n' +
107-
" // application.inject('route', 'foo', 'service:foo');\n" +
108-
'}\n' +
109-
'\n' +
110-
'export default {\n' +
111-
' initialize\n' +
112-
'};'
113-
);
100+
expect(_file('app/initializers/foo/bar.ts'))
101+
.to.contain('export function initialize(/* application */) {')
102+
.to.contain(" // application.inject('route', 'foo', 'service:foo');")
103+
.to.contain('}')
104+
.to.contain('')
105+
.to.contain('export default {')
106+
.to.contain(' initialize')
107+
.to.contain('};');
114108
});
115109
});
116110
});
@@ -125,15 +119,14 @@ describe('Blueprint: initializer', function() {
125119
// this is a pretty corner case scenario.
126120
it.skip('initializer foo', function() {
127121
return emberGenerateDestroy(['initializer', 'foo'], _file => {
128-
expect(_file('addon/initializers/foo.ts')).to.contain(
129-
'export function initialize(/* application */) {\n' +
130-
" // application.inject('route', 'foo', 'service:foo');\n" +
131-
'}\n' +
132-
'\n' +
133-
'export default {\n' +
134-
' initialize\n' +
135-
'};'
136-
);
122+
expect(_file('addon/initializers/foo.ts'))
123+
.to.contain('export function initialize(/* application */) {')
124+
.to.contain(" // application.inject('route', 'foo', 'service:foo');")
125+
.to.contain('}')
126+
.to.contain('')
127+
.to.contain('export default {')
128+
.to.contain(' initialize')
129+
.to.contain('};');
137130

138131
expect(_file('app/initializers/foo.ts')).to.contain(
139132
"export { default, initialize } from 'my-addon/initializers/foo';"
@@ -147,15 +140,14 @@ describe('Blueprint: initializer', function() {
147140
// this is a pretty corner case scenario.
148141
it.skip('initializer foo/bar', function() {
149142
return emberGenerateDestroy(['initializer', 'foo/bar'], _file => {
150-
expect(_file('addon/initializers/foo/bar.ts')).to.contain(
151-
'export function initialize(/* application */) {\n' +
152-
" // application.inject('route', 'foo', 'service:foo');\n" +
153-
'}\n' +
154-
'\n' +
155-
'export default {\n' +
156-
' initialize\n' +
157-
'};'
158-
);
143+
expect(_file('addon/initializers/foo/bar.ts'))
144+
.to.contain('export function initialize(/* application */) {')
145+
.to.contain(" // application.inject('route', 'foo', 'service:foo');")
146+
.to.contain('}')
147+
.to.contain('')
148+
.to.contain('export default {')
149+
.to.contain(' initialize')
150+
.to.contain('};');
159151

160152
expect(_file('app/initializers/foo/bar.ts')).to.contain(
161153
"export { default, initialize } from 'my-addon/initializers/foo/bar';"
@@ -167,15 +159,14 @@ describe('Blueprint: initializer', function() {
167159

168160
it('initializer foo --dumy', function() {
169161
return emberGenerateDestroy(['initializer', 'foo', '--dummy'], _file => {
170-
expect(_file('tests/dummy/app/initializers/foo.ts')).to.contain(
171-
'export function initialize(/* application */) {\n' +
172-
" // application.inject('route', 'foo', 'service:foo');\n" +
173-
'}\n' +
174-
'\n' +
175-
'export default {\n' +
176-
' initialize\n' +
177-
'};'
178-
);
162+
expect(_file('tests/dummy/app/initializers/foo.ts'))
163+
.to.contain('export function initialize(/* application */) {')
164+
.to.contain(" // application.inject('route', 'foo', 'service:foo');")
165+
.to.contain('}')
166+
.to.contain('')
167+
.to.contain('export default {')
168+
.to.contain(' initialize')
169+
.to.contain('};');
179170

180171
expect(_file('app/initializers/foo.ts')).to.not.exist;
181172

@@ -185,15 +176,14 @@ describe('Blueprint: initializer', function() {
185176

186177
it('initializer foo/bar --dummy', function() {
187178
return emberGenerateDestroy(['initializer', 'foo/bar', '--dummy'], _file => {
188-
expect(_file('tests/dummy/app/initializers/foo/bar.ts')).to.contain(
189-
'export function initialize(/* application */) {\n' +
190-
" // application.inject('route', 'foo', 'service:foo');\n" +
191-
'}\n' +
192-
'\n' +
193-
'export default {\n' +
194-
' initialize\n' +
195-
'};'
196-
);
179+
expect(_file('tests/dummy/app/initializers/foo/bar.ts'))
180+
.to.contain('export function initialize(/* application */) {')
181+
.to.contain(" // application.inject('route', 'foo', 'service:foo');")
182+
.to.contain('}')
183+
.to.contain('')
184+
.to.contain('export default {')
185+
.to.contain(' initialize')
186+
.to.contain('};');
197187

198188
expect(_file('app/initializers/foo/bar.ts')).to.not.exist;
199189

@@ -221,15 +211,14 @@ describe('Blueprint: initializer', function() {
221211

222212
it('initializer foo --in-repo-addon=my-addon', function() {
223213
return emberGenerateDestroy(['initializer', 'foo', '--in-repo-addon=my-addon'], _file => {
224-
expect(_file('lib/my-addon/addon/initializers/foo.ts')).to.contain(
225-
'export function initialize(/* application */) {\n' +
226-
" // application.inject('route', 'foo', 'service:foo');\n" +
227-
'}\n' +
228-
'\n' +
229-
'export default {\n' +
230-
' initialize\n' +
231-
'};'
232-
);
214+
expect(_file('lib/my-addon/addon/initializers/foo.ts'))
215+
.to.contain('export function initialize(/* application */) {')
216+
.to.contain(" // application.inject('route', 'foo', 'service:foo');")
217+
.to.contain('}')
218+
.to.contain('')
219+
.to.contain('export default {')
220+
.to.contain(' initialize')
221+
.to.contain('};');
233222

234223
expect(_file('lib/my-addon/app/initializers/foo.ts')).to.contain(
235224
"export { default, initialize } from 'my-addon/initializers/foo';"
@@ -241,15 +230,14 @@ describe('Blueprint: initializer', function() {
241230

242231
it('initializer foo/bar --in-repo-addon=my-addon', function() {
243232
return emberGenerateDestroy(['initializer', 'foo/bar', '--in-repo-addon=my-addon'], _file => {
244-
expect(_file('lib/my-addon/addon/initializers/foo/bar.ts')).to.contain(
245-
'export function initialize(/* application */) {\n' +
246-
" // application.inject('route', 'foo', 'service:foo');\n" +
247-
'}\n' +
248-
'\n' +
249-
'export default {\n' +
250-
' initialize\n' +
251-
'};'
252-
);
233+
expect(_file('lib/my-addon/addon/initializers/foo/bar.ts'))
234+
.to.contain('export function initialize(/* application */) {')
235+
.to.contain(" // application.inject('route', 'foo', 'service:foo');")
236+
.to.contain('}')
237+
.to.contain('')
238+
.to.contain('export default {')
239+
.to.contain(' initialize')
240+
.to.contain('};');
253241

254242
expect(_file('lib/my-addon/app/initializers/foo/bar.ts')).to.contain(
255243
"export { default, initialize } from 'my-addon/initializers/foo/bar';"

0 commit comments

Comments
 (0)