aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIgor Minar2013-07-22 13:59:21 -0700
committerIgor Minar2013-07-22 13:59:27 -0700
commit717f24feb43cb71538a7c07e4aa013c916640006 (patch)
treeace42af0d8c793338f9d605da532536cb54f43d9
parent45f9f62367221b2aa097ba1d87d744e50140ddc7 (diff)
downloadangular.js-717f24feb43cb71538a7c07e4aa013c916640006.tar.bz2
chore(dump): remove dead code
This code is not being used any more and the test is now failing due to Karma changes. Karma used to expose window.dump but that changed recently and that's why our build is now failing. I'm removing the code and test, but we still need to figure out how to route window.dump through angular.mock.dump, but that will have to be a separate commit.
-rw-r--r--src/ngMock/angular-mocks.js20
-rw-r--r--test/ngMock/angular-mocksSpec.js5
2 files changed, 2 insertions, 23 deletions
diff --git a/src/ngMock/angular-mocks.js b/src/ngMock/angular-mocks.js
index eb7868c9..3024a4c9 100644
--- a/src/ngMock/angular-mocks.js
+++ b/src/ngMock/angular-mocks.js
@@ -859,7 +859,7 @@ angular.mock.dump = function(object) {
</pre>
*
* Now we setup the mock backend and create the test specs.
- *
+ *
<pre>
// testing controller
describe('MyController', function() {
@@ -915,7 +915,7 @@ angular.mock.dump = function(object) {
it('should send auth header', function() {
var controller = createController();
$httpBackend.flush();
-
+
$httpBackend.expectPOST('/add-msg.py', undefined, function(headers) {
// check if the header was send, if it wasn't the expectation won't
// match the request and the test will fail
@@ -1742,22 +1742,6 @@ angular.mock.clearDataCache = function() {
};
-window.jstestdriver && (function(window) {
- /**
- * Global method to output any number of objects into JSTD console. Useful for debugging.
- */
- window.dump = function() {
- var args = [];
- angular.forEach(arguments, function(arg) {
- args.push(angular.mock.dump(arg));
- });
- jstestdriver.console.log.apply(jstestdriver.console, args);
- if (window.console) {
- window.console.log.apply(window.console, args);
- }
- };
-})(window);
-
(window.jasmine || window.mocha) && (function(window) {
diff --git a/test/ngMock/angular-mocksSpec.js b/test/ngMock/angular-mocksSpec.js
index 3f82ac57..4e17dfb2 100644
--- a/test/ngMock/angular-mocksSpec.js
+++ b/test/ngMock/angular-mocksSpec.js
@@ -377,11 +377,6 @@ describe('ngMock', function() {
expect(d($rootScope)).toMatch(/Scope\(.*\): \{/);
expect(d($rootScope)).toMatch(/{"abc":"123"}/);
}));
-
-
- it('should be published on window', function(){
- expect(window.dump instanceof Function).toBe(true);
- });
});