Skip to content

Commit f99e931

Browse files
jinnanyangjinnanyang
committed
[fix]升级nightwatch,修改vt
1 parent bbf1f4b commit f99e931

File tree

67 files changed

+885
-519
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

67 files changed

+885
-519
lines changed

‎examples-test/base/global.js‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
var chromedriver = require('../../node_modules/chromedriver/lib/chromedriver');
2+
3+
function stopChromeDriver() {
4+
chromedriver.stop();
5+
}
6+
7+
module.exports = {
8+
after: function (done) {
9+
console.log('Close Chromedriver after all tests')
10+
stopChromeDriver.call(this);
11+
done();
12+
}
13+
};

‎examples-test/leaflet/01_layerServiceIT.js‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
var commonTools = require('../base/commonTools');
22
module.exports = {
3+
after:function(browser){
4+
console.log('Closing down...');
5+
browser.end();
6+
},
37
'leaflet_01_layerService': function (browser) {
48
var type = 'leaflet';
59
var exampleName = '01_layerService';
@@ -16,7 +20,7 @@ module.exports = {
1620
});
1721
//测试版权点击的正确性
1822
//commonTools.verifyCopyrightOfLeaflet(browser);
19-
browser.pause(1000);
20-
browser.end();
23+
// browser.pause(1000);
24+
// browser.end();
2125
}
2226
};

‎examples-test/leaflet/01_mapQueryByBoundsIT.js‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
var commonTools = require('../base/commonTools');
22
module.exports = {
3+
after:function(browser){
4+
console.log('Closing down...');
5+
browser.end();
6+
},
37
'leaflet_01_mapQueryByBounds': function (browser) {
48
var type = 'leaflet';
59
var exampleName = '01_mapQueryByBounds';
@@ -14,8 +18,8 @@ module.exports = {
1418
});
1519
//测试版权点击的正确性
1620
//commonTools.verifyCopyrightOfLeaflet(browser);
17-
browser.pause(1000);
18-
browser.end();
21+
// browser.pause(1000);
22+
// browser.end();
1923
}
2024
};
2125

‎examples-test/leaflet/01_mapQueryByDistanceIT.js‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
var commonTools = require('../base/commonTools');
22
module.exports = {
3+
after: function(browser){
4+
browser.end();
5+
},
6+
37
'leaflet_01_mapQueryByDistance': function (browser) {
48
var type = 'leaflet';
59
var exampleName = '01_mapQueryByDistance';
@@ -20,7 +24,7 @@ module.exports = {
2024
});
2125
//测试版权点击的正确性
2226
//commonTools.verifyCopyrightOfLeaflet(browser);
23-
browser.pause(1000);
24-
browser.end();
27+
// browser.pause(1000);
28+
2529
}
2630
};

‎examples-test/leaflet/01_mapQueryByGeometryIT.js‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
var commonTools = require('../base/commonTools');
22
module.exports = {
3+
after:function(browser){
4+
console.log('Closing down...');
5+
browser.end();
6+
},
37
'leaflet_01_mapQueryByGeometry': function (browser) {
48
var type = 'leaflet';
59
var exampleName = '01_mapQueryByGeometry';
@@ -14,8 +18,8 @@ module.exports = {
1418
});
1519
//测试版权点击的正确性
1620
//commonTools.verifyCopyrightOfLeaflet(browser);
17-
browser.pause(1000);
18-
browser.end();
21+
// browser.pause(1000);
22+
// browser.end();
1923
}
2024
};
2125

‎examples-test/leaflet/01_mapQueryBySQLIT.js‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
var commonTools = require('../base/commonTools');
22
module.exports = {
3+
after:function(browser){
4+
console.log('Closing down...');
5+
browser.end();
6+
},
37
'leaflet_01_mapQueryBySQL': function (browser) {
48
var type = 'leaflet';
59
var exampleName = '01_mapQueryBySQL';
@@ -12,8 +16,8 @@ module.exports = {
1216
});
1317
//测试版权点击的正确性
1418
//commonTools.verifyCopyrightOfLeaflet(browser);
15-
browser.pause(1000);
16-
browser.end();
19+
// browser.pause(1000);
20+
// browser.end();
1721
}
1822
};
1923

‎examples-test/leaflet/01_mapServiceIT.js‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
var commonTools = require('../base/commonTools');
22
module.exports = {
3+
after:function(browser){
4+
console.log('Closing down...');
5+
browser.end();
6+
},
37
'leaflet_01_mapService': function (browser) {
48
var type = 'leaflet';
59
var exampleName = '01_mapService';
@@ -16,7 +20,7 @@ module.exports = {
1620
});
1721
//测试版权点击的正确性
1822
//commonTools.verifyCopyrightOfLeaflet(browser);
19-
browser.pause(1000);
20-
browser.end();
23+
// browser.pause(1000);
24+
// browser.end();
2125
}
2226
};

‎examples-test/leaflet/01_measure_areaIT.js‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
var commonTools = require('../base/commonTools');
22
module.exports = {
3+
after:function(browser){
4+
console.log('Closing down...');
5+
browser.end();
6+
},
37
'leaflet_01_measure_area': function (browser) {
48
var type = 'leaflet';
59
var exampleName = '01_measure_area';
@@ -18,7 +22,7 @@ module.exports = {
1822
});
1923
//测试版权点击的正确性
2024
//commonTools.verifyCopyrightOfLeaflet(browser);
21-
browser.pause(1000);
22-
browser.end();
25+
// browser.pause(1000);
26+
// browser.end();
2327
}
2428
};

‎examples-test/leaflet/01_measure_distanceIT.js‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
var commonTools = require('../base/commonTools');
22
module.exports = {
3+
after:function(browser){
4+
console.log('Closing down...');
5+
browser.end();
6+
},
37
'leaflet_01_measure_distance': function (browser) {
48
var type = 'leaflet';
59
var exampleName = '01_measure_distance';
@@ -11,14 +15,15 @@ module.exports = {
1115
browser.waitForElementPresent('.leaflet-pane.leaflet-marker-pane img', 10000);
1216
browser.waitForElementPresent('.leaflet-popup-content', 10000);
1317
/*check the info showing in leaflet-popup is equal to our expectation*/
18+
// 线上站点改动
1419
var distanceInfo = '距离：2115093.3333095433米';
1520
browser.expect.element('.leaflet-popup-content').text.to.equal(distanceInfo);
1621
browser.click('.leaflet-popup-close-button', function () {
1722
browser.waitForElementNotPresent('.leaflet-popup-content', 10000);
1823
});
1924
//测试版权点击的正确性
2025
//commonTools.verifyCopyrightOfLeaflet(browser);
21-
browser.pause(1000);
22-
browser.end();
26+
// browser.pause(1000);
27+
// browser.end();
2328
}
2429
};

‎examples-test/leaflet/01_overlayTiledMapLayerIT.js‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
var commonTools = require('../base/commonTools');
22
module.exports = {
3+
after:function(browser){
4+
console.log('Closing down...');
5+
browser.end();
6+
},
37
'leaflet_01_overlayTiledMapLayer': function (browser) {
48
browser.windowMaximize();
59
var type = 'leaflet';
@@ -9,8 +13,8 @@ module.exports = {
913
commonTools.cmpTestTileWithStdTile(browser, type, exampleName, 128, 128, 256, 256);
1014
//测试版权点击的正确性
1115
//commonTools.verifyCopyrightOfLeaflet(browser);
12-
browser.pause(1000);
13-
browser.end();
16+
// browser.pause(1000);
17+
// browser.end();
1418
}
1519
};
1620

0 commit comments

Comments
 (0)