From 18d4e25574eef64fd6b7067ef92fdb7846de4dd2 Mon Sep 17 00:00:00 2001
From: Alexander Lutay <alutay@sipwise.com>
Date: Fri, 11 Jan 2019 13:32:03 +0100
Subject: [PATCH] Revert "TT#46791 Fix floating bug with 'Edit' problem on
 'Weekdays' page"

The fix here didn't work well because another ngcp-panel issue has been
noticed and reported as TT#50005, the second AJAX request aborts Selenium
test by hiding "Edit" button. The better approach is follow.

This reverts commit a9399b1efd386542141744b4ee905c614873c7d8.

Change-Id: Icf6251261f0cbc12ef4e819b3352dc3ebf7c4246
---
 t/selenium/controller_billing.t | 18 ++++--------------
 1 file changed, 4 insertions(+), 14 deletions(-)

diff --git a/t/selenium/controller_billing.t b/t/selenium/controller_billing.t
index c4491e66b8..3352bb4247 100644
--- a/t/selenium/controller_billing.t
+++ b/t/selenium/controller_billing.t
@@ -128,18 +128,9 @@ $edit_link->click();
 ok($d->find_element('//*[@id="masthead"]//h2[contains(text(),"times for mytestprofile")]'));
 
 diag("Edit Wednesday");
-diag("Creating one 'Dates' record to be able search it later to wait for AJAX");
-$d->find_element('Create Special Off-Peak Date', 'link_text')->click();
-$d->fill_element('#start', 'css', "2018-01-01 11:11:11");
-$d->fill_element('#end', 'css', "2018-01-01 12:12:12");
-$d->find_element('#save', 'css')->click();
-$d->find_text("Special offpeak entry successfully created");
-diag("Wait for 'Dates' AXAJ is finished, otherwise it might hide 'Edit' popup button");
-$d->fill_element('//div[contains(@class, "dataTables_filter")]//input', 'xpath', 'thisshouldnotexist');
-$d->find_element('#date_definition_table tr > td.dataTables_empty', 'css');
-diag("Move mouse over 'Weekdays' row to make 'Edit' button available");
 $row = $d->find_element('//table//td[contains(text(),"Wednesday")]');
 ok($row);
+diag("Move mouse over 'Weekdays' row to make 'Edit' button available");
 $d->move_action(element => ($d->find_element('//h3[contains(text(),"Weekdays")]')));
 sleep 2 if ($d->browser_name_in("htmlunit"));
 $d->move_action(element => $row);
@@ -168,16 +159,15 @@ $d->fill_element('#end', 'css', "2008-02-28 13:37:00");
 $d->find_element('#save', 'css')->click();
 
 diag("Find/delete my created date definition");
-$d->fill_element('//div[contains(@class, "dataTables_filter")]//input', 'xpath', '2008-02-28');
 $elem = $d->find_element('//div[contains(@class,"dataTables_wrapper")]');
 $d->scroll_to_element($elem);
 $row = $d->find_element('//div[contains(@class,"dataTables_wrapper")]//td[contains(text(),"2008-02-28")]/..');
 ok($row);
 $d->move_action(element => $row);
-my $delete_button = $d->find_child_element($row, './/a[contains(@class,"btn-secondary")]');
-ok($delete_button);
+$edit_link = $d->find_child_element($row, './/a[contains(@class,"btn-secondary")]');
+ok($edit_link);
 sleep 2 if ($browsername eq "htmlunit");
-$delete_button->click();
+$edit_link->click();
 $d->find_text("Are you sure?");
 $d->find_element('#dataConfirmOK', 'css')->click();