Skip to content

Commit

Permalink
Merge pull request #99 from bobisjan/require-resolve-testing-blueprint
Browse files Browse the repository at this point in the history
Resolve Ember Testing coding standard
  • Loading branch information
rwjblue committed Aug 3, 2016
2 parents 98f048c + b142586 commit c61eefe
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 4 deletions.
4 changes: 1 addition & 3 deletions blueprints/ember-cli-eslint/files/.eslintrc.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
var path = require('path');

module.exports = {
extends: [
require.resolve('ember-cli-eslint/coding-standard/ember-application.js')
require.resolve('ember-cli-eslint/coding-standard/ember-application')
]
};
2 changes: 1 addition & 1 deletion blueprints/ember-cli-eslint/files/tests/.eslintrc.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
module.exports = {
extends: '../node_modules/ember-cli-eslint/coding-standard/ember-testing.js'
extends: require.resolve('ember-cli-eslint/coding-standard/ember-testing')
};

0 comments on commit c61eefe

Please sign in to comment.