From 9abad900f97601493dc17f4bcced8b43ca998c97 Mon Sep 17 00:00:00 2001 From: Kenneth Skovhede Date: Mon, 13 Feb 2017 22:47:17 +0100 Subject: Fixes to gui test as we now have two buttons labeled Restore on screen --- guiTests/guiTest.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'guiTests') diff --git a/guiTests/guiTest.py b/guiTests/guiTest.py index 1fdbe9af0..370c25867 100644 --- a/guiTests/guiTest.py +++ b/guiTests/guiTest.py @@ -136,14 +136,15 @@ wait_for_text(60, "//div[@class='task ng-scope']/dl[2]/dd[1]", "(took ") # Restore driver.find_element_by_link_text(BACKUP_NAME).click() -driver.find_element_by_xpath("//span[contains(text(),'Restore files ...')]").click() +[n for n in driver.find_elements_by_xpath("//span[contains(text(),'Restore files ...')]") if n.is_displayed()][0].click() driver.find_element_by_xpath("//span[contains(text(),'" + SOURCE_FOLDER + "')]") # wait for filelist time.sleep(1) driver.find_element_by_xpath("//restore-file-picker/ul/li/div/a[2]").click() # select root folder checkbox driver.find_element_by_link_text("Continue").click() driver.find_element_by_id("restoretonewpath").click() driver.find_element_by_id("restore_path").send_keys(RESTORE_FOLDER) -driver.find_element_by_link_text("Restore").click() +driver.find_element_by_xpath("//form[@id='restore']/div/div[@class='buttons']/a/span[contains(text(),'Restore')]") + # wait for restore to finish wait_for_text(60, "//form[@id='restore']/div[3]/h3/div[1]", "Your files and folders have been restored successfully.") -- cgit v1.2.3