Skip to content

Commit 6a196e2

Browse files
committed
fix(deps): use angular ~1.2 before migrated to 1.3
Change angular version spec from ">=1.2.*" to "~1.2" to ensure generator tests run before migration to 1.3 is completed. Closes angular-fullstack#654.
1 parent 8c9f0f9 commit 6a196e2

File tree

2 files changed

+42
-7
lines changed

2 files changed

+42
-7
lines changed

Diff for: app/templates/_bower.json

+7-7
Original file line numberDiff line numberDiff line change
@@ -2,23 +2,23 @@
22
"name": "<%= _.slugify(_.humanize(appname)) %>",
33
"version": "0.0.0",
44
"dependencies": {
5-
"angular": ">=1.2.*",
5+
"angular": "~1.2",
66
"json3": "~3.3.1",
77
"es5-shim": "~3.0.1",<% if(filters.bootstrap) { %><% if (filters.sass) { %>
88
"bootstrap-sass-official": "~3.1.1",<% } %>
99
"bootstrap": "~3.1.1",<% } %>
10-
"angular-resource": ">=1.2.*",
11-
"angular-cookies": ">=1.2.*",
12-
"angular-sanitize": ">=1.2.*",<% if (filters.ngroute) { %>
13-
"angular-route": ">=1.2.*",<% } %><% if (filters.uibootstrap) { %>
10+
"angular-resource": "~1.2",
11+
"angular-cookies": "~1.2",
12+
"angular-sanitize": "~1.2",<% if (filters.ngroute) { %>
13+
"angular-route": "~1.2",<% } %><% if (filters.uibootstrap) { %>
1414
"angular-bootstrap": "~0.11.0",<% } %>
1515
"font-awesome": ">=4.1.0",
1616
"lodash": "~2.4.1"<% if (filters.socketio) { %>,
1717
"angular-socket-io": "~0.6.0"<% } %><% if (filters.uirouter) { %>,
1818
"angular-ui-router": "~0.2.10"<% } %>
1919
},
2020
"devDependencies": {
21-
"angular-mocks": ">=1.2.*",
22-
"angular-scenario": ">=1.2.*"
21+
"angular-mocks": "~1.2",
22+
"angular-scenario": "~1.2"
2323
}
2424
}

Diff for: test/test-file-creation.js

+35
Original file line numberDiff line numberDiff line change
@@ -314,6 +314,41 @@ describe('angular-fullstack generator', function () {
314314
}.bind(this));
315315
});
316316

317+
describe('making sure test fixtures are present', function() {
318+
319+
it('should have package.json in fixtures', function() {
320+
helpers.assertFile([
321+
path.join(__dirname, 'fixtures', 'package.json')
322+
]);
323+
});
324+
325+
it('should have bower.json in fixtures', function() {
326+
helpers.assertFile([
327+
path.join(__dirname, 'fixtures', 'bower.json')
328+
]);
329+
});
330+
331+
it('should have all npm packages in fixtures/node_modules', function() {
332+
var packageJson = require('./fixtures/package.json');
333+
var deps = Object.keys(packageJson.dependencies);
334+
deps = deps.concat(Object.keys(packageJson.devDependencies));
335+
deps = deps.map(function(dep) {
336+
return path.join(__dirname, 'fixtures', 'node_modules', dep);
337+
});
338+
helpers.assertFile(deps);
339+
});
340+
341+
it('should have all bower packages in fixtures/bower_components', function() {
342+
var bowerJson = require('./fixtures/bower.json');
343+
var deps = Object.keys(bowerJson.dependencies);
344+
deps = deps.concat(Object.keys(bowerJson.devDependencies));
345+
deps = deps.map(function(dep) {
346+
return path.join(__dirname, 'fixtures', 'bower_components', dep);
347+
});
348+
helpers.assertFile(deps);
349+
});
350+
});
351+
317352
describe('running app', function() {
318353

319354
beforeEach(function() {

0 commit comments

Comments
 (0)