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

game/decor.py

@@ -3,15 +3,18 @@
 """
 
 from builtins import object
+
 from rest_framework.reverse import reverse
+
 from game.theme import get_theme, get_all_themes
 
 
 class Decor(object):
-    def __init__(self, pk, name, url, width, height, theme, z_index):
+    def __init__(self, pk, name, url, xmas_url, width, height, theme, z_index):
         self.id = self.pk = pk
         self.name = name
         self.url = url
+        self.xmas_url = xmas_url
         self.width = width
         self.height = height
         self.theme = theme
@@ -19,297 +22,369 @@ class Decor(object):
 
 
 DECOR_DATA = {
-    (u"tree1", u"grass"): Decor(
+    ("tree1", "grass"): Decor(
         z_index=4,
-        name=u"tree1",
-        url=u"decor/grass/tree1.svg",
+        name="tree1",
+        url="decor/grass/tree1.svg",
+        xmas_url="decor/snow/tree1.svg",
         height=100,
         width=100,
         theme=get_theme("grass"),
         pk=1,
     ),
-    (u"tree2", u"grass"): Decor(
+    ("tree2", "grass"): Decor(
         z_index=4,
-        name=u"tree2",
-        url=u"decor/grass/tree2.svg",
+        name="tree2",
+        url="decor/grass/tree2.svg",
+        xmas_url="decor/snow/tree2.svg",
         height=100,
         width=100,
         theme=get_theme("grass"),
         pk=2,
     ),
-    (u"bush", u"grass"): Decor(
+    ("bush", "grass"): Decor(
         z_index=3,
-        name=u"bush",
-        url=u"decor/grass/bush.svg",
+        name="bush",
+        url="decor/grass/bush.svg",
+        xmas_url="decor/snow/bush.svg",
         height=50,
         width=50,
         theme=get_theme("grass"),
         pk=3,
     ),
-    (u"house", u"grass"): Decor(
+    ("house", "grass"): Decor(
         z_index=1,
-        name=u"house",
-        url=u"decor/grass/house.svg",
+        name="house",
+        url="decor/grass/house.svg",
+        xmas_url="decor/snow/house.svg",
         height=50,
         width=50,
         theme=get_theme("grass"),
         pk=4,
     ),
-    (u"cfc", u"grass"): Decor(
+    ("cfc", "grass"): Decor(
         z_index=1,
-        name=u"cfc",
+        name="cfc",
         # FUTURE: add external branding option
-        url=u"decor/grass/cfc.svg",
+        url="decor/grass/cfc.svg",
+        xmas_url="decor/snow/cfc.svg",
         height=107,
         width=100,
         theme=get_theme("grass"),
         pk=5,
     ),
-    (u"pond", u"grass"): Decor(
+    ("pond", "grass"): Decor(
         z_index=2,
-        name=u"pond",
-        url=u"decor/grass/pond.svg",
+        name="pond",
+        url="decor/grass/pond.svg",
+        xmas_url="decor/snow/pond.svg",
         height=100,
         width=150,
         theme=get_theme("grass"),
         pk=6,
     ),
-    (u"tree1", u"snow"): Decor(
+    ("tree1", "snow"): Decor(
         z_index=4,
-        name=u"tree1",
-        url=u"decor/snow/tree1.svg",
+        name="tree1",
+        url="decor/snow/tree1.svg",
+        xmas_url="decor/snow/tree1.svg",
         height=100,
         width=100,
         theme=get_theme("snow"),
         pk=7,
     ),
-    (u"tree2", u"snow"): Decor(
+    ("tree2", "snow"): Decor(
         z_index=4,
-        name=u"tree2",
-        url=u"decor/snow/tree2.svg",
+        name="tree2",
+        url="decor/snow/tree2.svg",
+        xmas_url="decor/snow/tree2.svg",
         height=100,
         width=100,
         theme=get_theme("snow"),
         pk=8,
     ),
-    (u"bush", u"snow"): Decor(
+    ("bush", "snow"): Decor(
         z_index=3,
-        name=u"bush",
-        url=u"decor/snow/bush.svg",
+        name="bush",
+        url="decor/snow/bush.svg",
+        xmas_url="decor/snow/bush.svg",
         height=50,
         width=50,
         theme=get_theme("snow"),
         pk=9,
     ),
-    (u"house", u"snow"): Decor(
+    ("house", "snow"): Decor(
         z_index=1,
-        name=u"house",
-        url=u"decor/snow/house.svg",
+        name="house",
+        url="decor/snow/house.svg",
+        xmas_url="decor/snow/house.svg",
         height=50,
         width=50,
         theme=get_theme("snow"),
         pk=10,
     ),
-    (u"cfc", u"snow"): Decor(
+    ("cfc", "snow"): Decor(
         z_index=1,
-        name=u"cfc",
+        name="cfc",
         # FUTURE: add external branding option
-        url=u"decor/snow/cfc.svg",
+        url="decor/snow/cfc.svg",
+        xmas_url="decor/snow/cfc.svg",
         height=107,
         width=100,
         theme=get_theme("snow"),
         pk=11,
     ),
-    (u"pond", u"snow"): Decor(
+    ("pond", "snow"): Decor(
         z_index=2,
-        name=u"pond",
-        url=u"decor/snow/pond.svg",
+        name="pond",
+        url="decor/snow/pond.svg",
+        xmas_url="decor/snow/pond.svg",
         height=100,
         width=150,
         theme=get_theme("snow"),
         pk=12,
     ),
-    (u"tile1", u"grass"): Decor(
+    ("tile1", "grass"): Decor(
         z_index=0,
-        name=u"tile1",
-        url=u"decor/grass/tile1.svg",
+        name="tile1",
+        url="decor/grass/tile1.svg",
+        xmas_url="decor/snow/tile1.svg",
         height=100,
         width=100,
         theme=get_theme("grass"),
         pk=13,
     ),
-    (u"tile1", u"snow"): Decor(
+    ("tile1", "snow"): Decor(
         z_index=0,
-        name=u"tile1",
-        url=u"decor/snow/tile1.svg",
+        name="tile1",
+        url="decor/snow/tile1.svg",
+        xmas_url="decor/snow/tile1.svg",
         height=100,
         width=100,
         theme=get_theme("snow"),
         pk=14,
     ),
-    (u"tile2", u"snow"): Decor(
+    ("tile2", "snow"): Decor(
         z_index=0,
-        name=u"tile2",
-        url=u"decor/snow/tile2.svg",
+        name="tile2",
+        url="decor/snow/tile2.svg",
+        xmas_url="decor/snow/tile2.svg",
         height=100,
         width=100,
         theme=get_theme("snow"),
         pk=15,
     ),
-    (u"house", u"farm"): Decor(
+    ("house", "farm"): Decor(
         z_index=1,
-        name=u"house",
-        url=u"decor/farm/house1.svg",
+        name="house",
+        url="decor/farm/house1.svg",
+        xmas_url="decor/snow/house1.svg",
         height=224,
         width=184,
         theme=get_theme("farm"),
         pk=16,
     ),
-    (u"cfc", u"farm"): Decor(
+    ("cfc", "farm"): Decor(
         z_index=1,
-        name=u"cfc",
-        url=u"decor/farm/cfc.svg",
+        name="cfc",
+        url="decor/farm/cfc.svg",
+        xmas_url="decor/snow/barn.svg",
         height=301,
         width=332,
         theme=get_theme("farm"),
         pk=17,
     ),
-    (u"bush", u"farm"): Decor(
+    ("bush", "farm"): Decor(
         z_index=3,
-        name=u"bush",
-        url=u"decor/farm/bush.svg",
+        name="bush",
+        url="decor/farm/bush.svg",
+        xmas_url="decor/snow/bush.svg",
         height=30,
         width=50,
         theme=get_theme("farm"),
         pk=18,
     ),
-    (u"tree1", u"farm"): Decor(
+    ("tree1", "farm"): Decor(
         z_index=4,
-        name=u"tree1",
-        url=u"decor/farm/tree1.svg",
+        name="tree1",
+        url="decor/farm/tree1.svg",
+        xmas_url="decor/snow/tree1.svg",
         height=100,
         width=100,
         theme=get_theme("farm"),
         pk=19,
     ),
-    (u"tree2", u"farm"): Decor(
+    ("tree2", "farm"): Decor(
         z_index=4,
-        name=u"tree2",
-        url=u"decor/farm/house2.svg",
+        name="tree2",
+        url="decor/farm/house2.svg",
+        xmas_url="decor/snow/house.svg",
         height=88,
         width=65,
         theme=get_theme("farm"),
         pk=20,
     ),
-    (u"pond", u"farm"): Decor(
+    ("pond", "farm"): Decor(
         z_index=2,
-        name=u"pond",
-        url=u"decor/farm/crops.svg",
+        name="pond",
+        url="decor/farm/crops.svg",
+        xmas_url="decor/snow/crops.svg",
         height=100,
         width=150,
         theme=get_theme("farm"),
         pk=21,
     ),
-    (u"tile1", u"farm"): Decor(
+    ("tile1", "farm"): Decor(
         z_index=0,
-        name=u"tile1",
-        url=u"decor/farm/tile1.svg",
+        name="tile1",
+        url="decor/farm/tile1.svg",
+        xmas_url="decor/snow/tile1.svg",
         height=337,
         width=194,
         theme=get_theme("farm"),
         pk=22,
     ),
-    (u"tile1", u"city"): Decor(
+    ("tile1", "city"): Decor(
         z_index=0,
-        name=u"tile1",
-        url=u"decor/city/pavementTile.png",
+        name="tile1",
+        url="decor/city/pavementTile.png",
+        xmas_url="decor/snow/tile1.svg",
         height=100,
         width=100,
         theme=get_theme("city"),
         pk=23,
     ),
-    (u"house", u"city"): Decor(
+    ("house", "city"): Decor(
         z_index=1,
-        name=u"house",
-        url=u"decor/city/house.svg",
+        name="house",
+        url="decor/city/house.svg",
+        xmas_url="decor/snow/house2.svg",
         height=50,
         width=50,
         theme=get_theme("city"),
         pk=24,
     ),
-    (u"bush", u"city"): Decor(
+    ("bush", "city"): Decor(
         z_index=3,
-        name=u"bush",
-        url=u"decor/city/bush.svg",
+        name="bush",
+        url="decor/city/bush.svg",
+        xmas_url="decor/snow/bush.svg",
         height=50,
         width=50,
         theme=get_theme("city"),
         pk=25,
     ),
-    (u"tree1", u"city"): Decor(
+    ("tree1", "city"): Decor(
         z_index=4,
-        name=u"tree1",
-        url=u"decor/city/shop.svg",
+        name="tree1",
+        url="decor/city/shop.svg",
+        xmas_url="decor/snow/shop.svg",
         height=70,
         width=70,
         theme=get_theme("city"),
         pk=26,
     ),
-    (u"tree2", u"city"): Decor(
+    ("tree2", "city"): Decor(
         z_index=4,
-        name=u"tree2",
-        url=u"decor/city/school.svg",
+        name="tree2",
+        url="decor/city/school.svg",
+        xmas_url="decor/snow/school.svg",
         height=100,
         width=100,
         theme=get_theme("city"),
         pk=27,
     ),
-    (u"pond", u"city"): Decor(
+    ("pond", "city"): Decor(
         z_index=2,
-        name=u"pond",
-        url=u"decor/city/hospital.svg",
+        name="pond",
+        url="decor/city/hospital.svg",
+        xmas_url="decor/snow/hospital.svg",
         height=157,
         width=140,
         theme=get_theme("city"),
         pk=28,
     ),
-    (u"cfc", u"city"): Decor(
+    ("cfc", "city"): Decor(
         z_index=1,
-        name=u"cfc",
+        name="cfc",
         # FUTURE: add external branding option
-        url=u"decor/grass/cfc.svg",
+        url="decor/grass/cfc.svg",
+        xmas_url="decor/snow/cfc.svg",
         height=107,
         width=100,
         theme=get_theme("city"),
         pk=29,
     ),
-    (u"tile2", u"grass"): Decor(
+    ("tile2", "grass"): Decor(
         z_index=0,
-        name=u"tile2",
-        url=u"decor/snow/tile2.svg",
+        name="tile2",
+        url="decor/snow/tile2.svg",
+        xmas_url="decor/snow/tile2.svg",
         height=100,
         width=100,
         theme=get_theme("grass"),
         pk=30,
     ),
-    (u"tile2", u"farm"): Decor(
+    ("tile2", "farm"): Decor(
         z_index=0,
-        name=u"tile2",
-        url=u"decor/snow/tile2.svg",
+        name="tile2",
+        url="decor/snow/tile2.svg",
+        xmas_url="decor/snow/tile2.svg",
         height=100,
         width=100,
         theme=get_theme("farm"),
         pk=31,
     ),
-    (u"tile2", u"city"): Decor(
+    ("tile2", "city"): Decor(
         z_index=0,
-        name=u"tile2",
-        url=u"decor/snow/tile2.svg",
+        name="tile2",
+        url="decor/snow/tile2.svg",
+        xmas_url="decor/snow/tile2.svg",
         height=100,
         width=100,
         theme=get_theme("city"),
         pk=32,
     ),
+    ("solar_panel", "grass"): Decor(
+        z_index=4,
+        name="solar_panel",
+        url="decor/grass/solar_panel.svg",
+        xmas_url="decor/snow/tree1.svg",
+        height=100,
+        width=100,
+        theme=get_theme("grass"),
+        pk=33
+    ),
+    ("solar_panel", "farm"): Decor(
+        z_index=4,
+        name="solar_panel",
+        url="decor/farm/solar_panel.svg",
+        xmas_url="decor/snow/tree1.svg",
+        height=100,
+        width=100,
+        theme=get_theme("farm"),
+        pk=34
+    ),
+    ("solar_panel", "snow"): Decor(
+        z_index=4,
+        name="solar_panel",
+        url="decor/snow/solar_panel.svg",
+        xmas_url="decor/snow/solar_panel.svg",
+        height=100,
+        width=100,
+        theme=get_theme("snow"),
+        pk=35
+    ),
+    ("solar_panel", "city"): Decor(
+        z_index=4,
+        name="solar_panel",
+        url="decor/city/solar_panel.svg",
+        xmas_url="decor/snow/solar_panel.svg",
+        height=100,
+        width=100,
+        theme=get_theme("city"),
+        pk=36
+    )
 }
 
 

game/end_to_end_tests/base_game_test.py

@@ -1,15 +1,15 @@
 import os
 import socket
+import time
 from builtins import str
 
-import time
 from common.models import UserProfile
 from common.tests.utils.classes import create_class_directly
 from common.tests.utils.organisation import create_organisation_directly
 from common.tests.utils.student import create_school_student_directly
 from common.tests.utils.teacher import signup_teacher_directly
-from django.core.management import call_command
 from django.urls import reverse
+from portal.tests.pageObjects.portal.base_page import BasePage
 from portal.tests.pageObjects.portal.home_page import HomePage
 
 from game.models import Workspace
@@ -43,15 +43,17 @@ class BaseGameTest(SeleniumTestCase):
             else:
                 break
 
-    def _complete_level(self, level_number, **kwargs):
-        page = self.go_to_level(level_number)
-        self.complete_and_check_level(level_number, page, **kwargs)
+    def _complete_level(self, level_number, from_python_den=False, **kwargs):
+        page = self.go_to_level(level_number, from_python_den)
+        (self.complete_and_check_level(level_number, page, from_python_den, **kwargs))
 
     def complete_and_check_level(
         self,
         level_number,
         page,
+        from_python_den=False,
         next_episode=None,
+        redirects=False,
         check_algorithm_score=True,
         check_route_score=True,
         final_level=False,
@@ -60,33 +62,56 @@ class BaseGameTest(SeleniumTestCase):
         if check_algorithm_score:
             page.assert_algorithm_score(10)
         if check_route_score:
-            page.assert_route_score(10)
+            if level_number < 13 and not from_python_den:
+                page.assert_route_score(20)
+            else:
+                page.assert_route_score(10)
         if final_level:
             return page
         if next_episode is None:
-            page.next_level()
-            page.assert_level_number(level_number + 1)
+            if redirects:
+                page.next_level_redirected(from_python_den)
+            else:
+                page.next_level(from_python_den)
+                page.assert_level_number(level_number + 1, from_python_den)
         else:
             page.next_episode()
-            page.assert_episode_number(next_episode)
+            page.assert_episode_number(next_episode, from_python_den)
         return page
 
+    def go_to_reverse(self, url_reverse):
+        path = reverse(url_reverse)
+        self._go_to_path(path)
+        return BasePage(self.selenium)
+
     def go_to_homepage(self):
         path = reverse("home")
         self._go_to_path(path)
         return HomePage(self.selenium)
 
-    def go_to_level(self, level_name):
-        path = reverse("play_default_level", kwargs={"levelName": str(level_name)})
+    def go_to_level(self, level_name, from_python_den=False):
+        viewname = (
+            "play_python_default_level" if from_python_den else "play_default_level"
+        )
+
+        path = reverse(viewname, kwargs={"level_name": str(level_name)})
         self._go_to_path(path)
-        self.selenium.execute_script("ocargo.animation.FAST_ANIMATION_DURATION = 1;")
 
         return GamePage(self.selenium)
 
+    def go_to_level_without_dismissing_dialog(self, level_name, from_python_den=False):
+        viewname = (
+            "play_python_default_level" if from_python_den else "play_default_level"
+        )
+
+        path = reverse(viewname, kwargs={"level_name": str(level_name)})
+        self._go_to_path(path)
+
+        return BasePage(self.selenium)
+
     def go_to_custom_level(self, level):
         path = reverse("play_custom_level", kwargs={"levelId": str(level.id)})
         self._go_to_path(path)
-        self.selenium.execute_script("ocargo.animation.FAST_ANIMATION_DURATION = 1;")
 
         return GamePage(self.selenium)
 
@@ -96,9 +121,11 @@ class BaseGameTest(SeleniumTestCase):
         return EditorPage(self.selenium)
 
     def go_to_episode(self, episodeId):
-        path = reverse("start_episode", kwargs={"episodeId": str(episodeId)})
+        if int(episodeId) > 9:
+            path = reverse("start_python_episode", kwargs={"episodeId": str(episodeId)})
+        else:
+            path = reverse("start_episode", kwargs={"episodeId": str(episodeId)})
         self._go_to_path(path)
-        self.selenium.execute_script("ocargo.animation.FAST_ANIMATION_DURATION = 1;")
 
         return GamePage(self.selenium)
 
@@ -123,23 +150,8 @@ class BaseGameTest(SeleniumTestCase):
             self.go_to_level(level).load_solution(workspace_id).run_crashing_program()
         )
 
-    def run_python_commands_test(self, level):
-        return self.go_to_level(level).check_python_commands()
-
-    def run_clear_console_test(self, level):
-        return self.go_to_level(level).write_to_then_clear_console()
-
-    def run_console_parse_error_test(self, level):
-        return self.go_to_level(level).run_parse_error_program()
-
-    def run_console_attribute_error_test(self, level):
-        return self.go_to_level(level).run_attribute_error_program()
-
-    def run_console_print_test(self, level):
-        return self.go_to_level(level).run_print_program()
-
-    def run_invalid_import_test(self, level):
-        return self.go_to_level(level).run_invalid_import_program()
+    def run_animal_sound_horn_test(self, level):
+        return self.go_to_custom_level(level).run_animal_sound_horn_program()
 
     def running_out_of_instructions_test(self, level, workspace_file):
         user_profile = self.login_once()
@@ -221,7 +233,6 @@ class BaseGameTest(SeleniumTestCase):
     @classmethod
     def setUpClass(cls):
         super().setUpClass()
-        call_command("collectstatic", "--noinput")
 
     @classmethod
     def tearDownClass(cls):

game/end_to_end_tests/editor_page.py

@@ -16,8 +16,23 @@ class EditorPage(BasePage):
 
     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.browser.find_element(By.ID, button_id).click()
         self.wait_for_element_to_be_invisible((By.ID, button_id), wait_seconds=15)
 
     def go_to_code_tab(self):
-        self.browser.find_element_by_id("blocks_tab").click()
+        self.browser.find_element(By.ID, "blocks_tab").click()
+
+    def go_to_scenery_tab(self):
+        self.browser.find_element(By.ID, "scenery_tab").click()
+
+    def go_to_character_tab(self):
+        self.browser.find_element(By.ID, "character_tab").click()
+
+    def go_to_description_tab(self):
+        self.browser.find_element(By.ID, "description_tab").click()
+
+    def go_to_hint_tab(self):
+        self.browser.find_element(By.ID, "hint_tab").click()
+
+    def go_to_save_tab(self):
+        self.browser.find_element(By.ID, "save_tab").click()