Skip to content

Commit f367c35

Browse files
committed
Merge pull request #24 from quaertym/revert-23-check-dependencies-when-included
Revert "Move dependency checking to included hook"
2 parents 32a6c68 + 31d1516 commit f367c35

File tree

3 files changed

+7
-14
lines changed

3 files changed

+7
-14
lines changed

lib/dependency-checker.js

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,8 @@ function isUnsatisfied(pkg) {
1616
function EmberCLIDependencyChecker(project) {
1717
this.name = 'ember-cli-dependency-checker';
1818
this.project = project;
19-
}
20-
21-
EmberCLIDependencyChecker.prototype.included = function(/*app*/) {
2219
this.checkDependencies();
23-
};
20+
}
2421

2522
EmberCLIDependencyChecker.prototype.checkDependencies = function() {
2623

tests/helpers/assert-error.js

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,10 @@ var DependencyChecker = require('../../lib/dependency-checker');
55
var DependencyError = require('../../lib/dependency-error');
66

77
module.exports = function(project, type) {
8-
9-
var includeDependencyChecker = function() {
10-
var dependencyChecker = new DependencyChecker(project);
11-
dependencyChecker.included();
8+
var dependencyChecker = function() {
9+
return new DependencyChecker(project);
1210
};
1311

14-
assert.throws(includeDependencyChecker, DependencyError, 'Missing ' + type + ' packages');
12+
assert.throws(dependencyChecker, DependencyError, 'Missing ' + type + ' packages');
1513
DependencyChecker.setAlreadyChecked(false);
1614
};

tests/helpers/assert-no-error.js

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,10 @@ var DependencyChecker = require('../../lib/dependency-checker');
55
var DependencyError = require('../../lib/dependency-error');
66

77
module.exports = function(project, type) {
8-
9-
var includeDependencyChecker = function() {
10-
var dependencyChecker = new DependencyChecker(project);
11-
dependencyChecker.included();
8+
var dependencyChecker = function() {
9+
return new DependencyChecker(project);
1210
};
1311

14-
assert.doesNotThrow(includeDependencyChecker, DependencyError, 'Missing ' + type + 'packages');
12+
assert.doesNotThrow(dependencyChecker, DependencyError, 'Missing ' + type + 'packages');
1513
DependencyChecker.setAlreadyChecked(false);
1614
};

0 commit comments

Comments
 (0)