Merge pull request SatelliteQE#1702 from sghai/zstream-fixes

Fixed few more UI failures
devendra104 · Nov 19, 2014 · fe9dd25 · fe9dd25
2 parents bfd710a + aa0b29c
commit fe9dd25
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 7 deletions.
diff --git a/robottelo/ui/computeresource.py b/robottelo/ui/computeresource.py
@@ -82,6 +82,7 @@ def search(self, name):
         Searches existing compute resource from UI
         """
         Navigator(self.browser).go_to_compute_resources()
+        self.wait_for_ajax()
         element = self.search_entity(name, locators["resource.select_name"])
         return element
 

diff --git a/robottelo/ui/configgroups.py b/robottelo/ui/configgroups.py
@@ -45,6 +45,7 @@ def search(self, name):
         Searches existing config-groups from UI
         """
         Navigator(self.browser).go_to_config_groups()
+        self.wait_for_ajax()
         element = self.search_entity(name,
                                      locators["config_groups.select_name"])
         return element

diff --git a/robottelo/ui/domain.py b/robottelo/ui/domain.py
@@ -46,6 +46,7 @@ def search(self, description, timeout=None):
         Searches existing domain from UI
         """
         Navigator(self.browser).go_to_domains()
+        self.wait_for_ajax()
         element = self.search_entity(description,
                                      locators["domain.domain_description"],
                                      timeout=timeout)

diff --git a/robottelo/ui/location.py b/robottelo/ui/location.py
@@ -120,6 +120,7 @@ def search(self, name):
         Searches existing location from UI
         """
         nav(self.browser).go_to_loc()
+        self.wait_for_ajax()
         element = self.search_entity(name, locators["location.select_name"])
         return element
 

diff --git a/robottelo/ui/medium.py b/robottelo/ui/medium.py
@@ -51,6 +51,7 @@ def search(self, name):
         Searches existing medium from UI
         """
         Navigator(self.browser).go_to_installation_media()
+        self.wait_for_ajax()
         element = self.search_entity(name, locators["medium.medium_name"])
         return element
 

diff --git a/robottelo/ui/org.py b/robottelo/ui/org.py
@@ -122,6 +122,7 @@ def search(self, name):
         Searches existing Organization from UI
         """
         nav(self.browser).go_to_org()
+        self.wait_for_ajax()
         element = self.search_entity(name, locators["org.org_name"])
         return element
 

diff --git a/tests/foreman/ui/test_location.py b/tests/foreman/ui/test_location.py
@@ -77,7 +77,7 @@ def test_negative_create_1(self, loc_name):
         @BZ: 1123818
         """
         with Session(self.browser) as session:
-            make_loc(session, name=loc_name)
+            make_loc(session, name=loc_name, edit=False)
             error = session.nav.wait_until_element(
                 common_locators["name_haserror"])
             self.assertIsNotNone(error)
@@ -91,7 +91,7 @@ def test_negative_create_2(self):
 
         loc_name = ""
         with Session(self.browser) as session:
-            make_loc(session, name=loc_name)
+            make_loc(session, name=loc_name, edit=False)
             error = session.nav.wait_until_element(
                 common_locators["name_haserror"])
             self.assertIsNotNone(error)
@@ -105,7 +105,7 @@ def test_negative_create_3(self):
 
         loc_name = "    "
         with Session(self.browser) as session:
-            make_loc(session, name=loc_name)
+            make_loc(session, name=loc_name, edit=False)
             error = session.nav.wait_until_element(
                 common_locators["name_haserror"])
             self.assertIsNotNone(error)
@@ -123,7 +123,7 @@ def test_negative_create_4(self, loc_name):
         with Session(self.browser) as session:
             make_loc(session, name=loc_name)
             self.assertIsNotNone(self.location.search(loc_name))
-            make_loc(session, name=loc_name)
+            make_loc(session, name=loc_name, edit=False)
             error = session.nav.wait_until_element(
                 common_locators["name_haserror"])
             self.assertIsNotNone(error)

diff --git a/tests/foreman/ui/test_org.py b/tests/foreman/ui/test_org.py
@@ -204,7 +204,7 @@ def test_negative_create_0(self, org_name):
         @assert: organization is not created
         """
         with Session(self.browser) as session:
-            make_org(session, org_name=org_name)
+            make_org(session, org_name=org_name, edit=False)
             error = session.nav.wait_until_element(
                 common_locators["name_haserror"])
             self.assertIsNotNone(error)
@@ -218,7 +218,7 @@ def test_negative_create_1(self):
         """
         org_name = ""
         with Session(self.browser) as session:
-            make_org(session, org_name=org_name)
+            make_org(session, org_name=org_name, edit=False)
             error = session.nav.wait_until_element(
                 common_locators["name_haserror"])
             self.assertIsNotNone(error)
@@ -232,7 +232,7 @@ def test_negative_create_2(self):
         """
         org_name = "    "
         with Session(self.browser) as session:
-            make_org(session, org_name=org_name)
+            make_org(session, org_name=org_name, edit=False)
             error = session.nav.wait_until_element(
                 common_locators["name_haserror"])
             self.assertIsNotNone(error)