fix tests

san650 · Nov 22, 2020 · 1dd475b · 1dd475b
1 parent 221c72c
commit 1dd475b
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 19 deletions.
diff --git a/tests/helpers/index.ts b/tests/helpers/index.ts
@@ -6,15 +6,8 @@ import {
 // @ts-ignore
 import { setAdapter } from 'ember-cli-page-object/test-support/adapters';
 
-const { require } = window;
-const hasRfc268 = ( require as any).has('@ember/test-helpers');
-
 export function setupApplicationTest(hooks: NestedHooks) {
-  if (!hasRfc268) {
-    throw new Error(`"@ember/test-helpers" not installed.`)
-  }
-
-  const Rfc268Adapter = require('ember-cli-page-object/test-support/adapters/rfc268');
+  const Rfc268Adapter = requireRfc268Adapter();
 
   upstreamSetupApplicationTest(hooks);
 
@@ -24,11 +17,7 @@ export function setupApplicationTest(hooks: NestedHooks) {
 }
 
 export function setupRenderingTest(hooks: NestedHooks) {
-  if (!hasRfc268) {
-    throw new Error(`"@ember/test-helpers" not installed.`)
-  }
-
-  const Rfc268Adapter = require('ember-cli-page-object/test-support/adapters/rfc268');
+  const Rfc268Adapter = requireRfc268Adapter();
 
   upstreamSetupRenderingTest(hooks);
 
@@ -37,4 +26,15 @@ export function setupRenderingTest(hooks: NestedHooks) {
   });
 }
 
+function requireRfc268Adapter() {
+  const { require } = window;
+  const hasRfc268 = ( require as any).has('@ember/test-helpers');
+
+  if (!hasRfc268) {
+    throw new Error(`"@ember/test-helpers" not installed.`)
+  }
+
+  return require('ember-cli-page-object/test-support/adapters/rfc268').default;
+}
+
 export { setupTest } from 'ember-qunit';
diff --git a/tests/helpers/properties.js b/tests/helpers/properties.js
@@ -87,7 +87,7 @@ export function moduleForProperty(name, cbOrOptions, cb) {
   if (require.has('@ember/test-helpers')) {
     // Generate rfc268 tests
 
-    const Rfc268Adapter = require('ember-cli-page-object/test-support/adapters/rfc268');
+    const Rfc268Adapter = require('ember-cli-page-object/test-support/adapters/rfc268').default;
 
     module(`Application mode | Property | ${name}`, function(hooks) {
       setupApplicationTest(hooks);

diff --git a/tests/unit/-private/action-test.js b/tests/unit/-private/action-test.js
@@ -146,8 +146,8 @@ PageObject: 'page.run("1")'
 
       assert.rejects(p.run(1), new Error(`bed time
 
-  PageObject: 'page.run("1")'
-    Selector: '.Scope .Selector'`));
+PageObject: 'page.run("1")'
+  Selector: '.Scope .Selector'`));
     } else {
       assert.expect(0);
     }
@@ -334,8 +334,8 @@ PageObject: 'page.run("1")'
 
         assert.rejects(p.emptyRun().child.run(1), new Error(`bed time
 
-  PageObject: 'page.child.run("1")'
-    Selector: '.root .child .Selector2'`));
+PageObject: 'page.child.run("1")'
+  Selector: '.root .child .Selector2'`));
       } else {
         assert.expect(0);
       }

diff --git a/tests/unit/extend/find-element-with-assert-test.ts b/tests/unit/extend/find-element-with-assert-test.ts
@@ -1,5 +1,5 @@
 import { module, test } from 'qunit';
-import { setupRenderingTest } from 'ember-qunit';
+import { setupRenderingTest } from '../../helpers';
 import { create } from 'ember-cli-page-object';
 import { findElementWithAssert } from 'ember-cli-page-object/extend';
 import hbs from 'htmlbars-inline-precompile';