Removed code used in bachelor site.

seleniumbender: Removed argument "--source" from tox commands.
config.py: Removed TEST_CREDENTIALS used when logging into the bachelor site.
           Removed names of sources used to generate the codebender site.
utils.py: Removed reference to TEST_CREDENTIALS in function login.
          Updated comment related to bachelor site in function compile_sketch.
conftest.py: Removed fixture requires_source since we have only codebender_cc source used
             to generate codebender site.
             Removed fixture source used to specify the source repository from which the
             site was derived (e.g. bachelor or codebender_cc).
             Removed Removed parser.addoption "--source" used to indicate the source used
             to generate the site.
             Removed TEST_CREDENTIALS used as default value in testing_credentials
             function.
test_home.py: Removed TEST_CREDENTIALS used for bachelor site from test_login function.
test_user_home.py: Removed functions test_create_project_blank_name,
                   test_create_project_invalid_name, test_create_project_valid_name since
                   the way that a project is created when Create sketch button is clicked
                   has changed.
                   Removed @pytest.mark.requires_source(SOURCE_CODEBENDER_CC).

Author: Konstantinacc

bin/seleniumbender

@@ -73,24 +73,24 @@ NO_LOGS=0 # flag for tests that do not send any logs on their email
 
 if [ "${target}" -eq 1 ]; then
     IDENTIFIER="test_target_libraries"
-    tox tests/target_libraries -- --url=${URL} --source=${SOURCE} -F --plugin --libraries=${TARGETS}
+    tox tests/target_libraries -- --url=${URL} -F --plugin --libraries=${TARGETS}
 elif [ "${examples}" -eq 1 ]; then
     IDENTIFIER="libraries_test"
-    tox tests/libraries -- --url=${URL} --source=${SOURCE} -F --plugin
+    tox tests/libraries -- --url=${URL} -F --plugin
 elif [ "${libraries}" -eq 1 ]; then
     IDENTIFIER="libraries_fetch"
-    tox tests/libraries_fetch -- --url=${URL} --source=${SOURCE} -F --plugin
+    tox tests/libraries_fetch -- --url=${URL} -F --plugin
 elif [ "${sketches}" -eq 1 ]; then
     IDENTIFIER="cb_compile_tester"
-    tox tests/compile_tester -- --url=${URL} --source=${SOURCE} -F --plugin
+    tox tests/compile_tester -- --url=${URL} -F --plugin
 elif [ "${common}" -eq 1 ]; then
     IDENTIFIER="common"
-    tox tests/common -- --url=${URL} --source=${SOURCE} --plugin
+    tox tests/common -- --url=${URL} --plugin
     RETVAL=$?
     NO_LOGS=1
 elif [ "${noplugin}" -eq 1 ]; then
     IDENTIFIER="noplugin"
-    tox tests/noplugin -- --url=${URL} --source=${SOURCE}
+    tox tests/noplugin -- --url=${URL}
     RETVAL=$?
     NO_LOGS=1
 elif [ "${walkthrough}" -eq 1 ]; then
@@ -99,17 +99,17 @@ elif [ "${walkthrough}" -eq 1 ]; then
     # Linux
     export SELENIUM_USER_AGENT_CHROME='Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/47.0.2526.106 Safari/537.36'
     export SELENIUM_USER_AGENT='Mozilla/5.0 (X11; Ubuntu; Linux x86_64; rv:43.0) Gecko/20100101 Firefox/43.0 codebender-selenium'
-    tox tests/walkthrough -- --url=${URL} --source=${SOURCE} --plugin
+    tox tests/walkthrough -- --url=${URL} --plugin
     RETVALS+=($?)
     # Windows
     export SELENIUM_USER_AGENT_CHROME='Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/47.0.2526.106 Safari/537.36'
     export SELENIUM_USER_AGENT='Mozilla/5.0 (Windows NT 6.1; rv:43.0) Gecko/20100101 Firefox/43.0 codebender-selenium'
-    tox tests/walkthrough -- --url=${URL} --source=${SOURCE} --plugin
+    tox tests/walkthrough -- --url=${URL} --plugin
     RETVALS+=($?)
     # MacOSX
     export SELENIUM_USER_AGENT_CHROME='Mozilla/5.0 (Macintosh; Intel Mac OS X 10_11_1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/47.0.2526.106 Safari/537.36'
     export SELENIUM_USER_AGENT='Mozilla/5.0 (Macintosh; Intel Mac OS X 10_11_1; rv:43.0) Gecko/20100101 Firefox/43.0 codebender-selenium'
-    tox tests/walkthrough -- --url=${URL} --source=${SOURCE} --plugin
+    tox tests/walkthrough -- --url=${URL} --plugin
     RETVALS+=($?)
 
     for i in "${RETVALS[@]}"
