From 3b8ceb6512b0e1172769815033e98454588fdd87 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Diana=20L=C3=B3pez=20Alvas?= <dlopezalvas@gmail.com>
Date: Fri, 23 Aug 2024 14:46:06 -0300
Subject: [PATCH] reorganize tests

---
 .../ChallengeView/SceneView.test.tsx          |  4 ++--
 .../Creator/CreatorSelection.test.tsx         |  8 +++----
 .../components}/Creator/GridOptions.test.tsx  | 12 +++++-----
 .../components}/Creator/SceneCell.test.tsx    | 12 +++++-----
 .../components}/Creator/SceneEdition.test.tsx |  8 +++----
 .../components}/Creator/SceneGrid.test.tsx    |  8 +++----
 .../components}/Creator/SceneTools.test.tsx   |  8 +++----
 .../Creator/StatementEdition.test.tsx         |  8 +++----
 .../Creator/ToolboxPreview.test.tsx           |  6 ++---
 .../components}/ImportChallengeCard.test.tsx  |  4 ++--
 .../components}/MainRoutesComponents.test.tsx | 22 +++++++++----------
 .../components}/passwordRecovery.test.tsx     |  6 ++---
 .../{ => unit/components}/shareByUrl.test.tsx | 15 +++++++------
 src/test/{ => unit}/localStorage.test.ts      |  4 ++--
 src/test/{ => unit}/pbApi.test.ts             |  6 ++---
 .../{ => unit}/serializedChallenge.test.ts    |  4 ++--
 src/test/{ => unit}/staticData.test.ts        |  6 ++---
 17 files changed, 71 insertions(+), 70 deletions(-)
 rename src/test/{ => unit/components}/ChallengeView/SceneView.test.tsx (91%)
 rename src/test/{ => unit/components}/Creator/CreatorSelection.test.tsx (73%)
 rename src/test/{ => unit/components}/Creator/GridOptions.test.tsx (83%)
 rename src/test/{ => unit/components}/Creator/SceneCell.test.tsx (93%)
 rename src/test/{ => unit/components}/Creator/SceneEdition.test.tsx (87%)
 rename src/test/{ => unit/components}/Creator/SceneGrid.test.tsx (86%)
 rename src/test/{ => unit/components}/Creator/SceneTools.test.tsx (72%)
 rename src/test/{ => unit/components}/Creator/StatementEdition.test.tsx (80%)
 rename src/test/{ => unit/components}/Creator/ToolboxPreview.test.tsx (66%)
 rename src/test/{ => unit/components}/ImportChallengeCard.test.tsx (79%)
 rename src/test/{ => unit/components}/MainRoutesComponents.test.tsx (72%)
 rename src/test/{ => unit/components}/passwordRecovery.test.tsx (90%)
 rename src/test/{ => unit/components}/shareByUrl.test.tsx (89%)
 rename src/test/{ => unit}/localStorage.test.ts (93%)
 rename src/test/{ => unit}/pbApi.test.ts (93%)
 rename src/test/{ => unit}/serializedChallenge.test.ts (96%)
 rename src/test/{ => unit}/staticData.test.ts (87%)

diff --git a/src/test/ChallengeView/SceneView.test.tsx b/src/test/unit/components/ChallengeView/SceneView.test.tsx
similarity index 91%
rename from src/test/ChallengeView/SceneView.test.tsx
rename to src/test/unit/components/ChallengeView/SceneView.test.tsx
index e8432fae..dfaecf50 100644
--- a/src/test/ChallengeView/SceneView.test.tsx
+++ b/src/test/unit/components/ChallengeView/SceneView.test.tsx
@@ -4,9 +4,9 @@
  */
 // This enables iframe loading on rendering, otherwise it's turned off.
 
-import { SceneView } from "../../components/challengeView/SceneView"
+import { SceneView } from "../../../../components/challengeView/SceneView"
 import { screen } from '@testing-library/react'
