From c5f0342ad87ba91d43e8b99bfc82039cdbf998a2 Mon Sep 17 00:00:00 2001 From: Vojta Jina Date: Fri, 29 Apr 2011 23:38:08 +0200 Subject: Don't check url (by HEAD request) before navigateTo Removed angular.scenario.Application.checkUrlStatus_ method and these tests: * should call error handler if status check fails * should perform a HEAD request to verify file existence * should call error handler if status code is less than 200 * should call error handler if status code is greater than 299 * should call error handler if status code is greater than 299 --- test/scenario/ApplicationSpec.js | 75 ---------------------------------------- 1 file changed, 75 deletions(-) (limited to 'test') diff --git a/test/scenario/ApplicationSpec.js b/test/scenario/ApplicationSpec.js index 77d50b55..673a328f 100644 --- a/test/scenario/ApplicationSpec.js +++ b/test/scenario/ApplicationSpec.js @@ -12,9 +12,6 @@ describe('angular.scenario.Application', function() { beforeEach(function() { frames = _jQuery("
"); app = new angular.scenario.Application(frames); - app.checkUrlStatus_ = function(url, callback) { - callback.call(this); - }; }); it('should return new $window and $document after navigate', function() { @@ -82,15 +79,6 @@ describe('angular.scenario.Application', function() { expect(called).toBeTruthy(); }); - it('should call error handler if status check fails', function() { - app.checkUrlStatus_ = function(url, callback) { - callback.call(this, 'Example Error'); - }; - app.navigateTo('http://localhost/', angular.noop, function(error) { - expect(error).toEqual('Example Error'); - }); - }); - it('should hide old iframes and navigate to about:blank', function() { app.navigateTo('http://localhost/#foo'); app.navigateTo('http://localhost/#bar'); @@ -151,67 +139,4 @@ describe('angular.scenario.Application', function() { expect(handlers.length).toEqual(1); handlers[0](); }); - - describe('jQuery ajax', function() { - var options; - var response; - var jQueryAjax; - - beforeEach(function() { - response = { - status: 200, - statusText: 'OK' - }; - jQueryAjax = _jQuery.ajax; - _jQuery.ajax = function(opts) { - options = opts; - opts.complete.call(this, response); - }; - app.checkUrlStatus_ = angular.scenario.Application. - prototype.checkUrlStatus_; - }); - - afterEach(function() { - _jQuery.ajax = jQueryAjax; - }); - - it('should perform a HEAD request to verify file existence', function() { - app.navigateTo('http://www.google.com/', angular.noop, angular.noop); - expect(options.type).toEqual('HEAD'); - expect(options.url).toEqual('http://www.google.com/'); - }); - - it('should call error handler if status code is less than 200', function() { - var finished; - response.status = 199; - response.statusText = 'Error Message'; - app.navigateTo('http://localhost/', angular.noop, function(error) { - expect(error).toEqual('199 Error Message'); - finished = true; - }); - expect(finished).toBeTruthy(); - }); - - it('should call error handler if status code is greater than 299', function() { - var finished; - response.status = 300; - response.statusText = 'Error'; - app.navigateTo('http://localhost/', angular.noop, function(error) { - expect(error).toEqual('300 Error'); - finished = true; - }); - expect(finished).toBeTruthy(); - }); - - it('should call error handler if status code is 0 for sandbox error', function() { - var finished; - response.status = 0; - response.statusText = ''; - app.navigateTo('http://localhost/', angular.noop, function(error) { - expect(error).toEqual('Sandbox Error: Cannot access http://localhost/'); - finished = true; - }); - expect(finished).toBeTruthy(); - }); - }); }); -- cgit v1.2.3