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.

Sign up for GitHub

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

Jump to bottom

Mixin generation in addon #5388

Merged
merged 1 commit into from
Jan 22, 2016
+14 −13
Merged

Mixin generation in addon #5388

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion blueprints/mixin-test/files/tests/unit/mixins/__name__-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import Ember from 'ember';
import <%= classifiedModuleName %>Mixin from '../../../mixins/<%= dasherizedModuleName %>';
import <%= classifiedModuleName %>Mixin from '<%= projectName %>/mixins/<%= dasherizedModuleName %>';
import { module, test } from 'qunit';

module('<%= friendlyTestName %>');
Expand Down
1 change: 1 addition & 0 deletions blueprints/mixin-test/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ module.exports = {
description: 'Generates a mixin unit test.',
locals: function(options) {
return {
projectName: options.inRepoAddon ? options.inRepoAddon : options.project.name(),
friendlyTestName: testInfo.name(options.entity.name, 'Unit', 'Mixin')
};
}
Expand Down
6 changes: 3 additions & 3 deletions tests/acceptance/addon-generate-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -544,7 +544,7 @@ describe('Acceptance: ember generate in-addon', function() {
});
assertFile('tests/unit/mixins/foo-test.js', {
contains: [
"import FooMixin from '../../../mixins/foo';"
"import FooMixin from 'my-addon/mixins/foo';"
]
});
assertFileToNotExist('app/mixins/foo.js');
Expand All @@ -561,7 +561,7 @@ describe('Acceptance: ember generate in-addon', function() {
});
assertFile('tests/unit/mixins/foo/bar-test.js', {
contains: [
"import FooBarMixin from '../../../mixins/foo/bar';"
"import FooBarMixin from 'my-addon/mixins/foo/bar';"
]
});
assertFileToNotExist('app/mixins/foo/bar.js');
Expand All @@ -578,7 +578,7 @@ describe('Acceptance: ember generate in-addon', function() {
});
assertFile('tests/unit/mixins/foo/bar/baz-test.js', {
contains: [
"import FooBarBazMixin from '../../../mixins/foo/bar/baz';"
"import FooBarBazMixin from 'my-addon/mixins/foo/bar/baz';"
]
});
assertFileToNotExist('app/mixins/foo/bar/baz.js');
Expand Down
6 changes: 3 additions & 3 deletions tests/acceptance/generate-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -670,7 +670,7 @@ describe('Acceptance: ember generate', function() {
});
assertFile('tests/unit/mixins/foo-test.js', {
contains: [
"import FooMixin from '../../../mixins/foo';"
"import FooMixin from 'my-app/mixins/foo';"
]
});
});
Expand All @@ -686,7 +686,7 @@ describe('Acceptance: ember generate', function() {
});
assertFile('tests/unit/mixins/foo/bar-test.js', {
contains: [
"import FooBarMixin from '../../../mixins/foo/bar';"
"import FooBarMixin from 'my-app/mixins/foo/bar';"
]
});
});
Expand All @@ -696,7 +696,7 @@ describe('Acceptance: ember generate', function() {
return generate(['mixin', 'foo/bar/baz']).then(function() {
assertFile('tests/unit/mixins/foo/bar/baz-test.js', {
contains: [
"import FooBarBazMixin from '../../../mixins/foo/bar/baz';"
"import FooBarBazMixin from 'my-app/mixins/foo/bar/baz';"
]
});
});
Expand Down
6 changes: 3 additions & 3 deletions tests/acceptance/in-repo-addon-generate-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -559,7 +559,7 @@ describe('Acceptance: ember generate in-repo-addon', function() {
});
assertFile('tests/unit/mixins/foo-test.js', {
contains: [
"import FooMixin from '../../../mixins/foo';"
"import FooMixin from 'my-addon/mixins/foo';"
]
});
});
Expand All @@ -575,7 +575,7 @@ describe('Acceptance: ember generate in-repo-addon', function() {
});
assertFile('tests/unit/mixins/foo/bar-test.js', {
contains: [
"import FooBarMixin from '../../../mixins/foo/bar';"
"import FooBarMixin from 'my-addon/mixins/foo/bar';"
]
});
});
Expand All @@ -585,7 +585,7 @@ describe('Acceptance: ember generate in-repo-addon', function() {
return generateInRepoAddon(['mixin', 'foo/bar/baz', '--in-repo-addon=my-addon']).then(function() {
assertFile('tests/unit/mixins/foo/bar/baz-test.js', {
contains: [
"import FooBarBazMixin from '../../../mixins/foo/bar/baz';"
"import FooBarBazMixin from 'my-addon/mixins/foo/bar/baz';"
]
});
});
Expand Down
6 changes: 3 additions & 3 deletions tests/acceptance/pods-generate-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1216,7 +1216,7 @@ describe('Acceptance: ember generate pod', function() {
});
assertFile('tests/unit/mixins/foo-test.js', {
contains: [
"import FooMixin from '../../../mixins/foo';"
"import FooMixin from 'my-app/mixins/foo';"
]
});
});
Expand All @@ -1232,7 +1232,7 @@ describe('Acceptance: ember generate pod', function() {
});
assertFile('tests/unit/mixins/foo/bar-test.js', {
contains: [
"import FooBarMixin from '../../../mixins/foo/bar';"
"import FooBarMixin from 'my-app/mixins/foo/bar';"
]
});
});
Expand All @@ -1242,7 +1242,7 @@ describe('Acceptance: ember generate pod', function() {
return generate(['mixin', 'foo/bar/baz', '--pod']).then(function() {
assertFile('tests/unit/mixins/foo/bar/baz-test.js', {
contains: [
"import FooBarBazMixin from '../../../mixins/foo/bar/baz';"
"import FooBarBazMixin from 'my-app/mixins/foo/bar/baz';"
]
});
});
Expand Down