Skip to content

Commit

Permalink
Merge pull request #2897 from mainmatter/ember-6
Browse files Browse the repository at this point in the history
feat(test-apps): fix Ember 5.x deprecations. Support Ember 6.0 testing
  • Loading branch information
BobrImperator authored Dec 29, 2024
2 parents e6c5c94 + 4bfd507 commit 81de99b
Show file tree
Hide file tree
Showing 10 changed files with 16 additions and 17 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,11 +56,11 @@ jobs:
- test-app
test-suite:
- test:one ember-lts-3.28
- test:one ember-4.0
- test:one ember-lts-4.4
- test:one ember-lts-4.8
- test:one ember-lts-4.12
- test:one ember-lts-5.8
- test:one ember-6.0
- test:one ember-default
- test:one ember-release
allow-failure: [false]
Expand Down
9 changes: 4 additions & 5 deletions packages/classic-test-app/app/controllers/application.js
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
import Controller from '@ember/controller';
import { inject as service } from '@ember/service';
import { action } from '@ember/object';

export default Controller.extend({
router: service(),

actions: {
transitionToLoginRoute() {
this.router.transitionTo('login');
},
},
transitionToLoginRoute: action(function () {
this.router.transitionTo('login');
}),
});
2 changes: 1 addition & 1 deletion packages/classic-test-app/app/templates/application.hbs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{{main-navigation onLogin=(action 'transitionToLoginRoute')}}
{{main-navigation onLogin=this.transitionToLoginRoute}}
<div class="container mt-4">
{{outlet}}
</div>
Empty file.
Empty file.
20 changes: 10 additions & 10 deletions packages/test-esa/config/ember-try.js
Original file line number Diff line number Diff line change
Expand Up @@ -27,16 +27,6 @@ module.exports = function () {
},
},
},
{
name: 'ember-4.0',
npm: {
devDependencies: {
'ember-cli': '~4.0.0',
'ember-data': '~4.0.0',
'ember-source': '~4.0.0',
},
},
},
{
name: 'ember-lts-4.4',
npm: {
Expand Down Expand Up @@ -77,6 +67,16 @@ module.exports = function () {
},
},
},
{
name: 'ember-6.0',
npm: {
devDependencies: {
'ember-cli': '~6.0.0',
'ember-source': '~6.0.0',
'ember-data': '~5.3.0',
},
},
},
{
name: 'ember-release',
npm: {
Expand Down

0 comments on commit 81de99b

Please sign in to comment.