From 0bd61b0d10688fbe1fe781773873060e94742528 Mon Sep 17 00:00:00 2001
From: Ben Monro <benjamin.monro@walmartlabs.com>
Date: Sun, 26 May 2019 17:37:56 -0700
Subject: [PATCH 1/5] feat: no more having to re-add DomTestingLibrary after
 page load! :party:

---
 src/index.js                | 25 +++++++++++++++++--------
 test-app/index.html         |  4 ++++
 test-app/page2.html         |  1 +
 tests/testcafe/selectors.js |  9 +++++++++
 4 files changed, 31 insertions(+), 8 deletions(-)
 create mode 100644 test-app/page2.html

diff --git a/src/index.js b/src/index.js
index b72fba3..4accc3e 100644
--- a/src/index.js
+++ b/src/index.js
@@ -5,26 +5,33 @@ import path from 'path'
 import { ClientFunction, Selector } from 'testcafe'
 import { queries } from 'dom-testing-library'
 
-const LIBRARY_UMD_PATH = path.join(
+const DOM_TESTING_LIBRARY_UMD_PATH = path.join(
   './node_modules',
   'dom-testing-library/dist/dom-testing-library.umd.js',
 )
-const LIBRARY_UMD_CONTENT = fs.readFileSync(LIBRARY_UMD_PATH).toString()
+const DOM_TESTING_LIBRARY_UMD = fs.readFileSync(DOM_TESTING_LIBRARY_UMD_PATH).toString()
 
 export const addTestcafeTestingLibrary = async t => {
+  // inject for 1st pageload.  Then just use injectables for subsequent page loads.
   // eslint-disable-next-line
   const inject = ClientFunction(
     () => {
       // eslint-disable-next-line no-undef
       window.eval(script)
-      window.TestCafeTestingLibrary = {}
     },
     {
-      dependencies: { script: LIBRARY_UMD_CONTENT },
+      dependencies: { script: DOM_TESTING_LIBRARY_UMD },
     },
   )
 
-  await inject.with({ boundTestRun: t })()
+  await inject.with({ boundTestRun: t })();
+
+  //and for subsequent pageloads:
+  t.testRun.injectable.scripts.push('/dom-testing-library.js');
+  t.testRun.session.proxy.GET('/dom-testing-library.js', { content: DOM_TESTING_LIBRARY_UMD, contentType: 'application/x-javascript' })
+
+
+
 }
 
 Object.keys(queries).forEach(queryName => {
@@ -42,8 +49,10 @@ export const within = async sel => {
   await ClientFunction(
     new Function(
       ` 
-    const elem = document.querySelector("${sanitizedSel}");
-    window.TestCafeTestingLibrary["within_${sanitizedSel}"] = DomTestingLibrary.within(elem);
+
+      window.TestcafeTestingLibrary = window.TestcafeTestingLibrary || {}
+      const elem = document.querySelector("${sanitizedSel}");
+      window.TestcafeTestingLibrary["within_${sanitizedSel}"] = DomTestingLibrary.within(elem);
 
     `,
     ),
@@ -53,7 +62,7 @@ export const within = async sel => {
   Object.keys(queries).forEach(queryName => {
     container[queryName] = Selector(
       new Function(
-        `return window.TestCafeTestingLibrary["within_${sanitizedSel}"].${queryName}(...arguments)`,
+        `return window.TestcafeTestingLibrary["within_${sanitizedSel}"].${queryName}(...arguments)`,
       ),
     )
   })
diff --git a/test-app/index.html b/test-app/index.html
index 49024d5..9f16d84 100644
--- a/test-app/index.html
+++ b/test-app/index.html
@@ -61,6 +61,10 @@ <h2>getAllByText</h2>
     <button onclick="this.innerText = 'Jackie Kicked'">Jackie Chan 1</button>
     <button onclick="this.innerText = 'Jackie Kicked'">Jackie Chan 2</button>
   </section>
+  <section>
+    <h2>navigate</h2>
+    <a href="page2.html">Go to Page 2</a>
+  </section>
   <!-- Prettier unindents the script tag below -->
   <script>
     document
diff --git a/test-app/page2.html b/test-app/page2.html
new file mode 100644
index 0000000..43c248d
--- /dev/null
+++ b/test-app/page2.html
@@ -0,0 +1 @@
+<div>second page</div>
\ No newline at end of file
diff --git a/tests/testcafe/selectors.js b/tests/testcafe/selectors.js
index 153e921..5503470 100644
--- a/tests/testcafe/selectors.js
+++ b/tests/testcafe/selectors.js
@@ -55,6 +55,15 @@ test('queryAllByText', async t => {
   await t.expect(queryAllByText('Non-existing Button Text').exists).notOk()
 })
 
+
+
+
+test('still works after browser page load', async t => {
+  await t
+    .click(getByText('Go to Page 2'))
+    .expect(getByText('second page').exists).ok()
+})
+
 test.skip('getByTestId only throws the error message', async t => {
   const testId = 'Some random id'
   const errorMessage = `Unable to find an element by: [data-testid="${testId}"]`

From 8e37a915286165a6ec106a1d653536bd1e2ab3ae Mon Sep 17 00:00:00 2001
From: Ben Monro <benjamin.monro@walmartlabs.com>
Date: Sun, 26 May 2019 18:51:37 -0700
Subject: [PATCH 2/5] configure works after page load and standalone

---
 src/index.js                | 35 ++++++++++++++++++++++++++---------
 test-app/index.html         |  5 +++++
 test-app/page2.html         |  9 ++++++++-
 tests/testcafe/configure.js | 20 +++++++++++++++-----
 4 files changed, 54 insertions(+), 15 deletions(-)

diff --git a/src/index.js b/src/index.js
index 4accc3e..1e3f372 100644
--- a/src/index.js
+++ b/src/index.js
@@ -11,7 +11,24 @@ const DOM_TESTING_LIBRARY_UMD_PATH = path.join(
 )
 const DOM_TESTING_LIBRARY_UMD = fs.readFileSync(DOM_TESTING_LIBRARY_UMD_PATH).toString()
 
-export const addTestcafeTestingLibrary = async t => {
+
+
+
+export async function configure(options, t) {
+  const configFunction =
+    `
+  window.DomTestingLibrary.configure(${JSON.stringify(options)});
+`;
+  await ClientFunction(new Function(configFunction))();
+
+  if (t) {
+    t.testRun.injectable.scripts.push('/testcafe-testing-library-config.js');
+    t.testRun.session.proxy.GET('/testcafe-testing-library-config.js', { content: configFunction, contentType: 'application/x-javascript' })
+  }
+
+}
+
+export async function addTestcafeTestingLibrary(t) {
   // inject for 1st pageload.  Then just use injectables for subsequent page loads.
   // eslint-disable-next-line
   const inject = ClientFunction(
@@ -30,8 +47,16 @@ export const addTestcafeTestingLibrary = async t => {
   t.testRun.injectable.scripts.push('/dom-testing-library.js');
   t.testRun.session.proxy.GET('/dom-testing-library.js', { content: DOM_TESTING_LIBRARY_UMD, contentType: 'application/x-javascript' })
 
+  if (addTestcafeTestingLibrary.options) {
+    await configure(addTestcafeTestingLibrary.options, t);
+  }
 
+}
 
+// eslint-disable-next-line no-shadow
+addTestcafeTestingLibrary.configure = function configure(options) {
+  addTestcafeTestingLibrary.options = { ...options };
+  return addTestcafeTestingLibrary;
 }
 
 Object.keys(queries).forEach(queryName => {
@@ -70,11 +95,3 @@ export const within = async sel => {
   return container
 }
 
-
-export const configure = async options => {
-  await ClientFunction(new Function(
-    `
-      window.DomTestingLibrary.configure(${JSON.stringify(options)});
-    `
-  ))
-}
\ No newline at end of file
diff --git a/test-app/index.html b/test-app/index.html
index 9f16d84..ec1d9d1 100644
--- a/test-app/index.html
+++ b/test-app/index.html
@@ -56,6 +56,11 @@ <h2>configure</h2>
     <img data-automation-id="image-with-random-alt-tag" src="data:image/png;base64,"
       onclick="this.style.border = '5px solid red'" />
   </section>
+  <section>
+    <h2>configure standalone</h2>
+
+    <img data-other-test-id="other-id" src="data:image/png;base64," onclick="this.style.border = '5px solid red'" />
+  </section>
   <section>
     <h2>getAllByText</h2>
     <button onclick="this.innerText = 'Jackie Kicked'">Jackie Chan 1</button>
diff --git a/test-app/page2.html b/test-app/page2.html
index 43c248d..c134a25 100644
--- a/test-app/page2.html
+++ b/test-app/page2.html
@@ -1 +1,8 @@
-<div>second page</div>
\ No newline at end of file
+<div>second page</div>
+<section>
+    <section>
+        <h2>configure</h2>
+        <img data-automation-id="page2-thing" src="data:image/png;base64,"
+            onclick="this.style.border = '5px solid red'" />
+    </section>
+</section>
\ No newline at end of file
diff --git a/tests/testcafe/configure.js b/tests/testcafe/configure.js
index dfc4f95..f59264d 100644
--- a/tests/testcafe/configure.js
+++ b/tests/testcafe/configure.js
@@ -1,16 +1,26 @@
 /* eslint-disable import/named */
-import { configure, getByTestId, addTestcafeTestingLibrary } from '../../src'
+import { configure, getByTestId, getByText, addTestcafeTestingLibrary } from '../../src'
 
 
 
 // eslint-disable-next-line babel/no-unused-expressions
-fixture`configure`.beforeEach(addTestcafeTestingLibrary)
+fixture`configure`.beforeEach(addTestcafeTestingLibrary.configure({ testIdAttribute: 'data-automation-id' }))
     .page`http://localhost:13370`
 
 
-test('configure', async t => {
-    await configure({ testIdAttribute: 'data-automation-id' });
-
+test('supports alternative testIdAttribute', async t => {
     await t
         .click(getByTestId('image-with-random-alt-tag'))
+})
+
+test('still works after browser page load', async t => {
+    await t
+        .click(getByText('Go to Page 2'))
+        .click(getByTestId('page2-thing'))
+        .expect(getByText('second page').exists).ok()
+})
+
+test('can be used standalone', async t => {
+    await configure({ testIdAttribute: 'data-other-test-id' });
+    await t.click(getByTestId('other-id'));
 })
\ No newline at end of file

From 6ced4ad9cac2d674dda6dcca822df470d67d6cd5 Mon Sep 17 00:00:00 2001
From: Ben Monro <benjamin.monro@walmartlabs.com>
Date: Sun, 26 May 2019 19:02:38 -0700
Subject: [PATCH 3/5] update snapshot

---
 tests/unit/__snapshots__/selectors.test.js.snap | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/unit/__snapshots__/selectors.test.js.snap b/tests/unit/__snapshots__/selectors.test.js.snap
index 241ec06..c1c59e1 100644
--- a/tests/unit/__snapshots__/selectors.test.js.snap
+++ b/tests/unit/__snapshots__/selectors.test.js.snap
@@ -2,9 +2,9 @@
 
 exports[`exports expected selectors 1`] = `
 Array [
+  "configure",
   "addTestcafeTestingLibrary",
   "within",
-  "configure",
   "queryAllByLabelText",
   "getAllByLabelText",
   "queryByLabelText",

From 0fb260666c46007711dcf4fbef96bb8fedd5d892 Mon Sep 17 00:00:00 2001
From: Ben Monro <benjamin.monro@walmartlabs.com>
Date: Sun, 26 May 2019 19:12:14 -0700
Subject: [PATCH 4/5] set browsers

---
 .testcaferc.json | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/.testcaferc.json b/.testcaferc.json
index 222efa3..e429314 100644
--- a/.testcaferc.json
+++ b/.testcaferc.json
@@ -1,6 +1,8 @@
 {
   "src": "tests/testcafe/**/*.js",
-  "browsers": ["chromium"],
-
+  "browsers": [
+    "chrome:headless",
+    "firefox:headless"
+  ],
   "concurrency": 1
-}
+}
\ No newline at end of file

From 6ae40844e4db94fbaca87a32766d709fbe64c41f Mon Sep 17 00:00:00 2001
From: Ben Monro <benjamin.monro@walmartlabs.com>
Date: Sun, 26 May 2019 19:17:14 -0700
Subject: [PATCH 5/5] updated readme

---
 README.md | 2 --
 1 file changed, 2 deletions(-)

diff --git a/README.md b/README.md
index 8d17e28..558317d 100644
--- a/README.md
+++ b/README.md
@@ -8,8 +8,6 @@
 
 <p>Testcafe selectors and utilities that encourage good testing practices laid down by dom-testing-library.</p>
 
-**_Please go upvote this issue in testcafe to help make this library better_** https://github.com/DevExpress/testcafe/issues/3758
-
 [**Read the docs**](https://testing-library.com/docs/testcafe-testing-library/intro) | [Edit the docs](https://github.com/alexkrolick/testing-library-docs)
 
 </div>