Merge branch 'master' into fix/part1-dependabot/npm_and_yarn/types/lodash-4.14.187

Author: flacial

.github/workflows/init-preview-db.yml

@@ -0,0 +1,21 @@
+name: init-preview-db
+on:
+  pull_request:
+    types:
+      - closed
+    paths:
+      - '**.prisma'
+jobs:
+  ssh-and-update-preview-db:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: appleboy/ssh-action@master
+        with:
+          host: ${{ secrets.PREVIEW_DB_HOST }}
+          username: ${{ secrets.PREVIEW_DB_USERNAME }}
+          password: ${{ secrets.PREVIEW_DB_PW }}
+          script: |
+            cd c0d3-app
+            git pull origin master
+            yarn --ignore-engines
+            yarn db:init --force

__tests__/pages/admin/lessons/[lessonSlug]/[pageName]/lessons.test.js

@@ -10,32 +10,20 @@ import dummyAlertData from '../../../../../../__dummy__/alertData'
 import getExercisesData from '../../../../../../__dummy__/getExercisesData'
 import '@testing-library/jest-dom'
 import GET_APP from '../../../../../../graphql/queries/getApp'
+import { MODULES } from '../../../../../../graphql/queries/modules'
+import { CHALLENGES } from '../../../../../../graphql/queries/challenges'
+import ADD_CHALLENGE from '../../../../../../graphql/queries/createChallenge'
 import GET_EXERCISES from '../../../../../../graphql/queries/getExercises'
 import REMOVE_EXERCISE_FLAG from '../../../../../../graphql/queries/removeExerciseFlag'
 import DELETE_EXERCISE from '../../../../../../graphql/queries/deleteExercise'
 import { MockedProvider } from '@apollo/client/testing'
-import { gql } from '@apollo/client'
 import userEvent from '@testing-library/user-event'
 import UPDATE_LESSON from '../../../../../../graphql/queries/updateLesson'
 
 // Imported to be able to use expect(...).toBeInTheDocument()
 import '@testing-library/jest-dom'
 import { AddModuleDocument } from '../../../../../../graphql'
 
-const MODULES = gql`
-  query {
-    modules {
-      id
-      name
-      content
-      lesson {
-        id
-      }
-      order
-    }
-  }
-`
-
 const modules = [
   {
     id: 1,
@@ -236,13 +224,44 @@ const unflagExerciseMock = {
   }
 }
 
+const challenges = dummyLessonData.find(e => e.slug === 'js1').challenges
+const challengesQueryMock = {
+  request: { query: CHALLENGES, variables: {} },
+  result: {
+    data: {
+      challenges
+    }
+  }
+}
+
+const addChallengeQueryMock = {
+  request: {
+    query: ADD_CHALLENGE,
+    variables: {
+      content: 'Write an app that delete assets',
+      lessonId: 2,
+      name: 'Asset deletion',
+      order: 1,
+      description: 'Write an app that delete assets',
+      title: 'Asset deletion'
+    }
+  },
+  result: {
+    data: {
+      createChallenge: dummyLessonData[0]
+    }
+  }
+}
+
 const mocks = [
   getAppQueryMock,
   getAppQueryMock,
   getAppQueryMock,
   modulesQueryMock,
   updateLessonMutationMock,
   addModuleMock,
+  challengesQueryMock,
+  addChallengeQueryMock,
   getExercisesMock
 ]
 
@@ -251,6 +270,8 @@ const mocksWithError = [
   modulesQueryMock,
   updateLessonMutationMockWithError,
   addModuleMock,
+  challengesQueryMock,
+  addChallengeQueryMock,
   getExercisesMock
 ]
 
@@ -260,7 +281,9 @@ const mocksWithRefetchExercises = [
   getAppQueryMock,
   getExerciseWithRefetchMock,
   deleteExerciseMock,
-  unflagExerciseMock
+  unflagExerciseMock,
+  challengesQueryMock,
+  addChallengeQueryMock
 ]
 
 const useRouter = jest.spyOn(require('next/router'), 'useRouter')
@@ -460,6 +483,119 @@ describe('modules', () => {
   })
 })
 
