diff options
| -rw-r--r-- | css/angular-scenario.css | 5 | ||||
| -rw-r--r-- | src/scenario/Application.js | 8 | ||||
| -rw-r--r-- | src/scenario/Scenario.js | 12 | ||||
| -rw-r--r-- | test/scenario/ApplicationSpec.js | 49 |
4 files changed, 48 insertions, 26 deletions
diff --git a/css/angular-scenario.css b/css/angular-scenario.css index f5cded7f..b8d25c1c 100644 --- a/css/angular-scenario.css +++ b/css/angular-scenario.css @@ -8,6 +8,11 @@ body { font-size: 14px; } +#system-error { + font-size: 1.5em; + text-align: center; +} + #json, #xml { display: none; } diff --git a/src/scenario/Application.js b/src/scenario/Application.js index eacf3c7b..9d05aad0 100644 --- a/src/scenario/Application.js +++ b/src/scenario/Application.js @@ -41,7 +41,7 @@ angular.scenario.Application.prototype.getWindow_ = function() { * Checks that a URL would return a 2xx success status code. Callback is called * with no arguments on success, or with an error on failure. * - * Warning: This requires the server to be able to respond to HEAD requests + * Warning: This requires the server to be able to respond to HEAD requests * and not modify the state of your application. * * @param {string} url Url to check @@ -69,7 +69,7 @@ angular.scenario.Application.prototype.checkUrlStatus_ = function(url, callback) /** * Changes the location of the frame. * - * @param {string} url The URL. If it begins with a # then only the + * @param {string} url The URL. If it begins with a # then only the * hash of the page is changed. * @param {Function} loadFn function($window, $document) Called when frame loads. * @param {Function} errorFn function(error) Called if any error when loading. @@ -79,8 +79,8 @@ angular.scenario.Application.prototype.navigateTo = function(url, loadFn, errorF var frame = this.getFrame_(); //TODO(esprehn): Refactor to use rethrow() errorFn = errorFn || function(e) { throw e; }; - if (/^file:\/\//.test(url)) { - errorFn('Sandbox Error: Cannot load file:// URL.'); + if (url === 'about:blank') { + errorFn('Sandbox Error: Navigating to about:blank is not allowed.'); } else if (url.charAt(0) === '#') { url = frame.attr('src').split('#')[0] + url; frame.attr('src', url); diff --git a/src/scenario/Scenario.js b/src/scenario/Scenario.js index d141c42b..fc7150bc 100644 --- a/src/scenario/Scenario.js +++ b/src/scenario/Scenario.js @@ -93,6 +93,7 @@ angular.scenario.matcher = angular.scenario.matcher || function(name, fn) { * @param {Object} config Config options */ function angularScenarioInit($scenario, config) { + var href = window.location.href; var body = _jQuery(document.body); var output = []; @@ -108,6 +109,15 @@ function angularScenarioInit($scenario, config) { } }); + if (!/^http/.test(href) && !/^https/.test(href)) { + body.append('<p id="system-error"></p>'); + body.find('#system-error').text( + 'Scenario runner must be run using http or https. The protocol ' + + href.split(':')[0] + ':// is not supported.' + ); + return; + } + var appFrame = body.append('<div id="application"></div>').find('#application'); var application = new angular.scenario.Application(appFrame); @@ -134,7 +144,7 @@ function angularScenarioInit($scenario, config) { * * @param {Array} list list to iterate over * @param {Function} iterator Callback function(value, continueFunction) - * @param {Function} done Callback function(error, result) called when + * @param {Function} done Callback function(error, result) called when * iteration finishes or an error occurs. */ function asyncForEach(list, iterator, done) { diff --git a/test/scenario/ApplicationSpec.js b/test/scenario/ApplicationSpec.js index 75a7e9c9..77d50b55 100644 --- a/test/scenario/ApplicationSpec.js +++ b/test/scenario/ApplicationSpec.js @@ -1,4 +1,5 @@ describe('angular.scenario.Application', function() { + var $window; var app, frames; function callLoadHandlers(app) { @@ -52,53 +53,59 @@ describe('angular.scenario.Application', function() { }); it('should use a new iframe each time', function() { - app.navigateTo('about:blank'); + app.navigateTo('http://localhost/'); var frame = app.getFrame_(); frame.attr('test', true); - app.navigateTo('about:blank'); + app.navigateTo('http://localhost/'); expect(app.getFrame_().attr('test')).toBeFalsy(); }); it('should call error handler if document not accessible', function() { + var called; app.getWindow_ = function() { return {}; }; - app.navigateTo('about:blank', angular.noop, function(error) { + app.navigateTo('http://localhost/', angular.noop, function(error) { expect(error).toMatch(/Sandbox Error/); + called = true; }); callLoadHandlers(app); + expect(called).toBeTruthy(); }); - it('should call error handler if using file:// URL', function() { - app.navigateTo('file://foo/bar.txt', angular.noop, function(error) { + it('should call error handler if navigating to about:blank', function() { + var called; + app.navigateTo('about:blank', angular.noop, function(error) { expect(error).toMatch(/Sandbox Error/); + called = true; }); + 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('about:blank', angular.noop, function(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('about:blank#foo'); - app.navigateTo('about:blank#bar'); + app.navigateTo('http://localhost/#foo'); + app.navigateTo('http://localhost/#bar'); var iframes = frames.find('iframe'); expect(iframes.length).toEqual(2); expect(iframes[0].src).toEqual('about:blank'); - expect(iframes[1].src).toEqual('about:blank#bar'); + expect(iframes[1].src).toEqual('http://localhost/#bar'); expect(_jQuery(iframes[0]).css('display')).toEqual('none'); }); it('should URL update description bar', function() { - app.navigateTo('about:blank'); + app.navigateTo('http://localhost/'); var anchor = frames.find('> h2 a'); - expect(anchor.attr('href')).toEqual('about:blank'); - expect(anchor.text()).toEqual('about:blank'); + expect(anchor.attr('href')).toEqual('http://localhost/'); + expect(anchor.text()).toEqual('http://localhost/'); }); it('should call onload handler when frame loads', function() { @@ -106,7 +113,7 @@ describe('angular.scenario.Application', function() { app.getWindow_ = function() { return {document: {}}; }; - app.navigateTo('about:blank', function($window, $document) { + app.navigateTo('http://localhost/', function($window, $document) { called = true; }); callLoadHandlers(app); @@ -130,7 +137,7 @@ describe('angular.scenario.Application', function() { notifyWhenNoOutstandingRequests: function(fn) { handlers.push(fn); } - } + }; }; app.getWindow_ = function() { return testWindow; @@ -173,35 +180,35 @@ describe('angular.scenario.Application', function() { 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('about:blank', angular.noop, function(error) { + 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('about:blank', angular.noop, function(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('about:blank', angular.noop, function(error) { - expect(error).toEqual('Sandbox Error: Cannot access about:blank'); + app.navigateTo('http://localhost/', angular.noop, function(error) { + expect(error).toEqual('Sandbox Error: Cannot access http://localhost/'); finished = true; }); expect(finished).toBeTruthy(); |