Cleaned up

example/android/python/app_simple.py

@@ -11,9 +11,10 @@ class SimpleAndroidUITests(unittest.TestCase):
             'deviceName': 'Android Emulator',
             'automationName': 'UIAutomator2',
             'app': '/root/tmp/sample_apk_debug.apk',
-            'avd': 'samsung_galaxy_s6_7.1.1'
+            'browserName': 'android',
+            'avd': 'nexus_5_7.1.1'
         }
-        self.driver = webdriver.Remote('http://127.0.0.1:4723/wd/hub', desired_caps)
+        self.driver = webdriver.Remote('http://127.0.0.1:4444/wd/hub', desired_caps)
 
     def tearDown(self):
         self.driver.quit()

example/android/python/msite_simple_chrome.py

@@ -13,9 +13,10 @@ class MSiteChromeAndroidUITests(unittest.TestCase):
             'deviceName': 'Android Emulator',
             'appPackage': 'com.android.chrome',
             'appActivity': 'com.google.android.apps.chrome.Main',
-            'avd': 'samsung_galaxy_s6_7.1.1'
+            'browserName': 'chrome',
+            'ignore-certificate-errors': True
         }
-        self.driver = webdriver.Remote('http://127.0.0.1:4723/wd/hub', desired_caps)
+        self.driver = webdriver.Remote('http://127.0.0.1:4444/wd/hub', desired_caps)
 
     def test_open_url(self):
         self.driver.get('http://targeturl.com')

example/android/python/msite_simple_default_browser.py

@@ -13,9 +13,9 @@ class MSiteDefaultBrowserAndroidUITests(unittest.TestCase):
             'deviceName': 'Android Emulator',
             'appPackage': 'com.android.browser',
             'appActivity': 'com.android.browser.BrowserActivity',
-            'avd': 'samsung_galaxy_s6_6.0'
+            'browserName': 'browser'
         }
-        self.driver = webdriver.Remote('http://127.0.0.1:4723/wd/hub', desired_caps)
+        self.driver = webdriver.Remote('http://127.0.0.1:4444/wd/hub', desired_caps)
 
     def test_open_url(self):
         self.driver.get('http://targeturl.com')

example/compose/README.md

@@ -1,16 +0,0 @@
-[docker-compose.yml](/example/compose/docker-compose.yml) file for setting up selenium grid.
------------------------------------------------------
-
-Example compose file which can be used to set up selenium grid hub with emulator nodes connected to it
-![](/images/compose_selenium_grid.png)
-
-Requirements
-============
-docker-compose   
-for `scale:` option docker-compose v1.13.0 and newer is required
-
-Quick Start
-===========
-```bash
-docker-compose up
-```

example/compose/docker-compose.yml

@@ -1,31 +0,0 @@
-version: "2.2"
-services:
-  hub:
-    image: selenium/hub:3.4.0
-    ports:
-      - "4444:4444"
-
-  node_samsung_7.1.1:
-    image: butomo1989/docker-android-x86-7.1.1
-    privileged: true
-    scale: 2
-    ports:
-      - 6080
-    environment:
-      - DEVICE=Samsung Galaxy S6
-      - CONNECT_TO_GRID=True
-      - APPIUM=true
-      - SELENIUM_HOST=hub
-
-  node_nexus_web_7.1.1:
-    image: butomo1989/docker-android-x86-7.1.1
-    privileged: true
-    scale: 2
-    ports:
-      - 6080
-    environment:
-      - DEVICE=Nexus 5
-      - CONNECT_TO_GRID=True
-      - APPIUM=true
-      - SELENIUM_HOST=hub
-      - MOBILE_WEB_TEST=True