Skip to content

Commit a9c7b91

Browse files
WindvisWindvis
committed
Rename the RFC232 fixture files
Since it's now the only test setup we support, we can give the fixtures more descriptive names.
1 parent c299250 commit a9c7b91

34 files changed

+80
-118
lines changed

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

+2-6
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,7 @@ describe('Blueprint: acceptance-test', function () {
2020

2121
it('acceptance-test foo', function () {
2222
return emberGenerateDestroy(['acceptance-test', 'foo'], (_file) => {
23-
expect(_file('tests/acceptance/foo-test.js')).to.equal(
24-
fixture('acceptance-test/qunit-rfc268.js')
25-
);
23+
expect(_file('tests/acceptance/foo-test.js')).to.equal(fixture('acceptance-test/app.js'));
2624
});
2725
});
2826
});
@@ -34,9 +32,7 @@ describe('Blueprint: acceptance-test', function () {
3432

3533
it('acceptance-test foo', function () {
3634
return emberGenerateDestroy(['acceptance-test', 'foo'], (_file) => {
37-
expect(_file('tests/acceptance/foo-test.js')).to.equal(
38-
fixture('acceptance-test/qunit-rfc268-addon.js')
39-
);
35+
expect(_file('tests/acceptance/foo-test.js')).to.equal(fixture('acceptance-test/addon.js'));
4036
});
4137
});
4238
});

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

