chore: 🤖 upgrade rose addon to ember lts 3.20

addons/rose/.eslintrc.js

@@ -51,9 +51,7 @@ module.exports = {
         node: true
       },
       plugins: ['node'],
-      rules: Object.assign({}, require('eslint-plugin-node').configs.recommended.rules, {
-        // add your custom rules and overrides for node files here
-      })
+      extends: ['plugin:node/recommended']
     }
   ]
 };

addons/rose/.travis.yml

@@ -1,66 +0,0 @@
----
-language: node_js
-node_js:
-  # we recommend testing addons with the same minimum supported node version as Ember CLI
-  # so that your addon works for all apps
-  - "10"
-
-dist: trusty
-
-addons:
-  chrome: stable
-
-cache:
-  yarn: true
-
-env:
-  global:
-    # See https://git.io/vdao3 for details.
-    - JOBS=1
-
-branches:
-  only:
-    - master
-    # npm version tags
-    - /^v\d+\.\d+\.\d+/
-
-jobs:
-  fast_finish: true
-  allow_failures:
-    - env: EMBER_TRY_SCENARIO=ember-canary
-
-  include:
-    # runs linting and tests with current locked deps
-    - stage: "Tests"
-      name: "Tests"
-      script:
-        - yarn lint:hbs
-        - yarn lint:js
-        - yarn test
-
-    - stage: "Additional Tests"
-      name: "Floating Dependencies"
-      install:
-        - yarn install --no-lockfile --non-interactive
-      script:
-        - yarn test
-
-    # we recommend new addons test the current and previous LTS
-    # as well as latest stable release (bonus points to beta/canary)
-    - env: EMBER_TRY_SCENARIO=ember-lts-3.12
-    - env: EMBER_TRY_SCENARIO=ember-lts-3.16
-    - env: EMBER_TRY_SCENARIO=ember-release
-    - env: EMBER_TRY_SCENARIO=ember-beta
-    - env: EMBER_TRY_SCENARIO=ember-canary
-    - env: EMBER_TRY_SCENARIO=ember-default-with-jquery
-    - env: EMBER_TRY_SCENARIO=ember-classic
-
-before_install:
-  - curl -o- -L https://yarnpkg.com/install.sh | bash
-  - export PATH=$HOME/.yarn/bin:$PATH
-
-install:
-  - yarn install --non-interactive
-
-script:
-  - node_modules/.bin/ember try:one $EMBER_TRY_SCENARIO

addons/rose/config/ember-try.js

@@ -22,6 +22,14 @@ module.exports = async function () {
           },
         },
       },
+      {
+        name: 'ember-lts-3.20',
+        npm: {
+          devDependencies: {
+            'ember-source': '~3.20.5'
+          }
+        }
+      },
       {
         name: 'ember-release',
         npm: {
@@ -46,16 +54,6 @@ module.exports = async function () {
           },
         },
       },
