Merge "Use Selenium 2.52.0 for UI functional tests"
This commit is contained in:
commit
582d85f5fe
|
@ -55,7 +55,7 @@ function shutdownSelenium() {
|
|||
}
|
||||
}
|
||||
|
||||
var SELENIUM_VERSION = '2.45.0';
|
||||
var SELENIUM_VERSION = '2.52.0';
|
||||
var SELENIUM_DRIVERS = {chrome: {version: '2.20'}};
|
||||
|
||||
gulp.task('selenium:fetch', function(cb) {
|
||||
|
|
|
@ -63,6 +63,7 @@ define([
|
|||
goToEnvironment: function(clusterName) {
|
||||
var self = this;
|
||||
return this.remote
|
||||
.waitForCssSelector(self.clusterSelector, 5000)
|
||||
.findAllByCssSelector(self.clusterSelector)
|
||||
.then(function(divs) {
|
||||
return divs.reduce(
|
||||
|
|
|
@ -79,7 +79,8 @@ define([
|
|||
.then(function() {
|
||||
return self.modal.waitToClose();
|
||||
})
|
||||
.waitForElementDeletion('.network-group-name[data-name=' + name + ']', 2000);
|
||||
.waitForElementDeletion('.network-group-name[data-name=' + name + ']', 2000)
|
||||
.sleep(3000); // unconditionally sleep to wait until update_dnsmasq task is finished
|
||||
}
|
||||
};
|
||||
return NetworkPage;
|
||||
|
|
|
@ -97,7 +97,6 @@ define([
|
|||
.type('\uE00C')
|
||||
.end()
|
||||
.clickLinkByText('Environments')
|
||||
.waitForCssSelector(clustersPage.clusterSelector, 2000)
|
||||
.then(function() {
|
||||
return clustersPage.goToEnvironment(initialName);
|
||||
});
|
||||
|
|
|
@ -375,12 +375,14 @@ define([
|
|||
);
|
||||
})
|
||||
.clickByCssSelector('.subtab-link-neutron_l3')
|
||||
.waitForCssSelector('.nav-pills.networks li.all', 1000)
|
||||
.assertElementTextEquals(
|
||||
'.nav-pills.networks li.all',
|
||||
'All Networks',
|
||||
'Navigation pill text is not changed when switching to neutron_l3 tab'
|
||||
)
|
||||
.clickByCssSelector('.subtab-link-all')
|
||||
.waitForCssSelector('.network-group-name', 2000)
|
||||
.then(function() {
|
||||
return networkPage.removeNodeNetworkGroup('temp');
|
||||
})
|
||||
|
@ -394,7 +396,6 @@ define([
|
|||
.then(function() {
|
||||
return networkPage.addNodeNetworkGroup('Node_Network_Group_1');
|
||||
})
|
||||
.waitForCssSelector('.network-group-name[data-name=Node_Network_Group_1]', 2000)
|
||||
.clickLinkByText('default')
|
||||
.assertElementsExist(
|
||||
'.node_network_groups li',
|
||||
|
|
Loading…
Reference in New Issue