aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/ng/rootScope.js4
-rw-r--r--src/ngMock/angular-mocks.js1
-rw-r--r--test/testabilityPatch.js4
3 files changed, 6 insertions, 3 deletions
diff --git a/src/ng/rootScope.js b/src/ng/rootScope.js
index 2e76d6ee..d94a621d 100644
--- a/src/ng/rootScope.js
+++ b/src/ng/rootScope.js
@@ -577,7 +577,7 @@ function $RootScopeProvider(){
*
* @description
* Broadcasted when a scope and its children are being destroyed.
- *
+ *
* Note that, in AngularJS, there is also a `$destroy` jQuery event, which can be used to
* clean up DOM bindings before an element is removed from the DOM.
*/
@@ -601,7 +601,7 @@ function $RootScopeProvider(){
* Just before a scope is destroyed a `$destroy` event is broadcasted on this scope.
* Application code can register a `$destroy` event handler that will give it chance to
* perform any necessary cleanup.
- *
+ *
* Note that, in AngularJS, there is also a `$destroy` jQuery event, which can be used to
* clean up DOM bindings before an element is removed from the DOM.
*/
diff --git a/src/ngMock/angular-mocks.js b/src/ngMock/angular-mocks.js
index 36bf982f..ff2d79d4 100644
--- a/src/ngMock/angular-mocks.js
+++ b/src/ngMock/angular-mocks.js
@@ -787,6 +787,7 @@ angular.mock.dump = function(object) {
} else if (object instanceof Error) {
out = object.stack || ('' + object.name + ': ' + object.message);
} else {
+ // TODO(i): this prevents methods to be logged, we should have a better way to serialize objects
out = angular.toJson(object, true);
}
} else {
diff --git a/test/testabilityPatch.js b/test/testabilityPatch.js
index 32dd75ea..7b4fe0ec 100644
--- a/test/testabilityPatch.js
+++ b/test/testabilityPatch.js
@@ -291,5 +291,7 @@ function trace(name) {
var karmaDump = dump;
window.dump = function () {
- karmaDump(angular.mock.dump.apply(undefined, arguments));
+ karmaDump.apply(undefined, map(arguments, function(arg) {
+ return angular.mock.dump(arg);
+ }));
};