From bdb89f3b529c2a987a0fdeb0690efb9120be6bdc Mon Sep 17 00:00:00 2001 From: James Gill Date: Wed, 30 Nov 2016 10:13:40 +1000 Subject: [PATCH] currently failing on 3 tests as part of `Breadcrumb directive with multiple-interpolation conf` test - renders the correct state chain and views content, - renders the correct state chain and views content, and - renders the correct state chain and views content change all occurences of `$viewContentLoaded` to `$stateChangeSuccess` --- CHANGELOG.md | 4 ++++ bower.json | 2 +- package.json | 2 +- release/angular-breadcrumb.js | 12 ++++++------ release/angular-breadcrumb.min.js | 4 ++-- sample/angular-breadcrumb-0.5.0.zip | Bin 6241 -> 0 bytes sample/angular-breadcrumb-0.5.2.zip | Bin 0 -> 6260 bytes sample/views/home.html | 4 ++-- src/angular-breadcrumb.js | 10 +++++----- test/spec/directive-basic-test.js | 4 ++-- test/spec/directive-dynamic-parent-test.js | 6 +++--- test/spec/directive-interpolation-test.js | 4 ++-- test/spec/directive-last-basic-test.js | 8 ++++---- test/spec/directive-last-interpolation-test.js | 4 ++-- test/spec/directive-last-sample-test.js | 2 +- test/spec/directive-ncyBreadcrumbIgnore-test.js | 8 ++++---- test/spec/directive-object-parent-test.js | 2 +- test/spec/directive-sample-test.js | 2 +- test/spec/directive-template-test.js | 8 ++++---- test/spec/directive-text-basic-separator-test.js | 4 ++-- test/spec/directive-text-basic-test.js | 4 ++-- test/spec/directive-text-interpolation-test.js | 4 ++-- test/spec/directive-text-sample-test.js | 2 +- test/spec/directive-ui-sref-template-test.js | 6 +++--- 24 files changed, 55 insertions(+), 51 deletions(-) delete mode 100644 sample/angular-breadcrumb-0.5.0.zip create mode 100644 sample/angular-breadcrumb-0.5.2.zip diff --git a/CHANGELOG.md b/CHANGELOG.md index 7fa0e4f..89dc53b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ + +### 0.5.2 (2016-11-30) + + ## 0.5.0 (2016-11-14) diff --git a/bower.json b/bower.json index 96b52f5..4496805 100644 --- a/bower.json +++ b/bower.json @@ -1,7 +1,7 @@ { "name": "angular-breadcrumb", "description": "AngularJS module that generates a breadcrumb from ui-router's states", - "version": "0.5.0", + "version": "0.5.2", "main": "release/angular-breadcrumb.js", "ignore": [ "sample", diff --git a/package.json b/package.json index 6f773eb..44eb988 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "angular-breadcrumb", "description": "AngularJS module that generates a breadcrumb from ui-router's states", - "version": "0.5.0", + "version": "0.5.2", "homepage": "http://ncuillery.github.io/angular-breadcrumb", "author": { "name": "Nicolas Cuillery", diff --git a/release/angular-breadcrumb.js b/release/angular-breadcrumb.js index ecbeeba..699030f 100644 --- a/release/angular-breadcrumb.js +++ b/release/angular-breadcrumb.js @@ -1,4 +1,4 @@ -/*! angular-breadcrumb - v0.5.0 +/*! angular-breadcrumb - v0.5.2 * http://ncuillery.github.io/angular-breadcrumb * Copyright (c) 2016 Nicolas Cuillery; Licensed MIT */ @@ -48,8 +48,8 @@ function $Breadcrumb() { var $lastViewScope = $rootScope; - // Early catch of $viewContentLoaded event - registerListenerOnce('$Breadcrumb.$viewContentLoaded', $rootScope, '$viewContentLoaded', function (event) { + // Early catch of $stateChangeSuccess event + registerListenerOnce('$Breadcrumb.$stateChangeSuccess', $rootScope, '$stateChangeSuccess', function (event) { // With nested views, the event occur several times, in "wrong" order if(!event.targetScope.ncyBreadcrumbIgnore && isAOlderThanB(event.targetScope.$id, $lastViewScope.$id)) { @@ -255,7 +255,7 @@ function BreadcrumbDirective($interpolate, $breadcrumb, $rootScope) { }); }; - registerListenerOnce('BreadcrumbDirective.$viewContentLoaded', $rootScope, '$viewContentLoaded', function (event) { + registerListenerOnce('BreadcrumbDirective.$stateChangeSuccess', $rootScope, '$stateChangeSuccess', function (event) { if(!event.targetScope.ncyBreadcrumbIgnore) { renderBreadcrumb(); } @@ -313,7 +313,7 @@ function BreadcrumbLastDirective($interpolate, $breadcrumb, $rootScope) { } }; - registerListenerOnce('BreadcrumbLastDirective.$viewContentLoaded', $rootScope, '$viewContentLoaded', function (event) { + registerListenerOnce('BreadcrumbLastDirective.$stateChangeSuccess', $rootScope, '$stateChangeSuccess', function (event) { if(!event.targetScope.ncyBreadcrumbIgnore) { renderLabel(); } @@ -381,7 +381,7 @@ function BreadcrumbTextDirective($interpolate, $breadcrumb, $rootScope) { scope.ncyBreadcrumbChain = combinedLabels.join(separator); }; - registerListenerOnce('BreadcrumbTextDirective.$viewContentLoaded', $rootScope, '$viewContentLoaded', function (event) { + registerListenerOnce('BreadcrumbTextDirective.$stateChangeSuccess', $rootScope, '$stateChangeSuccess', function (event) { if(!event.targetScope.ncyBreadcrumbIgnore) { renderLabel(); } diff --git a/release/angular-breadcrumb.min.js b/release/angular-breadcrumb.min.js index 1f3a44b..d4ade3f 100644 --- a/release/angular-breadcrumb.min.js +++ b/release/angular-breadcrumb.min.js @@ -1,4 +1,4 @@ -/*! angular-breadcrumb - v0.5.0 +/*! angular-breadcrumb - v0.5.2 * http://ncuillery.github.io/angular-breadcrumb * Copyright (c) 2016 Nicolas Cuillery; Licensed MIT */ -!function(a,b,c){"use strict";function d(a,c){return b.equals(a.length,c.length)?a>c:a.length>c.length}function e(a){var b=a.replace(/\n/g," ").match(/^([^(]+?)\s*(\((.*)\))?$/);if(!b||4!==b.length)throw new Error("Invalid state ref '"+a+"'");return{state:b[1],paramExpr:b[3]||null}}function f(a,b,d,e){var f=k[a];f!==c&&f(),f=b.$on(d,e),k[a]=f}function g(){var a={prefixStateName:null,template:"bootstrap3",templateUrl:null,templateLast:"default",templateLastUrl:null,includeAbstract:!1};this.setOptions=function(c){b.extend(a,c)},this.$get=["$state","$stateParams","$rootScope",function(b,g,h){var i=h;f("$Breadcrumb.$viewContentLoaded",h,"$viewContentLoaded",function(a){!a.targetScope.ncyBreadcrumbIgnore&&d(a.targetScope.$id,i.$id)&&(i=a.targetScope)});var j=function(a){var b=a.parent||(/^(.+)\.[^.]+$/.exec(a.name)||[])[1],c="object"==typeof b;return c?b.name:b},k=function(c,d){for(var f,h,j=e(d),k=!1,l=!1,m=0,n=c.length;n>m;m+=1)if(c[m].name===j.state)return;f=b.get(j.state),f.ncyBreadcrumb&&(f.ncyBreadcrumb.force&&(k=!0),f.ncyBreadcrumb.skip&&(l=!0)),f["abstract"]&&!a.includeAbstract&&!k||l||(j.paramExpr&&(h=i.$eval(j.paramExpr)),f.ncyBreadcrumbLink=b.href(j.state,h||g||{}),f.ncyBreadcrumbStateRef=d,c.unshift(f))},l=function(a){var c=e(a),d=b.get(c.state);if(d.ncyBreadcrumb&&d.ncyBreadcrumb.parent){var f="function"==typeof d.ncyBreadcrumb.parent,g=f?d.ncyBreadcrumb.parent(i):d.ncyBreadcrumb.parent;if(g)return g}return j(d)};return{getTemplate:function(b){return a.templateUrl?null:b[a.template]?b[a.template]:a.template},getTemplateUrl:function(){return a.templateUrl},getTemplateLast:function(b){return a.templateLastUrl?null:b[a.templateLast]?b[a.templateLast]:a.templateLast},getTemplateLastUrl:function(){return a.templateLastUrl},getStatesChain:function(c){for(var d=[],e=b.$current.self.name;e;e=l(e))if(k(d,e),c&&d.length)return d;return a.prefixStateName&&k(d,a.prefixStateName),d},getLastStep:function(){var a=this.getStatesChain(!0);return a.length?a[0]:c},$getLastViewScope:function(){return i}}}]}function h(a,c,d){var e={bootstrap2:'',bootstrap3:'
  1. {{step.ncyBreadcrumbLabel}}{{step.ncyBreadcrumbLabel}}
