From 2bf0cb567322f987416cea6f4302d845e9156783 Mon Sep 17 00:00:00 2001
From: Sebastian Silbermann <silbermann.sebastian@gmail.com>
Date: Mon, 24 Jun 2019 16:17:13 +0200
Subject: [PATCH 1/3] Add expected behavior of base element

---
 src/__tests__/render.js | 41 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 41 insertions(+)

diff --git a/src/__tests__/render.js b/src/__tests__/render.js
index f8bed704..5cf7442b 100644
--- a/src/__tests__/render.js
+++ b/src/__tests__/render.js
@@ -113,3 +113,44 @@ test('renders options.wrapper around node', () => {
 </div>
 `)
 })
+
+describe('baseElement', () => {
+  let baseElement
+  beforeAll(() => {
+    baseElement = document.createElement('div')
+    document.body.appendChild(baseElement)
+  })
+
+  afterAll(() => {
+    baseElement.parentNode.removeChild(baseElement)
+  })
+
+  it('can take a custom element for isolation', () => {
+    function DescribedButton({title: description, ...buttonProps}) {
+      return (
+        <React.Fragment>
+          <button {...buttonProps} aria-describedby="tooltip" />
+          {ReactDOM.createPortal(
+            <div id="tooltip" role="tooltip">
+              {description}
+            </div>,
+            document.body,
+          )}
+        </React.Fragment>
+      )
+    }
+
+    const {getByRole, getByText} = render(
+      <DescribedButton description="this descripton is hidden from rtl">
+        Click me
+      </DescribedButton>,
+      {baseElement},
+    )
+
+    expect(getByText('Click me')).toBeTruthy()
+    expect(document.querySelector('[role="tooltip"]')).toBeTruthy()
+    expect(() => getByRole('tooltip')).toThrow(
+      'Unable to find an element by [role=tooltip]',
+    )
+  })
+})

From f145b3afe20e992c31ec435a289efcd5b2a97ae0 Mon Sep 17 00:00:00 2001
From: Sebastian Silbermann <silbermann.sebastian@gmail.com>
Date: Mon, 24 Jun 2019 16:17:25 +0200
Subject: [PATCH 2/3] Fix expected behavior of baseElement

---
 src/index.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/index.js b/src/index.js
index 8192e169..4565074b 100644
--- a/src/index.js
+++ b/src/index.js
@@ -30,11 +30,13 @@ function render(
     wrapper: WrapperComponent,
   } = {},
 ) {
-  if (!container) {
+  if (!baseElement) {
     // default to document.body instead of documentElement to avoid output of potentially-large
     // head elements (such as JSS style blocks) in debug output
     baseElement = document.body
-    container = document.body.appendChild(document.createElement('div'))
+  }
+  if (!container) {
+    container = baseElement.appendChild(document.createElement('div'))
   }
 
   // we'll add it to the mounted containers regardless of whether it's actually

From b9623336af842112b52905dacb230697420429cc Mon Sep 17 00:00:00 2001
From: Sebastian Silbermann <silbermann.sebastian@gmail.com>
Date: Mon, 24 Jun 2019 20:34:49 +0200
Subject: [PATCH 3/3] Improve tests

---
 src/__tests__/multi-base.js | 41 +++++++++++++++++++++++++++++++++++
 src/__tests__/render.js     | 43 -------------------------------------
 2 files changed, 41 insertions(+), 43 deletions(-)
 create mode 100644 src/__tests__/multi-base.js

diff --git a/src/__tests__/multi-base.js b/src/__tests__/multi-base.js
new file mode 100644
index 00000000..03f0d93e
--- /dev/null
+++ b/src/__tests__/multi-base.js
@@ -0,0 +1,41 @@
+import React from 'react'
+import {render, cleanup} from '../'
+
+// these are created once per test suite and reused for each case
+let treeA, treeB
+beforeAll(() => {
+  treeA = document.createElement('div')
+  treeB = document.createElement('div')
+  document.body.appendChild(treeA)
+  document.body.appendChild(treeB)
+})
+
+afterAll(() => {
+  treeA.parentNode.removeChild(treeA)
+  treeB.parentNode.removeChild(treeB)
+})
+
+afterEach(cleanup)
+
+test('baseElement isolates trees from one another', () => {
+  const {getByText: getByTextInA} = render(<div>Jekyll</div>, {
+    baseElement: treeA,
+  })
+  const {getByText: getByTextInB} = render(<div>Hyde</div>, {
+    baseElement: treeB,
+  })
+
+  expect(() => getByTextInA('Jekyll')).not.toThrow(
+    'Unable to find an element with the text: Jekyll.',
+  )
+  expect(() => getByTextInB('Jekyll')).toThrow(
+    'Unable to find an element with the text: Jekyll.',
+  )
+
+  expect(() => getByTextInA('Hyde')).toThrow(
+    'Unable to find an element with the text: Hyde.',
+  )
+  expect(() => getByTextInB('Hyde')).not.toThrow(
+    'Unable to find an element with the text: Hyde.',
+  )
+})
diff --git a/src/__tests__/render.js b/src/__tests__/render.js
index 5cf7442b..4fdf8dc0 100644
--- a/src/__tests__/render.js
+++ b/src/__tests__/render.js
@@ -3,8 +3,6 @@ import React from 'react'
 import ReactDOM from 'react-dom'
 import {render, cleanup} from '../'
 
-afterEach(cleanup)
-
 test('renders div into document', () => {
   const ref = React.createRef()
   const {container} = render(<div ref={ref} />)
@@ -113,44 +111,3 @@ test('renders options.wrapper around node', () => {
 </div>
 `)
 })
-
-describe('baseElement', () => {
-  let baseElement
-  beforeAll(() => {
-    baseElement = document.createElement('div')
-    document.body.appendChild(baseElement)
-  })
-
-  afterAll(() => {
-    baseElement.parentNode.removeChild(baseElement)
-  })
-
-  it('can take a custom element for isolation', () => {
-    function DescribedButton({title: description, ...buttonProps}) {
-      return (
-        <React.Fragment>
-          <button {...buttonProps} aria-describedby="tooltip" />
-          {ReactDOM.createPortal(
-            <div id="tooltip" role="tooltip">
-              {description}
-            </div>,
-            document.body,
-          )}
-        </React.Fragment>
-      )
-    }
-
-    const {getByRole, getByText} = render(
-      <DescribedButton description="this descripton is hidden from rtl">
-        Click me
-      </DescribedButton>,
-      {baseElement},
-    )
-
-    expect(getByText('Click me')).toBeTruthy()
-    expect(document.querySelector('[role="tooltip"]')).toBeTruthy()
-    expect(() => getByRole('tooltip')).toThrow(
-      'Unable to find an element by [role=tooltip]',
-    )
-  })
-})