diff --git a/.gitignore b/.gitignore index 107779dad..92091167b 100644 --- a/.gitignore +++ b/.gitignore @@ -19,3 +19,5 @@ land.html /css/img /test/css /test/img + +/.vscode/ diff --git a/test/spec/services/mapillary.js b/test/spec/services/mapillary.js index efc7fb510..72046b1b6 100644 --- a/test/spec/services/mapillary.js +++ b/test/spec/services/mapillary.js @@ -1,9 +1,6 @@ describe('iD.serviceMapillary', function() { var dimensions = [64, 64], - ua = navigator.userAgent, - isPhantom = (navigator.userAgent.match(/PhantomJS/) !== null), - uaMock = function () { return ua; }, - context, server, mapillary, orig; + context, server, mapillary; before(function() { @@ -24,28 +21,10 @@ describe('iD.serviceMapillary', function() { server = sinon.fakeServer.create(); mapillary = iD.services.mapillary; mapillary.reset(); - - /* eslint-disable no-global-assign */ - /* mock userAgent */ - if (isPhantom) { - orig = navigator; - navigator = Object.create(orig, { userAgent: { get: uaMock }}); - } else { - orig = navigator.__lookupGetter__('userAgent'); - navigator.__defineGetter__('userAgent', uaMock); - } }); afterEach(function() { server.restore(); - - /* restore userAgent */ - if (isPhantom) { - navigator = orig; - } else { - navigator.__defineGetter__('userAgent', orig); - } - /* eslint-enable no-global-assign */ }); diff --git a/test/spec/services/openstreetcam.js b/test/spec/services/openstreetcam.js index e9d8dbc27..01658facf 100644 --- a/test/spec/services/openstreetcam.js +++ b/test/spec/services/openstreetcam.js @@ -1,9 +1,6 @@ describe('iD.serviceOpenstreetcam', function() { var dimensions = [64, 64], - ua = navigator.userAgent, - isPhantom = (navigator.userAgent.match(/PhantomJS/) !== null), - uaMock = function () { return ua; }, - context, server, openstreetcam, orig; + context, server, openstreetcam; before(function() { iD.services.openstreetcam = iD.serviceOpenstreetcam; @@ -23,28 +20,10 @@ describe('iD.serviceOpenstreetcam', function() { server = sinon.fakeServer.create(); openstreetcam = iD.services.openstreetcam; openstreetcam.reset(); - - /* eslint-disable no-global-assign */ - /* mock userAgent */ - if (isPhantom) { - orig = navigator; - navigator = Object.create(orig, { userAgent: { get: uaMock }}); - } else { - orig = navigator.__lookupGetter__('userAgent'); - navigator.__defineGetter__('userAgent', uaMock); - } }); afterEach(function() { server.restore(); - - /* restore userAgent */ - if (isPhantom) { - navigator = orig; - } else { - navigator.__defineGetter__('userAgent', orig); - } - /* eslint-enable no-global-assign */ });