'};return{restrict:"AE",replace:!0,scope:{},template:c.getTemplate(e),templateUrl:c.getTemplateUrl(),link:{post:function(e){var g=[],h=function(){n(g),g=[];var d=c.$getLastViewScope();e.steps=c.getStatesChain(),b.forEach(e.steps,function(b){if(b.ncyBreadcrumb&&b.ncyBreadcrumb.label){var c=a(b.ncyBreadcrumb.label);b.ncyBreadcrumbLabel=c(d),m(g,c,d,b)}else b.ncyBreadcrumbLabel=b.name})};f("BreadcrumbDirective.$viewContentLoaded",d,"$viewContentLoaded",function(a){a.targetScope.ncyBreadcrumbIgnore||h()}),h()}}}}function i(a,b,c){var d={"default":"{{ncyBreadcrumbLabel}}"};return{restrict:"A",scope:{},template:b.getTemplateLast(d),templateUrl:b.getTemplateLastUrl(),compile:function(d,e){var g=d.attr(e.$attr.ncyBreadcrumbLast);return g&&d.html(g),{post:function(d){var e=[],g=function(){n(e),e=[];var c=b.$getLastViewScope(),f=b.getLastStep();if(f)if(d.ncyBreadcrumbLink=f.ncyBreadcrumbLink,f.ncyBreadcrumb&&f.ncyBreadcrumb.label){var g=a(f.ncyBreadcrumb.label);d.ncyBreadcrumbLabel=g(c),m(e,g,c,d)}else d.ncyBreadcrumbLabel=f.name};f("BreadcrumbLastDirective.$viewContentLoaded",c,"$viewContentLoaded",function(a){a.targetScope.ncyBreadcrumbIgnore||g()}),g()}}}}}function j(a,c,d){return{restrict:"A",scope:{},template:"{{ncyBreadcrumbChain}}",compile:function(e,g){var h=e.attr(g.$attr.ncyBreadcrumbText);h&&e.html(h);var i=e.attr(g.$attr.ncyBreadcrumbTextSeparator)||" / ";return{post:function(e){var g=[],h=function(a,c,d){b.forEach(l(c),function(b){var c=d.$watch(b,function(a,b){a!==b&&j()});a.push(c)})},j=function(){n(g),g=[];var d=c.$getLastViewScope(),f=c.getStatesChain(),j=[];b.forEach(f,function(b){if(b.ncyBreadcrumb&&b.ncyBreadcrumb.label){var c=a(b.ncyBreadcrumb.label);j.push(c(d)),h(g,c,d)}else j.push(b.name)}),e.ncyBreadcrumbChain=j.join(i)};f("BreadcrumbTextDirective.$viewContentLoaded",d,"$viewContentLoaded",function(a){a.targetScope.ncyBreadcrumbIgnore||j()}),j()}}}}}var k={},l=function(a){if(a.expressions)return a.expressions;var c=[];return b.forEach(a.parts,function(a){b.isFunction(a)&&c.push(a.exp)}),c},m=function(a,c,d,e){b.forEach(l(c),function(b){var f=d.$watch(b,function(){e.ncyBreadcrumbLabel=c(d)});a.push(f)})},n=function(a){b.forEach(a,function(a){a()})};h.$inject=["$interpolate","$breadcrumb","$rootScope"],i.$inject=["$interpolate","$breadcrumb","$rootScope"],j.$inject=["$interpolate","$breadcrumb","$rootScope"],b.module("ncy-angular-breadcrumb",["ui.router.state"]).provider("$breadcrumb",g).directive("ncyBreadcrumb",h).directive("ncyBreadcrumbLast",i).directive("ncyBreadcrumbText",j)}(window,window.angular); \ No newline at end of file +!function(a,b,c){"use strict";function d(a,c){return b.equals(a.length,c.length)?a>c:a.length>c.length}function e(a){var b=a.replace(/\n/g," ").match(/^([^(]+?)\s*(\((.*)\))?$/);if(!b||4!==b.length)throw new Error("Invalid state ref '"+a+"'");return{state:b[1],paramExpr:b[3]||null}}function f(a,b,d,e){var f=k[a];f!==c&&f(),f=b.$on(d,e),k[a]=f}function g(){var a={prefixStateName:null,template:"bootstrap3",templateUrl:null,templateLast:"default",templateLastUrl:null,includeAbstract:!1};this.setOptions=function(c){b.extend(a,c)},this.$get=["$state","$stateParams","$rootScope",function(b,g,h){var i=h;f("$Breadcrumb.$stateChangeSuccess",h,"$stateChangeSuccess",function(a){!a.targetScope.ncyBreadcrumbIgnore&&d(a.targetScope.$id,i.$id)&&(i=a.targetScope)});var j=function(a){var b=a.parent||(/^(.+)\.[^.]+$/.exec(a.name)||[])[1],c="object"==typeof b;return c?b.name:b},k=function(c,d){for(var f,h,j=e(d),k=!1,l=!1,m=0,n=c.length;n>m;m+=1)if(c[m].name===j.state)return;f=b.get(j.state),f.ncyBreadcrumb&&(f.ncyBreadcrumb.force&&(k=!0),f.ncyBreadcrumb.skip&&(l=!0)),f["abstract"]&&!a.includeAbstract&&!k||l||(j.paramExpr&&(h=i.$eval(j.paramExpr)),f.ncyBreadcrumbLink=b.href(j.state,h||g||{}),f.ncyBreadcrumbStateRef=d,c.unshift(f))},l=function(a){var c=e(a),d=b.get(c.state);if(d.ncyBreadcrumb&&d.ncyBreadcrumb.parent){var f="function"==typeof d.ncyBreadcrumb.parent,g=f?d.ncyBreadcrumb.parent(i):d.ncyBreadcrumb.parent;if(g)return g}return j(d)};return{getTemplate:function(b){return a.templateUrl?null:b[a.template]?b[a.template]:a.template},getTemplateUrl:function(){return a.templateUrl},getTemplateLast:function(b){return a.templateLastUrl?null:b[a.templateLast]?b[a.templateLast]:a.templateLast},getTemplateLastUrl:function(){return a.templateLastUrl},getStatesChain:function(c){for(var d=[],e=b.$current.self.name;e;e=l(e))if(k(d,e),c&&d.length)return d;return a.prefixStateName&&k(d,a.prefixStateName),d},getLastStep:function(){var a=this.getStatesChain(!0);return a.length?a[0]:c},$getLastViewScope:function(){return i}}}]}function h(a,c,d){var e={bootstrap2:'',bootstrap3:'
  1. {{step.ncyBreadcrumbLabel}}{{step.ncyBreadcrumbLabel}}
