Skip to content

Commit b023c4f

Browse files
ncuilleryncuillery
committed
chore(tests): Run tests with PhantomJS 2
This fixes the test failure with AngularJS 1.5 which is not compatible with PhantomJS 1: angular/angular.js#13794 BREAKING CHANGES: The minimal AngularJS version is now 1.2.x. The branches 1.0.x et 1.1.x are no longer supported. Closes #135
1 parent 0c8aab6 commit b023c4f

6 files changed

+41
-28
lines changed

Diff for: ‎Gruntfile.js

+9-5
Original file line numberDiff line numberDiff line change
@@ -219,10 +219,13 @@ module.exports = function (grunt) {
219219
},
220220
shell: {
221221
testMinimal: {
222-
command: 'bower install angular#=1.0.8 angular-mocks#=1.0.8 angular-sanitize#=1.0.8 angular-ui-router#=0.2.0 --config.directory=. --config.cwd=testDependencies'
222+
command: 'bower install angular#=1.2.29 angular-mocks#=1.2.29 angular-sanitize#=1.2.29 angular-ui-router#=0.2.18 --config.directory=. --config.cwd=testDependencies'
223223
},
224-
test1dot2: {
225-
command: 'bower install angular#=1.2.18 angular-mocks#=1.2.18 angular-sanitize#=1.2.18 angular-ui-router#=0.2.15 --config.directory=. --config.cwd=testDependencies'
224+
test1dot3: {
225+
command: 'bower install angular#=1.3.20 angular-mocks#=1.3.20 angular-sanitize#=1.3.20 angular-ui-router#=0.2.18 --config.directory=. --config.cwd=testDependencies'
226+
},
227+
test1dot4: {
228+
command: 'bower install angular#=1.4.10 angular-mocks#=1.4.10 angular-sanitize#=1.4.10 angular-ui-router#=0.2.18 --config.directory=. --config.cwd=testDependencies'
226229
},
227230
testLatest: {
228231
command: 'bower install angular angular-mocks angular-sanitize angular-ui-router --config.directory=. --config.cwd=testDependencies'
@@ -250,9 +253,10 @@ module.exports = function (grunt) {
250253

251254
grunt.registerTask('meteor-publish', ['exec:meteor-init', 'exec:meteor-publish']);
252255

253-
grunt.registerTask('test', ['jshint', 'testMin', 'test1dot2', 'testLatest']);
256+
grunt.registerTask('test', ['jshint', 'testMin', 'test1dot3', 'test1dot4', 'testLatest']);
254257
grunt.registerTask('testMin', ['clean:test', 'shell:testMinimal', 'karma']);
255-
grunt.registerTask('test1dot2', ['clean:test', 'shell:test1dot2', 'karma']);
258+
grunt.registerTask('test1dot3', ['clean:test', 'shell:test1dot3', 'karma']);
259+
grunt.registerTask('test1dot4', ['clean:test', 'shell:test1dot4', 'karma']);
256260
grunt.registerTask('testLatest', ['clean:test', 'shell:testLatest', 'karma']);
257261

258262
grunt.registerTask('default', ['test', 'concat:dev', 'uglify:dev']);

Diff for: ‎bower.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
"README.md"
2121
],
2222
"dependencies": {
23-
"angular": ">=1.0.8",
23+
"angular": ">=1.2.0",
2424
"angular-ui-router": ">=0.2.0"
2525
},
2626
"devDependencies": {

Diff for: ‎dist/angular-breadcrumb.js

+9-8
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
/*! angular-breadcrumb - v0.4.0-dev-2015-08-07
1+
/*! angular-breadcrumb - v0.4.1-dev-2016-04-09
22
* http://ncuillery.github.io/angular-breadcrumb
3-
* Copyright (c) 2015 Nicolas Cuillery; Licensed MIT */
3+
* Copyright (c) 2016 Nicolas Cuillery; Licensed MIT */
44

55
(function (window, angular, undefined) {
66
'use strict';
@@ -152,6 +152,7 @@ function $Breadcrumb() {
152152

153153
var getExpression = function(interpolationFunction) {
154154
if(interpolationFunction.expressions) {
155+
// Workaround for Angular 1.2.x
155156
return interpolationFunction.expressions;
156157
} else {
157158
var expressions = [];
@@ -210,7 +211,7 @@ function BreadcrumbDirective($interpolate, $breadcrumb, $rootScope) {
210211
var renderBreadcrumb = function() {
211212
deregisterWatchers(labelWatchers);
212213
labelWatchers = [];
213-
214+
214215
var viewScope = $breadcrumb.$getLastViewScope();
215216
scope.steps = $breadcrumb.getStatesChain();
216217
angular.forEach(scope.steps, function (step) {
@@ -260,7 +261,7 @@ function BreadcrumbLastDirective($interpolate, $breadcrumb, $rootScope) {
260261
var renderLabel = function() {
261262
deregisterWatchers(labelWatchers);
262263
labelWatchers = [];
263-
264+
264265
var viewScope = $breadcrumb.$getLastViewScope();
265266
var lastStep = $breadcrumb.getLastStep();
266267
if(lastStep) {
@@ -306,13 +307,13 @@ function BreadcrumbTextDirective($interpolate, $breadcrumb, $rootScope) {
306307
if(template) {
307308
cElement.html(template);
308309
}
309-
310+
310311
var separator = cElement.attr(cAttrs.$attr.ncyBreadcrumbTextSeparator) || ' / ';
311312

312313
return {
313314
post: function postLink(scope) {
314315
var labelWatchers = [];
315-
316+
316317
var registerWatchersText = function(labelWatcherArray, interpolationFunction, viewScope) {
317318
angular.forEach(getExpression(interpolationFunction), function(expression) {
318319
var watcher = viewScope.$watch(expression, function(newValue, oldValue) {
@@ -327,7 +328,7 @@ function BreadcrumbTextDirective($interpolate, $breadcrumb, $rootScope) {
327328
var renderLabel = function() {
328329
deregisterWatchers(labelWatchers);
329330
labelWatchers = [];
330-
331+
331332
var viewScope = $breadcrumb.$getLastViewScope();
332333
var steps = $breadcrumb.getStatesChain();
333334
var combinedLabels = [];
@@ -341,7 +342,7 @@ function BreadcrumbTextDirective($interpolate, $breadcrumb, $rootScope) {
341342
combinedLabels.push(step.name);
342343
}
343344
});
344-
345+
345346
scope.ncyBreadcrumbChain = combinedLabels.join(separator);
346347
};
347348

Diff for: ‎dist/angular-breadcrumb.min.js

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: ‎package.json

+13-6
Original file line numberDiff line numberDiff line change
@@ -41,15 +41,22 @@
4141
"grunt-contrib-uglify": "~0.2.0",
4242
"grunt-contrib-watch": "~0.4.0",
4343
"grunt-conventional-changelog": "~1.1.0",
44-
"grunt-karma": "~0.6.2",
44+
"grunt-exec": "^0.4.6",
45+
"grunt-karma": "~0.12.2",
4546
"grunt-open": "~0.2.0",
4647
"grunt-shell": "~0.7.0",
4748
"grunt-text-replace": "^0.3.12",
48-
"karma": "~0.10.2",
49-
"karma-coverage": "~0.1.0",
50-
"karma-story-reporter": "~0.2.2",
51-
"grunt-exec": "^0.4.6",
49+
"jasmine-core": "^2.4.1",
50+
"karma": "^0.13.22",
51+
"karma-coverage": "~0.1.5",
52+
"karma-jasmine": "^0.3.8",
53+
"karma-phantomjs-launcher": "^1.0.0",
54+
"karma-story-reporter": "^0.3.1",
55+
"phantomjs-prebuilt": "^2.1.7",
5256
"spacejam": "^1.1.1"
5357
},
54-
"keywords": ["angular", "breadcrumb"]
58+
"keywords": [
59+
"angular",
60+
"breadcrumb"
61+
]
5562
}

Diff for: ‎src/angular-breadcrumb.js

+7-6
Original file line numberDiff line numberDiff line change
@@ -149,6 +149,7 @@ var getExpression = function(interpolationFunction) {
149149
if(interpolationFunction.expressions) {
150150
return interpolationFunction.expressions;
151151
} else {
152+
// Workaround for Angular 1.2.x
152153
var expressions = [];
153154
angular.forEach(interpolationFunction.parts, function(part) {
154155
if(angular.isFunction(part)) {
@@ -205,7 +206,7 @@ function BreadcrumbDirective($interpolate, $breadcrumb, $rootScope) {
205206
var renderBreadcrumb = function() {
206207
deregisterWatchers(labelWatchers);
207208
labelWatchers = [];
208-
209+
209210
var viewScope = $breadcrumb.$getLastViewScope();
210211
scope.steps = $breadcrumb.getStatesChain();
211212
angular.forEach(scope.steps, function (step) {
@@ -255,7 +256,7 @@ function BreadcrumbLastDirective($interpolate, $breadcrumb, $rootScope) {
255256
var renderLabel = function() {
256257
deregisterWatchers(labelWatchers);
257258
labelWatchers = [];
258-
259+
259260
var viewScope = $breadcrumb.$getLastViewScope();
260261
var lastStep = $breadcrumb.getLastStep();
261262
if(lastStep) {
@@ -301,13 +302,13 @@ function BreadcrumbTextDirective($interpolate, $breadcrumb, $rootScope) {
301302
if(template) {
302303
cElement.html(template);
303304
}
304-
305+
305306
var separator = cElement.attr(cAttrs.$attr.ncyBreadcrumbTextSeparator) || ' / ';
306307

307308
return {
308309
post: function postLink(scope) {
309310
var labelWatchers = [];
310-
311+
311312
var registerWatchersText = function(labelWatcherArray, interpolationFunction, viewScope) {
312313
angular.forEach(getExpression(interpolationFunction), function(expression) {
313314
var watcher = viewScope.$watch(expression, function(newValue, oldValue) {
@@ -322,7 +323,7 @@ function BreadcrumbTextDirective($interpolate, $breadcrumb, $rootScope) {
322323
var renderLabel = function() {
323324
deregisterWatchers(labelWatchers);
324325
labelWatchers = [];
325-
326+
326327
var viewScope = $breadcrumb.$getLastViewScope();
327328
var steps = $breadcrumb.getStatesChain();
328329
var combinedLabels = [];
@@ -336,7 +337,7 @@ function BreadcrumbTextDirective($interpolate, $breadcrumb, $rootScope) {
336337
combinedLabels.push(step.name);
337338
}
338339
});
339-
340+
340341
scope.ncyBreadcrumbChain = combinedLabels.join(separator);
341342
};
342343

0 commit comments

Comments
 (0)