[CONTENT] Remove start codes

content/adventures/adventures.schema.json

@@ -50,7 +50,6 @@
         "story_text_6": { "type": "string" },
         "example_code_6": { "type": "string" }
       },
-      "required": ["start_code"],
       "additionalProperties": false
     }
   }

tests/cypress.config.js

@@ -21,6 +21,7 @@ module.exports = defineConfig({
     login_page: '/login',
     recover_page: '/recover',
     hedy_page: '/hedy',
+    hedy_english_keywords: '/hedy?keyword_language=en',
     hedy_level2_page: '/hedy/2',
     hedy_level5_page: '/hedy/5',
     adventure_page: '/hedy/1#print_command',

tests/cypress/e2e/hedy_page/editor_box.cy.js

@@ -9,7 +9,7 @@ describe('Is able to type in the editor box', () => {
     it(`Language ${language} should run`, () => {
       cy.visit(`${Cypress.env('hedy_page')}?language=${language}#default`);
 
-      // click on textaread to get focus, then clear it
+      // click on text areas to get focus, then clear it
       codeMirrorContent().click();
       clearViaBackspace();
 
@@ -99,4 +99,4 @@ function clearViaBackspace() {
 
 function codeMirrorContent() {
   return cy.get('.cm-content');
-}
+}

tests/cypress/e2e/hedy_page/keyword_language.cy.js

@@ -1,11 +1,16 @@
-import {goToHedyPage} from "../tools/navigation/nav";
+import {goToHedyPageWithEnKeywords} from "../tools/navigation/nav";
 
 describe('when the user changes their language to Arabic', () => {
   beforeEach(() => {
-    goToHedyPage();
-
+    goToHedyPageWithEnKeywords();
+    cy.get('.cm-content').click();
+    cy.get('#editor').type("print Hallo!'\n");
     cy.getBySel('language-dropdown').click();
     cy.getBySel('switch-lang-ar').click();
+
+    // switch back and forth
+    cy.getBySel('kwlang-switch-btn').click();
+    cy.getBySel('kwlang-switch-toggle').click();
   });
 
   it('initially has keywords in Arabic', () => {

tests/cypress/e2e/hedy_page/run_code_button.cy.js

@@ -4,6 +4,8 @@ describe('Is able to run code', () => {
     it('Passes', () => {
       goToHedyPage();
 
+      cy.get('.cm-content').click();
+      cy.focused().type("print Hallo!'\n");
       // Run with correct code
       cy.get('#runit').click();
       cy.get('#okbox').should('be.visible');

tests/cypress/e2e/tools/navigation/nav.js

@@ -47,6 +47,11 @@ export function goToHedyPage()
     return goToPage(Cypress.env('hedy_page'));
 }
 
+export function goToHedyPageWithEnKeywords()
+{
+    return goToPage(Cypress.env('hedy_english_keywords'));
+}
+
 export function goToAdventurePage()
 {
     return goToPage(Cypress.env('adventure_page'));

tests/test_snippets/test_adventures.py

@@ -30,7 +30,7 @@ def collect_snippets(path, filtered_language=None):
     files = [f for f in os.listdir(path) if os.path.isfile(os.path.join(path, f)) and f.endswith('.yaml')]
     for f in files:
         lang = f.split(".")[0]
-        # we always grab the en snippets to restore broken code
+        # we always store the English snippets, to use them if we need to restore broken code
         if not filtered_language or (filtered_language and (lang == filtered_language or lang == 'en')):
             f = os.path.join(path, f)
             yaml = YamlFile.for_file(f)
@@ -46,17 +46,10 @@ def collect_snippets(path, filtered_language=None):
                             adventure_name = adventure['name']
 
                             for adventure_part, text in level.items():
-                                is_markdown = adventure_part != 'start_code'
-
-                                if is_markdown:
-                                    # If we have Markdown, there can be multiple code blocks inside it
-                                    codes = [tag.contents[0].contents[0]
-                                             for tag in utils.markdown_to_html_tags(text)
-                                             if tag.name == 'pre' and tag.contents and tag.contents[0].contents]
-                                else:
-                                    # If we don't have Markdown (this happensin the start_code field)
-                                    # the entire field is a single code block
-                                    codes = [text]
+                                # This block is markdown, and there can be multiple code blocks inside it
+                                codes = [tag.contents[0].contents[0]
+                                         for tag in utils.markdown_to_html_tags(text)
+                                         if tag.name == 'pre' and tag.contents and tag.contents[0].contents]
 
                                 if check_stories and adventure_part == 'story_text' and codes != []:
                                     # Can be used to catch languages with example codes in the story_text