From fa58b707acca94b6907c1ac7dc85a68d32923e00 Mon Sep 17 00:00:00 2001
From: Nico Schedel <nschedel@sipwise.com>
Date: Wed, 17 Apr 2019 11:06:24 +0200
Subject: [PATCH] TT#56376 selenium: Common.pm xpath refinements

Common.pm:
- Changed some xpaths to be less static.

Change-Id: I024c1ec398705ba6f3faa44090c564232ae2c519
---
 t/lib/Selenium/Collection/Common.pm | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/t/lib/Selenium/Collection/Common.pm b/t/lib/Selenium/Collection/Common.pm
index 989eaeaa54..04976b6b53 100644
--- a/t/lib/Selenium/Collection/Common.pm
+++ b/t/lib/Selenium/Collection/Common.pm
@@ -19,7 +19,7 @@ sub create_domain {
     $self->driver->find_element("Domains", 'link_text')->click();
 
     diag('Try to add a domain');
-    $self->driver->find_element('//*[@id="content"]/div/div[1]/span[2]/a')->click();
+    $self->driver->find_element('Create Domain', 'link_text')->click();
     ok($self->driver->wait_for_text('//*[@id="reselleridtable"]/tbody/tr[1]/td[2]', 'default'), "Default reseller and creation site are avalible");
     $self->driver->find_element('//*[@id="reselleridtable"]/tbody/tr[1]/td[5]/input')->click(); #select default reseller
     $self->driver->find_element('//*[@id="domain"]')->send_keys($name);
@@ -41,7 +41,7 @@ sub delete_domain {
     ok($self->driver->wait_for_text('//*[@id="Domain_table"]/tbody/tr[1]/td[3]', $name), "Domain found");
     $self->driver->move_action(element => $self->driver->find_element('//*[@id="Domain_table"]'));
     $self->driver->move_action(element => $self->driver->find_element('//*[@id="Domain_table"]/tbody/tr[1]/td[3]'));
-    $self->driver->find_element('//*[@id="Domain_table"]/tbody/tr[1]/td[4]/div/a[1]')->click();
+    $self->driver->find_element('//*[@id="Domain_table"]/tbody/tr[1]//td//div//a[contains(text(),"Delete")]')->click();
     if($cancel){
         popup_confirm_cancel($self, 'We are NOT going to delete this domain');
     } else {
@@ -111,7 +111,7 @@ sub delete_reseller {
     ok($self->driver->wait_for_text('//*[@id="Resellers_table"]/tbody/tr[1]/td[3]', $name), 'Entry found');
     $self->driver->move_action(element => $self->driver->find_element('//*[@id="Resellers_table"]'));
     $self->driver->move_action(element => $self->driver->find_element('//*[@id="Resellers_table"]/tbody/tr[1]/td[3]'));
-    $self->driver->find_element('//*[@id="Resellers_table"]/tbody/tr[1]/td[5]/div/a[2]')->click();
+    $self->driver->find_element('//*[@id="Resellers_table"]/tbody/tr[1]//td//div//a[contains(text(),"Terminate")]')->click();
     if($cancel){
         popup_confirm_cancel($self, 'We are NOT going to delete this reseller');
     } else {
@@ -132,7 +132,7 @@ sub delete_reseller_contract {
     ok($self->driver->wait_for_text('//*[@id="contract_table"]/tbody/tr/td[2]', $resellerid), 'Entry found');
     $self->driver->move_action(element => $self->driver->find_element('//*[@id="contract_table"]'));
     $self->driver->move_action(element => $self->driver->find_element('//*[@id="contract_table"]/tbody/tr[1]/td[3]'));
-    $self->driver->find_element('//*[@id="contract_table"]/tbody/tr[1]/td[7]/div/a[2]')->click();
+    $self->driver->find_element('//*[@id="contract_table"]/tbody/tr[1]//td//div//a[contains(text(),"Terminate")]')->click();
     if($cancel){
         popup_confirm_cancel($self, 'We are NOT going to delete this reseller contract');
     } else {