Merge pull request #36 from Addepar/monroe/v2

Testing with ember-cli-page-object v2.0.0-beta.3
Addepar · Feb 23, 2022 · a5e1c58 · a5e1c58
2 parents 6e3c5b7 + b11e3c7
commit a5e1c58
Show file tree

Hide file tree

Showing 5 changed files with 2,578 additions and 116 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -38,8 +38,6 @@ jobs:
       matrix:
         ember-version:
           [
-            ember-lts-2.8,
-            ember-lts-2.12,
             ember-lts-2.18,
             ember-lts-3.4,
             ember-lts-3.8,

diff --git a/addon-test-support/-private/page-object.js b/addon-test-support/-private/page-object.js
@@ -1,13 +1,9 @@
 import { assert } from '@ember/debug';
 
 import { create } from 'ember-cli-page-object';
-import { useNativeEvents } from 'ember-cli-page-object/extend';
 
 import { extractPageObjects, extractGetters, deepMergeDescriptors } from './utils/descriptors';
 
-// pre-emptively turn on native events since we'll need them
-useNativeEvents();
-
 function extendDefinition(definition, extension) {
   assert('must provide a string or an object to extend', extension !== null && (typeof extension === 'string' || typeof extension === 'object'));
   assert('must provide a definition with atleast one key when extending a PageObject', extension && Object.keys(extension).length > 0);

diff --git a/config/ember-try.js b/config/ember-try.js
@@ -10,30 +10,6 @@ module.exports = function() {
     return {
       useYarn: true,
       scenarios: [
-        {
-          name: 'ember-lts-2.8',
-          bower: {
-            dependencies: {
-              ember: 'components/ember#lts-2-8',
-            },
-            resolutions: {
-              ember: 'lts-2-8',
-            },
-          },
-          npm: {
-            devDependencies: {
-              'ember-source': null,
-            },
-          },
-        },
-        {
-          name: 'ember-lts-2.12',
-          npm: {
-            devDependencies: {
-              'ember-source': '~2.12.0',
-            },
-          },
-        },
         {
           name: 'ember-lts-2.18',
           npm: {

diff --git a/package.json b/package.json
@@ -21,15 +21,15 @@
   "dependencies": {
     "broccoli-funnel": "^2.0.1",
     "ember-cli-babel": "^7.12.0",
-    "ember-cli-page-object": "^1.17.6"
+    "ember-cli-page-object": "~v2.0.0-beta.3"
   },
   "devDependencies": {
     "broccoli-asset-rev": "^2.4.5",
+    "ember-auto-import": "^2.4.0",
     "ember-cli": "~3.1.4",
     "ember-cli-dependency-checker": "^3.2.0",
     "ember-cli-eslint": "^5.1.0",
-    "ember-cli-htmlbars": "^3.0.1",
-    "ember-cli-htmlbars-inline-precompile": "^2.1.0",
+    "ember-cli-htmlbars": "^6.0.1",
     "ember-cli-inject-live-reload": "^2.0.1",
     "ember-cli-sri": "^2.1.0",
     "ember-cli-uglify": "^2.0.0",
@@ -42,7 +42,8 @@
     "ember-source-channel-url": "^1.0.1",
     "ember-test-selectors": "5.0.0",
     "ember-try": "^1.1.0",
-    "loader.js": "^4.2.3"
+    "loader.js": "^4.2.3",
+    "webpack": "^5.68.0"
   },
   "engines": {
     "node": ">= 10.*"