Remove Remote driver for mobile tests

shopelectro/tests/tests_analytics.py

@@ -27,7 +27,7 @@ def test_google_ecommerce_purchase(self):
         order_page.make_order()
 
         success_page = selenium.SuccessPage(self.browser)
-        assert success_page.is_success()
+        self.assertTrue(success_page.is_success())
 
         order = Order.objects.order_by('-created').first()
         reached = self.browser.execute_script('return gaObject.results;')

shopelectro/tests/tests_selenium.py

@@ -934,7 +934,7 @@ def buy_product(self):
 
     def go_to_cart(self):
         self.click(self.CART_LOCATOR)
-        self.wait.until(EC.url_to_be(self.order_page_url))
+        self.wait.until(EC.url_contains(self.order_page_url))
 
     def test_download_header_price(self):
         """User clicks Download price button in site's header."""

shopelectro/tests/tests_selenium_mobile.py

@@ -12,6 +12,7 @@
 from selenium.webdriver.support import expected_conditions as EC
 from selenium.webdriver.support.ui import WebDriverWait
 
+from shopelectro.selenium import SiteDriver
 from shopelectro.models import Product
 
 
@@ -31,14 +32,17 @@ def setUpClass(cls):
                 'deviceName': 'Apple iPhone 5',
             },
         }
-        cls.browser = webdriver.Remote(
-            command_executor=settings.SELENIUM_URL,
-            desired_capabilities=capabilities
+        cls.browser = SiteDriver(
+            site_url=cls.live_server_url,
+            desired_capabilities=capabilities,
         )
-        cls.wait = WebDriverWait(cls.browser, 120)
         cls.browser.set_window_size(400, 800)
         cls.browser.implicitly_wait(10)
 
+    @property
+    def wait(self):
+        return self.browser.wait
+
     @classmethod
     def tearDownClass(cls):
         """Close selenium session."""