openstack/murano-dashboard
Code Issues Proposed changes

Update functional tests due to horizon update

Browse Source 
DOM was changed, so UI tests need to be fixed.

Change-Id: Iecf7011a995d5516f6d51efe62c44692ec556d8e
Closes-Bug: #1485642
This commit is contained in:
Ekaterina Chernova
2015-08-17 19:59:32 +03:00
parent d156ec8f97
commit 1977a53e9e
3 changed files with 28 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
muranodashboard/tests/functional/base.py
View File

@@ -117,7 +117,7 @@ class UITestCase(BaseDeps):
self.fill_field(by.By.ID, 'id_password', cfg.common.password) self.fill_field(by.By.ID, 'id_password', cfg.common.password)
self.driver.find_element_by_xpath("//button[@type='submit']").click() self.driver.find_element_by_xpath("//button[@type='submit']").click()
murano = self.driver.find_element_by_xpath(consts.Murano) murano = self.driver.find_element_by_xpath(consts.Murano)
if 'active' not in murano.get_attribute('class'): if 'collapsed' in murano.get_attribute('class'):
murano.click() murano.click()
def fill_field(self, by_find, field, value): def fill_field(self, by_find, field, value):
@@ -151,7 +151,7 @@ class UITestCase(BaseDeps):
el = ui.WebDriverWait(self.driver, 10).until( el = ui.WebDriverWait(self.driver, 10).until(
EC.presence_of_element_located( EC.presence_of_element_located(
(by.By.XPATH, getattr(consts, menu)))) (by.By.XPATH, getattr(consts, menu))))
if 'active' not in el.get_attribute('class'): if 'collapsed' in el.get_attribute('class'):
el.click() el.click()
self.wait_for_sidebar_is_loaded() self.wait_for_sidebar_is_loaded()
@@ -242,7 +242,7 @@ class UITestCase(BaseDeps):
def wait_for_sidebar_is_loaded(self): def wait_for_sidebar_is_loaded(self):
ui.WebDriverWait(self.driver, 10).until( ui.WebDriverWait(self.driver, 10).until(
EC.presence_of_element_located( EC.presence_of_element_located(
(by.By.CSS_SELECTOR, "div.sidebar dt.active"))) (by.By.CSS_SELECTOR, "div#sidebar li.active")))
time.sleep(0.5) time.sleep(0.5)
@@ -343,8 +343,7 @@ class ApplicationTestCase(ImageTestCase):
el.click() el.click()
self.wait_for_alert_message() self.wait_for_alert_message()
def select_action_for_package(self, package, action): def select_action_for_package(self, package_id, action):
package_id = self.get_element_id(package)
if action == 'more': if action == 'more':
el = self.wait_element_is_clickable( el = self.wait_element_is_clickable(
by.By.XPATH, "//tr[@data-object-id='{0}']" by.By.XPATH, "//tr[@data-object-id='{0}']"
@@ -359,10 +358,9 @@ class ApplicationTestCase(ImageTestCase):
".//*[@id='packages__row_{0}__action_{1}']". ".//*[@id='packages__row_{0}__action_{1}']".
format(package_id, action)).click() format(package_id, action)).click()
def check_package_parameter(self, package, column, value): def check_package_parameter(self, package_id, column, value):
columns = {'Active': 3, 'Public': 4} columns = {'Active': 3, 'Public': 4}
package_id = self.get_element_id(package)
column_num = str(columns[column]) column_num = str(columns[column])
column_element = self.driver.find_element_by_xpath( column_element = self.driver.find_element_by_xpath(

6
muranodashboard/tests/functional/consts.py
View File

@@ -32,6 +32,6 @@ DeleteCategory = "//tr[td[contains(text(), '{0}')]]//button[contains(@id, 'actio
# Panel's # Panel's
Murano = "//*[@id='main_content']/div[2]//dt[contains(text(), 'Murano')]" Murano = "//*[@id='main_content']/div[2]//a[contains(text(), 'Murano')]"
Application_Catalog = Murano + "/following::h4[1]" Application_Catalog = Murano + "/following::a[span[contains(text(), 'Application Catalog')]]" # noqa
Manage = Murano + "/following::h4[2]" Manage = Murano + "/following::a[span[contains(text(), 'Manage')]]"

38
muranodashboard/tests/functional/sanity_check.py
View File

@@ -621,7 +621,7 @@ class TestSuitePackages(base.PackageTestCase):
""" """
self.navigate_to('Manage') self.navigate_to('Manage')
self.go_to_submenu('Package Definitions') self.go_to_submenu('Package Definitions')
self.select_action_for_package('PostgreSQL', self.select_action_for_package(self.postgre_id,
'modify_package') 'modify_package')
self.fill_field(by.By.ID, 'id_name', 'PostgreSQL-modified') self.fill_field(by.By.ID, 'id_name', 'PostgreSQL-modified')
self.driver.find_element_by_xpath(c.InputSubmit).click() self.driver.find_element_by_xpath(c.InputSubmit).click()
@@ -631,7 +631,7 @@ class TestSuitePackages(base.PackageTestCase):
c.AppPackageDefinitions.format( c.AppPackageDefinitions.format(
'PostgreSQL-modified')) 'PostgreSQL-modified'))
self.select_action_for_package('PostgreSQL-modified', self.select_action_for_package(self.postgre_id,
'modify_package') 'modify_package')
self.fill_field(by.By.ID, 'id_name', 'PostgreSQL') self.fill_field(by.By.ID, 'id_name', 'PostgreSQL')
self.driver.find_element_by_xpath(c.InputSubmit).click() self.driver.find_element_by_xpath(c.InputSubmit).click()
@@ -651,7 +651,7 @@ class TestSuitePackages(base.PackageTestCase):
""" """
self.navigate_to('Manage') self.navigate_to('Manage')
self.go_to_submenu('Package Definitions') self.go_to_submenu('Package Definitions')
self.select_action_for_package('PostgreSQL', self.select_action_for_package(self.postgre_id,
'modify_package') 'modify_package')
self.fill_field(by.By.ID, 'id_tags', 'TEST_TAG') self.fill_field(by.By.ID, 'id_tags', 'TEST_TAG')
@@ -674,8 +674,8 @@ class TestSuitePackages(base.PackageTestCase):
self.navigate_to('Manage') self.navigate_to('Manage')
self.go_to_submenu('Package Definitions') self.go_to_submenu('Package Definitions')
self.select_action_for_package('PostgreSQL', 'more') self.select_action_for_package(self.postgre_id, 'more')
self.select_action_for_package('PostgreSQL', 'download_package') self.select_action_for_package(self.postgre_id, 'download_package')
def test_check_toggle_enabled_package(self): def test_check_toggle_enabled_package(self):
"""Test check ability to make package active or inactive """Test check ability to make package active or inactive
@@ -690,15 +690,15 @@ class TestSuitePackages(base.PackageTestCase):
self.navigate_to('Manage') self.navigate_to('Manage')
self.go_to_submenu('Package Definitions') self.go_to_submenu('Package Definitions')
self.select_action_for_package('PostgreSQL', 'more') self.select_action_for_package(self.postgre_id, 'more')
self.select_action_for_package('PostgreSQL', 'toggle_enabled') self.select_action_for_package(self.postgre_id, 'toggle_enabled')
self.check_package_parameter('PostgreSQL', 'Active', 'False') self.check_package_parameter(self.postgre_id, 'Active', 'False')
self.select_action_for_package('PostgreSQL', 'more') self.select_action_for_package(self.postgre_id, 'more')
self.select_action_for_package('PostgreSQL', 'toggle_enabled') self.select_action_for_package(self.postgre_id, 'toggle_enabled')
self.check_package_parameter('PostgreSQL', 'Active', 'True') self.check_package_parameter(self.postgre_id, 'Active', 'True')
def test_check_toggle_public_package(self): def test_check_toggle_public_package(self):
"""Test check ability to make package active or inactive """Test check ability to make package active or inactive
@@ -713,15 +713,17 @@ class TestSuitePackages(base.PackageTestCase):
self.navigate_to('Manage') self.navigate_to('Manage')
self.go_to_submenu('Package Definitions') self.go_to_submenu('Package Definitions')
self.select_action_for_package('PostgreSQL', 'more') self.select_action_for_package(self.postgre_id, 'more')
self.select_action_for_package('PostgreSQL', 'toggle_public_enabled') self.select_action_for_package(self.postgre_id,
'toggle_public_enabled')
self.check_package_parameter('PostgreSQL', 'Public', 'True') self.check_package_parameter(self.postgre_id, 'Public', 'True')
self.select_action_for_package('PostgreSQL', 'more') self.select_action_for_package(self.postgre_id, 'more')
self.select_action_for_package('PostgreSQL', 'toggle_public_enabled') self.select_action_for_package(self.postgre_id,
'toggle_public_enabled')
self.check_package_parameter('PostgreSQL', 'Public', 'False') self.check_package_parameter(self.postgre_id, 'Public', 'False')
def test_modify_description(self): def test_modify_description(self):
"""Test check ability to change description of the package """Test check ability to change description of the package
@@ -733,7 +735,7 @@ class TestSuitePackages(base.PackageTestCase):
""" """
self.navigate_to('Manage') self.navigate_to('Manage')
self.go_to_submenu('Package Definitions') self.go_to_submenu('Package Definitions')
self.select_action_for_package('MockApp', self.select_action_for_package(self.mockapp_id,
'modify_package') 'modify_package')
self.modify_package('description', 'New Description') self.modify_package('description', 'New Description')