Fix failing checks: e2e tests, welcome action

.changeset/thick-trees-punch.md

@@ -0,0 +1,8 @@
+---
+"@pushkin-templates/exp-basic": patch
+"@pushkin-templates/exp-grammaticality-judgment": patch
+"@pushkin-templates/exp-lexical-decision": patch
+"@pushkin-templates/exp-self-paced-reading": patch
+---
+
+Fix logic error that caused the post-experiment feedback page to show the "Oops! Something went wrong" message when the percentile rank and/or summary stat values was 0, which are valid values. Now it checks for null/undefined.

.github/workflows/welcome.yml

@@ -1,6 +1,7 @@
 name: Welcome new contributors
 
-on: 
+on:
+  workflow_dispatch:
   issues:
     types: [opened]
   pull_request:
@@ -10,11 +11,10 @@ jobs:
   write-message:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
       - uses: actions/first-interaction@main
         with:
-          repo-token: ${{ secrets.GITHUB_TOKEN }}
-          issue-message: |
+          repo_token: ${{ secrets.GITHUB_TOKEN }}
+          issue_message: |
             👋 
             Thanks for opening this issue! We will investigate the matter and get back to you as soon as possible. In the meantime, double check that your issue:
 
@@ -29,7 +29,7 @@ jobs:
                - [JavaScript Tutorial](https://www.codecademy.com/learn/introduction-to-javascript)
                - [JsPsych Tutorial](https://www.jspsych.org/7.3/tutorials/hello-world/#jspsych-hello-world-experiment)
 
-          pr-message: |
+          pr_message: |
             👋 
             Thanks for making this pull request! We will review it as soon as possible. In the meantime, double check that your PR:
 

templates/experiments/basic/src/e2e/experiment.test.js

@@ -238,28 +238,23 @@ test.describe("Completing the experiment in simulation mode", () => {
     expect(dbUserResults.user_id).toBe(userResults.user_id);
   });
   test("should produce the expected results page", async ({ page }) => {
-    // Click the link to see results
-    await page.click("text=Click to see your results!");
-
-    // Check that the results page displays the loading message initially
-    const loadingMessage = await page.locator("h1");
-    await expect(loadingMessage).toHaveText("Loading...");
-
     // Mock the API response to simulate data being available
-    await page.route("**/api/results", (route) =>
+    await page.route(`**/api/${expInfo.shortName}/getPercentileRank`, (route) =>
       route.fulfill({
         status: 200,
         contentType: "application/json",
         body: JSON.stringify({
-          percentileRank: 75,
-          totalRows: 100,
-          summary_stat: 5000,
+          resData: {
+            percentileRank: 75,
+            totalRows: 100,
+            summary_stat: 5000,
+          },
         }),
       }),
     );
 
-    // Reload the page to trigger the API call
-    await page.reload();
+    // Click the link to see results
+    await page.click("text=Click to see your results!");
 
     // Check that the correct results header is displayed
     const resultsHeader = await page.locator("h1");

templates/experiments/basic/src/e2e/results.test.js

@@ -15,10 +15,15 @@ test.describe("Results page in simulation mode", () => {
   );
 
   test.beforeEach(async ({ page }) => {
+    // Register listener before goto to avoid missing the response
+    const tabulateResponsePromise = page.waitForResponse(
+      `/api/${expInfo.shortName}/tabulateAndPostResults`,
+    );
     // Go to the experiment in simulation mode
     await page.goto(`/quizzes/${expInfo.shortName}?simulate=true`);
-
-    // Wait for the experiment to finish
+    // Wait for tabulateAndPostResults to complete so data is committed to DB
+    await tabulateResponsePromise;
+    // Wait for the experiment finish screen
     await page.waitForSelector("text=Click to see your results!");
   });
 

templates/experiments/basic/src/web page/src/results.js

@@ -77,7 +77,7 @@ const ExpResults = (props) => {
       );
     }
 
-    if (!data.percentileRank || !data.totalRows || !data.summary_stat) {
+    if (data.percentileRank == null || !data.totalRows || data.summary_stat == null) {
       return (
         <div>
           <Container className="mt-5 text-center">

templates/experiments/grammaticality-judgment/src/e2e/experiment.test.js

@@ -234,28 +234,23 @@ test.describe("Completing the experiment in simulation mode", () => {
     expect(dbUserResults.user_id).toBe(userResults.user_id);
   });
   test("should produce the expected results page", async ({ page }) => {
-    // Click the link to see results
-    await page.click("text=Click to see your results!");
-
-    // Check that the results page displays the loading message initially
-    const loadingMessage = await page.locator("h1");
-    await expect(loadingMessage).toHaveText("Loading...");
-
     // Mock the API response to simulate data being available
-    await page.route("**/api/results", (route) =>
+    await page.route(`**/api/${expInfo.shortName}/getPercentileRank`, (route) =>
       route.fulfill({
         status: 200,
         contentType: "application/json",
         body: JSON.stringify({
-          percentileRank: 75,
-          totalRows: 100,
-          summary_stat: 5000,
+          resData: {
+            percentileRank: 75,
+            totalRows: 100,
+            summary_stat: 5000,
+          },
         }),
       }),
     );
 
-    // Reload the page to trigger the API call
-    await page.reload();
+    // Click the link to see results
+    await page.click("text=Click to see your results!");
 
     // Check that the correct results header is displayed
     const resultsHeader = await page.locator("h1");

templates/experiments/grammaticality-judgment/src/e2e/results.test.js

@@ -15,10 +15,15 @@ test.describe("Results page in simulation mode", () => {
   );
 
   test.beforeEach(async ({ page }) => {
+    // Register listener before goto to avoid missing the response
+    const tabulateResponsePromise = page.waitForResponse(
+      `/api/${expInfo.shortName}/tabulateAndPostResults`,
+    );
     // Go to the experiment in simulation mode
     await page.goto(`/quizzes/${expInfo.shortName}?simulate=true`);
-
-    // Wait for the experiment to finish
+    // Wait for tabulateAndPostResults to complete so data is committed to DB
+    await tabulateResponsePromise;
+    // Wait for the experiment finish screen
     await page.waitForSelector("text=Click to see your results!");
   });
 

templates/experiments/grammaticality-judgment/src/web page/src/results.js

@@ -77,7 +77,7 @@ const ExpResults = (props) => {
       );
     }
 
-    if (!data.percentileRank || !data.totalRows || !data.summary_stat) {
+    if (data.percentileRank == null || !data.totalRows || data.summary_stat == null) {
       return (
         <div>
           <Container className="mt-5 text-center">

templates/experiments/lexical-decision/src/e2e/experiment.test.js

@@ -234,28 +234,23 @@ test.describe("Completing the experiment in simulation mode", () => {
     expect(dbUserResults.user_id).toBe(userResults.user_id);
   });
   test("should produce the expected results page", async ({ page }) => {
-    // Click the link to see results
-    await page.click("text=Click to see your results!");
-
-    // Check that the results page displays the loading message initially
-    const loadingMessage = await page.locator("h1");
-    await expect(loadingMessage).toHaveText("Loading...");
-
     // Mock the API response to simulate data being available
-    await page.route("**/api/results", (route) =>
+    await page.route(`**/api/${expInfo.shortName}/getPercentileRank`, (route) =>
       route.fulfill({
         status: 200,
         contentType: "application/json",
         body: JSON.stringify({
-          percentileRank: 75,
-          totalRows: 100,
-          summary_stat: 5000,
+          resData: {
+            percentileRank: 75,
+            totalRows: 100,
+            summary_stat: 5000,
+          },
         }),
       }),
     );
 
-    // Reload the page to trigger the API call
-    await page.reload();
+    // Click the link to see results
+    await page.click("text=Click to see your results!");
 
     // Check that the correct results header is displayed
     const resultsHeader = await page.locator("h1");

templates/experiments/lexical-decision/src/e2e/results.test.js

@@ -15,10 +15,15 @@ test.describe("Results page in simulation mode", () => {
   );
 
   test.beforeEach(async ({ page }) => {
+    // Register listener before goto to avoid missing the response
+    const tabulateResponsePromise = page.waitForResponse(
+      `/api/${expInfo.shortName}/tabulateAndPostResults`,
+    );
     // Go to the experiment in simulation mode
     await page.goto(`/quizzes/${expInfo.shortName}?simulate=true`);
-
-    // Wait for the experiment to finish
+    // Wait for tabulateAndPostResults to complete so data is committed to DB
+    await tabulateResponsePromise;
+    // Wait for the experiment finish screen
     await page.waitForSelector("text=Click to see your results!");
   });
 

templates/experiments/lexical-decision/src/web page/src/results.js

@@ -77,7 +77,7 @@ const ExpResults = (props) => {
       );
     }
 
-    if (!data.percentileRank || !data.totalRows || !data.summary_stat) {
+    if (data.percentileRank == null || !data.totalRows || data.summary_stat == null) {
       return (
         <div>
           <Container className="mt-5 text-center">

templates/experiments/self-paced-reading/src/e2e/experiment.test.js

@@ -234,28 +234,23 @@ test.describe("Completing the experiment in simulation mode", () => {
     expect(dbUserResults.user_id).toBe(userResults.user_id);
   });
   test("should produce the expected results page", async ({ page }) => {
-    // Click the link to see results
-    await page.click("text=Click to see your results!");
-
-    // Check that the results page displays the loading message initially
-    const loadingMessage = await page.locator("h1");
-    await expect(loadingMessage).toHaveText("Loading...");
-
     // Mock the API response to simulate data being available
-    await page.route("**/api/results", (route) =>
+    await page.route(`**/api/${expInfo.shortName}/getPercentileRank`, (route) =>
       route.fulfill({
         status: 200,
         contentType: "application/json",
         body: JSON.stringify({
-          percentileRank: 75,
-          totalRows: 100,
-          summary_stat: 5000,
+          resData: {
+            percentileRank: 75,
+            totalRows: 100,
+            summary_stat: 5000,
+          },
         }),
       }),
     );
 
-    // Reload the page to trigger the API call
-    await page.reload();
+    // Click the link to see results
+    await page.click("text=Click to see your results!");
 
     // Check that the correct results header is displayed
     const resultsHeader = await page.locator("h1");

templates/experiments/self-paced-reading/src/e2e/results.test.js

@@ -15,10 +15,15 @@ test.describe("Results page in simulation mode", () => {
   );
 
   test.beforeEach(async ({ page }) => {
+    // Register listener before goto to avoid missing the response
+    const tabulateResponsePromise = page.waitForResponse(
+      `/api/${expInfo.shortName}/tabulateAndPostResults`,
+    );
     // Go to the experiment in simulation mode
     await page.goto(`/quizzes/${expInfo.shortName}?simulate=true`);
-
-    // Wait for the experiment to finish
+    // Wait for tabulateAndPostResults to complete so data is committed to DB
+    await tabulateResponsePromise;
+    // Wait for the experiment finish screen
     await page.waitForSelector("text=Click to see your results!");
   });
 

templates/experiments/self-paced-reading/src/web page/src/results.js

@@ -77,7 +77,7 @@ const ExpResults = (props) => {
       );
     }
 
-    if (!data.percentileRank || !data.totalRows || !data.summary_stat) {
+    if (data.percentileRank == null || !data.totalRows || data.summary_stat == null) {
       return (
         <div>
           <Container className="mt-5 text-center">