Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make acceptance blueprint test explicit about QUnit version #17199

Merged
merged 1 commit into from
Nov 11, 2018
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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