[CONTENT] Split keywords into adventures (hedyorg#4184)

Splits new keywords into separate adventures allowing for a better flow in the learning trajectory, f.e. in level 2 is, ask and sleep get their own tabs: <img width="1469" alt="image" src="https://github.com/hedyorg/hedy/assets/1003685/779dc616-ef73-459e-92f5-5d62cd9bece7">
RMerbis · May 25, 2023 · 7bb7195 · 7bb7195
1 parent 42c9378
commit 7bb7195
Show file tree

Hide file tree

Showing 6 changed files with 1,006 additions and 496 deletions.
diff --git a/content/adventures/en.yaml b/content/adventures/en.yaml
diff --git a/hedy_content.py b/hedy_content.py
@@ -52,6 +52,8 @@
 ADVENTURE_ORDER_PER_LEVEL = {
     1: [
         'default',
+        'print_command',
+        'ask_command',
         'parrot',
         'rock',
         'haunted',
@@ -62,27 +64,34 @@
     ],
     2: [
         'default',
+        'is_command',
         'rock',
+        'ask_command',
+        'rock_2',
+        'haunted',
+        'sleep_command',
         'parrot',
         'story',
-        'haunted',
         'restaurant',
         'turtle'
     ],
     3: [
         'default',
-        'dishes',
-        'rock',
+        'random_command',
         'dice',
+        'rock',
         'fortune',
-        'turtle',
-        'story',
+        'restaurant',
+        'add_remove_command',
         'parrot',
+        'dishes',
+        'story',
         'haunted',
-        'restaurant'
+        'turtle'
     ],
     4: [
         'default',
+        'quotation_marks',
         'rock',
         'dice',
         'dishes',
@@ -95,20 +104,23 @@
     ],
     5: [
         'default',
+        'if_command',
         'language',
         'dice',
         'dishes',
         'story',
         'rock',
-        'pressit',
         'parrot',
-        'turtle',
         'haunted',
+        'in_command',
         'restaurant',
-        'fortune'
+        'fortune',
+        'pressit',
+        'turtle'
     ],
     6: [
         'default',
+        'maths',
         'songs',
         'dice',
         'dishes',
@@ -119,46 +131,55 @@
     ],
     7: [
         'default',
+        'repeat_command',
         'story',
         'songs',
         'dishes',
-        'pressit',
         'dice',
+        'repeat_command_2',
         'fortune',
-        'restaurant'
+        'restaurant',
+        'pressit'
     ],
     8: [
         'default',
-        'story',
+        'repeat_command',
         'fortune',
+        'repeat_command_2',
         'songs',
+        'if_command',
+        'story',
         'haunted',
         'restaurant',
         'turtle'
     ],
     9: [
         'default',
+        'repeat_command',
         'rock',
         'story',
-        'pressit',
         'calculator',
         'restaurant',
         'haunted',
+        'pressit',
         'turtle'
     ],
     10: [
         'default',
+        'for_command',
         'dishes',
-        'fortune',
-        'rock',
         'dice',
+        'fortune',
+        'harry_potter',
         'songs',
         'story',
+        'rock',
         'calculator',
         'restaurant',
     ],
     11: [
         'default',
+        'for_command',
         'years',
         'calculator',
         'songs',
@@ -167,6 +188,8 @@
     ],
     12: [
         'default',
+        'maths',
+        'quotation_marks',
         'story',
         'fortune',
         'songs',
@@ -177,6 +200,7 @@
     ],
     13: [
         'default',
+        'and_or_command',
         'secret',
         'story',
         'rock',
@@ -186,6 +210,7 @@
     ],
     14: [
         'default',
+        'is_command',
         'haunted',
         'calculator',
         'piggybank',
@@ -194,6 +219,7 @@
     ],
     15: [
         'default',
+        'while_command',
         'restaurant',
         'story',
         'dice',
@@ -203,17 +229,21 @@
     ],
     16: [
         'default',
+        'random_command',
         'haunted',
         'songs',
         'language'
     ],
     17: [
         'default',
+        'print_command',
+        'elif_command',
         'tic',
         'blackjack'
     ],
     18: [
         'default',
+        'print_command',
         'story',
         'songs'
     ]

diff --git a/tests/cypress.config.js b/tests/cypress.config.js
@@ -22,6 +22,7 @@ module.exports = defineConfig({
     recover_page: '/recover',
     hedy_page: '/hedy',
     hedy_level2_page: '/hedy/2',
+    adventure_page: '/hedy/1#print_command',
     admin_page: '/admin',
     admin_users_page: '/admin/users',
     teachers_page: '/for-teachers',

diff --git a/tests/cypress/e2e/hedy_page/syntax_highlighting.cy.js b/tests/cypress/e2e/hedy_page/syntax_highlighting.cy.js
@@ -1,9 +1,9 @@
 import { loginForUser } from "../tools/login/login";
-import { goToHedyPage } from "../tools/navigation/nav";
+import { goToHedyPage, goToAdventurePage } from "../tools/navigation/nav";
 
-describe('The Hedy level 1 page', () => {
+describe('The Hedy level 1 print adventure page', () => {
   beforeEach(() => {
-    goToHedyPage();
+    goToAdventurePage();
   });
 
   it('has the word print highlighted in examples', () => {

diff --git a/tests/cypress/e2e/tools/navigation/nav.js b/tests/cypress/e2e/tools/navigation/nav.js
@@ -47,6 +47,11 @@ export function goToHedyPage()
     return goToPage(Cypress.env('hedy_page'));
 }
 
+export function goToAdventurePage()
+{
+    return goToPage(Cypress.env('adventure_page'));
+}
+
 export function goToProfilePage()
 {
     return goToPage(Cypress.env('profile_page'));

diff --git a/tests/test_snippets/test_adventures.py b/tests/test_snippets/test_adventures.py
@@ -122,8 +122,9 @@ class TestsAdventurePrograms(HedyTester):
 
     @parameterized.expand(Hedy_snippets, skip_on_empty=True)
     def test_adventures(self, name, snippet):
+        keywords = ['Introduction']
 
-        if snippet is not None and len(snippet.code) > 0:
+        if snippet is not None and len(snippet.code) > 0 and snippet.adventure_name not in keywords:
             try:
                 self.single_level_tester(
                     code=snippet.code,
@@ -149,6 +150,7 @@ def test_adventures(self, name, snippet):
                         error_message = error_message.replace('<span class="command-highlighted">', '`')
                         error_message = error_message.replace('</span>', '`')
                         print(f'\n----\n{snippet.code}\n----')
+                        print(f'from adventure {snippet.adventure_name}')
                         print(f'in language {snippet.language} from level {snippet.level} gives error:')
                         print(f'{error_message} at line {location}')
                         raise E