TT#70901 selenium: add new login functions for ngcp panel

- add login functions for ngcp panel for usage in future new functions
- rename existing login functions to login/logout_csc
- removed login routine from create/delete_subscriber. functions that need
to create a subscriber or do any other things in ngcp-panel should launch
login_ngcp themselves
- edited tests to properly use these new functions

Change-Id: If936e92df3b486de9783b48d1cb64c1e75888485

t/selenium/functions/Collections.py

@@ -7,7 +7,7 @@ from selenium.webdriver.support import expected_conditions as EC
 from selenium.webdriver.common.by import By
 
 
-def login(driver, name, pwd):
+def login_csc(driver, name, pwd):
     driver.get(os.environ['CATALYST_SERVER'])
     driver.find_element_by_xpath(
         '//*[@id="csc-login-form"]//div//input[@type="text"]'
@@ -19,7 +19,7 @@ def login(driver, name, pwd):
         '//*[@id="csc-login"]//div//button').click()
 
 
-def logout(driver):
+def logout_csc(driver):
     WebDriverWait(driver, 10).until(EC.element_to_be_clickable((
         By.XPATH, '//*[@id="csc-header-toolbar"]/div[1]/button')))
     driver.find_element_by_xpath(
@@ -28,7 +28,7 @@ def logout(driver):
         '/html/body//div[contains(text(), "Logout")]').click()
 
 
-def create_subscriber(driver):
+def login_panel(driver):
     driver.get(os.environ['CATALYST_SERVER'] + ":1443/logout")
     driver.get(os.environ['CATALYST_SERVER'] + ":1443")
     driver.find_element_by_xpath(
@@ -36,6 +36,14 @@ def create_subscriber(driver):
     driver.find_element_by_xpath(
         '//*[@id="password"]').send_keys('administrator')
     driver.find_element_by_xpath('//*[@id="submit"]').click()
+
+
+def logout_panel(driver):
+    driver.find_element_by_xpath(
+        '//*[@id="top-nav"]/ul//a[contains(text(), "Logout")]').click()
+
+
+def create_subscriber(driver):
     driver.find_element_by_xpath(
         '//*[@id="main-nav"]//*[contains(text(),"Settings")]').click()
     driver.find_element_by_link_text('Customers').click()
@@ -72,13 +80,6 @@ def create_subscriber(driver):
 
 
 def delete_subscriber(driver):
-    driver.get(os.environ['CATALYST_SERVER'] + ":1443/logout")
-    driver.get(os.environ['CATALYST_SERVER'] + ":1443")
-    driver.find_element_by_xpath(
-        '//*[@id="username"]').send_keys('administrator')
-    driver.find_element_by_xpath(
-        '//*[@id="password"]').send_keys('administrator')
-    driver.find_element_by_xpath('//*[@id="submit"]').click()
     driver.find_element_by_xpath(
         '//*[@id="main-nav"]//*[contains(text(),"Settings")]').click()
     driver.find_element_by_link_text('Customers').click()

t/selenium/testrun.py

@@ -34,6 +34,7 @@ class testrun(unittest.TestCase):
         global filename
         filename = "test_a_create_subscriber.png"
         driver = self.driver
+        Collections.login_panel(driver)
         Collections.create_subscriber(self.driver)
         driver.find_element_by_link_text('Expand Groups').click()
         domainname = driver.find_element_by_xpath(
@@ -83,7 +84,7 @@ class testrun(unittest.TestCase):
         global filename
         filename = "test_c_call_blocking.png"
         driver = self.driver
-        Collections.login(driver, "testuser@" + domainname, "testpasswd")
+        Collections.login_csc(driver, "testuser@" + domainname, "testpasswd")
         WebDriverWait(driver, 10).until(EC.element_to_be_clickable((
             By.XPATH, '//*[@id="main-menu"]//div[@class="q-item-label"]'
             '[contains(text(), "Call Blocking")]')))
@@ -252,7 +253,7 @@ class testrun(unittest.TestCase):
             '//*[@id="q-app"]//div[contains(@class, "q-toggle")]//span'
             '[contains(text(), "Your number is hidden")]').is_displayed(),
             "Option 'hide number' was not enabled")
-        Collections.logout(driver)
+        Collections.logout_csc(driver)
         self.assertEqual(
             driver.current_url, os.environ['CATALYST_SERVER'] +
             "/login/subscriber/#/login", "Logout failed")
@@ -263,7 +264,7 @@ class testrun(unittest.TestCase):
         global filename
         filename = "test_d_call_forward_always.png"
         driver = self.driver
-        Collections.login(driver, "testuser@" + domainname, "testpasswd")
+        Collections.login_csc(driver, "testuser@" + domainname, "testpasswd")
         WebDriverWait(driver, 10).until(EC.element_to_be_clickable((
             By.XPATH, '//*[@id="main-menu"]//div[@class="q-item-label"]'
             '[contains(text(), "Call Forward")]')))
@@ -549,7 +550,7 @@ class testrun(unittest.TestCase):
             '//*[@id="q-app"]//div/span[contains(text(), "testsourceset")]'),
             "Second Source Set was not deleted")
         driver.implicitly_wait(10)
-        Collections.logout(driver)
+        Collections.logout_csc(driver)
         self.assertEqual(
             driver.current_url, os.environ['CATALYST_SERVER'] +
             "/login/subscriber/#/login", "Logout failed")
