Renamed class for walkthrough.

Improved logic at walkthrough test.

Author: freskoulix

codebender_testing/config.py

@@ -80,16 +80,17 @@ def jsondump(data):
 TEST_PROJECT_NAME = "test_project"
 
 TIMEOUT = {
-    'LOCATE_ELEMENT': 30
+    'LOCATE_ELEMENT': 30,
+    'FLASH_FAIL': 30
 }
 
-DEFAULT_USER_AGENT = 'Mozilla/5.0 (X11; Ubuntu; Linux x86_64; rv:43.0) Gecko/20100101 Firefox/43.0 codebender-selenium'
-TESTS_USER_AGENT = os.getenv('SELENIUM_USER_AGENT', DEFAULT_USER_AGENT)
+DEFAULT_USER_AGENT_FIREFOX = 'Mozilla/5.0 (X11; Ubuntu; Linux x86_64; rv:43.0) Gecko/20100101 Firefox/43.0 codebender-selenium'
+TESTS_USER_AGENT_FIREFOX = os.getenv('SELENIUM_USER_AGENT', DEFAULT_USER_AGENT_FIREFOX)
 
 DEFAULT_USER_AGENT_CHROME = 'Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/47.0.2526.106 Safari/537.36'
 TESTS_USER_AGENT_CHROME = os.getenv('SELENIUM_USER_AGENT_CHROME', DEFAULT_USER_AGENT_CHROME)
 
-BROWSER = "firefox"
+SELENIUM_BROWSER = 'firefox'
 
 # Set up Selenium Webdrivers to be used for selenium tests.
 def _get_firefox_profile():
@@ -141,15 +142,16 @@ def create_webdriver(command_executor, desired_capabilities):
     browser_profile = None
     browser_profile_path = None
 
+    SELENIUM_BROWSER = browser_name
+
     if browser_name == "chrome":
-        BROWSER = "chrome"
         desired_capabilities = DesiredCapabilities.CHROME.copy()
         desired_capabilities.update(_capabilities)
         options = chrome.options.Options()
         browser_profile_path = os.path.join('/tmp', _get_chrome_profile())
         options.add_argument('--user-data-dir=' + browser_profile_path)
         if desired_capabilities["version"] > CHROME_EXT_MAX_CHROME_VERSION:
-            # Add new chrome extension to capabilities.
+            # Add the chrome app to capabilities.
             options.add_extension(os.path.join(_EXTENSIONS_DIR, _CHROME_APP_FNAME))
             options.add_argument("--user-agent=" + TESTS_USER_AGENT_CHROME)
         else:
@@ -164,7 +166,7 @@ def create_webdriver(command_executor, desired_capabilities):
         desired_capabilities.update(_capabilities)
         browser_profile = _get_firefox_profile()
         browser_profile_path = browser_profile.path
-        browser_profile.set_preference("general.useragent.override", TESTS_USER_AGENT)
+        browser_profile.set_preference("general.useragent.override", TESTS_USER_AGENT_FIREFOX)
         desired_capabilities["firefox_profile"] = browser_profile.update_preferences()
     else:
         raise ValueError("Invalid webdriver %s (only chrome and firefox are supported)" % browser_name)

tests/walkthrough/test_walkthrough.py

@@ -1,16 +1,17 @@
 from selenium.webdriver.common.by import By
+from selenium.webdriver.support import expected_conditions
+from selenium.webdriver.support.ui import WebDriverWait
 import pytest
-
-from codebender_testing.config import TESTS_USER_AGENT
-from codebender_testing.config import TESTS_USER_AGENT_CHROME
-from codebender_testing.config import BROWSER
+import os
+from codebender_testing.config import SELENIUM_BROWSER
+from codebender_testing.config import TIMEOUT
 from codebender_testing.utils import SeleniumTestCase
 from codebender_testing.utils import SELECT_BOARD_SCRIPT
 
 TEST_BOARD = 'Arduino Uno'
 
 
-class TestUserHome(SeleniumTestCase):
+class TestWalkthrough(SeleniumTestCase):
 
     @pytest.fixture(scope="class", autouse=True)
     def open_user_home(self, tester_login):
@@ -29,20 +30,11 @@ def test_page_2(self):
 
     def test_page_3(self):
         """Test page 3"""
-        if BROWSER == "firefox":
-            if 'Linux' in TESTS_USER_AGENT:
-                self.get_element(By.CSS_SELECTOR, '#linux-directions .btn:nth-child(2)').click()
-            elif 'Windows' in TESTS_USER_AGENT:
-                self.get_element(By.CSS_SELECTOR, '#windows-directions .btn:nth-child(2)').click()
-            elif 'Mac' in TESTS_USER_AGENT:
-                self.get_element(By.CSS_SELECTOR, '#mac-directions .btn:nth-child(2)').click()
-        elif BROWSER == "chrome":
-            if 'Linux' in TESTS_USER_AGENT_CHROME:
-                self.get_element(By.CSS_SELECTOR, '#linux-directions .btn:nth-child(2)').click()
-            elif 'Windows' in TESTS_USER_AGENT_CHROME:
-                self.get_element(By.CSS_SELECTOR, '#windows-directions .btn:nth-child(2)').click()
-            elif 'Mac' in TESTS_USER_AGENT_CHROME:
-                self.get_element(By.CSS_SELECTOR, '#mac-directions .btn:nth-child(2)').click()
+        user_agent = self.execute_script('return navigator.userAgent')
+        platforms = ['Linux', 'Windows', 'Mac']
+        for platform in platforms:
+            if platform in user_agent:
+                self.get_element(By.CSS_SELECTOR, '#{0}-directions .btn:nth-child(2)'.format(platform.lower())).click()
 
     def test_page_4(self):
         """Test page 4"""
@@ -54,8 +46,15 @@ def test_page_4(self):
         cb_cf_flash_btn = self.get_element(By.CSS_SELECTOR, '#cb_cf_flash_btn')
         assert cb_cf_flash_btn.is_displayed()
         cb_cf_flash_btn.click()
+        WebDriverWait(self.driver, TIMEOUT['FLASH_FAIL']).until(
+            expected_conditions.element_to_be_clickable((By.CSS_SELECTOR, '#cb_cf_flash_btn'))
+        )
         cb_cf_operation_output = self.get_element(By.CSS_SELECTOR, '#cb_cf_operation_output')
-        assert cb_cf_operation_output.text.strip() == 'Please select a valid port!'
+        assert cb_cf_operation_output.text.strip() in [
+            'Please select a valid port!',
+            'The specified port might not be available. Please check if it is used by another application. If the problem persists, unplug your device and plug it again. More Info',
+            'An error occurred while connecting to your device. Please try again.'
+        ]
         board_image = self.get_element(By.CSS_SELECTOR, '#arduinoImg')
         assert board_image.is_displayed()