-
-
+
)}
diff --git a/test/unit/bugs/3199-sanitization-escaping.jsx b/test/unit/bugs/3199-sanitization-escaping.jsx
index bc0127dcd34..83d1136051d 100644
--- a/test/unit/bugs/3199-sanitization-escaping.jsx
+++ b/test/unit/bugs/3199-sanitization-escaping.jsx
@@ -1,5 +1,5 @@
import React from "react"
-import { render } from "enzyme"
+import { render } from "@testing-library/react"
import Markdown from "core/components/providers/markdown"
describe("UI-3199: Sanitized Markdown causing code examples to be double escaped", function(){
@@ -13,9 +13,10 @@ describe("UI-3199: Sanitized Markdown causing code examples to be double escaped
source: str
}
- let el = render(
`
- const el = render(
`)
+ const {
+ container
+ } = render(
`)
})
it("allows image elements", function () {
const str = ``
- const el = render(
`
- const el = render(
hello!
)
// Then
- expect(wrapper.find("div").length).toEqual(1)
- expect(wrapper.find("div").text()).toEqual("hello!")
+ expect(container.querySelectorAll("div").length).toEqual(1)
+ expect(container.querySelector("div").textContent).toEqual("hello!")
})
it("renders children for an OpenAPI 3 definition", function(){
// When
- let wrapper = shallow(
+ let {
+ container
+ } = render(
hello!
)
// Then
- expect(wrapper.find("div").length).toEqual(1)
- expect(wrapper.find("div").text()).toEqual("hello!")
+ expect(container.querySelectorAll("div").length).toEqual(1)
+ expect(container.querySelector("div").textContent).toEqual("hello!")
})
it("renders children when a bypass prop is set", function(){
// When
- let wrapper = shallow(
+ let {
+ container
+ } = render(
hello!
)
// Then
- expect(wrapper.find("div").length).toEqual(1)
- expect(wrapper.find("div").text()).toEqual("hello!")
+ expect(container.querySelectorAll("div").length).toEqual(1)
+ expect(container.querySelector("div").textContent).toEqual("hello!")
})
it("renders the correct message for an ambiguous-version definition", function(){
// When
- let wrapper = shallow(
+ let {
+ container
+ } = render(
hello!
)
// Then
- expect(wrapper.find("div.version-pragma__message--ambiguous").length).toEqual(1)
- expect(wrapper.find("div.version-pragma__message--missing").length).toEqual(0)
+ expect(container.querySelectorAll("div.version-pragma__message--ambiguous").length).toEqual(1)
+ expect(container.querySelectorAll("div.version-pragma__message--missing").length).toEqual(0)
})
it("renders the correct message for a missing-version definition", function(){
// When
- let wrapper = shallow(
+ let {
+ container
+ } = render(
hello!
)
// Then
- expect(wrapper.find("div.version-pragma__message--missing").length).toEqual(1)
- expect(wrapper.find("div.version-pragma__message--ambiguous").length).toEqual(0)
+ expect(container.querySelectorAll("div.version-pragma__message--missing").length).toEqual(1)
+ expect(container.querySelectorAll("div.version-pragma__message--ambiguous").length).toEqual(0)
})
-})
+})
\ No newline at end of file
diff --git a/test/unit/core/plugins/json-schema-5/components/json-schema-form.jsx b/test/unit/core/plugins/json-schema-5/components/json-schema-form.jsx
index 488589dc724..940c2dfb8b3 100644
--- a/test/unit/core/plugins/json-schema-5/components/json-schema-form.jsx
+++ b/test/unit/core/plugins/json-schema-5/components/json-schema-form.jsx
@@ -1,7 +1,7 @@
import React from "react"
import Immutable, { List } from "immutable"
import { Select, Input, TextArea } from "core/components/layout-utils"
-import { mount, render } from "enzyme"
+import { render } from "@testing-library/react"
import * as JsonSchemaComponents from "core/plugins/json-schema-5/components/json-schema-components"
const components = {...JsonSchemaComponents, Select, Input, TextArea}
@@ -30,11 +30,11 @@ describe("
hello!
)
// Then
- expect(wrapper.find("div").length).toEqual(1)
- expect(wrapper.find("div").text()).toEqual("hello!")
+ expect(getByText("hello!")).toBeInTheDocument()
})
it("renders children for an OpenAPI 3.0.x definition", function(){
// When
- let wrapper = shallow(
+ const { getByText } = render(
hello!
)
// Then
- expect(wrapper.find("div").length).toEqual(1)
- expect(wrapper.find("div").text()).toEqual("hello!")
+ expect(getByText("hello!")).toBeInTheDocument()
})
it("renders children for an OpenAPI 3.1.0 definition", function(){
// When
- let wrapper = shallow(
+ const { getByText } = render(
hello!
)
// Then
- expect(wrapper.find("div").length).toEqual(1)
- expect(wrapper.find("div").text()).toEqual("hello!")
+ expect(getByText("hello!")).toBeInTheDocument()
})
it("renders children when a bypass prop is set", function(){
// When
- let wrapper = shallow(
+ const { getByText } = render(
hello!
)
// Then
- expect(wrapper.find("div").length).toEqual(1)
- expect(wrapper.find("div").text()).toEqual("hello!")
+ expect(getByText("hello!")).toBeInTheDocument()
})
it("renders the correct message for an ambiguous-version definition", function(){
// When
- let wrapper = shallow(
+ const { container } = render(
hello!
)
// Then
- expect(wrapper.find("div.version-pragma__message--ambiguous").length).toEqual(1)
- expect(wrapper.find("div.version-pragma__message--missing").length).toEqual(0)
+ expect(container.querySelector("div.version-pragma__message--ambiguous")).toBeInTheDocument()
+ expect(container.querySelector("div.version-pragma__message--missing")).not.toBeInTheDocument()
})
it("renders the correct message for a missing-version definition", function(){
// When
- let wrapper = shallow(
+ const { container } = render(
hello!
)
// Then
- expect(wrapper.find("div.version-pragma__message--missing").length).toEqual(1)
- expect(wrapper.find("div.version-pragma__message--ambiguous").length).toEqual(0)
+ expect(container.querySelector("div.version-pragma__message--missing")).toBeInTheDocument()
+ expect(container.querySelector("div.version-pragma__message--ambiguous")).not.toBeInTheDocument()
})
-
})
diff --git a/test/unit/core/plugins/safe-render/index.jsx b/test/unit/core/plugins/safe-render/index.jsx
index 34d2c69394a..12dc1e17bb6 100644
--- a/test/unit/core/plugins/safe-render/index.jsx
+++ b/test/unit/core/plugins/safe-render/index.jsx
@@ -1,9 +1,7 @@
import React from "react"
-import { mount } from "enzyme"
-import sinon from "sinon"
+import { render, screen } from "@testing-library/react"
import { Provider } from "react-redux"
import noop from "lodash/noop"
-
import System from "core/system"
import ViewPlugin from "core/plugins/view"
import SafeRenderPlugin from "core/plugins/safe-render"
@@ -18,7 +16,7 @@ describe("safe-render", function() {
it("should catch errors thrown inside of React Component class render method", function() {
class BrokenComponent extends React.Component {
render() {
- return null
+ throw new Error("broken")
}
}
const BrokenComponentPlugin = () => {
@@ -42,16 +40,14 @@ describe("safe-render", function() {
})
const SafeBrokenComponent = system.getSystem().getComponent("BrokenComponent")
- const wrapper = mount(
)
- wrapper.find(BrokenComponent).simulateError(new Error("error"))
-
- expect(wrapper.text()).toEqual("😱 Could not render BrokenComponent, see the console.")
+ expect(container).toHaveTextContent("😱 Could not render BrokenComponent, see the console.")
})
it("should catch errors thrown inside of container created from function component", function() {
- const BrokenComponent = () => null
+ const BrokenComponent = () => { throw new Error("broken") }
const BrokenComponentPlugin = () => {
return {
components: {
@@ -170,18 +160,16 @@ describe("safe-render", function() {
})
const SafeBrokenComponent = system.getSystem().getComponent("BrokenComponent", true)
- const wrapper = mount(
+ const {container} = render(
)
- wrapper.find(BrokenComponent).simulateError(new Error("error"))
-
- expect(wrapper.text()).toEqual("😱 Could not render BrokenComponent, see the console.")
+ expect(container).toHaveTextContent("😱 Could not render BrokenComponent, see the console.")
})
it("should render custom Fallback component", function() {
- const BrokenComponent = () => null
+ const BrokenComponent = () => { throw new Error("broken") }
const BrokenComponentPlugin = () => {
return {
components: {
@@ -209,15 +197,13 @@ describe("safe-render", function() {
})
const SafeBrokenComponent = system.getSystem().getComponent("BrokenComponent")
- const wrapper = mount(
)
// Then
- expect(renderedComponent.text()).toEqual("This came from mapStateToProps and this came from the system and this came from my own props")
+ expect(getByText("This came from mapStateToProps and this came from the system and this came from my own props")).toBeInTheDocument()
})
it("gives the system and own props as props to a container's `mapStateToProps` function", function() {
@@ -578,14 +578,14 @@ describe("bound system", function(){
// When
let Component = system.getSystem().getComponent("ContainerComponent", true)
- const renderedComponent = render(
+ const { getByText } = render(
)
// Then
- expect(renderedComponent.text()).toEqual("This came from mapStateToProps and this came from the system and this came from my own props")
+ expect(getByText("This came from mapStateToProps and this came from the system and this came from my own props")).toBeInTheDocument()
})
})
diff --git a/test/unit/core/system/wrapComponent.jsx b/test/unit/core/system/wrapComponent.jsx
index 8a5522e7f40..b15906f12bf 100644
--- a/test/unit/core/system/wrapComponent.jsx
+++ b/test/unit/core/system/wrapComponent.jsx
@@ -1,6 +1,6 @@
import React from "react"
-import { render } from "enzyme"
+import { render } from "@testing-library/react"
import System from "core/system"
describe("wrapComponents", () => {
@@ -31,12 +31,10 @@ describe("wrapComponents", () => {
let Component = system.getSystem().getComponents("wow")
const wrapper = render(![]()
elements", function() {
const str = `
`
- const el = render(
Mocked Curl
,
+ responseBody: () => Mocked ResponseBody
}
let props = {
@@ -69,33 +68,21 @@ describe("Request duration
50 ms
Response headers
content-type: application/xml ONE
\nONE
\nONE
\nONE
\n| ABC |
| ABC |
| ABC |
`
- const el = render(` + str + `
\n` + str + `
\nh1
\nh2
\nh3
\nh4
\nh5
\nh6
\nh1
\nh2
\nh3
\nh4
\nh5
\nh6
\n\n
`)
+ const {
+ container
+ } = render(\n
`)
})
})
@@ -66,33 +82,43 @@ describe("Markdown component", function () {
it("allows elements with class, style and data-* attribs", function () {
const getConfigs = () => ({ useUnsafeMarkdown: true })
const str = `ONE`
- const el = render(ONE
ONE
ONE
ONE
`
- const el = render(` + str + `
` + str + `
h1
\nh2
\nh3
\nh4
\nh5
\nh6
h1
\nh2
\nh3
\nh4
\nh5
\nh6
+ {children}
+
+ )
+
const components = {
- HighlightCode: () => null
+ HighlightCode
}
const props = {
getComponent: c => components[c],
@@ -13,35 +22,41 @@ describe("{children}
// Given
let components = {
- Collapse: ModelCollapse,
- ModelWrapper: ModelComponent,
- JumpToPath: dummyComponent,
+ Collapse: makeDummyComponent("Collapse"),
+ ModelWrapper: makeDummyComponent("ModelWrapper"),
+ JumpToPath: makeDummyComponent("JumpToPath"),
+ Model: makeDummyComponent("Model"),
+ ModelCollapse: makeDummyComponent("ModelCollapse"),
+ ArrowUpIcon: makeDummyComponent("ArrowUpIcon"),
+ ArrowDownIcon: makeDummyComponent("ArrowDownIcon")
}
let props = {
getComponent: (c) => {
@@ -31,7 +34,9 @@ describe("{children}
)
+jest.mock("core/plugins/json-schema-5/components/model", () =>
+ ({ schema }) =>
+)
+jest.mock("core/components/property", () => ({propKey, propVal}) => )
+
describe("
+
+ )
+)
+
describe("
+ {title}
+
+ {children}
+ ${str}
${str}
\nDescription with
\nDescription with
\nscript
\nscript
\n