CalvinBackup/iD
1
0
Fork 0
mirror of https://github.com/FoggedLens/iD.git synced 2026-02-12 16:52:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5106 from openstreetmap/remove_test_user_mocks

Browse Source 
removed: user mocks from image service test specs
This commit is contained in:
Bryan Housel
2018-06-26 21:11:23 -04:00
committed by GitHub
parent 6a7e56a755 db1c896ef2
commit 3943364852
3 changed files with 4 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@@ -19,3 +19,5 @@ land.html
/css/img
/test/css
/test/img
/.vscode/

23
test/spec/services/mapillary.js
View File

@@ -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 */
});

23
test/spec/services/openstreetcam.js
View File

@@ -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 */
});