Skip to content

Commit

Permalink
Allow @ember/test-helpers 3 (#518)
Browse files Browse the repository at this point in the history
* Set the package manager used

* Allow @ember/test-helpers v3

* Launch tests on ember-test-helpers 3

* Add @ember/string as dependencies of the test-app

* Remove ember-export-application-global that use Ember.String
  • Loading branch information
francois2metz authored Sep 23, 2023
1 parent 8536901 commit a68ab01
Show file tree
Hide file tree
Showing 6 changed files with 75 additions and 11 deletions.
1 change: 1 addition & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,7 @@ jobs:
- ember-beta
- ember-canary
- ember-modifier-4
- ember-test-helpers-3
- embroider-safe
- embroider-optimized

Expand Down
2 changes: 1 addition & 1 deletion addon/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
},
"peerDependencies": {
"ember-modifier": "^3.2.0 || ^4.0.0",
"@ember/test-helpers": "^2.6.0",
"@ember/test-helpers": "^2.6.0 || ^3.0.0",
"@ember/test-waiters": "^3.0.1",
"ember-source": "^3.28.0 || ^4.0.0"
},
Expand Down
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"version": "0.0.0",
"private": true,
"packageManager": "pnpm@7.33.6",
"repository": {
"type": "git",
"url": "https://github.com/adopted-ember-addons/ember-sortable"
Expand Down
69 changes: 60 additions & 9 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 11 additions & 0 deletions test-app/config/ember-try.js
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,17 @@ module.exports = async function () {
},
},
},
{
name: 'ember-test-helpers-3',
npm: {
dependencies: {
'@ember/test-helpers': '^3.0.0',
},
devDependencies: {
'ember-qunit': '^7.0.0',
},
},
},
{
name: 'ember-release',
npm: {
Expand Down
2 changes: 1 addition & 1 deletion test-app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
"test:all": "ember try:each"
},
"dependencies": {
"@ember/string": "^3.1.1",
"@ember/test-helpers": "^2.6.0",
"@ember/test-waiters": "^3.0.1",
"ember-modifier": "^3.2.0",
Expand All @@ -43,7 +44,6 @@
"ember-cli-htmlbars": "^6.0.1",
"ember-cli-inject-live-reload": "^2.0.0",
"ember-disable-prototype-extensions": "^1.1.3",
"ember-export-application-global": "^2.0.0",
"ember-load-initializers": "^2.1.2",
"ember-qunit": "mydea/ember-qunit#fn/ember-auto-import-v2-node-12",
"ember-resolver": "^8.0.3",
Expand Down

0 comments on commit a68ab01

Please sign in to comment.