Skip to content

Commit 5e8fa47

Browse files
committed
[fix]VT review by qiwei
1 parent 9cc245e commit 5e8fa47

File tree

2 files changed

+41
-50
lines changed

2 files changed

+41
-50
lines changed
Lines changed: 23 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,26 @@
11
var commonTools = require('../base/commonTools');
22
module.exports = {
3-
after: function (browser) {
4-
console.log('Closing down...');
5-
browser.end();
6-
},
7-
'leaflet_02_getGridCellInfos': function (browser) {
8-
var type = 'leaflet';
9-
var exampleName = '02_getGridCellInfos';
10-
commonTools.openExampleAndLoadMap(browser, type, exampleName);
11-
/*check elements exist*/
12-
browser.click('#map');
13-
browser.waitForElementPresent('.leaflet-pane.leaflet-marker-pane', 10000);
14-
browser.waitForElementPresent('.leaflet-pane.leaflet-marker-pane img', 10000);
15-
browser.waitForElementPresent('.leaflet-popup-content', 10000);
16-
browser.expect.element('.leaflet-popup-content').text.to.be.contain('栅格查询结果');
17-
browser.expect.element('.leaflet-popup-content').text.to.be.contain('column');
18-
browser.expect.element('.leaflet-popup-content').text.to.be.contain('row');
19-
browser.expect.element('.leaflet-popup-content').text.to.be.contain('value');
20-
browser.click('.leaflet-popup-close-button', function () {
21-
browser.waitForElementNotPresent('.leaflet-popup-content', 10000);
22-
});
23-
//测试版权点击的正确性
24-
//commonTools.verifyCopyrightOfLeaflet(browser);
25-
// browser.pause(1000);
26-
// browser.end();
27-
}
28-
};
29-
30-
3+
after: function (browser) {
4+
console.log('Closing down...');
5+
browser.end();
6+
},
7+
'leaflet_02_getGridCellInfos': function (browser) {
8+
var type = 'leaflet';
9+
var exampleName = '02_getGridCellInfos';
10+
commonTools.openExampleAndLoadMap(browser, type, exampleName);
11+
/*check elements exist*/
12+
browser
13+
.waitForElementVisible('.leaflet-draw-draw-marker')
14+
.click('.leaflet-draw-draw-marker')
15+
.click('#map')
16+
.click('.panel-group.sidebar-config-wrap .btn-primary')
17+
.waitForElementVisible('#tableContainerAll .table-container')
18+
.expect.element('#tableContainerAll tbody tr td:nth-child(5)')
19+
.text.to.equal('{"red":25,"green":38,"blue":0,"alpha":255}');
3120

21+
//测试版权点击的正确性
22+
//commonTools.verifyCopyrightOfLeaflet(browser);
23+
// browser.pause(1000);
24+
// browser.end();
25+
}
26+
};
Lines changed: 18 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,20 @@
11
var commonTools = require('../base/commonTools');
22
module.exports = {
3-
after: function(browser){
4-
browser.end();
5-
},
6-
'openlayers_02_getGridCellInfos': function (browser) {
7-
var type = 'openlayers';
8-
var exampleName = '02_getGridCellInfos';
9-
commonTools.openExampleAndLoadMap(browser, type, exampleName);
10-
browser.click('#map');
11-
browser.waitForElementPresent('#popup', 10000);
12-
browser.waitForElementPresent('#popup-content', 10000);
13-
browser.pause(2000);
14-
browser.expect.element('#popup-content').text.to.be.contain("栅格查询结果");
15-
browser.expect.element('#popup-content').text.to.be.contain('column');
16-
browser.expect.element('#popup-content').text.to.be.contain('row');
17-
browser.expect.element('#popup-content').text.to.be.contain('value');
18-
// browser.end();
19-
}
20-
};
21-
22-
23-
24-
3+
after: function (browser) {
4+
browser.end();
5+
},
6+
'openlayers_02_getGridCellInfos': function (browser) {
7+
var type = 'openlayers';
8+
var exampleName = '02_getGridCellInfos';
9+
commonTools.openExampleAndLoadMap(browser, type, exampleName);
10+
browser
11+
.waitForElementPresent('#drawPoint')
12+
.click('#drawPoint')
13+
.click('#map')
14+
.click('#collapseOne .button-group button')
15+
.waitForElementVisible('#tableContainerAll .table-container')
16+
.expect.element('#tableContainerAll tbody tr td:nth-child(5)')
17+
.text.to.equal('{"red":25,"green":38,"blue":0,"alpha":255}');
18+
// browser.end();
19+
}
20+
};

0 commit comments

Comments
 (0)