From daa53953462f95ed6667f685c48789abec22ee24 Mon Sep 17 00:00:00 2001 From: Caleb Date: Mon, 23 Oct 2017 12:03:01 -0600 Subject: [PATCH] Fix tests for React 16. --- package.json | 6 ++-- setupTests.js | 2 +- .../__snapshots__/renderer.spec.js.snap | 26 ++++++++-------- yarn.lock | 31 ++++++++++--------- 4 files changed, 33 insertions(+), 32 deletions(-) diff --git a/package.json b/package.json index 64fe9494..58743230 100644 --- a/package.json +++ b/package.json @@ -90,8 +90,8 @@ "css-loader": "^0.28.7", "cssnano": "^v4.0.0-rc.2", "deep-equal": "^1.0.1", - "enzyme": "^3.0.0", - "enzyme-adapter-react-15": "^1.0.0", + "enzyme": "^3.1.0", + "enzyme-adapter-react-16": "^1.0.2", "eslint": "^3.7.1", "eslint-config-netlify": "github:netlify/eslint-config-netlify", "eslint-import-resolver-webpack": "^0.8.3", @@ -107,7 +107,7 @@ "postcss-cssnext": "^3.0.2", "postcss-import": "^11.0.0", "postcss-loader": "^2.0.7", - "react-test-renderer": "^15.5.0", + "react-test-renderer": "^16.0.0", "style-loader": "^0.18.2", "stylefmt": "^4.3.1", "stylelint": "^7.9.0", diff --git a/setupTests.js b/setupTests.js index b0163789..30ee2428 100644 --- a/setupTests.js +++ b/setupTests.js @@ -1,4 +1,4 @@ import enzyme from 'enzyme'; -import enzymeAdapter from 'enzyme-adapter-react-15'; +import enzymeAdapter from 'enzyme-adapter-react-16'; enzyme.configure({ adapter: new enzymeAdapter() }); \ No newline at end of file diff --git a/src/components/Widgets/Markdown/MarkdownPreview/__tests__/__snapshots__/renderer.spec.js.snap b/src/components/Widgets/Markdown/MarkdownPreview/__tests__/__snapshots__/renderer.spec.js.snap index 2d901185..98825d53 100644 --- a/src/components/Widgets/Markdown/MarkdownPreview/__tests__/__snapshots__/renderer.spec.js.snap +++ b/src/components/Widgets/Markdown/MarkdownPreview/__tests__/__snapshots__/renderer.spec.js.snap @@ -1,13 +1,13 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP -exports[`Markdown Preview renderer HTML rendering should render HTML 1`] = `"

Paragraph with inline element

"`; +exports[`Markdown Preview renderer HTML rendering should render HTML 1`] = `"

Paragraph with inline element

"`; -exports[`Markdown Preview renderer Markdown rendering Code should render code 1`] = `"

Use the printf() function.

"`; +exports[`Markdown Preview renderer Markdown rendering Code should render code 1`] = `"

Use the printf() function.

"`; -exports[`Markdown Preview renderer Markdown rendering Code should render code 2 1`] = `"

There is a literal backtick (\`) here.

"`; +exports[`Markdown Preview renderer Markdown rendering Code should render code 2 1`] = `"

There is a literal backtick (\`) here.

"`; exports[`Markdown Preview renderer Markdown rendering General should render markdown 1`] = ` -"

H1

+"

H1

Text with bold & em elements

H2

    @@ -28,7 +28,7 @@ exports[`Markdown Preview renderer Markdown rendering General should render mark `; exports[`Markdown Preview renderer Markdown rendering HTML should render HTML as is when using Markdown 1`] = ` -"

    Title

    +"

    Title

    " `; -exports[`Markdown Preview renderer Markdown rendering Headings should render Heading 1 1`] = `"

    Title

    "`; +exports[`Markdown Preview renderer Markdown rendering Headings should render Heading 1 1`] = `"

    Title

    "`; -exports[`Markdown Preview renderer Markdown rendering Headings should render Heading 2 1`] = `"

    Title

    "`; +exports[`Markdown Preview renderer Markdown rendering Headings should render Heading 2 1`] = `"

    Title

    "`; -exports[`Markdown Preview renderer Markdown rendering Headings should render Heading 3 1`] = `"

    Title

    "`; +exports[`Markdown Preview renderer Markdown rendering Headings should render Heading 3 1`] = `"

    Title

    "`; -exports[`Markdown Preview renderer Markdown rendering Headings should render Heading 4 1`] = `"

    Title

    "`; +exports[`Markdown Preview renderer Markdown rendering Headings should render Heading 4 1`] = `"

    Title

    "`; -exports[`Markdown Preview renderer Markdown rendering Headings should render Heading 5 1`] = `"
    Title
    "`; +exports[`Markdown Preview renderer Markdown rendering Headings should render Heading 5 1`] = `"
    Title
    "`; -exports[`Markdown Preview renderer Markdown rendering Headings should render Heading 6 1`] = `"
    Title
    "`; +exports[`Markdown Preview renderer Markdown rendering Headings should render Heading 6 1`] = `"
    Title
    "`; -exports[`Markdown Preview renderer Markdown rendering Links should render links 1`] = `"

    I get 10 times more traffic from Google than from Yahoo or MSN.

    "`; +exports[`Markdown Preview renderer Markdown rendering Links should render links 1`] = `"

    I get 10 times more traffic from Google than from Yahoo or MSN.

    "`; exports[`Markdown Preview renderer Markdown rendering Lists should render lists 1`] = ` -"
      +"
      1. ol item 1

      2. ol item 2

        diff --git a/yarn.lock b/yarn.lock index e244d3f9..a0b7fd38 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2672,15 +2672,16 @@ entities@^1.1.1, entities@~1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/entities/-/entities-1.1.1.tgz#6e5c2d0a5621b5dadaecef80b90edfb5cd7772f0" -enzyme-adapter-react-15@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/enzyme-adapter-react-15/-/enzyme-adapter-react-15-1.0.0.tgz#2f97f024324c585a6523034d4ba99bd6ca29ce56" +enzyme-adapter-react-16@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/enzyme-adapter-react-16/-/enzyme-adapter-react-16-1.0.2.tgz#8c6f431f17c69e1e9eeb25ca4bd92f31971eb2dd" dependencies: enzyme-adapter-utils "^1.0.0" lodash "^4.17.4" object.assign "^4.0.4" object.values "^1.0.4" prop-types "^15.5.10" + react-test-renderer "^16.0.0-0" enzyme-adapter-utils@^1.0.0: version "1.0.0" @@ -2690,9 +2691,9 @@ enzyme-adapter-utils@^1.0.0: object.assign "^4.0.4" prop-types "^15.5.10" -enzyme@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/enzyme/-/enzyme-3.0.0.tgz#94ce364254dc654c4e619b25eecc644bf6481de7" +enzyme@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/enzyme/-/enzyme-3.1.0.tgz#d8ca84085790fbcec6ed40badd14478faee4c25a" dependencies: cheerio "^1.0.0-rc.2" function.prototype.name "^1.0.3" @@ -2703,7 +2704,7 @@ enzyme@^3.0.0: object.entries "^1.0.4" object.values "^1.0.4" raf "^3.3.2" - rst-selector-parser "^2.2.1" + rst-selector-parser "^2.2.2" errno@^0.1.3, errno@^0.1.4: version "0.1.4" @@ -7548,12 +7549,12 @@ react-style-proptype@^3.0.0: dependencies: prop-types "^15.5.4" -react-test-renderer@^15.5.0: - version "15.6.2" - resolved "https://registry.yarnpkg.com/react-test-renderer/-/react-test-renderer-15.6.2.tgz#d0333434fc2c438092696ca770da5ed48037efa8" +react-test-renderer@^16.0.0, react-test-renderer@^16.0.0-0: + version "16.0.0" + resolved "https://registry.yarnpkg.com/react-test-renderer/-/react-test-renderer-16.0.0.tgz#9fe7b8308f2f71f29fc356d4102086f131c9cb15" dependencies: - fbjs "^0.8.9" - object-assign "^4.1.0" + fbjs "^0.8.16" + object-assign "^4.1.1" react-themeable@^1.1.0: version "1.1.0" @@ -8125,9 +8126,9 @@ ripemd160@^2.0.0, ripemd160@^2.0.1: hash-base "^2.0.0" inherits "^2.0.1" -rst-selector-parser@^2.2.1: - version "2.2.2" - resolved "https://registry.yarnpkg.com/rst-selector-parser/-/rst-selector-parser-2.2.2.tgz#9927b619bd5af8dc23a76c64caef04edf90d2c65" +rst-selector-parser@^2.2.2: + version "2.2.3" + resolved "https://registry.yarnpkg.com/rst-selector-parser/-/rst-selector-parser-2.2.3.tgz#81b230ea2fcc6066c89e3472de794285d9b03d91" dependencies: lodash.flattendeep "^4.4.0" nearley "^2.7.10"