Resizable Panels

cypress/e2e/demos-of-tutorials.cy.ts

@@ -5,6 +5,19 @@ context("Demos of all tutorials", () => {
     cy.get("ul.tutorial-list li").should("have.length", kExpNTutorials);
   }
 
+  beforeEach(() => {
+    cy.pytchResetDatabase({ initialUrl: "/tutorials/" });
+    assertNTutorials();
+  });
+
+  function launchNthTutorial(tutorialIndex: number) {
+    const childNumber = tutorialIndex + 1;
+    cy.get(
+      `ul.tutorial-list li:nth-child(${childNumber})` +
+        ' button[title="Learn how to make this project"]'
+    ).click();
+  }
+
   function launchNthTutorialDemo(tutorialIndex: number) {
     const childNumber = tutorialIndex + 1;
     cy.get(
@@ -13,10 +26,16 @@ context("Demos of all tutorials", () => {
     ).click();
   }
 
-  it("can run demos", () => {
-    cy.pytchResetDatabase({ initialUrl: "/tutorials/" });
-    assertNTutorials();
+  it("can start tutorials", () => {
+    for (let tutIdx = 0; tutIdx !== kExpNTutorials; ++tutIdx) {
+      launchNthTutorial(tutIdx);
+      cy.get(".ActivityContent .ProgressTrail").should("be.visible");
+      cy.pytchHomeFromIDE();
+      cy.get(".NavBar li").contains("Tutorials").click();
+    }
+  });
 
+  it("can run demos", () => {
     for (let tutIdx = 0; tutIdx !== kExpNTutorials; ++tutIdx) {
       launchNthTutorialDemo(tutIdx);
       cy.contains("Click the green flag to run");

cypress/e2e/junior/actor-assets.cy.ts

@@ -154,6 +154,15 @@ context("Working with assets of an actor", () => {
     assertCostumeNames(allCostumes);
   });
 
+  it("asset with uppercase filename", () => {
+    const assetFilename = "RECTANGLE-RED-80-60.PNG";
+
+    selectSprite("Snake");
+    selectActorAspect("Costumes");
+    addFromFixture(assetFilename);
+    assertCostumeNames(["python-logo.png", assetFilename]);
+  });
+
   it("has useful UI text for uploading", () => {
     const assertContentCorrect = (headerMatch: string, bodyMatch: string) => {
       launchAdd.assetFromThisDevice();

cypress/e2e/junior/lesson.cy.ts

@@ -1,8 +1,13 @@
 import { DiffViewKind, PrettyPrintedLine } from "../../../src/model/code-diff";
 import { LinkedJrTutorialRef } from "../../../src/model/junior/jr-tutorial";
-import { assertInIDE, withDownloadedZipfile } from "../utils";
+import {
+  assertInIDE,
+  assertShowsLinkedContentError,
+  withDownloadedZipfile,
+} from "../utils";
 import {
   assertActorNames,
+  assertJrTutChapterNumber,
   assertTwoStateSwitchState,
   clickUniqueSelected,
   getActivityBarTab,
@@ -73,30 +78,17 @@ context("Navigation of per-method lesson", () => {
     ).click();
   }
 
-  function assertChapterNumber(expNumber: number) {
-    if (expNumber === 0) {
-      cy.get(".chapter-title").should("be.visible");
-      cy.get(".chapter-title .chapter-number").should("not.exist");
-      return;
-    }
-
-    cy.get(".chapter-title .chapter-number").should(
-      "have.text",
-      `${expNumber} —`
-    );
-  }
-
   it("can move through chapters", () => {
     for (let i = 0; i !== 5; ++i) {
       advanceToNextChapter(i);
       const expChapter = i + 1;
-      assertChapterNumber(expChapter);
+      assertJrTutChapterNumber(expChapter);
     }
 
     // Jump directly back one at a time until chapter 1.
     for (let i = 4; i !== 0; --i) {
       jumpToChapter(i);
-      assertChapterNumber(i);
+      assertJrTutChapterNumber(i);
     }
   });
 
@@ -135,7 +127,7 @@ context("Navigation of per-method lesson", () => {
     settleModalDialog("Make a copy");
 
     cy.title().should("match", /Pytch: Copy of/);
-    assertChapterNumber(3);
+    assertJrTutChapterNumber(3);
     cy.get('.LearnerTask[data-task-index="6"][data-task-kind="current"]');
 
     // help-sidebar, lesson, keynav-help-sidebar
@@ -185,13 +177,13 @@ context("Navigation of per-method lesson", () => {
       for (let i = 0; i !== 5; ++i) {
         advanceToNextChapter(i);
       }
-      assertChapterNumber(5);
+      assertJrTutChapterNumber(5);
 
       cy.pytchSwitchProject("LESSON-LINKED-1");
-      assertChapterNumber(0);
+      assertJrTutChapterNumber(0);
 
       cy.pytchSwitchProject("LESSON-LINKED-0");
-      assertChapterNumber(5);
+      assertJrTutChapterNumber(5);
     });
   });
 
@@ -331,7 +323,7 @@ context("Navigation of per-method lesson", () => {
     assertHelpVisible();
 
     getActivityBarTab("book").click();
-    assertChapterNumber(3);
+    assertJrTutChapterNumber(3);
     assertNoHelp();
 
     getActivityBarTab("circle-question").click();
@@ -357,3 +349,20 @@ context("launch demo from tutorial card", () => {
     assertActorNames(["Stage", "Bowl", "Apple", "ScoreKeeper"]);
   });
 });
+
+context("rejects wrong program-kind", () => {
+  beforeEach(() => {
+    cy.pytchResetDatabase();
+    cy.contains("My projects").click();
+  });
+
+  it("flat project but per-method tutorial", () => {
+    cy.pytchTryUploadZipfiles(["v4-flat-linked-to-jr-tutorial.zip"]);
+
+    // The error is caught in two places.  To see the message we have to
+    // explicitly select the "lesson" activity.
+    cy.get('button[data-activity-bar-tab="lesson"]').click();
+
+    assertShowsLinkedContentError(/project.*flat.*tutorial.*per-method/);
+  });
+});

cypress/e2e/junior/utils.ts

@@ -8,7 +8,7 @@ import { deIndent } from "../../common/utils";
 
 import { IconName } from "@fortawesome/fontawesome-common-types";
 import { AceControllerMap } from "../../../src/skulpt-connection/code-editor";
-import { launchProjectInListDropdownAction } from "../utils";
+import { assertInIDE, launchProjectInListDropdownAction } from "../utils";
 import { Actions } from "easy-peasy";
 import { IActiveProject } from "../../../src/model/project";
 import { assertNever, range } from "../../../src/utils";
@@ -746,3 +746,21 @@ export const assertTwoStateSwitchState = (
   const expStateStr = expState.toString();
   cy.get(selector).should("have.attr", "aria-checked", expStateStr);
 };
+
+/** Assert that a "per-method" tutorial is being displayed, showing the
+ * chapter with the given `expChapterNumber`. */
+export function assertJrTutChapterNumber(expChapterNumber: number) {
+  assertInIDE("per-method");
+
+  cy.get(".Junior-LessonContent-HeaderBar .chapter-title").as("title");
+
+  if (expChapterNumber === 0) {
+    cy.get("@title").should("be.visible");
+    cy.get("@title").find(".chapter-number").should("not.exist");
+    return;
+  }
+
+  cy.get("@title")
+    .find(".chapter-number")
+    .should("have.text", `${expChapterNumber} —`);
+}