@@ -560,7 +561,7 @@ class testrun(unittest.TestCase):
         global filename
         filename = "test_e_conference_conversations.png"
         driver = self.driver
-        Collections.login(driver, "testuser@" + domainname, "testpasswd")
+        Collections.login_csc(driver, "testuser@" + domainname, "testpasswd")
         WebDriverWait(driver, 10).until(EC.element_to_be_clickable((
             By.XPATH, '//*[@id="main-menu"]//div[@class="q-item-label"]'
             '[contains(text(), "Join conference")]')))
@@ -613,7 +614,7 @@ class testrun(unittest.TestCase):
             '//*[@id="csc-conversation-content"]/div[@class="row justify-'
             'center csc-conversation-list-message"]').text, 'No Voicemails '
             'found', "Section 'Voicemails' is not empty")
-        Collections.logout(driver)
+        Collections.logout_csc(driver)
         self.assertEqual(
             driver.current_url, os.environ['CATALYST_SERVER'] +
             "/login/subscriber/#/login", "Logout failed")
@@ -624,7 +625,7 @@ class testrun(unittest.TestCase):
         global filename
         filename = "test_f_reminder.png"
         driver = self.driver
-        Collections.login(driver, "testuser@" + domainname, "testpasswd")
+        Collections.login_csc(driver, "testuser@" + domainname, "testpasswd")
         WebDriverWait(driver, 10).until(EC.element_to_be_clickable((
             By.XPATH, '//*[@id="main-menu"]//div[@class="q-item-label"]'
             '[contains(text(), "Reminder")]')))
@@ -674,7 +675,7 @@ class testrun(unittest.TestCase):
             '[contains(@class, "active")]/../'
             'span[contains(text(), "Always")]').is_displayed(),
             "Option 'Always' was not selected")
-        Collections.logout(driver)
+        Collections.logout_csc(driver)
         self.assertEqual(
             driver.current_url, os.environ['CATALYST_SERVER'] +
             "/login/subscriber/#/login", "Logout failed")
@@ -685,7 +686,7 @@ class testrun(unittest.TestCase):
         global filename
         filename = "test_g_settings.png"
         driver = self.driver
-        Collections.login(driver, "testuser@" + domainname, "testpasswd")
+        Collections.login_csc(driver, "testuser@" + domainname, "testpasswd")
         driver.find_element_by_xpath(
             '//*[@id="csc-header-toolbar"]/div[1]/button').click()
         driver.find_element_by_xpath(
@@ -710,7 +711,7 @@ class testrun(unittest.TestCase):
         self.assertEqual(
             driver.current_url, os.environ['CATALYST_SERVER'] +
             "/login/subscriber/#/login", "Logout failed")
-        Collections.login(driver, "testuser@" + domainname, "pass1234")
+        Collections.login_csc(driver, "testuser@" + domainname, "pass1234")
         self.assertEqual("testuser", driver.find_element_by_xpath(
             '//*[@id="csc-header-toolbar"]//div//span[contains(text(), '
             '"testuser")]').text, "Login failed")
@@ -745,7 +746,7 @@ class testrun(unittest.TestCase):
         global filename
         filename = "test_h_speed_dial.png"
         driver = self.driver
-        Collections.login(driver, "testuser@" + domainname, "testpasswd")
+        Collections.login_csc(driver, "testuser@" + domainname, "testpasswd")
         WebDriverWait(driver, 10).until(EC.element_to_be_clickable((
             By.XPATH, '//*[@id="main-menu"]//div[@class="q-item-label"]'
             '[contains(text(), "Speed Dial")]')))
@@ -818,7 +819,7 @@ class testrun(unittest.TestCase):
         self.assertTrue(driver.find_element_by_xpath(
             '//*[@id="q-app"]//div[contains(text(), "No speed dials found")]')
             .is_displayed(), "Speed dials was not deleted")
-        Collections.logout(driver)
+        Collections.logout_csc(driver)
         self.assertEqual(
             driver.current_url, os.environ['CATALYST_SERVER'] +
             "/login/subscriber/#/login", "Logout failed")
@@ -829,7 +830,7 @@ class testrun(unittest.TestCase):
         global filename
         filename = "test_i_voicebox.png"
         driver = self.driver
-        Collections.login(driver, "testuser@" + domainname, "testpasswd")
+        Collections.login_csc(driver, "testuser@" + domainname, "testpasswd")
         WebDriverWait(driver, 10).until(EC.element_to_be_clickable((
             By.XPATH, '//*[@id="main-menu"]//div[@class="q-item-label"]'
             '[contains(text(), "Voicebox")]')))
@@ -887,7 +888,7 @@ class testrun(unittest.TestCase):
             '/span[contains(text(), "Delete voicemail")]').is_displayed(),
             "Option 'Delete voicemail after email notification is delivered' "
             "was not enabled")
-        Collections.logout(driver)
+        Collections.logout_csc(driver)
         self.assertEqual(
             driver.current_url, os.environ['CATALYST_SERVER'] +
             "/login/subscriber/#/login", "Logout failed")
@@ -898,6 +899,7 @@ class testrun(unittest.TestCase):
         global filename
         filename = "test_z_delete_subscriber.png"
         driver = self.driver
+        Collections.login_panel(driver)
         Collections.delete_subscriber(driver)
         driver.find_element_by_link_text('Expand Groups').click()
         driver.execute_script(