CalvinBackup/iD
1
0
Fork 0
mirror of https://github.com/FoggedLens/iD.git synced 2026-05-22 00:07:03 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge in master

Browse Source
This commit is contained in:
Quincy Morgan
2019-05-20 14:38:52 -04:00
parent d7d46d9365 4fb4f88e5a
commit 39784cdd1f
19 changed files with 81 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/spec/services/mapillary.js
+1 -3
View File
@@ -54,7 +54,7 @@ describe('iD.serviceMapillary', function() {
});
describe('#loadImages', function() {
it('fires loadedImages when images are loaded', function(done) {
it.skip('fires loadedImages when images are loaded', function(done) {
mapillary.on('loadedImages', function() {
expect(server.requests().length).to.eql(2); // 1 images, 1 sequences
done();
@@ -100,7 +100,6 @@ describe('iD.serviceMapillary', function() {
});
it('loads multiple pages of image results', function(done) {
this.timeout(10000);
var calls = 0;
mapillary.on('loadedImages', function() {
server.respond(); // respond to new fetches
@@ -194,7 +193,6 @@ describe('iD.serviceMapillary', function() {
});
it('loads multiple pages of signs results', function(done) {
this.timeout(10000);
var calls = 0;
mapillary.on('loadedSigns', function() {
server.respond(); // respond to new fetches
test/spec/spec_helpers.js
+1
View File
@@ -22,6 +22,7 @@ iD.data.presets = {
mocha.setup({
timeout: 60000, // 1 minute
ui: 'bdd',
globals: [
'__onresize.tail-size',