+describe('challenges', () => {
+  const useRouterChallenges = {
+    ...useRouterObj,
+    asPath: 'c0d3.com/admin/lessons/js1/challenges',
+    query: {
+      ...useRouterObj.query,
+      pageName: 'challenges'
+    }
+  }
+
+  beforeAll(() => useRouter.mockImplementation(() => useRouterChallenges))
+
+  it('Should render challenges page', async () => {
+    expect.assertions(1)
+
+    render(
+      <MockedProvider mocks={mocks}>
+        <LessonPage />
+      </MockedProvider>
+    )
+
+    // Used to make the queries resolve
+    await act(() => new Promise(res => setTimeout(res, 0)))
+
+    expect(screen.getByText('Incremental Closure')).toBeInTheDocument()
+  })
+
+  it('Should add a challenge', async () => {
+    expect.assertions(1)
+
+    render(
+      <MockedProvider mocks={mocks}>
+        <LessonPage />
+      </MockedProvider>
+    )
+
+    // Used to make the queries resolve
+    await act(() => new Promise(res => setTimeout(res, 0)))
+
+    // Will be changed to ADD NEW CHALLENGE in a subsequent PR
+    await userEvent.click(screen.getByText('ADD NEW MODULE'))
+
+    // Challenge name
+    await userEvent.type(screen.getByTestId('input0'), 'Asset deletion', {
+      delay: 1
+    })
+
+    // Challenge description
+    await userEvent.type(
+      screen.getByTestId('textbox'),
+      'Write an app that delete assets',
+      {
+        delay: 1
+      }
+    )
+
+    // Challenge order
+    await userEvent.type(screen.getByTestId('input2'), '1', {
+      delay: 1
+    })
+
+    const submit = screen.getByText('ADD CHALLENGE')
+
+    await userEvent.click(submit)
+
+    expect(
+      await screen.findByText('Added the item successfully!')
+    ).toBeInTheDocument()
+  })
+
+  it('Should set "add challenge" mode', async () => {
+    expect.assertions(3)
+
+    render(
+      <MockedProvider mocks={mocks}>
+        <LessonPage />
+      </MockedProvider>
+    )
+
+    // Used to make the queries resolve
+    await act(() => new Promise(res => setTimeout(res, 0)))
+
+    // Will be changed to ADD NEW CHALLENGE in a subsequent PR
+    await userEvent.click(screen.getByText('ADD NEW MODULE'))
+
+    expect(screen.getByTestId('input0').value).toBe('')
+    expect(screen.getByTestId('input2').value).toBe('')
+    expect(screen.getByTestId('textbox').value).toBe('')
+  })
+
+  it('Should switch to another challenge', async () => {
+    expect.assertions(2)
+
+    render(
+      <MockedProvider mocks={mocks}>
+        <LessonPage />
+      </MockedProvider>
+    )
+
+    // Used to make the queries resolve
+    await act(() => new Promise(res => setTimeout(res, 0)))
+
+    const selectedChallenge = challenges[0]
+
+    await userEvent.click(screen.getByText(selectedChallenge.title))
+
+    expect(screen.getByTestId('input0').value).toBe(selectedChallenge.title)
+    expect(screen.getByTestId('textbox').value).toBe(
+      selectedChallenge.description
+    )
+  })
+})
+
 describe('introduction', () => {
   const useRouterIntroduction = {
     ...useRouterObj,
@@ -639,7 +775,7 @@ describe('exercises', () => {
     expect((await screen.findAllByText('Email')).length).toBe(3)
   })
 
-  it('Should not render exercises if they are none', async () => {
+  it('Should not render exercises if they are none flagged', async () => {
     expect.assertions(1)
 
     const mocksOfMocks = mocks.slice(0, -1)

package.json

@@ -38,7 +38,7 @@
     "@primer/octicons-react": "17.9.0",
     "@prisma/client": "4",
     "@quixo3/prisma-session-store": "^3.1.10",
-    "@sentry/nextjs": "^7.18.0",
+    "@sentry/nextjs": "^7.19.0",
     "apollo-server-micro": "^2.26.1",
     "apollo3-cache-persist": "^0.14.1",
     "bcrypt": "5.0.0",
@@ -127,7 +127,7 @@
     "remark-toc": "^8.0.1",
     "sass-loader": "^10.2.1",
     "storybook-addon-next-router": "^4.0.1",
-    "svgo": "^3.0.0",
+    "svgo": "^3.0.1",
     "ts-node": "^10.9.1",
     "typescript": "^4.7.4"
   }