From e0085de3e397e3425b1570ce482476d495d2fa35 Mon Sep 17 00:00:00 2001 From: Josef Olsson <josol381@student.liu.se> Date: Fri, 23 Apr 2021 17:30:30 +0200 Subject: [PATCH] Fix front-end tests --- .../components/CompetitionSettings.test.tsx | 10 ---------- .../components/ImageComponentDisplay.test.tsx | 8 +++++++- .../components/SettingsPanel.test.tsx | 3 ++- 3 files changed, 9 insertions(+), 12 deletions(-) delete mode 100644 client/src/pages/presentationEditor/components/CompetitionSettings.test.tsx diff --git a/client/src/pages/presentationEditor/components/CompetitionSettings.test.tsx b/client/src/pages/presentationEditor/components/CompetitionSettings.test.tsx deleted file mode 100644 index a655a30f..00000000 --- a/client/src/pages/presentationEditor/components/CompetitionSettings.test.tsx +++ /dev/null @@ -1,10 +0,0 @@ -import { render } from '@testing-library/react' -import React from 'react' -import { BrowserRouter } from 'react-router-dom' -import ImageComponentDisplay from './ImageComponentDisplay' - -it('renders image component display', () => { - render( - <ImageComponentDisplay component={{ id: 0, x: 0, y: 0, w: 0, h: 0, type: 0, media_id: 0 }} /> - ) -}) diff --git a/client/src/pages/presentationEditor/components/ImageComponentDisplay.test.tsx b/client/src/pages/presentationEditor/components/ImageComponentDisplay.test.tsx index b726023b..9e78f8e1 100644 --- a/client/src/pages/presentationEditor/components/ImageComponentDisplay.test.tsx +++ b/client/src/pages/presentationEditor/components/ImageComponentDisplay.test.tsx @@ -3,5 +3,11 @@ import React from 'react' import ImageComponentDisplay from './ImageComponentDisplay' it('renders competition settings', () => { - render(<ImageComponentDisplay component={{ id: 0, x: 0, y: 0, w: 0, h: 0, media_id: 0, type: 2 }} />) + render( + <ImageComponentDisplay + component={{ id: 0, x: 0, y: 0, w: 0, h: 0, data: { media_id: 0, filename: '' }, type_id: 2 }} + width={0} + height={0} + /> + ) }) diff --git a/client/src/pages/presentationEditor/components/SettingsPanel.test.tsx b/client/src/pages/presentationEditor/components/SettingsPanel.test.tsx index a7a71e25..a17569ec 100644 --- a/client/src/pages/presentationEditor/components/SettingsPanel.test.tsx +++ b/client/src/pages/presentationEditor/components/SettingsPanel.test.tsx @@ -6,6 +6,7 @@ import { BrowserRouter } from 'react-router-dom' import store from '../../../store' import CompetitionSettings from './CompetitionSettings' import SettingsPanel from './SettingsPanel' +import SlideSettings from './SlideSettings' it('renders settings panel', () => { render( @@ -28,5 +29,5 @@ it('renders slide settings tab', () => { const tabs = wrapper.find('.MuiTabs-flexContainer') expect(wrapper.find(CompetitionSettings).length).toEqual(1) tabs.children().at(1).simulate('click') - expect(wrapper.text().includes('2')).toBe(true) //TODO: check that SlideSettings exists + expect(wrapper.find(SlideSettings).length).toEqual(1) }) -- GitLab