From 6535caed55f371ddcfabfb5688c7c2ea6768e2cc Mon Sep 17 00:00:00 2001
From: Albin Henriksson <albhe428@student.liu.se>
Date: Mon, 19 Apr 2021 08:15:00 +0200
Subject: [PATCH] Fix tests
---
.../presentationEditor/PresentationEditorPage.test.tsx | 2 +-
.../pages/presentationEditor/components/SlideEditor.tsx | 4 ++--
.../pages/presentationEditor/components/SlideSettings.tsx | 3 ++-
.../components/TextComponentDisplay.test.tsx | 8 +++++++-
4 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/client/src/pages/presentationEditor/PresentationEditorPage.test.tsx b/client/src/pages/presentationEditor/PresentationEditorPage.test.tsx
index ebc96d73..956d0b72 100644
--- a/client/src/pages/presentationEditor/PresentationEditorPage.test.tsx
+++ b/client/src/pages/presentationEditor/PresentationEditorPage.test.tsx
@@ -13,7 +13,7 @@ it('renders presentation editor', () => {
id: 0,
year: 0,
city_id: 0,
- slides: [],
+ slides: [{ id: 5 }],
teams: [],
},
}
diff --git a/client/src/pages/presentationEditor/components/SlideEditor.tsx b/client/src/pages/presentationEditor/components/SlideEditor.tsx
index f9e9ce62..9baa9791 100644
--- a/client/src/pages/presentationEditor/components/SlideEditor.tsx
+++ b/client/src/pages/presentationEditor/components/SlideEditor.tsx
@@ -9,9 +9,9 @@ import TextComponentDisplay from './TextComponentDisplay'
const SlideEditor: React.FC = () => {
const components = useAppSelector(
- (state) => state.editor.competition.slides.find((slide) => slide.id === state.editor.activeSlideId)?.components
+ (state) =>
+ state.editor.competition.slides.find((slide) => slide && slide.id === state.editor.activeSlideId)?.components
)
- console.log(components)
return (
<SlideEditorContainer>
{components &&
diff --git a/client/src/pages/presentationEditor/components/SlideSettings.tsx b/client/src/pages/presentationEditor/components/SlideSettings.tsx
index 96f76bb0..cc6b343e 100644
--- a/client/src/pages/presentationEditor/components/SlideSettings.tsx
+++ b/client/src/pages/presentationEditor/components/SlideSettings.tsx
@@ -205,7 +205,8 @@ const SlideSettings: React.FC = () => {
secondary="(Fyll i rutan höger om textfältet för att markera korrekt svar)"
/>
</ListItem>
- {currentSlide.questions[0] &&
+ {currentSlide &&
+ currentSlide.questions[0] &&
currentSlide.questions[0].question_alternatives.map((alt) => (
<div key={alt.id}>
<ListItem divider>
diff --git a/client/src/pages/presentationEditor/components/TextComponentDisplay.test.tsx b/client/src/pages/presentationEditor/components/TextComponentDisplay.test.tsx
index 8f61ee36..c4489878 100644
--- a/client/src/pages/presentationEditor/components/TextComponentDisplay.test.tsx
+++ b/client/src/pages/presentationEditor/components/TextComponentDisplay.test.tsx
@@ -1,12 +1,18 @@
import { Editor } from '@tinymce/tinymce-react'
import { mount } from 'enzyme'
import React from 'react'
+import { Provider } from 'react-redux'
+import store from '../../../store'
import TextComponentDisplay from './TextComponentDisplay'
it('renders text component display', () => {
const testText = 'TEST'
const container = mount(
- <TextComponentDisplay component={{ id: 0, x: 0, y: 0, w: 0, h: 0, text: testText, type: 2, font: '123123' }} />
+ <Provider store={store}>
+ <TextComponentDisplay
+ component={{ id: 0, x: 0, y: 0, w: 0, h: 0, data: { text: testText, font: '123123' }, type_id: 2 }}
+ />
+ </Provider>
)
expect(container.find(Editor).prop('initialValue')).toBe(testText)
})
--
GitLab