diff --git a/package.json b/package.json index 6b4d91035..d10b1e534 100644 --- a/package.json +++ b/package.json @@ -38,7 +38,6 @@ "react-range-slider-input": "^3.0.7", "react-responsive": "^9.0.2", "react-spinners": "^0.11.0", - "react-test-renderer": "^17.0.2", "react-uid": "^2.3.3", "styled-components": "^5.3.11", "youtube-player": "^5.6.0", @@ -91,6 +90,7 @@ "prettier": "^2.8.8", "react-scripts": "4.0.3", "react-styleguidist": "^11.1.7", + "react-test-renderer": "^17.0.2", "semantic-release": "^17.4.6", "start-server-and-test": "^2.0.4" } diff --git a/src/components/Atoms/Button/Button.test.js b/src/components/Atoms/Button/Button.test.js index cf17a093a..9e47ee38f 100644 --- a/src/components/Atoms/Button/Button.test.js +++ b/src/components/Atoms/Button/Button.test.js @@ -1,6 +1,6 @@ import React from "react"; import "jest-styled-components"; -import renderWithTheme from "../../../hoc/shallowWithTheme"; +import renderWithTheme from "../../../../tests/hoc/shallowWithTheme"; import Button from "./Button"; it("renders a standard styled link correctly", () => { diff --git a/src/components/Atoms/Checkbox/Checkbox.test.js b/src/components/Atoms/Checkbox/Checkbox.test.js index a981f763a..7d52623fd 100644 --- a/src/components/Atoms/Checkbox/Checkbox.test.js +++ b/src/components/Atoms/Checkbox/Checkbox.test.js @@ -1,6 +1,6 @@ import React from 'react'; import 'jest-styled-components'; -import renderWithTheme from '../../../hoc/shallowWithTheme'; +import renderWithTheme from '../../../../tests/hoc/shallowWithTheme'; import Checkbox from './Checkbox'; it('renders correctly', () => { diff --git a/src/components/Atoms/ErrorText/ErrorText.test.js b/src/components/Atoms/ErrorText/ErrorText.test.js index ac9a8c902..712fa514c 100644 --- a/src/components/Atoms/ErrorText/ErrorText.test.js +++ b/src/components/Atoms/ErrorText/ErrorText.test.js @@ -1,7 +1,7 @@ import React from 'react'; import 'jest-styled-components'; -import renderWithTheme from '../../../hoc/shallowWithTheme'; +import renderWithTheme from '../../../../tests/hoc/shallowWithTheme'; import ErrorText from './ErrorText'; it('renders correctly', () => { diff --git a/src/components/Atoms/Input/input.test.js b/src/components/Atoms/Input/input.test.js index 1c08eee57..18ce5d1c9 100644 --- a/src/components/Atoms/Input/input.test.js +++ b/src/components/Atoms/Input/input.test.js @@ -1,6 +1,6 @@ import React from 'react'; import 'jest-styled-components'; -import renderWithTheme from '../../../hoc/shallowWithTheme'; +import renderWithTheme from '../../../../tests/hoc/shallowWithTheme'; import Input from './Input'; it('renders correctly', () => { diff --git a/src/components/Atoms/Link/Link.test.js b/src/components/Atoms/Link/Link.test.js index f38533291..2714c11ae 100644 --- a/src/components/Atoms/Link/Link.test.js +++ b/src/components/Atoms/Link/Link.test.js @@ -1,6 +1,6 @@ import React from "react"; import "jest-styled-components"; -import renderWithTheme from "../../../hoc/shallowWithTheme"; +import renderWithTheme from "../../../../tests/hoc/shallowWithTheme"; import Link from "./Link"; import { Internal } from "../Icons/index"; diff --git a/src/components/Atoms/Logo/Logo.test.js b/src/components/Atoms/Logo/Logo.test.js index fa698c860..7fd54e357 100644 --- a/src/components/Atoms/Logo/Logo.test.js +++ b/src/components/Atoms/Logo/Logo.test.js @@ -1,6 +1,6 @@ import React from "react"; import "jest-styled-components"; -import renderWithTheme from "../../../hoc/shallowWithTheme"; +import renderWithTheme from "../../../../tests/hoc/shallowWithTheme"; import Logo from "./Logo"; it("renders correctly", () => { diff --git a/src/components/Atoms/Pagination/Pagination.test.js b/src/components/Atoms/Pagination/Pagination.test.js index 04ccbb198..f3471c0fd 100644 --- a/src/components/Atoms/Pagination/Pagination.test.js +++ b/src/components/Atoms/Pagination/Pagination.test.js @@ -1,6 +1,6 @@ import React from 'react'; import 'jest-styled-components'; -import renderWithTheme from '../../../hoc/shallowWithTheme'; +import renderWithTheme from '../../../../tests/hoc/shallowWithTheme'; import Pagination from './Pagination'; it('renders correctly in minimalist form', () => { diff --git a/src/components/Atoms/Picture/Picture.test.js b/src/components/Atoms/Picture/Picture.test.js index a094844b8..42657905f 100644 --- a/src/components/Atoms/Picture/Picture.test.js +++ b/src/components/Atoms/Picture/Picture.test.js @@ -1,6 +1,6 @@ import React from "react"; import "jest-styled-components"; -import renderWithTheme from "../../../hoc/shallowWithTheme"; +import renderWithTheme from "../../../../tests/hoc/shallowWithTheme"; import Picture from "./Picture"; import { defaultData } from "../../../styleguide/data/data"; it("renders correctly", () => { diff --git a/src/components/Atoms/RadioButton/RadioButton.test.js b/src/components/Atoms/RadioButton/RadioButton.test.js index a29cda08b..076e94050 100644 --- a/src/components/Atoms/RadioButton/RadioButton.test.js +++ b/src/components/Atoms/RadioButton/RadioButton.test.js @@ -1,6 +1,6 @@ import React from 'react'; import 'jest-styled-components'; -import renderWithTheme from '../../../hoc/shallowWithTheme'; +import renderWithTheme from '../../../../tests/hoc/shallowWithTheme'; import RadioButton from './RadioButton'; it('renders correctly', () => { diff --git a/src/components/Atoms/RichText/RichText.test.js b/src/components/Atoms/RichText/RichText.test.js index d9b558a45..8568dabb5 100644 --- a/src/components/Atoms/RichText/RichText.test.js +++ b/src/components/Atoms/RichText/RichText.test.js @@ -1,6 +1,6 @@ import React from 'react'; import 'jest-styled-components'; -import renderWithTheme from '../../../hoc/shallowWithTheme'; +import renderWithTheme from '../../../../tests/hoc/shallowWithTheme'; import RichText from './RichText'; const htmlContent = "

Here's some copy

More copy"; diff --git a/src/components/Atoms/Select/Select.test.js b/src/components/Atoms/Select/Select.test.js index 2fb284c75..ffd4cf927 100644 --- a/src/components/Atoms/Select/Select.test.js +++ b/src/components/Atoms/Select/Select.test.js @@ -1,6 +1,6 @@ import React from 'react'; import 'jest-styled-components'; -import renderWithTheme from '../../../hoc/shallowWithTheme'; +import renderWithTheme from '../../../../tests/hoc/shallowWithTheme'; import Select from './Select'; it('renders correctly', () => { diff --git a/src/components/Atoms/SocialIcons/SocialIcons.test.js b/src/components/Atoms/SocialIcons/SocialIcons.test.js index 7023f87be..45ad4548f 100644 --- a/src/components/Atoms/SocialIcons/SocialIcons.test.js +++ b/src/components/Atoms/SocialIcons/SocialIcons.test.js @@ -1,6 +1,6 @@ import React from 'react'; import 'jest-styled-components'; -import renderWithTheme from '../../../hoc/shallowWithTheme'; +import renderWithTheme from '../../../../tests/hoc/shallowWithTheme'; import SocialIcons from './SocialIcons'; it('renders correctly with Comic Relief links', () => { diff --git a/src/components/Atoms/Text/Text.test.js b/src/components/Atoms/Text/Text.test.js index a05c6d819..0a913915b 100644 --- a/src/components/Atoms/Text/Text.test.js +++ b/src/components/Atoms/Text/Text.test.js @@ -1,6 +1,6 @@ import React from 'react'; import 'jest-styled-components'; -import renderWithTheme from '../../../hoc/shallowWithTheme'; +import renderWithTheme from '../../../../tests/hoc/shallowWithTheme'; import Text from './Text'; it('renders high heading correctly', () => { diff --git a/src/components/Atoms/TextArea/TextArea.test.js b/src/components/Atoms/TextArea/TextArea.test.js index 78541cee8..ea90bfd7e 100644 --- a/src/components/Atoms/TextArea/TextArea.test.js +++ b/src/components/Atoms/TextArea/TextArea.test.js @@ -1,6 +1,6 @@ import React from 'react'; import 'jest-styled-components'; -import renderWithTheme from '../../../hoc/shallowWithTheme'; +import renderWithTheme from '../../../../tests/hoc/shallowWithTheme'; import TextArea from './TextArea'; it('renders correctly', () => { diff --git a/src/components/Atoms/TextInputWithDropdown/TextInputWithDropdown.test.js b/src/components/Atoms/TextInputWithDropdown/TextInputWithDropdown.test.js index 82a8e3fd8..b7d4c66b2 100644 --- a/src/components/Atoms/TextInputWithDropdown/TextInputWithDropdown.test.js +++ b/src/components/Atoms/TextInputWithDropdown/TextInputWithDropdown.test.js @@ -1,7 +1,7 @@ import React from 'react'; import 'jest-styled-components'; -import renderWithTheme from '../../../hoc/shallowWithTheme'; +import renderWithTheme from '../../../../tests/hoc/shallowWithTheme'; import TextInputWithDropdown from './TextInputWithDropdown'; import { Dropdown, Container } from './TextInputWithDropdown.style'; diff --git a/src/components/Molecules/Accordion/Accordion.test.js b/src/components/Molecules/Accordion/Accordion.test.js index f4172a3dc..757644263 100644 --- a/src/components/Molecules/Accordion/Accordion.test.js +++ b/src/components/Molecules/Accordion/Accordion.test.js @@ -1,6 +1,6 @@ import React from 'react'; import 'jest-styled-components'; -import renderWithTheme from '../../../hoc/shallowWithTheme'; +import renderWithTheme from '../../../../tests/hoc/shallowWithTheme'; import Accordion from './Accordion'; import Text from '../../Atoms/Text/Text'; diff --git a/src/components/Molecules/ArticleTeaser/ArticleTeaser.test.js b/src/components/Molecules/ArticleTeaser/ArticleTeaser.test.js index 497731b26..04b70f879 100644 --- a/src/components/Molecules/ArticleTeaser/ArticleTeaser.test.js +++ b/src/components/Molecules/ArticleTeaser/ArticleTeaser.test.js @@ -1,6 +1,6 @@ import React from "react"; import "jest-styled-components"; -import renderWithTheme from "../../../hoc/shallowWithTheme"; +import renderWithTheme from "../../../../tests/hoc/shallowWithTheme"; import ArticleTeaser from "./ArticleTeaser"; import { defaultData } from "../../../styleguide/data/data"; it("renders article teaser correctly", () => { diff --git a/src/components/Molecules/Banner/Banner.test.js b/src/components/Molecules/Banner/Banner.test.js index 5134f9c76..72d1c39de 100644 --- a/src/components/Molecules/Banner/Banner.test.js +++ b/src/components/Molecules/Banner/Banner.test.js @@ -1,6 +1,6 @@ import React from 'react'; import 'jest-styled-components'; -import renderWithTheme from '../../../hoc/shallowWithTheme'; +import renderWithTheme from '../../../../tests/hoc/shallowWithTheme'; import Banner from './Banner'; import Text from '../../Atoms/Text/Text'; diff --git a/src/components/Molecules/Box/Box.test.js b/src/components/Molecules/Box/Box.test.js index b6f86a4ae..07a903923 100644 --- a/src/components/Molecules/Box/Box.test.js +++ b/src/components/Molecules/Box/Box.test.js @@ -1,6 +1,6 @@ import React from 'react'; import 'jest-styled-components'; -import renderWithTheme from '../../../hoc/shallowWithTheme'; +import renderWithTheme from '../../../../tests/hoc/shallowWithTheme'; import Box from './Box'; import { defaultData } from '../../../styleguide/data/data'; it('renders correctly', () => { diff --git a/src/components/Molecules/Card/Card.test.js b/src/components/Molecules/Card/Card.test.js index 9ff69329f..f9a30ffd1 100644 --- a/src/components/Molecules/Card/Card.test.js +++ b/src/components/Molecules/Card/Card.test.js @@ -1,6 +1,6 @@ import React from 'react'; import 'jest-styled-components'; -import renderWithTheme from '../../../hoc/shallowWithTheme'; +import renderWithTheme from '../../../../tests/hoc/shallowWithTheme'; import Card from './Card'; import { defaultData } from '../../../styleguide/data/data'; it('renders correctly', () => { diff --git a/src/components/Molecules/CardDs/CardDs.test.js b/src/components/Molecules/CardDs/CardDs.test.js index 399e985f1..ee6a8369e 100644 --- a/src/components/Molecules/CardDs/CardDs.test.js +++ b/src/components/Molecules/CardDs/CardDs.test.js @@ -1,6 +1,6 @@ import React from 'react'; import 'jest-styled-components'; -import renderWithTheme from '../../../hoc/shallowWithTheme'; +import renderWithTheme from '../../../../tests/hoc/shallowWithTheme'; import CardDs from './CardDs'; import { defaultData } from '../../../styleguide/data/data';import { Internal } from '../../Atoms/Icons/index'; diff --git a/src/components/Molecules/Chip/Chip.test.js b/src/components/Molecules/Chip/Chip.test.js index c30ffa31f..578016e95 100644 --- a/src/components/Molecules/Chip/Chip.test.js +++ b/src/components/Molecules/Chip/Chip.test.js @@ -1,6 +1,6 @@ import React from "react"; import "jest-styled-components"; -import renderWithTheme from "../../../hoc/shallowWithTheme"; +import renderWithTheme from "../../../../tests/hoc/shallowWithTheme"; import Chip from "./Chip"; it("renders article teaser correctly", () => { diff --git a/src/components/Molecules/Descriptor/Descriptor.test.js b/src/components/Molecules/Descriptor/Descriptor.test.js index fe8725b61..ed1466ee0 100644 --- a/src/components/Molecules/Descriptor/Descriptor.test.js +++ b/src/components/Molecules/Descriptor/Descriptor.test.js @@ -1,6 +1,6 @@ import React from 'react'; import 'jest-styled-components'; -import renderWithTheme from '../../../hoc/shallowWithTheme'; +import renderWithTheme from '../../../../tests/hoc/shallowWithTheme'; import Descriptor from './Descriptor'; it('renders article teaser correctly', () => { diff --git a/src/components/Molecules/DoubleCopy/DoubleCopy.test.js b/src/components/Molecules/DoubleCopy/DoubleCopy.test.js index 33679e5a7..8905c7dc1 100644 --- a/src/components/Molecules/DoubleCopy/DoubleCopy.test.js +++ b/src/components/Molecules/DoubleCopy/DoubleCopy.test.js @@ -1,7 +1,7 @@ import React from 'react'; import 'jest-styled-components'; -import renderWithTheme from '../../../hoc/shallowWithTheme'; +import renderWithTheme from '../../../../tests/hoc/shallowWithTheme'; import DoubleCopy from './DoubleCopy'; import RichText from '../../Atoms/RichText/RichText'; diff --git a/src/components/Molecules/InfoBanner/InfoBanner.test.js b/src/components/Molecules/InfoBanner/InfoBanner.test.js index b13f509cd..23cdbaf8d 100644 --- a/src/components/Molecules/InfoBanner/InfoBanner.test.js +++ b/src/components/Molecules/InfoBanner/InfoBanner.test.js @@ -1,6 +1,6 @@ import React from 'react'; import 'jest-styled-components'; -import renderWithTheme from '../../../hoc/shallowWithTheme'; +import renderWithTheme from '../../../../tests/hoc/shallowWithTheme'; import InfoBanner from './InfoBanner'; it('renders correctly', () => { diff --git a/src/components/Molecules/PartnerLink/PartnerLink.test.js b/src/components/Molecules/PartnerLink/PartnerLink.test.js index a4275ec71..d3a975861 100644 --- a/src/components/Molecules/PartnerLink/PartnerLink.test.js +++ b/src/components/Molecules/PartnerLink/PartnerLink.test.js @@ -1,7 +1,7 @@ import React from "react"; import "jest-styled-components"; -import renderWithTheme from "../../../hoc/shallowWithTheme"; +import renderWithTheme from "../../../../tests/hoc/shallowWithTheme"; import PartnerLink from "./PartnerLink"; import Picture from "../../Atoms/Picture/Picture"; import { defaultData } from "../../../styleguide/data/data"; diff --git a/src/components/Molecules/Promo/Promo.test.js b/src/components/Molecules/Promo/Promo.test.js index b1331e38c..44a563beb 100644 --- a/src/components/Molecules/Promo/Promo.test.js +++ b/src/components/Molecules/Promo/Promo.test.js @@ -1,6 +1,6 @@ import React from 'react'; import 'jest-styled-components'; -import renderWithTheme from '../../../hoc/shallowWithTheme'; +import renderWithTheme from '../../../../tests/hoc/shallowWithTheme'; import Promo from './Promo'; import Text from '../../Atoms/Text/Text'; import Link from '../../Atoms/Link/Link'; diff --git a/src/components/Molecules/SchoolLookup/SchoolLookup.test.js b/src/components/Molecules/SchoolLookup/SchoolLookup.test.js index db48b6538..ed9b7d132 100644 --- a/src/components/Molecules/SchoolLookup/SchoolLookup.test.js +++ b/src/components/Molecules/SchoolLookup/SchoolLookup.test.js @@ -1,7 +1,7 @@ import React from 'react'; import 'jest-styled-components'; -import renderWithTheme from '../../../hoc/shallowWithTheme'; +import renderWithTheme from '../../../../tests/hoc/shallowWithTheme'; import SchoolLookup from './SchoolLookup'; it('renders correctly', () => { diff --git a/src/components/Molecules/SearchInput/SearchInput.test.js b/src/components/Molecules/SearchInput/SearchInput.test.js index be7e66c57..dccec17eb 100644 --- a/src/components/Molecules/SearchInput/SearchInput.test.js +++ b/src/components/Molecules/SearchInput/SearchInput.test.js @@ -1,6 +1,6 @@ import React from 'react'; import 'jest-styled-components'; -import renderWithTheme from '../../../hoc/shallowWithTheme'; +import renderWithTheme from '../../../../tests/hoc/shallowWithTheme'; import SearchInput from './SearchInput'; it('renders correctly', () => { diff --git a/src/components/Molecules/SearchResult/SearchResult.test.js b/src/components/Molecules/SearchResult/SearchResult.test.js index 011c19afd..0b76a10ec 100644 --- a/src/components/Molecules/SearchResult/SearchResult.test.js +++ b/src/components/Molecules/SearchResult/SearchResult.test.js @@ -1,6 +1,6 @@ import React from 'react'; import 'jest-styled-components'; -import renderWithTheme from '../../../hoc/shallowWithTheme'; +import renderWithTheme from '../../../../tests/hoc/shallowWithTheme'; import SearchResult from './SearchResult'; import { defaultData } from '../../../styleguide/data/data'; diff --git a/src/components/Molecules/ShareButton/ShareButton.test.js b/src/components/Molecules/ShareButton/ShareButton.test.js index 690a4511b..f29c6f307 100644 --- a/src/components/Molecules/ShareButton/ShareButton.test.js +++ b/src/components/Molecules/ShareButton/ShareButton.test.js @@ -1,6 +1,6 @@ import React from 'react'; import 'jest-styled-components'; -import renderWithTheme from '../../../hoc/shallowWithTheme'; +import renderWithTheme from '../../../../tests/hoc/shallowWithTheme'; import ShareButton from './ShareButton'; it('renders correctly', () => { diff --git a/src/components/Molecules/SingleMessage/SingleMessage.test.js b/src/components/Molecules/SingleMessage/SingleMessage.test.js index 9538bd855..fdb06626f 100644 --- a/src/components/Molecules/SingleMessage/SingleMessage.test.js +++ b/src/components/Molecules/SingleMessage/SingleMessage.test.js @@ -1,6 +1,6 @@ import React from 'react'; import 'jest-styled-components'; -import renderWithTheme from '../../../hoc/shallowWithTheme'; +import renderWithTheme from '../../../../tests/hoc/shallowWithTheme'; import SingleMessage from './SingleMessage'; import { defaultData } from '../../../styleguide/data/data';import Text from '../../Atoms/Text/Text'; import Link from '../../Atoms/Link/Link'; diff --git a/src/components/Molecules/SingleMessageDS/SingleMessageDs.test.js b/src/components/Molecules/SingleMessageDS/SingleMessageDs.test.js index 93ce034b7..a9efb191f 100644 --- a/src/components/Molecules/SingleMessageDS/SingleMessageDs.test.js +++ b/src/components/Molecules/SingleMessageDS/SingleMessageDs.test.js @@ -1,6 +1,6 @@ import React from 'react'; import 'jest-styled-components'; -import renderWithTheme from '../../../hoc/shallowWithTheme'; +import renderWithTheme from '../../../../tests/hoc/shallowWithTheme'; import SingleMessageDs from './SingleMessageDs'; import Text from '../../Atoms/Text/Text'; import Download from '../../Atoms/Icons/Download'; diff --git a/src/components/Molecules/Typeahead/Typeahead.test.js b/src/components/Molecules/Typeahead/Typeahead.test.js index ace89ec6f..ba7510c4c 100644 --- a/src/components/Molecules/Typeahead/Typeahead.test.js +++ b/src/components/Molecules/Typeahead/Typeahead.test.js @@ -2,7 +2,7 @@ import React from 'react'; import 'jest-styled-components'; import axios from 'axios'; -import renderWithTheme from '../../../hoc/shallowWithTheme'; +import renderWithTheme from '../../../../tests/hoc/shallowWithTheme'; import Typeahead from './Typeahead'; const schoolsLookup = async query => { diff --git a/src/components/Molecules/VideoBanner/VideoBanner.test.js b/src/components/Molecules/VideoBanner/VideoBanner.test.js index dc9f7e258..691b30d83 100644 --- a/src/components/Molecules/VideoBanner/VideoBanner.test.js +++ b/src/components/Molecules/VideoBanner/VideoBanner.test.js @@ -1,7 +1,7 @@ import React from "react"; import "jest-styled-components"; -import renderWithTheme from "../../../hoc/shallowWithTheme"; +import renderWithTheme from "../../../../tests/hoc/shallowWithTheme"; import VideoBanner from "./VideoBanner"; import poster from "../../../styleguide/assets/VideoBannerPosterImage.png"; diff --git a/src/components/Organisms/CookieBanner/CookieBanner.test.js b/src/components/Organisms/CookieBanner/CookieBanner.test.js index 0de869284..94ea8ea07 100644 --- a/src/components/Organisms/CookieBanner/CookieBanner.test.js +++ b/src/components/Organisms/CookieBanner/CookieBanner.test.js @@ -1,6 +1,6 @@ import React from "react"; import "jest-styled-components"; -import renderWithTheme from "../../../hoc/shallowWithTheme"; +import renderWithTheme from "../../../../tests/hoc/shallowWithTheme"; import CookieBanner from "./CookieBanner"; it("renders correctly", () => { diff --git a/src/components/Organisms/Donate/Donate.test.js b/src/components/Organisms/Donate/Donate.test.js index 29f195ccf..40f13e496 100644 --- a/src/components/Organisms/Donate/Donate.test.js +++ b/src/components/Organisms/Donate/Donate.test.js @@ -1,6 +1,6 @@ import React from 'react'; import 'jest-styled-components'; -import renderWithTheme from '../../../hoc/shallowWithTheme'; +import renderWithTheme from '../../../../tests/hoc/shallowWithTheme'; import Donate from './Donate'; import data from './dev-data/data'; import singleData from './dev-data/data-single'; diff --git a/src/components/Organisms/EmailSignUp/EmailSignUp.test.js b/src/components/Organisms/EmailSignUp/EmailSignUp.test.js index 84b844465..b0f8caf9e 100644 --- a/src/components/Organisms/EmailSignUp/EmailSignUp.test.js +++ b/src/components/Organisms/EmailSignUp/EmailSignUp.test.js @@ -1,6 +1,6 @@ import React from "react"; import "jest-styled-components"; -import renderWithTheme from "../../../hoc/shallowWithTheme"; +import renderWithTheme from "../../../../tests/hoc/shallowWithTheme"; import { EmailSignUp, validationSchema } from "./_EmailSignUp"; import RichText from "../../Atoms/RichText/RichText"; import { useForm, FormProvider } from "react-hook-form"; diff --git a/src/components/Organisms/Footer/Footer.test.js b/src/components/Organisms/Footer/Footer.test.js index 371d48f62..661d566f1 100644 --- a/src/components/Organisms/Footer/Footer.test.js +++ b/src/components/Organisms/Footer/Footer.test.js @@ -1,7 +1,7 @@ /* eslint-disable react/jsx-wrap-multilines */ import React from 'react'; import 'jest-styled-components'; -import renderWithTheme from '../../../hoc/shallowWithTheme'; +import renderWithTheme from '../../../../tests/hoc/shallowWithTheme'; import Footer from './Footer'; import data from './data/data'; diff --git a/src/components/Organisms/Header/header.test.js b/src/components/Organisms/Header/header.test.js index 3c1edc7f5..5ca5e317b 100644 --- a/src/components/Organisms/Header/header.test.js +++ b/src/components/Organisms/Header/header.test.js @@ -1,7 +1,7 @@ /* eslint-disable react/jsx-wrap-multilines */ // import React from 'react'; import 'jest-styled-components'; -// import renderWithTheme from '../../../hoc/shallowWithTheme'; +// import renderWithTheme from '../../../../tests/hoc/shallowWithTheme'; // import Header from './Header'; // import data from './data/data'; diff --git a/src/components/Organisms/Membership/Membership.test.js b/src/components/Organisms/Membership/Membership.test.js index c8bf648f0..7bf3ee925 100644 --- a/src/components/Organisms/Membership/Membership.test.js +++ b/src/components/Organisms/Membership/Membership.test.js @@ -1,7 +1,7 @@ import React from "react"; import "jest-styled-components"; -import renderWithTheme from "../../../hoc/shallowWithTheme"; +import renderWithTheme from "../../../../tests/hoc/shallowWithTheme"; import Membership from "./Membership"; import { defaultData } from "../../../styleguide/data/data"; import data from "./dev-data/data"; diff --git a/src/components/Organisms/WYMDCarousel/WYMDCarousel.test.js b/src/components/Organisms/WYMDCarousel/WYMDCarousel.test.js index 98ebaa981..940221d08 100644 --- a/src/components/Organisms/WYMDCarousel/WYMDCarousel.test.js +++ b/src/components/Organisms/WYMDCarousel/WYMDCarousel.test.js @@ -1,7 +1,7 @@ import React from "react"; import "jest-styled-components"; -import renderWithTheme from "../../../hoc/shallowWithTheme"; +import renderWithTheme from "../../../../tests/hoc/shallowWithTheme"; import WYMDCarousel from "./WYMDCarousel"; const { carouselItemsComplete } = require("../../../styleguide/data/data"); diff --git a/src/hoc/shallowWithTheme.js b/tests/hoc/shallowWithTheme.js similarity index 68% rename from src/hoc/shallowWithTheme.js rename to tests/hoc/shallowWithTheme.js index 64e2f94c4..860ca0e74 100644 --- a/src/hoc/shallowWithTheme.js +++ b/tests/hoc/shallowWithTheme.js @@ -1,7 +1,8 @@ import React from 'react'; import renderer from 'react-test-renderer'; -import { crTheme } from '../index'; -import ThemeProvider from '../theme/ThemeProvider'; + +import { crTheme } from '../../src/index'; +import ThemeProvider from '../../src/theme/ThemeProvider'; export default function renderWithTheme(component) { return renderer.create(