rapid-router 5.4.1__py2.py3-none-any.whl → 7.6.8__py2.py3-none-any.whl

game/end_to_end_tests/game_page.py

@@ -1,7 +1,8 @@
 from __future__ import print_function
-from builtins import str
+
 import os
 import time
+from builtins import str
 
 from django.urls import reverse
 from hamcrest import assert_that, equal_to, contains_string, ends_with
@@ -18,6 +19,10 @@ class GamePage(BasePage):
     def __init__(self, browser):
         super(GamePage, self).__init__(browser)
 
+        self.browser.execute_script(
+            "ocargo.animation.FAST_ANIMATION_DURATION = 1;"
+        )
+
         assert self.on_correct_page("game_page")
 
         self._dismiss_initial_dialog()
@@ -27,21 +32,41 @@ class GamePage(BasePage):
         return self
 
     def dismiss_dialog(self, button_id):
-        self.wait_for_element_to_be_clickable((By.ID, button_id), wait_seconds=15)
-        self.browser.find_element_by_id(button_id).click()
-        self.wait_for_element_to_be_invisible((By.ID, button_id), wait_seconds=15)
+        self.wait_for_element_to_be_clickable(
+            (By.ID, button_id), wait_seconds=15
+        )
+        self.browser.find_element(By.ID, button_id).click()
+        self.wait_for_element_to_be_invisible(
+            (By.ID, button_id), wait_seconds=15
+        )
+
+    def save_solution(self, workspace_name):
+        self.browser.find_element(By.ID, "save_tab").click()
+        self.browser.find_element(By.ID, "workspaceNameInput").send_keys(
+            workspace_name
+        )
+        self.browser.find_element(By.ID, "saveWorkspace").click()
+        return self
+
+    def load_solution_by_name(self, solution_name):
+        self.browser.find_element(By.ID, "load_tab").click()
+        time.sleep(1)
+        self.browser.find_element(By.ID, solution_name).click()
+        self.browser.find_element(By.ID, "loadWorkspace").click()
+        time.sleep(1)
+        return self
 
     def load_solution(self, workspace_id):
-        self.browser.find_element_by_id("load_tab").click()
+        self.browser.find_element(By.ID, "load_tab").click()
         selector = "#loadWorkspaceTable tr[value='" + str(workspace_id) + "']"
         self.wait_for_element_to_be_clickable((By.CSS_SELECTOR, selector))
-        self.browser.find_element_by_css_selector(selector).click()
-        self.browser.find_element_by_id("loadWorkspace").click()
+        self.browser.find_element(By.CSS_SELECTOR, selector).click()
+        self.browser.find_element(By.ID, "loadWorkspace").click()
         time.sleep(1)
         return self
 
     def clear(self):
-        self.browser.find_element_by_id("clear_tab").click()
+        self.browser.find_element(By.ID, "clear_tab").click()
         return self
 
     def try_again(self):
@@ -49,12 +74,14 @@ class GamePage(BasePage):
         return self
 
     def step(self):
-        self.browser.find_element_by_id("step_tab").click()
+        self.browser.find_element(By.ID, "step_tab").click()
         return self
 
     def solution_button(self):
-        self.browser.find_element_by_id("solution_tab").click()
-        solution_loaded = self.browser.execute_script("return ocargo.solutionLoaded;")
+        self.browser.find_element(By.ID, "solution_tab").click()
+        solution_loaded = self.browser.execute_script(
+            "return ocargo.solutionLoaded;"
+        )
         timeout = time.time() + 30
 
         while not solution_loaded:
@@ -66,20 +93,34 @@ class GamePage(BasePage):
         return self
 
     def python_commands_button(self):
-        self.browser.find_element_by_id("van_commands_help").click()
+        self.browser.find_element(By.ID, "van_commands_help").click()
         return self
 
     def clear_console_button(self):
-        self.browser.find_element_by_id("clear_console").click()
+        self.browser.find_element(By.ID, "clear_console").click()
         return self
 
-    def assert_level_number(self, level_number):
-        path = reverse("play_default_level", kwargs={"levelName": str(level_number)})
-        assert_that(self.browser.current_url.replace("#myModal", ""), ends_with(path))
+    def assert_level_number(self, level_number, from_python_den):
+        viewname = (
+            "play_python_default_level"
+            if from_python_den
+            else "play_default_level"
+        )
 
