Skip to content

Commit

Permalink
Merge pull request #17199 from simonihmig/acceptance-blueprint
Browse files Browse the repository at this point in the history
Make acceptance blueprint test explicit about QUnit version
  • Loading branch information
rwjblue authored Nov 11, 2018
2 parents 446267e + 6e02471 commit 17687ef
Showing 1 changed file with 30 additions and 18 deletions.
48 changes: 30 additions & 18 deletions node-tests/blueprints/acceptance-test-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,17 @@ describe('Blueprint: acceptance-test', function() {
return emberNew();
});

it('acceptance-test foo', function() {
return emberGenerateDestroy(['acceptance-test', 'foo'], _file => {
expect(_file('tests/acceptance/foo-test.js')).to.equal(
fixture('acceptance-test/default.js')
);
describe('with ember-cli-qunit@4.1.0', function() {
beforeEach(function() {
generateFakePackageManifest('ember-cli-qunit', '4.1.0');
});

it('acceptance-test foo', function() {
return emberGenerateDestroy(['acceptance-test', 'foo'], _file => {
expect(_file('tests/acceptance/foo-test.js')).to.equal(
fixture('acceptance-test/default.js')
);
});
});
});

Expand Down Expand Up @@ -83,23 +89,29 @@ describe('Blueprint: acceptance-test', function() {
return emberNew({ target: 'addon' });
});

it('acceptance-test foo', function() {
return emberGenerateDestroy(['acceptance-test', 'foo'], _file => {
expect(_file('tests/acceptance/foo-test.js')).to.equal(
fixture('acceptance-test/addon-default.js')
);
describe('with ember-cli-qunit@4.1.0', function() {
beforeEach(function() {
generateFakePackageManifest('ember-cli-qunit', '4.1.0');
});

expect(_file('app/acceptance-tests/foo.js')).to.not.exist;
it('acceptance-test foo', function() {
return emberGenerateDestroy(['acceptance-test', 'foo'], _file => {
expect(_file('tests/acceptance/foo-test.js')).to.equal(
fixture('acceptance-test/addon-default.js')
);

expect(_file('app/acceptance-tests/foo.js')).to.not.exist;
});
});
});

it('acceptance-test foo/bar', function() {
return emberGenerateDestroy(['acceptance-test', 'foo/bar'], _file => {
expect(_file('tests/acceptance/foo/bar-test.js')).to.equal(
fixture('acceptance-test/addon-nested.js')
);
it('acceptance-test foo/bar', function() {
return emberGenerateDestroy(['acceptance-test', 'foo/bar'], _file => {
expect(_file('tests/acceptance/foo/bar-test.js')).to.equal(
fixture('acceptance-test/addon-nested.js')
);

expect(_file('app/acceptance-tests/foo/bar.js')).to.not.exist;
expect(_file('app/acceptance-tests/foo/bar.js')).to.not.exist;
});
});
});

Expand Down

0 comments on commit 17687ef

Please sign in to comment.