openstack
/
fuel-web
Code Issues Proposed changes

Merge "Use Selenium 2.52.0 for UI functional tests"

This commit is contained in:
Jenkins 2016-02-24 08:58:16 +00:00 committed by Gerrit Code Review
parent 8374ff7a6b dbc017503c
commit 582d85f5fe
5 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nailgun/gulpfile.js
View File

@ -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'}}; var SELENIUM_DRIVERS = {chrome: {version: '2.20'}};
gulp.task('selenium:fetch', function(cb) { gulp.task('selenium:fetch', function(cb) {

1
nailgun/static/tests/functional/pages/clusters.js
View File

@ -63,6 +63,7 @@ define([
goToEnvironment: function(clusterName) { goToEnvironment: function(clusterName) {
var self = this; var self = this;
return this.remote return this.remote
.waitForCssSelector(self.clusterSelector, 5000)
.findAllByCssSelector(self.clusterSelector) .findAllByCssSelector(self.clusterSelector)
.then(function(divs) { .then(function(divs) {
return divs.reduce( return divs.reduce(

3
nailgun/static/tests/functional/pages/network.js
View File

@ -79,7 +79,8 @@ define([
.then(function() { .then(function() {
return self.modal.waitToClose(); 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; return NetworkPage;

1
nailgun/static/tests/functional/test_cluster_dashboard.js
View File

@ -97,7 +97,6 @@ define([
.type('\uE00C') .type('\uE00C')
.end() .end()
.clickLinkByText('Environments') .clickLinkByText('Environments')
.waitForCssSelector(clustersPage.clusterSelector, 2000)
.then(function() { .then(function() {
return clustersPage.goToEnvironment(initialName); return clustersPage.goToEnvironment(initialName);
}); });

3
nailgun/static/tests/functional/test_cluster_network.js
View File

@ -375,12 +375,14 @@ define([
); );
}) })
.clickByCssSelector('.subtab-link-neutron_l3') .clickByCssSelector('.subtab-link-neutron_l3')
.waitForCssSelector('.nav-pills.networks li.all', 1000)
.assertElementTextEquals( .assertElementTextEquals(
'.nav-pills.networks li.all', '.nav-pills.networks li.all',
'All Networks', 'All Networks',
'Navigation pill text is not changed when switching to neutron_l3 tab' 'Navigation pill text is not changed when switching to neutron_l3 tab'
) )
.clickByCssSelector('.subtab-link-all') .clickByCssSelector('.subtab-link-all')
.waitForCssSelector('.network-group-name', 2000)
.then(function() { .then(function() {
return networkPage.removeNodeNetworkGroup('temp'); return networkPage.removeNodeNetworkGroup('temp');
}) })
@ -394,7 +396,6 @@ define([
.then(function() { .then(function() {
return networkPage.addNodeNetworkGroup('Node_Network_Group_1'); return networkPage.addNodeNetworkGroup('Node_Network_Group_1');
}) })
.waitForCssSelector('.network-group-name[data-name=Node_Network_Group_1]', 2000)
.clickLinkByText('default') .clickLinkByText('default')
.assertElementsExist( .assertElementsExist(
'.node_network_groups li', '.node_network_groups li',