'};return{restrict:"AE",replace:!0,scope:{},template:c.getTemplate(e),templateUrl:c.getTemplateUrl(),link:{post:function(e){var g=[],h=function(){n(g),g=[];var d=c.$getLastViewScope();e.steps=c.getStatesChain(),b.forEach(e.steps,function(b){if(b.ncyBreadcrumb&&b.ncyBreadcrumb.label){var c=a(b.ncyBreadcrumb.label);b.ncyBreadcrumbLabel=c(d),m(g,c,d,b)}else b.ncyBreadcrumbLabel=b.name})};f("BreadcrumbDirective.$stateChangeSuccess",d,"$stateChangeSuccess",function(a){a.targetScope.ncyBreadcrumbIgnore||h()}),h()}}}}function i(a,b,c){var d={"default":"{{ncyBreadcrumbLabel}}"};return{restrict:"A",scope:{},template:b.getTemplateLast(d),templateUrl:b.getTemplateLastUrl(),compile:function(d,e){var g=d.attr(e.$attr.ncyBreadcrumbLast);return g&&d.html(g),{post:function(d){var e=[],g=function(){n(e),e=[];var c=b.$getLastViewScope(),f=b.getLastStep();if(f)if(d.ncyBreadcrumbLink=f.ncyBreadcrumbLink,f.ncyBreadcrumb&&f.ncyBreadcrumb.label){var g=a(f.ncyBreadcrumb.label);d.ncyBreadcrumbLabel=g(c),m(e,g,c,d)}else d.ncyBreadcrumbLabel=f.name};f("BreadcrumbLastDirective.$stateChangeSuccess",c,"$stateChangeSuccess",function(a){a.targetScope.ncyBreadcrumbIgnore||g()}),g()}}}}}function j(a,c,d){return{restrict:"A",scope:{},template:"{{ncyBreadcrumbChain}}",compile:function(e,g){var h=e.attr(g.$attr.ncyBreadcrumbText);h&&e.html(h);var i=e.attr(g.$attr.ncyBreadcrumbTextSeparator)||" / ";return{post:function(e){var g=[],h=function(a,c,d){b.forEach(l(c),function(b){var c=d.$watch(b,function(a,b){a!==b&&j()});a.push(c)})},j=function(){n(g),g=[];var d=c.$getLastViewScope(),f=c.getStatesChain(),j=[];b.forEach(f,function(b){if(b.ncyBreadcrumb&&b.ncyBreadcrumb.label){var c=a(b.ncyBreadcrumb.label);j.push(c(d)),h(g,c,d)}else j.push(b.name)}),e.ncyBreadcrumbChain=j.join(i)};f("BreadcrumbTextDirective.$stateChangeSuccess",d,"$stateChangeSuccess",function(a){a.targetScope.ncyBreadcrumbIgnore||j()}),j()}}}}}var k={},l=function(a){if(a.expressions)return a.expressions;var c=[];return b.forEach(a.parts,function(a){b.isFunction(a)&&c.push(a.exp)}),c},m=function(a,c,d,e){b.forEach(l(c),function(b){var f=d.$watch(b,function(){e.ncyBreadcrumbLabel=c(d)});a.push(f)})},n=function(a){b.forEach(a,function(a){a()})};h.$inject=["$interpolate","$breadcrumb","$rootScope"],i.$inject=["$interpolate","$breadcrumb","$rootScope"],j.$inject=["$interpolate","$breadcrumb","$rootScope"],b.module("ncy-angular-breadcrumb",["ui.router.state"]).provider("$breadcrumb",g).directive("ncyBreadcrumb",h).directive("ncyBreadcrumbLast",i).directive("ncyBreadcrumbText",j)}(window,window.angular); \ No newline at end of file diff --git a/sample/angular-breadcrumb-0.5.0.zip b/sample/angular-breadcrumb-0.5.0.zip deleted file mode 100644 index 985e4bcfb287a1fc85a79db9060b25f41de63812..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6241 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 WLrv)e+&@oY{!Yx_vk(8D+y4NQ3*gNF diff --git a/sample/angular-breadcrumb-0.5.2.zip b/sample/angular-breadcrumb-0.5.2.zip new file mode 100644 index 0000000000000000000000000000000000000000..a065696019c54bc7cfbf99c0b7396458cd4b92f4 GIT binary patch literal 6260 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 r{{PqFzwQ5}i~s0fi_U*&Key features GitHub View on GitHub - - Download Download (0.5.0) + + Download Download (0.5.2) \ No newline at end of file diff --git a/src/angular-breadcrumb.js b/src/angular-breadcrumb.js index 696ec56..7c28077 100644 --- a/src/angular-breadcrumb.js +++ b/src/angular-breadcrumb.js @@ -43,8 +43,8 @@ function $Breadcrumb() { var $lastViewScope = $rootScope; - // Early catch of $viewContentLoaded event - registerListenerOnce('$Breadcrumb.$viewContentLoaded', $rootScope, '$viewContentLoaded', function (event) { + // Early catch of $stateChangeSuccess event + registerListenerOnce('$Breadcrumb.$stateChangeSuccess', $rootScope, '$stateChangeSuccess', function (event) { // With nested views, the event occur several times, in "wrong" order if(!event.targetScope.ncyBreadcrumbIgnore && isAOlderThanB(event.targetScope.$id, $lastViewScope.$id)) { @@ -250,7 +250,7 @@ function BreadcrumbDirective($interpolate, $breadcrumb, $rootScope) { }); }; - registerListenerOnce('BreadcrumbDirective.$viewContentLoaded', $rootScope, '$viewContentLoaded', function (event) { + registerListenerOnce('BreadcrumbDirective.$stateChangeSuccess', $rootScope, '$stateChangeSuccess', function (event) { if(!event.targetScope.ncyBreadcrumbIgnore) { renderBreadcrumb(); } @@ -308,7 +308,7 @@ function BreadcrumbLastDirective($interpolate, $breadcrumb, $rootScope) { } }; - registerListenerOnce('BreadcrumbLastDirective.$viewContentLoaded', $rootScope, '$viewContentLoaded', function (event) { + registerListenerOnce('BreadcrumbLastDirective.$stateChangeSuccess', $rootScope, '$stateChangeSuccess', function (event) { if(!event.targetScope.ncyBreadcrumbIgnore) { renderLabel(); } @@ -376,7 +376,7 @@ function BreadcrumbTextDirective($interpolate, $breadcrumb, $rootScope) { scope.ncyBreadcrumbChain = combinedLabels.join(separator); }; - registerListenerOnce('BreadcrumbTextDirective.$viewContentLoaded', $rootScope, '$viewContentLoaded', function (event) { + registerListenerOnce('BreadcrumbTextDirective.$stateChangeSuccess', $rootScope, '$stateChangeSuccess', function (event) { if(!event.targetScope.ncyBreadcrumbIgnore) { renderLabel(); } diff --git a/test/spec/directive-basic-test.js b/test/spec/directive-basic-test.js index cd5b06d..7f9fad5 100644 --- a/test/spec/directive-basic-test.js +++ b/test/spec/directive-basic-test.js @@ -18,7 +18,7 @@ describe('Breadcrumb directive with basic conf', function() { it('renders the correct state chain', inject(function() { goToState('D'); - scope.$emit('$viewContentLoaded'); + scope.$emit('$stateChangeSuccess'); scope.$digest(); console.info('Directive content : ' + element.text()); @@ -37,7 +37,7 @@ describe('Breadcrumb directive with basic conf', function() { it('should work with one state', inject(function() { goToState('A'); - scope.$emit('$viewContentLoaded'); + scope.$emit('$stateChangeSuccess'); scope.$digest(); console.info('Directive content : ' + element.text()); diff --git a/test/spec/directive-dynamic-parent-test.js b/test/spec/directive-dynamic-parent-test.js index 1cdb0da..583c995 100644 --- a/test/spec/directive-dynamic-parent-test.js +++ b/test/spec/directive-dynamic-parent-test.js @@ -22,7 +22,7 @@ describe('Breadcrumb directive with dynamic parent conf', function() { compile(scope); expect(scope.parentState).toBeDefined(); - scope.$emit('$viewContentLoaded'); + scope.$emit('$stateChangeSuccess'); scope.$digest(); console.info('Directive content : ' + element.text()); @@ -39,7 +39,7 @@ describe('Breadcrumb directive with dynamic parent conf', function() { compile(scope); expect(scope.parentState).toBeUndefined(); - scope.$emit('$viewContentLoaded'); + scope.$emit('$stateChangeSuccess'); scope.$digest(); console.info('Directive content : ' + element.text()); @@ -55,7 +55,7 @@ describe('Breadcrumb directive with dynamic parent conf', function() { compile(scope); - scope.$emit('$viewContentLoaded'); + scope.$emit('$stateChangeSuccess'); scope.$digest(); console.info('Directive content : ' + element.text()); diff --git a/test/spec/directive-interpolation-test.js b/test/spec/directive-interpolation-test.js index f79ff3a..8ff317f 100644 --- a/test/spec/directive-interpolation-test.js +++ b/test/spec/directive-interpolation-test.js @@ -23,7 +23,7 @@ describe('Breadcrumb directive with interpolation conf', function() { expect(scope.tripleB).toBeDefined(); - scope.$emit('$viewContentLoaded'); + scope.$emit('$stateChangeSuccess'); scope.$digest(); console.info('Directive content : ' + element.text()); @@ -39,7 +39,7 @@ describe('Breadcrumb directive with interpolation conf', function() { controller('BCtrl', {'$scope' : scope} ); compile(scope); - scope.$emit('$viewContentLoaded'); + scope.$emit('$stateChangeSuccess'); scope.$digest(); console.info('Directive content : ' + element.text()); diff --git a/test/spec/directive-last-basic-test.js b/test/spec/directive-last-basic-test.js index 1ec1245..07eb073 100644 --- a/test/spec/directive-last-basic-test.js +++ b/test/spec/directive-last-basic-test.js @@ -20,7 +20,7 @@ describe('Last step directive with basic conf', function() { it('renders the last step label correctly', inject(function() { goToState('D'); - scope.$emit('$viewContentLoaded'); + scope.$emit('$stateChangeSuccess'); scope.$digest(); console.info('Directive content : ' + element.text()); @@ -41,7 +41,7 @@ describe('Last step directive with basic conf', function() { it('renders the template correctly', inject(function() { goToState('D'); - scope.$emit('$viewContentLoaded'); + scope.$emit('$stateChangeSuccess'); scope.$digest(); console.info('Directive content : ' + element.text()); @@ -71,7 +71,7 @@ describe('Last step directive with basic conf', function() { it('correctly', inject(function() { goToState('D'); - scope.$emit('$viewContentLoaded'); + scope.$emit('$stateChangeSuccess'); scope.$digest(); console.info('Directive content : ' + element.html()); @@ -101,7 +101,7 @@ describe('Last step directive with basic conf', function() { it('correctly', inject(function() { goToState('html'); - scope.$emit('$viewContentLoaded'); + scope.$emit('$stateChangeSuccess'); scope.$digest(); console.info('Directive content : ' + element.html()); diff --git a/test/spec/directive-last-interpolation-test.js b/test/spec/directive-last-interpolation-test.js index 081fae4..e8a93fa 100644 --- a/test/spec/directive-last-interpolation-test.js +++ b/test/spec/directive-last-interpolation-test.js @@ -23,7 +23,7 @@ describe('Last step directive with interpolation conf', function() { expect(scope.tripleB).toBeDefined(); - scope.$emit('$viewContentLoaded'); + scope.$emit('$stateChangeSuccess'); scope.$digest(); console.info('Directive content : ' + element.text()); @@ -37,7 +37,7 @@ describe('Last step directive with interpolation conf', function() { controller('BCtrl', {'$scope' : scope} ); compile(scope); - scope.$emit('$viewContentLoaded'); + scope.$emit('$stateChangeSuccess'); scope.$digest(); console.info('Directive content : ' + element.text()); diff --git a/test/spec/directive-last-sample-test.js b/test/spec/directive-last-sample-test.js index 2fe9f0f..b6bbba3 100644 --- a/test/spec/directive-last-sample-test.js +++ b/test/spec/directive-last-sample-test.js @@ -23,7 +23,7 @@ describe('Last step directive with sample conf', function() { expect(scope.room).toBeDefined(); - scope.$emit('$viewContentLoaded'); + scope.$emit('$stateChangeSuccess'); scope.$digest(); console.info('Directive content : ' + element.text()); diff --git a/test/spec/directive-ncyBreadcrumbIgnore-test.js b/test/spec/directive-ncyBreadcrumbIgnore-test.js index 51ff3e3..062c5dd 100644 --- a/test/spec/directive-ncyBreadcrumbIgnore-test.js +++ b/test/spec/directive-ncyBreadcrumbIgnore-test.js @@ -21,7 +21,7 @@ describe('Breadcrumb directive with multiple-interpolation conf', function() { it('renders the correct state chain and views content', inject(function () { goToState('A.B'); - scope.$emit('$viewContentLoaded'); + scope.$emit('$stateChangeSuccess'); scope.$digest(); console.info('Directive content : ' + element.text()); @@ -41,7 +41,7 @@ describe('Breadcrumb directive with multiple-interpolation conf', function() { it('renders the incorrect state chain', inject(function () { goToState('A.B'); - scope.$emit('$viewContentLoaded'); + scope.$emit('$stateChangeSuccess'); scope.$digest(); console.info('Directive content : ' + element.text()); @@ -74,7 +74,7 @@ describe('Breadcrumb directive with multiple-interpolation conf', function() { it('renders the correct state chain and views content', inject(function () { goToState('A.B'); - scope.$emit('$viewContentLoaded'); + scope.$emit('$stateChangeSuccess'); scope.$digest(); console.info('Directive content : ' + element.text()); @@ -95,7 +95,7 @@ describe('Breadcrumb directive with multiple-interpolation conf', function() { it('renders the correct state chain and views content', inject(function () { goToState('A.B'); - scope.$emit('$viewContentLoaded'); + scope.$emit('$stateChangeSuccess'); scope.$digest(); console.info('Directive content : ' + element.text()); diff --git a/test/spec/directive-object-parent-test.js b/test/spec/directive-object-parent-test.js index 14435da..0e25dda 100644 --- a/test/spec/directive-object-parent-test.js +++ b/test/spec/directive-object-parent-test.js @@ -18,7 +18,7 @@ describe('Breadcrumb directive with object parent conf', function() { it('should handle parents provided by object reference', inject(function() { goToState('B'); - scope.$emit('$viewContentLoaded'); + scope.$emit('$stateChangeSuccess'); scope.$digest(); console.info('Directive content : ' + element.text()); diff --git a/test/spec/directive-sample-test.js b/test/spec/directive-sample-test.js index 4622e69..dd3b974 100644 --- a/test/spec/directive-sample-test.js +++ b/test/spec/directive-sample-test.js @@ -23,7 +23,7 @@ describe('Breadcrumb directive with sample conf', function() { expect(scope.room).toBeDefined(); - scope.$emit('$viewContentLoaded'); + scope.$emit('$stateChangeSuccess'); scope.$digest(); console.info('Directive content : ' + element.text()); diff --git a/test/spec/directive-template-test.js b/test/spec/directive-template-test.js index 9a92ce2..2c233ee 100644 --- a/test/spec/directive-template-test.js +++ b/test/spec/directive-template-test.js @@ -19,7 +19,7 @@ describe('Breadcrumb directive', function() { it('correctly', inject(function() { goToState('D'); - scope.$emit('$viewContentLoaded'); + scope.$emit('$stateChangeSuccess'); scope.$digest(); console.info('Directive content : ' + element.text()); @@ -52,7 +52,7 @@ describe('Breadcrumb directive', function() { it('correctly', inject(function() { goToState('D'); - scope.$emit('$viewContentLoaded'); + scope.$emit('$stateChangeSuccess'); scope.$digest(); console.info('Directive content : ' + element.text()); @@ -89,7 +89,7 @@ describe('Breadcrumb directive', function() { it('correctly', inject(function() { goToState('D'); - scope.$emit('$viewContentLoaded'); + scope.$emit('$stateChangeSuccess'); scope.$digest(); console.info('Directive content : ' + element.html()); @@ -124,7 +124,7 @@ describe('Breadcrumb directive', function() { it('correctly', inject(function() { goToState('html'); - scope.$emit('$viewContentLoaded'); + scope.$emit('$stateChangeSuccess'); scope.$digest(); console.info('Directive content : ' + element.html()); diff --git a/test/spec/directive-text-basic-separator-test.js b/test/spec/directive-text-basic-separator-test.js index 10623ad..bab883f 100644 --- a/test/spec/directive-text-basic-separator-test.js +++ b/test/spec/directive-text-basic-separator-test.js @@ -20,7 +20,7 @@ describe('Text directive with separator with basic conf', function() { it('renders the text label correctly', inject(function() { goToState('D'); - scope.$emit('$viewContentLoaded'); + scope.$emit('$stateChangeSuccess'); scope.$digest(); console.info('Directive content : ' + element.text()); @@ -41,7 +41,7 @@ describe('Text directive with separator with basic conf', function() { it('renders the template correctly', inject(function() { goToState('D'); - scope.$emit('$viewContentLoaded'); + scope.$emit('$stateChangeSuccess'); scope.$digest(); console.info('Directive content : ' + element.text()); diff --git a/test/spec/directive-text-basic-test.js b/test/spec/directive-text-basic-test.js index f74b370..05d6c50 100644 --- a/test/spec/directive-text-basic-test.js +++ b/test/spec/directive-text-basic-test.js @@ -20,7 +20,7 @@ describe('Text directive with basic conf', function() { it('renders the text label correctly', inject(function() { goToState('D'); - scope.$emit('$viewContentLoaded'); + scope.$emit('$stateChangeSuccess'); scope.$digest(); console.info('Directive content : ' + element.text()); @@ -41,7 +41,7 @@ describe('Text directive with basic conf', function() { it('renders the template correctly', inject(function() { goToState('D'); - scope.$emit('$viewContentLoaded'); + scope.$emit('$stateChangeSuccess'); scope.$digest(); console.info('Directive content : ' + element.text()); diff --git a/test/spec/directive-text-interpolation-test.js b/test/spec/directive-text-interpolation-test.js index f9fd3d6..8838c3a 100644 --- a/test/spec/directive-text-interpolation-test.js +++ b/test/spec/directive-text-interpolation-test.js @@ -23,7 +23,7 @@ describe('Text directive with interpolation conf', function() { expect(scope.tripleB).toBeDefined(); - scope.$emit('$viewContentLoaded'); + scope.$emit('$stateChangeSuccess'); scope.$digest(); console.info('Directive content : ' + element.text()); @@ -37,7 +37,7 @@ describe('Text directive with interpolation conf', function() { controller('BCtrl', {'$scope' : scope} ); compile(scope); - scope.$emit('$viewContentLoaded'); + scope.$emit('$stateChangeSuccess'); scope.$digest(); console.info('Directive content : ' + element.text()); diff --git a/test/spec/directive-text-sample-test.js b/test/spec/directive-text-sample-test.js index 5b1e694..d2b934a 100644 --- a/test/spec/directive-text-sample-test.js +++ b/test/spec/directive-text-sample-test.js @@ -23,7 +23,7 @@ describe('Text directive with sample conf', function() { expect(scope.room).toBeDefined(); - scope.$emit('$viewContentLoaded'); + scope.$emit('$stateChangeSuccess'); scope.$digest(); console.info('Directive content : ' + element.text()); diff --git a/test/spec/directive-ui-sref-template-test.js b/test/spec/directive-ui-sref-template-test.js index 83dc216..94d2fc0 100644 --- a/test/spec/directive-ui-sref-template-test.js +++ b/test/spec/directive-ui-sref-template-test.js @@ -18,7 +18,7 @@ describe('Breadcrumb directive with ui-sref template', function() { it('should work correctly', inject(function() { goToState('A.B'); - scope.$emit('$viewContentLoaded'); + scope.$emit('$stateChangeSuccess'); scope.$digest(); console.info('Directive content : ' + element.text()); @@ -30,7 +30,7 @@ describe('Breadcrumb directive with ui-sref template', function() { it('should deal with url params correctly', inject(function() { goToState('J'); - scope.$emit('$viewContentLoaded'); + scope.$emit('$stateChangeSuccess'); scope.$digest(); console.info('Directive content : ' + element.text()); @@ -44,7 +44,7 @@ describe('Breadcrumb directive with ui-sref template', function() { it('should deal with url params correctly even with dynamic parent', inject(function() { goToState('K'); - scope.$emit('$viewContentLoaded'); + scope.$emit('$stateChangeSuccess'); scope.$digest(); console.info('Directive content : ' + element.text());