+5-5
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ describe('Blueprint: component-test', function () {
2121
it('component-test foo', function () {
2222
return emberGenerateDestroy(['component-test', 'foo'], (_file) => {
2323
expect(_file('tests/integration/components/foo-test.js')).to.equal(
24-
fixture('component-test/rfc232.js', {
24+
fixture('component-test/app.js', {
2525
replace: {
2626
component: 'foo',
2727
componentInvocation: 'Foo',
@@ -34,7 +34,7 @@ describe('Blueprint: component-test', function () {
3434
it('component-test x-foo --unit', function () {
3535
return emberGenerateDestroy(['component-test', 'x-foo', '--unit'], (_file) => {
3636
expect(_file('tests/unit/components/x-foo-test.js')).to.equal(
37-
fixture('component-test/rfc232-unit.js')
37+
fixture('component-test/unit.js')
3838
);
3939
});
4040
});
@@ -61,7 +61,7 @@ describe('Blueprint: component-test', function () {
6161
it('component-test foo --unit', function () {
6262
return emberGenerateDestroy(['component-test', 'foo', '--unit'], (_file) => {
6363
expect(_file('tests/unit/components/foo-test.js')).to.equal(
64-
fixture('component-test/rfc232-unit-addon.js')
64+
fixture('component-test/addon-unit.js')
6565
);
6666
});
6767
});
@@ -77,7 +77,7 @@ describe('Blueprint: component-test', function () {
7777
['component-test', 'foo', '--in-repo-addon=my-addon'],
7878
(_file) => {
7979
expect(_file('tests/integration/components/foo-test.js')).to.equal(
80-
fixture('component-test/rfc232.js', {
80+
fixture('component-test/app.js', {
8181
replace: {
8282
component: 'foo',
8383
componentInvocation: 'Foo',
@@ -93,7 +93,7 @@ describe('Blueprint: component-test', function () {
9393
['component-test', 'x-foo', '--in-repo-addon=my-addon', '--unit'],
9494
(_file) => {
9595
expect(_file('tests/unit/components/x-foo-test.js')).to.equal(
96-
fixture('component-test/rfc232-unit.js')
96+
fixture('component-test/unit.js')
9797
);
9898
}
9999
);

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

+14-14
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ describe('Blueprint: component', function () {
3939
expect(_file('app/components/foo.hbs')).to.equal('{{yield}}');
4040

4141
expect(_file('tests/integration/components/foo-test.js')).to.equal(
42-
fixture('component-test/rfc232.js', {
42+
fixture('component-test/app.js', {
4343
replace: {
4444
component: 'foo',
4545
componentInvocation: 'Foo',
@@ -65,7 +65,7 @@ describe('Blueprint: component', function () {
6565
expect(_file('app/components/foo.hbs')).to.equal('{{yield}}');
6666

6767
expect(_file('tests/integration/components/foo-test.js')).to.equal(
68-
fixture('component-test/rfc232.js', {
68+
fixture('component-test/app.js', {
6969
replace: {
7070
component: 'foo',
7171
componentInvocation: 'Foo',
@@ -83,7 +83,7 @@ describe('Blueprint: component', function () {
8383
expect(_file('app/components/foo.hbs')).to.equal('{{yield}}');
8484

8585
expect(_file('tests/integration/components/foo-test.js')).to.equal(
86-
fixture('component-test/rfc232.js', {
86+
fixture('component-test/app.js', {
8787
replace: {
8888
component: 'foo',
8989
componentInvocation: 'Foo',
@@ -101,7 +101,7 @@ describe('Blueprint: component', function () {
101101
expect(_file('app/components/foo/index.hbs')).to.equal('{{yield}}');
102102

103103
expect(_file('tests/integration/components/foo-test.js')).to.equal(
104-
fixture('component-test/rfc232.js', {
104+
fixture('component-test/app.js', {
105105
replace: {
106106
component: 'foo',
107107
componentInvocation: 'Foo',
@@ -121,7 +121,7 @@ describe('Blueprint: component', function () {
121121
expect(_file('app/components/foo.hbs')).to.equal('{{yield}}');
122122

123123
expect(_file('tests/integration/components/foo-test.js')).to.equal(
124-
fixture('component-test/rfc232.js', {
124+
fixture('component-test/app.js', {
125125
replace: {
126126
component: 'foo',
127127
componentInvocation: 'Foo',
@@ -141,7 +141,7 @@ describe('Blueprint: component', function () {
141141
expect(_file('app/components/foo.hbs')).to.equal('{{yield}}');
142142

143143
expect(_file('tests/integration/components/foo-test.js')).to.equal(
144-
fixture('component-test/rfc232.js', {
144+
fixture('component-test/app.js', {
145145
replace: {
146146
component: 'foo',
147147
componentInvocation: 'Foo',
@@ -161,7 +161,7 @@ describe('Blueprint: component', function () {
161161
expect(_file('app/components/foo.hbs')).to.equal('{{yield}}');
162162

163163
expect(_file('tests/integration/components/foo-test.js')).to.equal(
164-
fixture('component-test/rfc232.js', {
164+
fixture('component-test/app.js', {
165165
replace: {
166166
component: 'foo',
167167
componentInvocation: 'Foo',
@@ -179,7 +179,7 @@ describe('Blueprint: component', function () {
179179
expect(_file('app/components/foo.hbs')).to.equal('{{yield}}');
180180

181181
expect(_file('tests/integration/components/foo-test.js')).to.equal(
182-
fixture('component-test/rfc232.js', {
182+
fixture('component-test/app.js', {
183183
replace: {
184184
component: 'foo',
185185
componentInvocation: 'Foo',
@@ -195,7 +195,7 @@ describe('Blueprint: component', function () {
195195
expect(_file('app/components/x-foo.hbs')).to.equal('{{yield}}');
196196

197197
expect(_file('tests/integration/components/x-foo-test.js')).to.equal(
198-
fixture('component-test/rfc232.js', {
198+
fixture('component-test/app.js', {
199199
replace: {
200200
component: 'x-foo',
201201
componentInvocation: 'XFoo',
@@ -215,7 +215,7 @@ describe('Blueprint: component', function () {
215215
expect(_file('app/components/x-foo.hbs')).to.equal('{{yield}}');
216216

217217
expect(_file('tests/integration/components/x-foo-test.js')).to.equal(
218-
fixture('component-test/rfc232.js', {
218+
fixture('component-test/app.js', {
219219
replace: {
220220
component: 'x-foo',
221221
componentInvocation: 'XFoo',
@@ -231,7 +231,7 @@ describe('Blueprint: component', function () {
231231
expect(_file('app/components/foo/x-foo.hbs')).to.equal('{{yield}}');
232232

233233
expect(_file('tests/integration/components/foo/x-foo-test.js')).to.equal(
234-
fixture('component-test/rfc232.js', {
234+
fixture('component-test/app.js', {
235235
replace: {
236236
component: 'foo/x-foo',
237237
componentInvocation: 'Foo::XFoo',
@@ -251,7 +251,7 @@ describe('Blueprint: component', function () {
251251
expect(_file('app/components/foo/x-foo.hbs')).to.equal('{{yield}}');
252252

253253
expect(_file('tests/integration/components/foo/x-foo-test.js')).to.equal(
254-
fixture('component-test/rfc232.js', {
254+
fixture('component-test/app.js', {
255255
replace: {
256256
component: 'foo/x-foo',
257257
componentInvocation: 'Foo::XFoo',
@@ -387,7 +387,7 @@ describe('Blueprint: component', function () {
387387
expect(_file('lib/my-addon/app/components/foo.hbs')).to.not.exist;
388388

389389
expect(_file('tests/integration/components/foo-test.js')).to.equal(
390-
fixture('component-test/rfc232.js', {
390+
fixture('component-test/app.js', {
391391
replace: {
392392
component: 'foo',
393393
componentInvocation: 'Foo',
@@ -411,7 +411,7 @@ describe('Blueprint: component', function () {
411411
expect(_file('lib/my-addon/app/components/x-foo.hbs')).to.not.exist;
412412

413413
expect(_file('tests/integration/components/x-foo-test.js')).to.equal(
414-
fixture('component-test/rfc232.js', {
414+
fixture('component-test/app.js', {
415415
replace: {
416416
component: 'x-foo',
417417
componentInvocation: 'XFoo',

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,15 @@ describe('Blueprint: controller-test', function () {
2121
it('controller-test foo', function () {
2222
return emberGenerateDestroy(['controller-test', 'foo'], (_file) => {
2323
expect(_file('tests/unit/controllers/foo-test.js')).to.equal(
24-
fixture('controller-test/rfc232.js')
24+
fixture('controller-test/app.js')
2525
);
2626
});
2727
});
2828

2929
it('controller-test foo/bar', function () {
3030
return emberGenerateDestroy(['controller-test', 'foo/bar'], (_file) => {
3131
expect(_file('tests/unit/controllers/foo/bar-test.js')).to.equal(
32-
fixture('controller-test/rfc232-nested.js')
32+
fixture('controller-test/nested.js')
3333
);
3434
});
3535
});
@@ -43,7 +43,7 @@ describe('Blueprint: controller-test', function () {
4343
it('controller-test foo', function () {
4444
return emberGenerateDestroy(['controller-test', 'foo'], (_file) => {
4545
expect(_file('tests/unit/controllers/foo-test.js')).to.equal(
46-
fixture('controller-test/rfc232-addon.js')
46+
fixture('controller-test/addon.js')
4747
);
4848
});
4949
});

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

+15-15
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ describe('Blueprint: controller', function () {
2424
expect(_file('app/controllers/foo.js')).to.equal(fixture('controller/controller.js'));
2525

2626
expect(_file('tests/unit/controllers/foo-test.js')).to.equal(
27-
fixture('controller-test/rfc232.js')
27+
fixture('controller-test/app.js')
2828
);
2929
});
3030
});
@@ -37,7 +37,7 @@ describe('Blueprint: controller', function () {
3737
expect(_file('app/controllers/foo.js')).to.equal(fixture('controller/controller.js'));
3838

3939
expect(_file('tests/unit/controllers/foo-test.js')).to.equal(
40-
fixture('controller-test/rfc232.js')
40+
fixture('controller-test/app.js')
4141
);
4242
});
4343
});
@@ -49,7 +49,7 @@ describe('Blueprint: controller', function () {
4949
);
5050

5151
expect(_file('tests/unit/controllers/foo/bar-test.js')).to.equal(
52-
fixture('controller-test/rfc232-nested.js')
52+
fixture('controller-test/nested.js')
5353
);
5454
});
5555
});
@@ -59,7 +59,7 @@ describe('Blueprint: controller', function () {
5959
expect(_file('app/foo/controller.js')).to.equal(fixture('controller/controller.js'));
6060

6161
expect(_file('tests/unit/foo/controller-test.js')).to.equal(
62-
fixture('controller-test/rfc232.js')
62+
fixture('controller-test/app.js')
6363
);
6464
});
6565
});
@@ -72,7 +72,7 @@ describe('Blueprint: controller', function () {
7272
expect(_file('app/foo/controller.js')).to.equal(fixture('controller/controller.js'));
7373

7474
expect(_file('tests/unit/foo/controller-test.js')).to.equal(
75-
fixture('controller-test/rfc232.js')
75+
fixture('controller-test/app.js')
7676
);
7777
});
7878
});
@@ -84,7 +84,7 @@ describe('Blueprint: controller', function () {
8484
);
8585

8686
expect(_file('tests/unit/foo/bar/controller-test.js')).to.equal(
87-
fixture('controller-test/rfc232-nested.js')
87+
fixture('controller-test/nested.js')
8888
);
8989
});
9090
});
@@ -99,7 +99,7 @@ describe('Blueprint: controller', function () {
9999
expect(_file('app/pods/foo/controller.js')).to.equal(fixture('controller/controller.js'));
100100

101101
expect(_file('tests/unit/pods/foo/controller-test.js')).to.equal(
102-
fixture('controller-test/rfc232.js')
102+
fixture('controller-test/app.js')
103103
);
104104
});
105105
});
@@ -111,7 +111,7 @@ describe('Blueprint: controller', function () {
111111
expect(_file('app/pods/foo/controller.js')).to.equal(fixture('controller/controller.js'));
112112

113113
expect(_file('tests/unit/pods/foo/controller-test.js')).to.equal(
114-
fixture('controller-test/rfc232.js')
114+
fixture('controller-test/app.js')
115115
);
116116
});
117117
});
@@ -123,7 +123,7 @@ describe('Blueprint: controller', function () {
123123
);
124124

125125
expect(_file('tests/unit/pods/foo/bar/controller-test.js')).to.equal(
126-
fixture('controller-test/rfc232-nested.js')
126+
fixture('controller-test/nested.js')
127127
);
128128
});
129129
});
@@ -144,7 +144,7 @@ describe('Blueprint: controller', function () {
144144
);
145145

146146
expect(_file('tests/unit/controllers/foo-test.js')).to.equal(
147-
fixture('controller-test/rfc232-addon.js')
147+
fixture('controller-test/addon.js')
148148
);
149149
});
150150
});
@@ -162,7 +162,7 @@ describe('Blueprint: controller', function () {
162162
);
163163

164164
expect(_file('tests/unit/controllers/foo-test.js')).to.equal(
165-
fixture('controller-test/rfc232-addon.js')
165+
fixture('controller-test/addon.js')
166166
);
167167
});
168168
});
@@ -178,7 +178,7 @@ describe('Blueprint: controller', function () {
178178
);
179179

180180
expect(_file('tests/unit/controllers/foo/bar-test.js')).to.equal(
181-
fixture('controller-test/rfc232-addon-nested.js')
181+
fixture('controller-test/addon-nested.js')
182182
);
183183
});
184184
});
@@ -238,7 +238,7 @@ describe('Blueprint: controller', function () {
238238
);
239239

240240
expect(_file('tests/unit/controllers/foo-test.js')).to.equal(
241-
fixture('controller-test/rfc232.js')
241+
fixture('controller-test/app.js')
242242
);
243243
});
244244
});
@@ -258,7 +258,7 @@ describe('Blueprint: controller', function () {
258258
);
259259

260260
expect(_file('tests/unit/controllers/foo-test.js')).to.equal(
261-
fixture('controller-test/rfc232.js')
261+
fixture('controller-test/app.js')
262262
);
263263
});
264264
});
@@ -276,7 +276,7 @@ describe('Blueprint: controller', function () {
276276
);
277277

278278
expect(_file('tests/unit/controllers/foo/bar-test.js')).to.equal(
279-
fixture('controller-test/rfc232-nested.js')
279+
fixture('controller-test/nested.js')
280280
);
281281
}
282282
);

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ describe('Blueprint: helper-test', function () {
2121
it('helper-test foo', function () {
2222
return emberGenerateDestroy(['helper-test', 'foo'], (_file) => {
2323
expect(_file('tests/integration/helpers/foo-test.js')).to.equal(
24-
fixture('helper-test/rfc232.js')
24+
fixture('helper-test/app.js')
2525
);
2626
});
2727
});
@@ -43,7 +43,7 @@ describe('Blueprint: helper-test', function () {
4343
it('helper-test foo', function () {
4444
return emberGenerateDestroy(['helper-test', 'foo'], (_file) => {
4545
expect(_file('tests/integration/helpers/foo-test.js')).to.equal(
46-
fixture('helper-test/rfc232-addon.js')
46+
fixture('helper-test/addon.js')
4747
);
4848
});
4949
});

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ describe('Blueprint: initializer-test', function () {
2121
it('initializer-test foo', function () {
2222
return emberGenerateDestroy(['initializer-test', 'foo'], (_file) => {
2323
expect(_file('tests/unit/initializers/foo-test.js')).to.equal(
24-
fixture('initializer-test/rfc232.js')
24+
fixture('initializer-test/app.js')
2525
);
2626
});
2727
});

‎node-tests/blueprints/instance-initializer-test-test.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ describe('Blueprint: instance-initializer-test', function () {
2121
it('instance-initializer-test foo', function () {
2222
return emberGenerateDestroy(['instance-initializer-test', 'foo'], (_file) => {
2323
expect(_file('tests/unit/instance-initializers/foo-test.js')).to.equal(
24-
fixture('instance-initializer-test/rfc232.js')
24+
fixture('instance-initializer-test/app.js')
2525
);
2626
});
2727
});

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ describe('Blueprint: mixin-test', function () {
2020

2121
it('mixin-test foo', function () {
2222
return emberGenerateDestroy(['mixin-test', 'foo'], (_file) => {
23-
expect(_file('tests/unit/mixins/foo-test.js')).to.equal(fixture('mixin-test/rfc232.js'));
23+
expect(_file('tests/unit/mixins/foo-test.js')).to.equal(fixture('mixin-test/app.js'));
2424
});
2525
});
2626
});

0 commit comments

Comments
 (0)