-      // The default `.travis.yml` runs this scenario via `yarn test`,
-      // not via `ember try`. It's still included here so that running
-      // `ember try:each` manually or from a customized CI config will run it
-      // along with all the other scenarios.
-      {
-        name: 'ember-default',
-        npm: {
-          devDependencies: {},
-        },
-      },
       {
         name: 'ember-default-with-jquery',
         env: {
@@ -65,9 +63,9 @@ module.exports = async function () {
         },
         npm: {
           devDependencies: {
-            '@ember/jquery': '^0.5.1',
-          },
-        },
+            '@ember/jquery': '^1.1.0'
+          }
+        }
       },
       {
         name: 'ember-classic',

addons/rose/package.json

@@ -10,7 +10,7 @@
   "scripts": {
     "build:development": "ember build",
     "build": "ember build --environment=production",
-    "lint": "yarn lint:hbs && yarn lint:js && yarn lint:sass",
+    "lint": "npm-run-all --aggregate-output --continue-on-error --parallel lint:*",
     "lint:hbs": "ember-template-lint .",
     "lint:js": "eslint .",
     "lint:sass": "sass-lint -v -q",
@@ -19,7 +19,7 @@
     "format:sass": "prettier --write addon/**/*.scss",
     "start": "ember serve",
     "test": "ember test",
-    "test:all": "ember try:each",
+    "test:ember-compatibility": "ember try:each",
     "prestorybook": "yarn build && yarn storybook:build",
     "storybook": "start-storybook -p 6006 -s dist",
     "storybook:build": "build-storybook -s dist",
@@ -27,12 +27,12 @@
   },
   "dependencies": {
     "babel-loader": "^8.1.0",
-    "ember-cli-babel": "^7.17.2",
-    "ember-cli-htmlbars": "^4.2.2"
+    "ember-cli-babel": "^7.21.0",
+    "ember-cli-htmlbars": "^5.2.0"
   },
   "devDependencies": {
     "@ember/optional-features": "^1.3.0",
-    "@glimmer/component": "^1.0.0",
+    "@glimmer/component": "^1.0.1",
     "@glimmer/tracking": "^1.0.0",
     "@hashicorp/structure-icons": "^1.8.1",
     "@storybook/addon-actions": "^6.0.21",
@@ -40,17 +40,15 @@
     "@storybook/addon-knobs": "^6.0.21",
     "@storybook/ember": "^6.0.21",
     "@storybook/ember-cli-storybook": "^0.2.1",
-    "babel-eslint": "^10.0.3",
+    "babel-eslint": "^10.1.0",
     "broccoli-asset-rev": "^3.0.0",
     "doctoc": "^1.4.0",
-    "ember-auto-import": "^1.5.3",
-    "ember-cli": "~3.16.1",
+    "ember-auto-import": "^1.6.0",
+    "ember-cli": "~3.20.2",
     "ember-cli-dependency-checker": "^3.2.0",
-    "ember-cli-eslint": "^5.1.0",
     "ember-cli-inject-live-reload": "^2.0.2",
     "ember-cli-sass": "^10.0.1",
     "ember-cli-sri": "^2.1.1",
-    "ember-cli-template-lint": "^1.0.0-beta.3",
     "ember-cli-uglify": "^3.0.0",
     "ember-cli-update": "^0.54.6",
     "ember-disable-prototype-extensions": "^1.1.3",
@@ -61,17 +59,20 @@
     "ember-modifier": "^1.0.3",
     "ember-qunit": "^4.6.0",
     "ember-radio-button": "^2.0.1",
-    "ember-resolver": "^7.0.0",
-    "ember-source": "~3.16.0",
+    "ember-resolver": "^8.0.0",
+    "ember-source": "~3.20.2",
     "ember-source-channel-url": "^2.0.1",
+    "ember-template-lint": "^2.9.1",
     "ember-try": "^1.4.0",
     "ember-uuid": "^2.1.0",
     "emberx-select": "github:adopted-ember-addons/emberx-select#bc5f774",
-    "eslint-plugin-ember": "^7.7.2",
-    "eslint-plugin-node": "^11.0.0",
+    "eslint": "^7.5.0",
+    "eslint-plugin-ember": "^8.9.1",
+    "eslint-plugin-node": "^11.1.0",
     "loader.js": "^4.7.0",
+    "npm-run-all": "^4.1.5",
     "prettier": "^2.0.5",
-    "qunit-dom": "^1.0.0",
+    "qunit-dom": "^1.2.0",
     "sass": "^1.26.5",
     "sass-lint": "^1.13.1"
   },

addons/rose/tests/dummy/app/app.js

@@ -1,7 +1,7 @@
 import Application from '@ember/application';
 import Resolver from 'ember-resolver';
 import loadInitializers from 'ember-load-initializers';
-import config from './config/environment';
+import config from 'dummy/config/environment';
 
 export default class App extends Application {
   modulePrefix = config.modulePrefix;

addons/rose/tests/dummy/app/router.js

@@ -1,5 +1,5 @@
 import EmberRouter from '@ember/routing/router';
-import config from './config/environment';
+import config from 'dummy/config/environment';
 
 export default class Router extends EmberRouter {
   location = config.locationType;

addons/rose/tests/dummy/config/ember-cli-update.json

@@ -0,0 +1,20 @@
+{
+  "schemaVersion": "1.0.0",
+  "packages": [
+    {
+      "name": "ember-cli",
+      "version": "3.20.2",
+      "blueprints": [
+        {
+          "name": "addon",
+          "outputRepo": "https://github.com/ember-cli/ember-addon-output",
+          "codemodsSource": "ember-addon-codemods-manifest@1",
+          "isBaseBlueprint": true,
+          "options": [
+            "--no-welcome"
+          ]
+        }
+      ]
+    }
+  ]
+}

addons/rose/tests/dummy/config/targets.js

@@ -6,7 +6,7 @@ const browsers = [
   'last 1 Safari versions',
 ];
 
-const isCI = !!process.env.CI;
+const isCI = Boolean(process.env.CI);
 const isProduction = process.env.EMBER_ENV === 'production';
 
 if (isCI || isProduction) {

addons/rose/tests/test-helper.js

@@ -1,5 +1,5 @@
-import Application from '../app';
-import config from '../config/environment';
+import Application from 'dummy/app';
+import config from 'dummy/config/environment';
 import { setApplication } from '@ember/test-helpers';
 import { start } from 'ember-qunit';
 

ui/core/mirage/config.js

@@ -1,3 +1,4 @@
+import Ember from 'ember';
 import config from '../config/environment';
 import { authHandler, deauthHandler } from './route-handlers/auth';
 import { pickRandomStatusString } from './factories/session';
@@ -321,14 +322,18 @@ export default function() {
 
   // session
 
-  // To simulate changes to `session.status` that may occur in the backend,
-  // we quietly randomize the value of the field on GET.
   this.get('/sessions', function ({ sessions }, { queryParams: { scope_id } }) {
-    sessions.where(session => session.scopeId === scope_id)
-      .models
-      .forEach(session => session.update({
-        status: pickRandomStatusString()
-      }));
+    // To simulate changes to `session.status` that may occur in the backend,
+    // we quietly randomize the value of the field on GET.
+    // But only if not in testing mode.
+    // In tests, we need deterministic statuses.
+    if (!Ember.testing) {
+      sessions.where(session => session.scopeId === scope_id)
+        .models
+        .forEach(session => session.update({
+          status: pickRandomStatusString()
+        }));
+    }
     return sessions.where(session => session.scopeId === scope_id)
   });
   this.get('/sessions/:id', function ({ sessions }, { params: { id } }) {

ui/core/tests/acceptance/sessions-test.js

@@ -42,8 +42,9 @@ module('Acceptance | sessions', function (hooks) {
     this.server.createList('group', 1, { scope: instances.scopes.org }, 'withMembers');
     this.server.createList('host-catalog', 1, { scope: instances.scopes.project }, 'withChildren');
     this.server.createList('target', 1, { scope: instances.scopes.project }, 'withRandomHostSets');
-    instances.sessions = this.server.createList('session', 10, {
+    instances.sessions = this.server.createList('session', 3, {
       scope: instances.scopes.project,
+      status: 'active'
     }, 'withAssociations');
     urls.sessions = `/scopes/${instances.scopes.org.id}/projects/${instances.scopes.project.id}/sessions`;
   });

yarn.lock

@@ -9989,7 +9989,7 @@ ember-cli-version-checker@^4.1.0:
     semver "^6.3.0"
     silent-error "^1.1.1"
 
-ember-cli@~3.16.1, ember-cli@~3.16.2:
+ember-cli@~3.16.2:
   version "3.16.2"
   resolved "https://registry.yarnpkg.com/ember-cli/-/ember-cli-3.16.2.tgz#97fcf7f5109a0cc5e9f8ee8e971d3420d670eedb"
   integrity sha512-x8czGIdRnS7bPRYY7PEhhVGakHTDGF1arKlgw8yBSch29hCuxmbMrxjQxEkvkTtQ8cb7a840N4eVyEujeYPQIw==