Permalink
Browse files

Merge pull request #170 from FountainJS/bump-yeoman-generator

Use Yeoman to v1.0.0
  • Loading branch information...
2 parents 08b65d6 + d1ca31d commit 1386c68843a8f940fdae11135d1d4690b9f9aafe @zckrs zckrs committed on GitHub Dec 19, 2016
Showing with 9 additions and 13 deletions.
  1. +8 −12 generators/app/index.js
  2. +1 −1 test/app/index.js
@@ -16,18 +16,14 @@ module.exports = fountain.Base.extend({
},
composing() {
- this.composeWith(`fountain-${this.props.framework}`, {
- options: {
- framework: this.props.framework,
- modules: this.props.modules,
- js: this.props.js,
- ci: this.props.ci,
- css: this.props.css,
- skipInstall: this.props.skipInstall,
- skipCache: this.props.skipCache
- }
- }, {
- local: require.resolve(`generator-fountain-${this.props.framework}/generators/app`)
+ this.composeWith(require.resolve(`generator-fountain-${this.props.framework}/generators/app`), {
+ framework: this.props.framework,
+ modules: this.props.modules,
+ js: this.props.js,
+ ci: this.props.ci,
+ css: this.props.css,
+ skipInstall: this.props.skipInstall,
+ skipCache: this.props.skipCache
});
}
});
View
@@ -39,5 +39,5 @@ test('composing(): Call this.composeWith', () => {
context.composeWith = () => {};
const spy = chai.spy.on(context, 'composeWith');
TestUtils.call(context, 'composing', {framework: 'react'});
- expect(spy).to.have.been.called.with('fountain-react');
+ expect(spy).to.have.been.called.with(require.resolve(`generator-fountain-react/generators/app`));
});

0 comments on commit 1386c68

Please sign in to comment.