-    def assert_episode_number(self, episode_number):
-        path = reverse("start_episode", kwargs={"episodeId": str(episode_number)})
-        assert_that(self.browser.current_url.replace("#myModal", ""), ends_with(path))
+        path = reverse(viewname, kwargs={"level_name": str(level_number)})
+        assert_that(
+            self.browser.current_url.replace("#myModal", ""), ends_with(path)
+        )
+
+    def assert_episode_number(self, episode_number, from_python_den):
+        viewname = (
+            "start_python_episode" if from_python_den else "start_episode"
+        )
+
+        path = reverse(viewname, kwargs={"episodeId": str(episode_number)})
+        assert_that(
+            self.browser.current_url.replace("#myModal", ""), ends_with(path)
+        )
 
     def assert_is_green_light(self, traffic_light_index):
         self._assert_light_is_on(traffic_light_index, "green")
@@ -88,20 +129,20 @@ class GamePage(BasePage):
         self._assert_light_is_on(traffic_light_index, "red")
 
     def _assert_light_is_on(self, traffic_light_index, colour):
-        image = self.browser.find_element_by_id(
-            "trafficLight_%s_%s" % (traffic_light_index, colour)
+        image = self.browser.find_element(
+            By.ID, "trafficLight_%s_%s" % (traffic_light_index, colour)
         )
 
         assert_that(image.get_attribute("opacity"), equal_to("1"))
 
     def run_program(self, wait_for_element_id="modal-content"):
-        self.browser.find_element_by_id("fast_tab").click()
+        self.browser.find_element(By.ID, "fast_tab").click()
 
         try:
-            self.wait_for_element_to_be_clickable((By.ID, wait_for_element_id), 45)
+            self.wait_for_element_to_be_clickable(
+                (By.ID, wait_for_element_id), 45
+            )
         except TimeoutException as e:
-            import time
-
             millis = int(round(time.time() * 1000))
             screenshot_filename = "/tmp/game_tests_%s-%s.png" % (
                 os.getenv("BUILD_NUMBER", "nonumber"),
@@ -115,9 +156,11 @@ class GamePage(BasePage):
 
     def run_retry_program(self):
         self.run_program("try_again_button")
-        modal_content = self.browser.find_element_by_id("modal-content").text
-        assert_that(modal_content, contains_string("Try creating a simpler program."))
-        self.browser.find_element_by_id("try_again_button").click()
+        modal_content = self.browser.find_element(By.ID, "modal-content").text
+        assert_that(
+            modal_content, contains_string("Try creating a simpler program.")
+        )
+        self.browser.find_element(By.ID, "try_again_button").click()
         time.sleep(1)
         return self
 
@@ -170,10 +213,24 @@ class GamePage(BasePage):
             "from van import Va", "You can only import 'Van' from 'van'"
         )
 
+    def run_animal_sound_horn_program(self):
+        return self._run_working_program(
+            """
+while not my_van.at_destination():
+  if my_van.is_animal_crossing():
+    my_van.sound_horn()
+  if my_van.is_road_forward():
+    my_van.move_forwards()
+  elif my_van.is_road_left():
+    my_van.turn_left()
+  else:
+    my_van.turn_right()""",
+        )
+
     def check_python_commands(self):
         self.python_commands_button()
         time.sleep(1)
-        python_commands = self.browser.find_element_by_id("myModal-lead").text
+        python_commands = self.browser.find_element(By.ID, "myModal-lead").text
         assert_that(
             python_commands,
             contains_string("Run the following commands on the van object v"),
@@ -182,51 +239,74 @@ class GamePage(BasePage):
 
     def write_to_then_clear_console(self):
         self._write_code("my_van.")
-        self.browser.find_element_by_id("fast_tab").click()
+        self.browser.find_element(By.ID, "fast_tab").click()
         time.sleep(1)
-        console = self.browser.find_element_by_id("consoleOutput")
+        console = self.browser.find_element(By.ID, "consoleOutput")
         self.clear_console_button()
         assert_that(console.text == "")
         return self
 
-    def next_episode(self):
+    def next_episode(self, from_python_den=False):
+        self.assert_success()
+        self.browser.find_element(By.ID, "next_episode_button").click()
+
+        tabId = "python_tab" if from_python_den else "blockly_tab"
+
+        WebDriverWait(self.browser, 10).until(
+            presence_of_all_elements_located((By.ID, tabId))
+        )
+        return self
+
+    def next_level(self, from_python_den=False):
         self.assert_success()
-        self.browser.find_element_by_id("next_episode_button").click()
+        self.browser.find_element(By.ID, "next_level_button").click()
+
+        tabId = "python_tab" if from_python_den else "blockly_tab"
+
         WebDriverWait(self.browser, 10).until(
-            presence_of_all_elements_located((By.ID, "blockly_tab"))
+            presence_of_all_elements_located((By.ID, tabId))
         )
         return self
 
-    def next_level(self):
+    def next_level_redirected(self, from_python_den=False):
         self.assert_success()
-        self.browser.find_element_by_id("next_level_button").click()
+        self.browser.find_element(By.ID, "next_level_button").click()
+
+        episodeId = "episode-16" if from_python_den else "episode-1"
+
         WebDriverWait(self.browser, 10).until(
-            presence_of_all_elements_located((By.ID, "blockly_tab"))
+            presence_of_all_elements_located((By.ID, episodeId))
         )
         return self
 
     def _run_failing_program(self, text):
         self.run_program("try_again_button")
-        error_message = self.browser.find_element_by_id("myModal-lead").text
+        error_message = self.browser.find_element(By.ID, "myModal-lead").text
         assert_that(error_message, contains_string(text))
         return self
 
     def _run_failing_python_program_console(self, code, console_message):
         self._write_code(code)
-        self.browser.find_element_by_id("fast_tab").click()
+        self.browser.find_element(By.ID, "fast_tab").click()
         time.sleep(1)
-        console = self.browser.find_element_by_id("consoleOutput")
+        console = self.browser.find_element(By.ID, "consoleOutput")
         assert_that(console.text, contains_string(console_message))
         return self
 
     def _run_failing_python_program_popup(self, code, text):
         self._write_code(code)
-        self.browser.find_element_by_id("fast_tab").click()
+        self.browser.find_element(By.ID, "fast_tab").click()
         time.sleep(1)
-        error_message = self.browser.find_element_by_id("myModal-lead").text
+        error_message = self.browser.find_element(By.ID, "myModal-lead").text
         assert_that(error_message, contains_string(text))
         return self
 
+    def _run_working_program(self, code):
+        self._write_code(code)
+        self.browser.find_element(By.ID, "fast_tab").click()
+        time.sleep(1)
+        return self
+
     def _write_code(self, code):
         self.browser.execute_script(
             "ocargo.pythonControl.appendCode(arguments[0])", code
@@ -235,17 +315,19 @@ class GamePage(BasePage):
 
     def _run_procedure_error_program(self, text):
         self.run_program("close_button")
-        error_message = self.browser.find_element_by_id("myModal-mainText").text
+        error_message = self.browser.find_element(
+            By.ID, "myModal-mainText"
+        ).text
         assert_that(error_message, contains_string(text))
 
     def _assert_score(self, element_id, score):
-        score_text = self.browser.find_element_by_id(element_id).text
+        score_text = self.browser.find_element(By.ID, element_id).text
         score_number = score_text.split("/")[0]
         assert_that(score_number, equal_to(str(score)))
         return self
 
     def assert_success(self):
-        modal_content = self.browser.find_element_by_id("modal-content").text
+        modal_content = self.browser.find_element(By.ID, "modal-content").text
         assert_that(modal_content, contains_string("Congratulations"))
         return self
 

game/end_to_end_tests/selenium_test_case.py

@@ -6,26 +6,7 @@ This solves a bug introduced when upgrading to Django 1.11,
 see more information here: https://github.com/jazzband/django-pipeline/issues/593
 """
 
-from django.core.servers.basehttp import WSGIServer
-from django.test.testcases import (
-    LiveServerTestCase,
-    LiveServerThread,
-    QuietWSGIRequestHandler,
-)
+from django.contrib.staticfiles.testing import LiveServerTestCase
 from django_selenium_clean import SeleniumTestCase
 
-
-class NonThreadedLiveServerThread(LiveServerThread):
-    """
-    Replaces ThreadedWSGIServer with WSGIServer as the threaded one doesn't close the DB connections properly, thus
-    triggering random "DB table locked" errors.
-    """
-
-    def _create_server(self):
-        return WSGIServer(
-            (self.host, self.port), QuietWSGIRequestHandler, allow_reuse_address=False
-        )
-
-
 SeleniumTestCase.__bases__ = (LiveServerTestCase,)
-SeleniumTestCase.server_thread_class = NonThreadedLiveServerThread

game/end_to_end_tests/test_cow_crashes.py

@@ -1,8 +1,7 @@
+from game.character import get_character
 from game.end_to_end_tests.base_game_test import BaseGameTest
 from game.models import Level, Block, LevelBlock
-
 from game.theme import get_theme
-from game.character import get_character
 
 
 class TestCowCrashes(BaseGameTest):
@@ -48,18 +47,17 @@ class TestCowCrashes(BaseGameTest):
         TestCowCrashes.cow_level = Level(
             name="Cow crashing",
             anonymous=False,
-            blocklyEnabled=True,
+            blockly_enabled=True,
             character=van,
             cows='[{"minCows":"7","maxCows":"7","potentialCoordinates":[{"x":4,"y":4},{"x":2,"y":4},{"x":3,"y":7},{"x":4,"y":6},{"x":2,"y":6},{"x":3,"y":1},{"x":4,"y":2}],"type":"WHITE"}]',
             default=False,
             destinations="[[4,5]]",
-            direct_drive=True,
             fuel_gauge=False,
             max_fuel=50,
             model_solution="[1]",
             origin='{"coordinate":[2,5],"direction":"E"}',
             path='[{"coordinate":[2,5],"connectedNodes":[1]},{"coordinate":[3,5],"connectedNodes":[0,4,2,5]},{"coordinate":[4,5],"connectedNodes":[1]},{"coordinate":[3,7],"connectedNodes":[4]},{"coordinate":[3,6],"connectedNodes":[8,3,6,1]},{"coordinate":[3,4],"connectedNodes":[10,1,11,16]},{"coordinate":[4,6],"connectedNodes":[4,7]},{"coordinate":[4,7],"connectedNodes":[6]},{"coordinate":[2,6],"connectedNodes":[9,4]},{"coordinate":[2,7],"connectedNodes":[8]},{"coordinate":[2,4],"connectedNodes":[13,5,12]},{"coordinate":[4,4],"connectedNodes":[5,14,15]},{"coordinate":[2,3],"connectedNodes":[10]},{"coordinate":[1,4],"connectedNodes":[10]},{"coordinate":[5,4],"connectedNodes":[11]},{"coordinate":[4,3],"connectedNodes":[11,19]},{"coordinate":[3,3],"connectedNodes":[5,17]},{"coordinate":[3,2],"connectedNodes":[18,16,19,20]},{"coordinate":[2,2],"connectedNodes":[17]},{"coordinate":[4,2],"connectedNodes":[17,15,23,22]},{"coordinate":[3,1],"connectedNodes":[21,17,22]},{"coordinate":[2,1],"connectedNodes":[20]},{"coordinate":[4,1],"connectedNodes":[20,19]},{"coordinate":[5,2],"connectedNodes":[19]}]',
-            pythonEnabled=False,
+            python_enabled=False,
             theme=grass,
             threads=1,
             traffic_lights="[]",

game/end_to_end_tests/test_language_dropdown.py

@@ -0,0 +1,14 @@
+from game.end_to_end_tests.base_game_test import BaseGameTest
+
+from selenium.webdriver.common.by import By
+
+class TestLanguageDropdown(BaseGameTest):
+    def test_level_language_dropdown(self):
+        page = self.go_to_level(1)
+        assert page.element_exists_by_id("language_dropdown")
+
+        self.selenium.find_element(By.ID, "language_dropdown").click()
+        self.selenium.find_element(By.ID, "language_dropdown_fr").click()
+
+        text_count = len(self.selenium.find_elements(By.XPATH, ("//*[contains(text(),'Move forwards')]")))
+        assert text_count == 0