Skip to content

Commit

Permalink
reorganize tests
Browse files Browse the repository at this point in the history
  • Loading branch information
dlopezalvas committed Aug 23, 2024
1 parent d7d7c94 commit 3b8ceb6
Show file tree
Hide file tree
Showing 17 changed files with 71 additions and 70 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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`, () => {
Expand Down
Original file line number Diff line number Diff line change
@@ -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(() => {
Expand Down
Original file line number Diff line number Diff line change
@@ -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', () => {

Expand Down
Original file line number Diff line number Diff line change
@@ -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', () => {

Expand Down
Original file line number Diff line number Diff line change
@@ -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(() => {
Expand Down
Original file line number Diff line number Diff line change
@@ -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(() => {
Expand Down
Original file line number Diff line number Diff line change
@@ -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(() => {
Expand Down
Original file line number Diff line number Diff line change
@@ -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(() => {
Expand Down
Original file line number Diff line number Diff line change
@@ -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 () => {
Expand Down
Original file line number Diff line number Diff line change
@@ -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 () => {
Expand Down
Original file line number Diff line number Diff line change
@@ -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()
})
Expand Down
Original file line number Diff line number Diff line change
@@ -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", () => {
Expand Down
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { LocalStorage } from '../localStorage';
import { User } from '../pbApi';
import { LocalStorage } from '../../localStorage';
import { User } from '../../pbApi';

describe('Storage', () => {

Expand Down
6 changes: 3 additions & 3 deletions src/test/pbApi.test.ts → src/test/unit/pbApi.test.ts
Original file line number Diff line number Diff line change
@@ -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', () => {

Expand Down
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
Original file line number Diff line number Diff line change
@@ -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', () => {
Expand Down

0 comments on commit 3b8ceb6

Please sign in to comment.