@@ -122,7 +122,7 @@ elif [ "${walkthrough}" -eq 1 ]; then
 elif [ "${staging}" -eq 1 ]; then
     IDENTIFIER="cb_compile_tester_staging"
     URL="https://staging.codebender.cc"
-    tox tests/compile_tester -- --url=${URL} --source=${SOURCE} -F --plugin
+    tox tests/compile_tester -- --url=${URL} -F --plugin
     # No need to send email for tests in staging
     exit $?
 fi

codebender_testing/config.py

@@ -30,10 +30,6 @@ def jsondump(data):
 LIVE_SITE_URL = "https://codebender.cc"
 STAGING_SITE_URL = "https://staging.codebender.cc"
 
-# Names of sources (i.e. repositories) used to generate the codebender site.
-SOURCE_BACHELOR = 'bachelor'
-SOURCE_CODEBENDER_CC = 'codebender_cc'
-
 # User whose projects we'd like to compile in our compile_tester
 # test case(s).
 COMPILE_TESTER_URL = "/user/cb_compile_tester"
@@ -80,12 +76,6 @@ def jsondump(data):
 # Directory in which the local compile tester files are stored.
 COMPILE_TESTER_DIR = os.path.join(TEST_DATA_DIR, 'cb_compile_tester')
 
-# Credentials to use when logging into the bachelor site.
-TEST_CREDENTIALS = {
-    "username": "tester",
-    "password": "testerPASS"
-}
-
 TEST_PROJECT_NAME = "test_project"
 
 TIMEOUT = {

codebender_testing/utils.py

@@ -23,7 +23,6 @@
 
 from codebender_testing.config import BASE_URL
 from codebender_testing.config import TIMEOUT
-from codebender_testing.config import TEST_CREDENTIALS
 from codebender_testing.config import TEST_PROJECT_NAME
 from codebender_testing.config import get_path
 from codebender_testing.config import jsondump
@@ -312,8 +311,6 @@ def login(self, credentials=None):
         unspecified location when calling this function.
         `credentials` should be a dict with keys 'username' and 'password',
         mapped to the appropriate values."""
-        if credentials is None:
-            credentials = TEST_CREDENTIALS
         try:
             self.open()
             login_button = self.driver.find_element_by_id('login_btn')
@@ -495,9 +492,7 @@ def compile_sketch(self, url, boards, iframe=False, project_view=False):
             try:
                 self.execute_script(SELECT_BOARD_SCRIPT(board), '$', 'compilerflasher.pluginHandler.plugin_found')
                 self.execute_script(_VERIFY_SCRIPT, 'compilerflasher')
-                # In the BACHELOR site the id is 'operation_output', but in the live
-                # site the id is 'cb_cf_operation_output'. The [id$=operation_output]
-                # here selects an id that _ends_ with 'operation_output'.
+                # The [id$=operation_output] here selects an id that _ends_ with 'operation_output'.
                 compile_result = WebDriverWait(self.driver, VERIFY_TIMEOUT).until(
                     any_text_to_be_present_in_element(
                         (By.CSS_SELECTOR, "[id$=operation_output]"),

tests/common/home/test_home.py

@@ -13,8 +13,8 @@ def test_navigate_home(self, tester_logout):
 
     def test_login(self, tester_logout):
         credentials = {
-            'username': os.environ.get('CODEBENDER_TEST_USER', config.TEST_CREDENTIALS['username']),
-            'password': os.environ.get('CODEBENDER_TEST_PASS', config.TEST_CREDENTIALS['password']),
+            'username': os.environ.get('CODEBENDER_TEST_USER'),
+            'password': os.environ.get('CODEBENDER_TEST_PASS'),
         }
         driver = self.driver
         self.open("/")

tests/common/user_home/test_user_home.py

@@ -3,8 +3,6 @@
 
 from codebender_testing.config import TEST_DATA_INO
 from codebender_testing.config import TEST_DATA_ZIP
-from codebender_testing.config import SOURCE_BACHELOR
-from codebender_testing.config import SOURCE_CODEBENDER_CC
 from codebender_testing.utils import SeleniumTestCase
 
 
@@ -19,45 +17,6 @@ def open_user_home(self, tester_login):
         performing any of these tests."""
         pass
 
-    @pytest.mark.requires_source(SOURCE_BACHELOR)
-    def test_create_project_blank_name(self):
-        """Test that we get an error when creating a project with no name."""
-        create_button = self.get_element(By.CSS_SELECTOR, '.form-search button')
-        create_button.click()
-        error_heading = self.get_element(By.CSS_SELECTOR, '.alert h4')
-        assert error_heading.text.startswith('Error')
-
-    @pytest.mark.requires_source(SOURCE_BACHELOR)
-    def test_create_project_invalid_name(self):
-        """Test that we get an error when creating a project with an
-        invalid name (e.g., a name containing a backslash).
-        """
-        project_name_input = self.get_element(By.CSS_SELECTOR,
-                                              '.form-search input[type=text]')
-        project_name_input.clear()
-        project_name_input.send_keys('foo\\bar')
-        create_button = self.get_element(By.CSS_SELECTOR, '.form-search button')
-        create_button.click()
-
-        error_heading = self.get_element(By.CSS_SELECTOR, '.alert h4')
-        assert error_heading.text.startswith('Error')
-
-    @pytest.mark.requires_source(SOURCE_BACHELOR)
-    def test_create_project_valid_name(self):
-        """Test that we can successfully create a project with a valid name."""
-        project_name_input = self.get_element(By.CSS_SELECTOR,
-                                              '.form-search input[type=text]')
-        project_name_input.clear()
-        project_name_input.send_keys(NEW_PROJECT_NAME)
-        create_button = self.get_element(By.CSS_SELECTOR, '.form-search button')
-        create_button.click()
-
-        project_heading = self.get_element(By.ID, 'editor_heading_project_name')
-        assert project_heading.text == NEW_PROJECT_NAME
-
-        # Cleanup: delete the project we just created.
-        self.delete_project(NEW_PROJECT_NAME)
-
     def _upload_test(self, dropzone_selector, test_fname, sketch_name=None):
         """Tests that we can successfully upload `test_fname`.
         `project_name` is the expected name of the project; by
@@ -72,12 +31,10 @@ def _upload_test(self, dropzone_selector, test_fname, sketch_name=None):
         finally:
             self.delete_project(upload_name)
 
-    @pytest.mark.requires_source(SOURCE_CODEBENDER_CC)
     def test_upload_project_ino(self):
         """Tests that we can upload a .ino file."""
         self._upload_test('#uploadInoModal form', TEST_DATA_INO)
 
-    @pytest.mark.requires_source(SOURCE_CODEBENDER_CC)
     def test_upload_project_zip(self):
         """Tests that we can successfully upload a zipped project."""
         # TODO: how is the project name inferred from the zip file?

tests/conftest.py

@@ -24,11 +24,6 @@ def pytest_addoption(parser):
                      help="Run the complete set of compile tests "
                           "(a minimal set of tests is run by default).")
 
-    parser.addoption("-S", "--source", action="store", default=config.SOURCE_BACHELOR,
-                     help="Indicate the source used to generate the repo. "
-                          "By default, we assume `bachelor`. "
-                          "You can instead use `codebender_cc` for the live site.")
-
     parser.addoption("-C", "--capabilities", action="store",
                      default=config.DEFAULT_CAPABILITIES_FILE_PATH,
                      help="Custom path to a YAML file containing a capability list.")
@@ -85,24 +80,14 @@ def testing_url(request):
     """A fixture to get the --url parameter."""
     return request.config.getoption("--url")
 
-
-@pytest.fixture(scope="class")
-def source(request):
-    """A fixture to specify the source repository from which the site was
-    derived (e.g. bachelor or codebender_cc)
-    """
-    return request.config.getoption("--source")
-
-
 @pytest.fixture(scope="class")
 def testing_credentials(request):
     """A fixture to get testing credentials specified via the environment
-    variables CODEBENDER_TEST_USER and CODEBENDER_TEST_PASS. Defaults to the
-    credentials specified in config.TEST_CREDENTIALS.
+    variables CODEBENDER_TEST_USER and CODEBENDER_TEST_PASS.
     """
     return {
-        'username': os.environ.get('CODEBENDER_TEST_USER', config.TEST_CREDENTIALS['username']),
-        'password': os.environ.get('CODEBENDER_TEST_PASS', config.TEST_CREDENTIALS['password']),
+        'username': os.environ.get('CODEBENDER_TEST_USER'),
+        'password': os.environ.get('CODEBENDER_TEST_PASS'),
     }
 
 
@@ -111,26 +96,6 @@ def testing_full(request):
     """A fixture to get the --full parameter."""
     return request.config.getoption("--full")
 
-
-@pytest.fixture(autouse=True)
-def requires_source(request, source):
-    """Skips tests that require a certain source version (e.g. bachelor or
-    codebender_cc) in order to run properly.
-
-    This functionality should be invoked as a pytest marker, e.g.:
-
-    ```
-    @pytest.mark.requires_source("bachelor")
-    def test_some_feature():
-        ...
-    ```
-    """
-    if request.node.get_marker('requires_source'):
-        required_source = request.node.get_marker('requires_source').args[0]
-        if required_source != source:
-            pytest.skip('skipped test that requires --source=' + source)
-
-
 @pytest.fixture(autouse=True)
 def requires_url(request, testing_url):
     """Skips tests that require a certain site URL in order to run properly.