Skip to content

Commit aac345d

Browse files
chriskrychochriskrycho
committed
Fix yet more Windows newline problems.
1 parent 8f3a811 commit aac345d

File tree

3 files changed

+37
-25
lines changed

3 files changed

+37
-25
lines changed

‎node-tests/blueprints/mixin-test.js‎

Lines changed: 22 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,8 @@ describe('Blueprint: mixin', function() {
2121
return emberGenerateDestroy(['mixin', 'foo'], _file => {
2222
expect(_file('app/mixins/foo.ts'))
2323
.to.contain("import Mixin from '@ember/object/mixin';")
24-
.to.contain('export default Mixin.create({\n});');
24+
.to.contain('export default Mixin.create({')
25+
.to.contain('});');
2526

2627
expect(_file('tests/unit/mixins/foo-test.ts')).to.contain(
2728
"import FooMixin from 'my-app/mixins/foo';"
@@ -33,7 +34,8 @@ describe('Blueprint: mixin', function() {
3334
return emberGenerateDestroy(['mixin', 'foo/bar'], _file => {
3435
expect(_file('app/mixins/foo/bar.ts'))
3536
.to.contain("import Mixin from '@ember/object/mixin';")
36-
.to.contain('export default Mixin.create({\n});');
37+
.to.contain('export default Mixin.create({')
38+
.to.contain('});');
3739

3840
expect(_file('tests/unit/mixins/foo/bar-test.ts')).to.contain(
3941
"import FooBarMixin from 'my-app/mixins/foo/bar';"
@@ -53,7 +55,8 @@ describe('Blueprint: mixin', function() {
5355
return emberGenerateDestroy(['mixin', 'foo', '--pod'], _file => {
5456
expect(_file('app/mixins/foo.ts'))
5557
.to.contain("import Mixin from '@ember/object/mixin';")
56-
.to.contain('export default Mixin.create({\n});');
58+
.to.contain('export default Mixin.create({')
59+
.to.contain('});');
5760

5861
expect(_file('tests/unit/mixins/foo-test.ts')).to.contain(
5962
"import FooMixin from 'my-app/mixins/foo';"
@@ -65,7 +68,8 @@ describe('Blueprint: mixin', function() {
6568
return emberGenerateDestroy(['mixin', 'foo/bar', '--pod'], _file => {
6669
expect(_file('app/mixins/foo/bar.ts'))
6770
.to.contain("import Mixin from '@ember/object/mixin';")
68-
.to.contain('export default Mixin.create({\n});');
71+
.to.contain('export default Mixin.create({')
72+
.to.contain('});');
6973

7074
expect(_file('tests/unit/mixins/foo/bar-test.ts')).to.contain(
7175
"import FooBarMixin from 'my-app/mixins/foo/bar';"
@@ -90,7 +94,8 @@ describe('Blueprint: mixin', function() {
9094
return emberGenerateDestroy(['mixin', 'foo', '--pod'], _file => {
9195
expect(_file('app/mixins/foo.ts'))
9296
.to.contain("import Mixin from '@ember/object/mixin';")
93-
.to.contain('export default Mixin.create({\n});');
97+
.to.contain('export default Mixin.create({')
98+
.to.contain('});');
9499

95100
expect(_file('tests/unit/mixins/foo-test.ts')).to.contain(
96101
"import FooMixin from 'my-app/mixins/foo';"
@@ -102,7 +107,8 @@ describe('Blueprint: mixin', function() {
102107
return emberGenerateDestroy(['mixin', 'foo/bar', '--pod'], _file => {
103108
expect(_file('app/mixins/foo/bar.ts'))
104109
.to.contain("import Mixin from '@ember/object/mixin';")
105-
.to.contain('export default Mixin.create({\n});');
110+
.to.contain('export default Mixin.create({')
111+
.to.contain('});');
106112

107113
expect(_file('tests/unit/mixins/foo/bar-test.ts')).to.contain(
108114
"import FooBarMixin from 'my-app/mixins/foo/bar';"
@@ -121,7 +127,8 @@ describe('Blueprint: mixin', function() {
121127
return emberGenerateDestroy(['mixin', 'foo'], _file => {
122128
expect(_file('addon/mixins/foo.ts'))
123129
.to.contain("import Mixin from '@ember/object/mixin';")
124-
.to.contain('export default Mixin.create({\n});');
130+
.to.contain('export default Mixin.create({')
131+
.to.contain('});');
125132

126133
expect(_file('tests/unit/mixins/foo-test.ts')).to.contain(
127134
"import FooMixin from 'my-addon/mixins/foo';"
@@ -135,7 +142,8 @@ describe('Blueprint: mixin', function() {
135142
return emberGenerateDestroy(['mixin', 'foo/bar'], _file => {
136143
expect(_file('addon/mixins/foo/bar.ts'))
137144
.to.contain("import Mixin from '@ember/object/mixin';")
138-
.to.contain('export default Mixin.create({\n});');
145+
.to.contain('export default Mixin.create({')
146+
.to.contain('});');
139147

140148
expect(_file('tests/unit/mixins/foo/bar-test.ts')).to.contain(
141149
"import FooBarMixin from 'my-addon/mixins/foo/bar';"
@@ -149,7 +157,8 @@ describe('Blueprint: mixin', function() {
149157
return emberGenerateDestroy(['mixin', 'foo/bar/baz'], _file => {
150158
expect(_file('addon/mixins/foo/bar/baz.ts'))
151159
.to.contain("import Mixin from '@ember/object/mixin';")
152-
.to.contain('export default Mixin.create({\n});');
160+
.to.contain('export default Mixin.create({')
161+
.to.contain('});');
153162

154163
expect(_file('tests/unit/mixins/foo/bar/baz-test.ts')).to.contain(
155164
"import FooBarBazMixin from 'my-addon/mixins/foo/bar/baz';"
@@ -169,7 +178,8 @@ describe('Blueprint: mixin', function() {
169178
return emberGenerateDestroy(['mixin', 'foo', '--in-repo-addon=my-addon'], _file => {
170179
expect(_file('lib/my-addon/addon/mixins/foo.ts'))
171180
.to.contain("import Mixin from '@ember/object/mixin';")
172-
.to.contain('export default Mixin.create({\n});');
181+
.to.contain('export default Mixin.create({')
182+
.to.contain('});');
173183

174184
expect(_file('tests/unit/mixins/foo-test.ts')).to.contain(
175185
"import FooMixin from 'my-addon/mixins/foo';"
@@ -181,7 +191,8 @@ describe('Blueprint: mixin', function() {
181191
return emberGenerateDestroy(['mixin', 'foo/bar', '--in-repo-addon=my-addon'], _file => {
182192
expect(_file('lib/my-addon/addon/mixins/foo/bar.ts'))
183193
.to.contain("import Mixin from '@ember/object/mixin';")
184-
.to.contain('export default Mixin.create({\n});');
194+
.to.contain('export default Mixin.create({')
195+
.to.contain('});');
185196

186197
expect(_file('tests/unit/mixins/foo/bar-test.ts')).to.contain(
187198
"import FooBarMixin from 'my-addon/mixins/foo/bar';"

‎node-tests/blueprints/route-test.js‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ describe('Blueprint: route', function() {
2525
return emberGenerateDestroy(['route', 'foo'], _file => {
2626
expect(_file('app/routes/foo.ts'))
2727
.to.contain("import Route from '@ember/routing/route';")
28-
.to.contain('export default class Foo extends Route.extend({\n')
28+
.to.contain('export default class Foo extends Route.extend({')
2929
.to.contain(' // anything which *must* be merged to prototype here')
3030
.to.contain('}) {')
3131
.to.contain(' // normal class body definition here')
@@ -58,7 +58,7 @@ describe('Blueprint: route', function() {
5858
return emberGenerateDestroy(['route', 'foo', '--path=:foo_id/show'], _file => {
5959
expect(_file('app/routes/foo.ts'))
6060
.to.contain("import Route from '@ember/routing/route';")
61-
.to.contain('export default class Foo extends Route.extend({\n')
61+
.to.contain('export default class Foo extends Route.extend({')
6262
.to.contain(' // anything which *must* be merged to prototype here')
6363
.to.contain('}) {')
6464
.to.contain(' // normal class body definition here')
@@ -85,7 +85,7 @@ describe('Blueprint: route', function() {
8585
return emberGenerateDestroy(['route', 'parent/child', '--reset-namespace'], _file => {
8686
expect(_file('app/routes/child.ts'))
8787
.to.contain("import Route from '@ember/routing/route';")
88-
.to.contain('export default class ParentChild extends Route.extend({\n')
88+
.to.contain('export default class ParentChild extends Route.extend({')
8989
.to.contain(' // anything which *must* be merged to prototype here')
9090
.to.contain('}) {')
9191
.to.contain(' // normal class body definition here')
@@ -111,7 +111,7 @@ describe('Blueprint: route', function() {
111111
_file => {
112112
expect(_file('app/child/route.ts'))
113113
.to.contain("import Route from '@ember/routing/route';")
114-
.to.contain('export default class ParentChild extends Route.extend({\n')
114+
.to.contain('export default class ParentChild extends Route.extend({')
115115
.to.contain(' // anything which *must* be merged to prototype here')
116116
.to.contain('}) {')
117117
.to.contain(' // normal class body definition here')
@@ -163,7 +163,7 @@ describe('Blueprint: route', function() {
163163
return emberGenerateDestroy(['route', 'foo', '--pod'], _file => {
164164
expect(_file('app/foo/route.ts'))
165165
.to.contain("import Route from '@ember/routing/route';")
166-
.to.contain('export default class Foo extends Route.extend({\n')
166+
.to.contain('export default class Foo extends Route.extend({')
167167
.to.contain(' // anything which *must* be merged to prototype here')
168168
.to.contain('}) {')
169169
.to.contain(' // normal class body definition here')
@@ -227,7 +227,7 @@ describe('Blueprint: route', function() {
227227
return emberGenerateDestroy(['route', 'foo', '--pod'], _file => {
228228
expect(_file('app/pods/foo/route.ts'))
229229
.to.contain("import Route from '@ember/routing/route';")
230-
.to.contain('export default class Foo extends Route.extend({\n')
230+
.to.contain('export default class Foo extends Route.extend({')
231231
.to.contain(' // anything which *must* be merged to prototype here')
232232
.to.contain('}) {')
233233
.to.contain(' // normal class body definition here')
@@ -258,7 +258,7 @@ describe('Blueprint: route', function() {
258258
return emberGenerateDestroy(['route', 'foo'], _file => {
259259
expect(_file('addon/routes/foo.ts'))
260260
.to.contain("import Route from '@ember/routing/route';")
261-
.to.contain('export default class Foo extends Route.extend({\n')
261+
.to.contain('export default class Foo extends Route.extend({')
262262
.to.contain(' // anything which *must* be merged to prototype here')
263263
.to.contain('}) {')
264264
.to.contain(' // normal class body definition here')
@@ -290,7 +290,7 @@ describe('Blueprint: route', function() {
290290
return emberGenerateDestroy(['route', 'foo/bar'], _file => {
291291
expect(_file('addon/routes/foo/bar.ts'))
292292
.to.contain("import Route from '@ember/routing/route';")
293-
.to.contain('export default class FooBar extends Route.extend({\n')
293+
.to.contain('export default class FooBar extends Route.extend({')
294294
.to.contain(' // anything which *must* be merged to prototype here')
295295
.to.contain('}) {')
296296
.to.contain(' // normal class body definition here')
@@ -320,7 +320,7 @@ describe('Blueprint: route', function() {
320320
return emberGenerateDestroy(['route', 'foo', '--dummy'], _file => {
321321
expect(_file('tests/dummy/app/routes/foo.ts'))
322322
.to.contain("import Route from '@ember/routing/route';")
323-
.to.contain('export default class Foo extends Route.extend({\n')
323+
.to.contain('export default class Foo extends Route.extend({')
324324
.to.contain(' // anything which *must* be merged to prototype here')
325325
.to.contain('}) {')
326326
.to.contain(' // normal class body definition here')
@@ -342,7 +342,7 @@ describe('Blueprint: route', function() {
342342
return emberGenerateDestroy(['route', 'foo/bar', '--dummy'], _file => {
343343
expect(_file('tests/dummy/app/routes/foo/bar.ts'))
344344
.to.contain("import Route from '@ember/routing/route';")
345-
.to.contain('export default class FooBar extends Route.extend({\n')
345+
.to.contain('export default class FooBar extends Route.extend({')
346346
.to.contain(' // anything which *must* be merged to prototype here')
347347
.to.contain('}) {')
348348
.to.contain(' // normal class body definition here')
@@ -368,7 +368,7 @@ describe('Blueprint: route', function() {
368368
return emberGenerateDestroy(['route', 'foo', '--pod'], _file => {
369369
expect(_file('addon/foo/route.ts'))
370370
.to.contain("import Route from '@ember/routing/route';")
371-
.to.contain('export default class Foo extends Route.extend({\n')
371+
.to.contain('export default class Foo extends Route.extend({')
372372
.to.contain(' // anything which *must* be merged to prototype here')
373373
.to.contain('}) {')
374374
.to.contain(' // normal class body definition here')
@@ -402,7 +402,7 @@ describe('Blueprint: route', function() {
402402
return emberGenerateDestroy(['route', 'foo', '--in-repo-addon=my-addon'], _file => {
403403
expect(_file('lib/my-addon/addon/routes/foo.ts'))
404404
.to.contain("import Route from '@ember/routing/route';")
405-
.to.contain('export default class Foo extends Route.extend({\n')
405+
.to.contain('export default class Foo extends Route.extend({')
406406
.to.contain(' // anything which *must* be merged to prototype here')
407407
.to.contain('}) {')
408408
.to.contain(' // normal class body definition here')
@@ -428,7 +428,7 @@ describe('Blueprint: route', function() {
428428
return emberGenerateDestroy(['route', 'foo/bar', '--in-repo-addon=my-addon'], _file => {
429429
expect(_file('lib/my-addon/addon/routes/foo/bar.ts'))
430430
.to.contain("import Route from '@ember/routing/route';")
431-
.to.contain('export default class FooBar extends Route.extend({\n')
431+
.to.contain('export default class FooBar extends Route.extend({')
432432
.to.contain(' // anything which *must* be merged to prototype here')
433433
.to.contain('}) {')
434434
.to.contain(' // normal class body definition here')

‎node-tests/blueprints/test-helper-test.js‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,8 @@ describe('Blueprint: test-helper', function() {
2020
return emberGenerateDestroy(['test-helper', 'foo'], _file => {
2121
expect(_file('tests/helpers/foo.ts'))
2222
.to.contain("import { registerAsyncHelper } from '@ember/test';")
23-
.to.contain("export default registerAsyncHelper('foo', function(app) {\n\n}");
23+
.to.contain("export default registerAsyncHelper('foo', function(app) {")
24+
.to.contain('}');
2425
});
2526
});
2627
});

0 commit comments

Comments
 (0)