-import { renderComponent } from "../testUtils"
+import { renderComponent } from "../../../testUtils"
 describe('SceneView renders all challenges', () => {
 
     test.skip(`Scene LimpiandoElHumedal loads ok`, () => {
diff --git a/src/test/Creator/CreatorSelection.test.tsx b/src/test/unit/components/Creator/CreatorSelection.test.tsx
similarity index 73%
rename from src/test/Creator/CreatorSelection.test.tsx
rename to src/test/unit/components/Creator/CreatorSelection.test.tsx
index 52ebdb2c..ae223236 100644
--- a/src/test/Creator/CreatorSelection.test.tsx
+++ b/src/test/unit/components/Creator/CreatorSelection.test.tsx
@@ -1,8 +1,8 @@
 import { screen } from '@testing-library/react'
-import { ActorSelection } from '../../components/creator/ActorSelection/ActorSelection';
-import { LocalStorage } from '../../localStorage';
-import { defaultChallenge } from "../../components/serializedChallenge"
-import { renderComponent } from '../testUtils';
+import { ActorSelection } from '../../../../components/creator/ActorSelection/ActorSelection';
+import { LocalStorage } from '../../../../localStorage';
+import { defaultChallenge } from "../../../../components/serializedChallenge"
+import { renderComponent } from '../../../testUtils';
 
 describe('Creator selection', () => {
     afterEach(() => {
diff --git a/src/test/Creator/GridOptions.test.tsx b/src/test/unit/components/Creator/GridOptions.test.tsx
similarity index 83%
rename from src/test/Creator/GridOptions.test.tsx
rename to src/test/unit/components/Creator/GridOptions.test.tsx
index ee33904c..ca23b5ec 100644
--- a/src/test/Creator/GridOptions.test.tsx
+++ b/src/test/unit/components/Creator/GridOptions.test.tsx
@@ -1,10 +1,10 @@
-import { renderComponent, renderWithContext } from "../testUtils"
+import { renderComponent, renderWithContext } from "../../../testUtils"
 import { fireEvent, screen } from '@testing-library/react'
-import { GridOptions } from "../../components/creator/Editor/SceneEdition/GridOptions/GridOptions"
-import { LocalStorage } from "../../localStorage"
-import { SceneMap, SerializedChallenge, defaultChallenge, defaultScene } from "../../components/serializedChallenge"
-import { ACTOR, EMPTY, OBSTACLE } from "../../components/creator/Editor/SceneEdition/mapUtils"
-import { CreatorContextProvider } from "../../components/creator/Editor/CreatorContext"
+import { GridOptions } from "../../../../components/creator/Editor/SceneEdition/GridOptions/GridOptions"
+import { LocalStorage } from "../../../../localStorage"
+import { SceneMap, SerializedChallenge, defaultChallenge, defaultScene } from "../../../../components/serializedChallenge"
+import { ACTOR, EMPTY, OBSTACLE } from "../../../../components/creator/Editor/SceneEdition/mapUtils"
+import { CreatorContextProvider } from "../../../../components/creator/Editor/CreatorContext"
 
 describe('Scene grid', () => {
 
diff --git a/src/test/Creator/SceneCell.test.tsx b/src/test/unit/components/Creator/SceneCell.test.tsx
similarity index 93%
rename from src/test/Creator/SceneCell.test.tsx
rename to src/test/unit/components/Creator/SceneCell.test.tsx
index 21913894..d9402748 100644
--- a/src/test/Creator/SceneCell.test.tsx
+++ b/src/test/unit/components/Creator/SceneCell.test.tsx
@@ -1,10 +1,10 @@
 import { fireEvent, render } from '@testing-library/react'
-import { Position, SceneCell } from "../../components/creator/Editor/SceneEdition/Grid/SceneCell"
-import { SceneMap, SceneType, SerializedChallenge, defaultChallenge } from "../../components/serializedChallenge"
-import { LocalStorage } from "../../localStorage"
-import { renderComponent } from "../testUtils"
-import { CreatorContextProvider } from '../../components/creator/Editor/CreatorContext'
-import { ACTOR, EMPTY, OBSTACLE } from '../../components/creator/Editor/SceneEdition/mapUtils'
+import { Position, SceneCell } from "../../../../components/creator/Editor/SceneEdition/Grid/SceneCell"
+import { SceneMap, SceneType, SerializedChallenge, defaultChallenge } from "../../../../components/serializedChallenge"
+import { LocalStorage } from "../../../../localStorage"
+import { renderComponent } from "../../../testUtils"
+import { CreatorContextProvider } from '../../../../components/creator/Editor/CreatorContext'
+import { ACTOR, EMPTY, OBSTACLE } from '../../../../components/creator/Editor/SceneEdition/mapUtils'
 
 describe('Scene grid', () => {
 
diff --git a/src/test/Creator/SceneEdition.test.tsx b/src/test/unit/components/Creator/SceneEdition.test.tsx
similarity index 87%
rename from src/test/Creator/SceneEdition.test.tsx
rename to src/test/unit/components/Creator/SceneEdition.test.tsx
index 4f03ca93..561fb922 100644
--- a/src/test/Creator/SceneEdition.test.tsx
+++ b/src/test/unit/components/Creator/SceneEdition.test.tsx
@@ -1,8 +1,8 @@
 import { fireEvent, screen } from '@testing-library/react'
-import { defaultChallenge, SerializedChallenge } from "../../components/serializedChallenge"
-import { SceneEdition } from '../../components/creator/Editor/SceneEdition/SceneEdition';
-import { LocalStorage } from '../../localStorage';
-import { renderWithContext } from '../testUtils';
+import { defaultChallenge, SerializedChallenge } from "../../../../components/serializedChallenge"
+import { SceneEdition } from '../../../../components/creator/Editor/SceneEdition/SceneEdition';
+import { LocalStorage } from '../../../../localStorage';
+import { renderWithContext } from '../../../testUtils';
 
 describe('Scene Edition', () => {
     afterEach(() => {
diff --git a/src/test/Creator/SceneGrid.test.tsx b/src/test/unit/components/Creator/SceneGrid.test.tsx
similarity index 86%
rename from src/test/Creator/SceneGrid.test.tsx
rename to src/test/unit/components/Creator/SceneGrid.test.tsx
index ef1de27c..f6eafdc3 100644
--- a/src/test/Creator/SceneGrid.test.tsx
+++ b/src/test/unit/components/Creator/SceneGrid.test.tsx
@@ -1,8 +1,8 @@
 import { screen } from '@testing-library/react'
-import { defaultChallenge, SerializedChallenge } from '../../components/serializedChallenge';
-import { LocalStorage } from '../../localStorage';
-import { SceneGrid } from '../../components/creator/Editor/SceneEdition/Grid/SceneGrid';
-import { renderWithContext } from '../testUtils';
+import { defaultChallenge, SerializedChallenge } from '../../../../components/serializedChallenge';
+import { LocalStorage } from '../../../../localStorage';
+import { SceneGrid } from '../../../../components/creator/Editor/SceneEdition/Grid/SceneGrid';
+import { renderWithContext } from '../../../testUtils';
 
 describe('Scene Grid', () => {
     afterEach(() => {
diff --git a/src/test/Creator/SceneTools.test.tsx b/src/test/unit/components/Creator/SceneTools.test.tsx
similarity index 72%
rename from src/test/Creator/SceneTools.test.tsx
rename to src/test/unit/components/Creator/SceneTools.test.tsx
index 6222fe0e..dd0b2898 100644
--- a/src/test/Creator/SceneTools.test.tsx
+++ b/src/test/unit/components/Creator/SceneTools.test.tsx
@@ -1,8 +1,8 @@
 import { screen } from '@testing-library/react'
-import { defaultChallenge } from "../../components/serializedChallenge"
-import { SceneTools } from '../../components/creator/Editor/SceneEdition/SceneTools';
-import { LocalStorage } from '../../localStorage';
-import { renderComponent } from '../testUtils';
+import { defaultChallenge } from "../../../../components/serializedChallenge"
+import { SceneTools } from '../../../../components/creator/Editor/SceneEdition/SceneTools';
+import { LocalStorage } from '../../../../localStorage';
+import { renderComponent } from '../../../testUtils';
 
 describe('Scene Tools', () => {
     afterEach(() => {
diff --git a/src/test/Creator/StatementEdition.test.tsx b/src/test/unit/components/Creator/StatementEdition.test.tsx
similarity index 80%
rename from src/test/Creator/StatementEdition.test.tsx
rename to src/test/unit/components/Creator/StatementEdition.test.tsx
index 789f5b2f..a0cfa87b 100644
--- a/src/test/Creator/StatementEdition.test.tsx
+++ b/src/test/unit/components/Creator/StatementEdition.test.tsx
@@ -1,8 +1,8 @@
 import { fireEvent, screen } from '@testing-library/react'
-import { defaultChallenge } from "../../components/serializedChallenge"
-import { StatementEdition } from '../../components/creator/Editor/ChallengeDetailsEdition/StatementEdition';
-import { LocalStorage } from '../../localStorage';
-import { renderComponent } from '../testUtils';
+import { defaultChallenge } from "../../../../components/serializedChallenge"
+import { StatementEdition } from '../../../../components/creator/Editor/ChallengeDetailsEdition/StatementEdition';
+import { LocalStorage } from '../../../../localStorage';
+import { renderComponent } from '../../../testUtils';
 
 describe('Statement Edition', () => {
     afterEach(() => {
diff --git a/src/test/Creator/ToolboxPreview.test.tsx b/src/test/unit/components/Creator/ToolboxPreview.test.tsx
similarity index 66%
rename from src/test/Creator/ToolboxPreview.test.tsx
rename to src/test/unit/components/Creator/ToolboxPreview.test.tsx
index 578b32dd..55d1ba2e 100644
--- a/src/test/Creator/ToolboxPreview.test.tsx
+++ b/src/test/unit/components/Creator/ToolboxPreview.test.tsx
@@ -1,7 +1,7 @@
 import { screen } from '@testing-library/react'
-import { renderComponent } from '../testUtils';
-import { ToolboxPreview } from '../../components/creator/Editor/ChallengeDetailsEdition/ToolBoxEditor/ToolboxPreview';
-import { commonBlocks, sceneBlocks } from '../../components/blockly/blocks';
+import { renderComponent } from '../../../testUtils';
+import { ToolboxPreview } from '../../../../components/creator/Editor/ChallengeDetailsEdition/ToolBoxEditor/ToolboxPreview';
+import { commonBlocks, sceneBlocks } from '../../../../components/blockly/blocks';
 
 describe('Toolbox Preview', () => {
   test('rendering toolbox preview ', async () => {
diff --git a/src/test/ImportChallengeCard.test.tsx b/src/test/unit/components/ImportChallengeCard.test.tsx
similarity index 79%
rename from src/test/ImportChallengeCard.test.tsx
rename to src/test/unit/components/ImportChallengeCard.test.tsx
index f75d7864..a6e9c5eb 100644
--- a/src/test/ImportChallengeCard.test.tsx
+++ b/src/test/unit/components/ImportChallengeCard.test.tsx
@@ -1,6 +1,6 @@
 import { screen, fireEvent } from '@testing-library/react'
-import { ImportChallengeCard } from '../components/home/ImportChallengeCard';
-import { renderComponent } from './testUtils';
+import { ImportChallengeCard } from '../../../components/home/ImportChallengeCard';
+import { renderComponent } from '../../testUtils';
 
 
 test('shows error snackbar when invalid file is uploaded', async () => {
diff --git a/src/test/MainRoutesComponents.test.tsx b/src/test/unit/components/MainRoutesComponents.test.tsx
similarity index 72%
rename from src/test/MainRoutesComponents.test.tsx
rename to src/test/unit/components/MainRoutesComponents.test.tsx
index 7a35e479..020ceb3c 100644
--- a/src/test/MainRoutesComponents.test.tsx
+++ b/src/test/unit/components/MainRoutesComponents.test.tsx
@@ -1,14 +1,14 @@
-import { About } from "../components/about/About"
-import { BookView } from "../components/book/BookView"
-import { ChallengeById, ChallengeByName } from "../components/EmberChallengeView"
-import { CreatorEditor } from "../components/creator/Editor/Editor"
-import { ActorSelection } from "../components/creator/ActorSelection/ActorSelection"
-import { Home } from "../components/home/Home"
-import { ImportedChallengeView } from "../components/ImportedChallengeView"
-import { ChangePassword, PasswordRecovery } from "../components/users/passwordRecovery/PasswordRecovery"
-import { Register } from "../components/users/register/Register"
-import { expectToThrow, renderComponent } from "./testUtils"
-import { validChallenge } from "./serializedChallenge.test"
+import { About } from "../../../components/about/About"
+import { BookView } from "../../../components/book/BookView"
+import { ChallengeById, ChallengeByName } from "../../../components/EmberChallengeView"
+import { CreatorEditor } from "../../../components/creator/Editor/Editor"
+import { ActorSelection } from "../../../components/creator/ActorSelection/ActorSelection"
+import { Home } from "../../../components/home/Home"
+import { ImportedChallengeView } from "../../../components/ImportedChallengeView"
+import { ChangePassword, PasswordRecovery } from "../../../components/users/passwordRecovery/PasswordRecovery"
+import { Register } from "../../../components/users/register/Register"
+import { expectToThrow, renderComponent } from "../../testUtils"
+import { validChallenge } from "../serializedChallenge.test"
 test('Renders home without errors', async () => {
   expect(() => renderComponent(<Home />)).not.toThrow()
 })
diff --git a/src/test/passwordRecovery.test.tsx b/src/test/unit/components/passwordRecovery.test.tsx
similarity index 90%
rename from src/test/passwordRecovery.test.tsx
rename to src/test/unit/components/passwordRecovery.test.tsx
index 7bd43af1..a7814051 100644
--- a/src/test/passwordRecovery.test.tsx
+++ b/src/test/unit/components/passwordRecovery.test.tsx
@@ -1,6 +1,6 @@
-import { ChangePassword, PasswordRecovery } from "../components/users/passwordRecovery/PasswordRecovery"
-import { PasswordStrength, testingPasswordStrength } from "../components/users/register/StrengthPassword"
-import { renderComponent } from "./testUtils"
+import { ChangePassword, PasswordRecovery } from "../../../components/users/passwordRecovery/PasswordRecovery"
+import { PasswordStrength, testingPasswordStrength } from "../../../components/users/register/StrengthPassword"
+import { renderComponent } from "../../testUtils"
 import { screen } from '@testing-library/react'
 
 describe("Password recovery", () => {
diff --git a/src/test/shareByUrl.test.tsx b/src/test/unit/components/shareByUrl.test.tsx
similarity index 89%
rename from src/test/shareByUrl.test.tsx
rename to src/test/unit/components/shareByUrl.test.tsx
index 481f12c1..39bc06e9 100644
--- a/src/test/shareByUrl.test.tsx
+++ b/src/test/unit/components/shareByUrl.test.tsx
@@ -1,11 +1,12 @@
-import { ShareModal } from "../components/creator/Editor/ActionButtons/ShareChallenge/ShareButton"
-import { ChallengeUpsertButton, ShareButtons } from "../components/creator/Editor/ActionButtons/ShareChallenge/ShareModalButtons"
-import { CreatorContextProvider } from "../components/creator/Editor/CreatorContext"
-import { SerializedChallenge } from "../components/serializedChallenge"
-import { LocalStorage } from "../localStorage"
-import { User } from "../pbApi"
-import { renderComponent } from "./testUtils"
+
 import { act, screen } from '@testing-library/react'
+import { ShareModal } from '../../../components/creator/Editor/ActionButtons/ShareChallenge/ShareButton'
+import { ChallengeUpsertButton, ShareButtons } from '../../../components/creator/Editor/ActionButtons/ShareChallenge/ShareModalButtons'
+import { CreatorContextProvider } from '../../../components/creator/Editor/CreatorContext'
+import { SerializedChallenge } from '../../../components/serializedChallenge'
+import { LocalStorage } from '../../../localStorage'
+import { User } from '../../../pbApi'
+import { renderComponent } from '../../testUtils'
 
 jest.mock("../pbApi", () => {
     return {
diff --git a/src/test/localStorage.test.ts b/src/test/unit/localStorage.test.ts
similarity index 93%
rename from src/test/localStorage.test.ts
rename to src/test/unit/localStorage.test.ts
index a100d58b..47154926 100644
--- a/src/test/localStorage.test.ts
+++ b/src/test/unit/localStorage.test.ts
@@ -1,5 +1,5 @@
-import { LocalStorage } from '../localStorage';
-import { User } from '../pbApi';
+import { LocalStorage } from '../../localStorage';
+import { User } from '../../pbApi';
 
 describe('Storage', () => {
 
diff --git a/src/test/pbApi.test.ts b/src/test/unit/pbApi.test.ts
similarity index 93%
rename from src/test/pbApi.test.ts
rename to src/test/unit/pbApi.test.ts
index db042b64..4d96c48b 100644
--- a/src/test/pbApi.test.ts
+++ b/src/test/unit/pbApi.test.ts
@@ -1,7 +1,7 @@
 import fetchMock from 'fetch-mock-jest';
-import { PilasBloquesApi } from '../pbApi';
-import { LocalStorage } from '../localStorage';
-import { expectToThrow, fakeUser, mockApi, mockApiPath } from './testUtils';
+import { PilasBloquesApi } from '../../pbApi';
+import { LocalStorage } from '../../localStorage';
+import { fakeUser, mockApi, mockApiPath } from '../testUtils';
 
 describe('PB Api', () => {
 
diff --git a/src/test/serializedChallenge.test.ts b/src/test/unit/serializedChallenge.test.ts
similarity index 96%
rename from src/test/serializedChallenge.test.ts
rename to src/test/unit/serializedChallenge.test.ts
index 28f513da..d8d7b1c3 100644
--- a/src/test/serializedChallenge.test.ts
+++ b/src/test/unit/serializedChallenge.test.ts
@@ -1,5 +1,5 @@
-import { Scene, SerializedChallenge, isValidChallenge, sceneIsValid } from '../components/serializedChallenge';
-import { Ember } from '../emberCommunication';
+import { Scene, SerializedChallenge, isValidChallenge, sceneIsValid } from '../../components/serializedChallenge';
+import { Ember } from '../../emberCommunication';
 
 const validScene: Scene = {
     type: "Lita",
diff --git a/src/test/staticData.test.ts b/src/test/unit/staticData.test.ts
similarity index 87%
rename from src/test/staticData.test.ts
rename to src/test/unit/staticData.test.ts
index 54ad0f01..ac9bd2ef 100644
--- a/src/test/staticData.test.ts
+++ b/src/test/unit/staticData.test.ts
@@ -1,6 +1,6 @@
-import { Book, getBook } from '../staticData/books';
-import { Challenge, getChallengeWithId, getChallengeWithName, getPathToChallenge, PathToChallenge } from '../staticData/challenges';
-import { expectToThrow } from './testUtils';
+import { Book, getBook } from '../../staticData/books';
+import { Challenge, getChallengeWithId, getChallengeWithName, getPathToChallenge, PathToChallenge } from '../../staticData/challenges';
+import { expectToThrow } from '../testUtils';
 
 describe('Static data fetching', () => {
   test('Should get book if it exists', () => {