Skip to content

Commit

Permalink
Merge pull request CesiumGS#1673 from AnalyticalGraphicsInc/arcgis-specs
Browse files Browse the repository at this point in the history
Use a properly invalid URL in ArcGisMapServerImageryProvider tests.
  • Loading branch information
kring committed May 2, 2014
2 parents 3383831 + ec04e42 commit 10fabfb
Showing 1 changed file with 8 additions and 8 deletions.
16 changes: 8 additions & 8 deletions Specs/Scene/ArcGisMapServerImageryProviderSpec.js
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ defineSuite([
});

it('returns valid value for hasAlphaChannel', function() {
var baseUrl = 'Made/Up/TiledArcGisMapServer';
var baseUrl = '//tiledArcGisMapServer.invalid';

jsonp.loadAndExecuteScript = function(url, functionName) {
expect(url).toEqual(baseUrl + '?callback=' + functionName + '&f=json');
Expand Down Expand Up @@ -92,7 +92,7 @@ defineSuite([
});

it('supports tiled servers in web mercator projection', function() {
var baseUrl = 'Made/Up/TiledArcGisMapServer';
var baseUrl = '//tiledArcGisMapServer.invalid';

jsonp.loadAndExecuteScript = function(url, functionName) {
expect(url).toEqual(baseUrl + '?callback=' + functionName + '&f=json');
Expand Down Expand Up @@ -173,7 +173,7 @@ defineSuite([
});

it('supports tiled servers in geographic projection', function() {
var baseUrl = 'Made/Up/TiledArcGisMapServer';
var baseUrl = '//tiledArcGisMapServer.invalid';

jsonp.loadAndExecuteScript = function(url, functionName) {
expect(url).toEqual(baseUrl + '?callback=' + functionName + '&f=json');
Expand Down Expand Up @@ -254,7 +254,7 @@ defineSuite([
});

it('supports non-tiled servers', function() {
var baseUrl = 'Made/Up/TiledArcGisMapServer';
var baseUrl = '//tiledArcGisMapServer.invalid';

jsonp.loadAndExecuteScript = function(url, functionName) {
expect(url).toEqual(baseUrl + '?callback=' + functionName + '&f=json');
Expand Down Expand Up @@ -316,7 +316,7 @@ defineSuite([
});

it('routes requests through a proxy if one is specified', function() {
var baseUrl = 'Made/Up/TiledArcGisMapServer';
var baseUrl = '//tiledArcGisMapServer.invalid';
var proxy = new DefaultProxy('/proxy/');

jsonp.loadAndExecuteScript = function(url, functionName) {
Expand Down Expand Up @@ -404,7 +404,7 @@ defineSuite([
});

it('raises error on unsupported WKID', function() {
var baseUrl = 'Made/Up/TiledArcGisMapServer';
var baseUrl = '//tiledArcGisMapServer.invalid';

jsonp.loadAndExecuteScript = function(url, functionName) {
expect(url).toEqual(baseUrl + '?callback=' + functionName + '&f=json');
Expand Down Expand Up @@ -458,7 +458,7 @@ defineSuite([
});

it('raises error on invalid URL', function() {
var baseUrl = 'Made/Up/TiledArcGisMapServer';
var baseUrl = '//tiledArcGisMapServer.invalid';

var provider = new ArcGisMapServerImageryProvider({
url : baseUrl
Expand All @@ -483,7 +483,7 @@ defineSuite([
});

it('raises error event when image cannot be loaded', function() {
var baseUrl = 'Made/Up/TiledArcGisMapServer';
var baseUrl = '//tiledArcGisMapServer.invalid';

jsonp.loadAndExecuteScript = function(url, functionName) {
expect(url).toEqual(baseUrl + '?callback=' + functionName + '&f=json');
Expand Down

0 comments on commit 10fabfb

Please sign in to comment.