Merge pull request #697 from ember-cli/enable-remaining-scenarios

enable currently remaining ember-try scenarios

.github/workflows/ci-build.yml

@@ -75,8 +75,8 @@ jobs:
           - ember-lts-3.20
           - ember-lts-3.24
           - ember-release
-          # - ember-beta
-          # - ember-canary
+          - ember-beta
+          - ember-canary
           - ember-classic
           - ember-default-with-jquery
           # - embroider-safe

addon/resolvers/classic/container-debug-adapter.js

@@ -1,6 +1,7 @@
 import { A } from '@ember/array';
 import ContainerDebugAdapter from '@ember/debug/container-debug-adapter';
 import { ModuleRegistry } from './index';
+import { getOwner } from '@ember/application';
 
 function getPod(type, key, prefix) {
   let match = key.match(new RegExp('^/?' + prefix + '/(.+)/' + type + '$'));
@@ -19,6 +20,7 @@ export default ContainerDebugAdapter.extend({
 
   init() {
     this._super(...arguments);
+    this.namespace = getOwner(this).lookup('application:main');
 
     if (!this._moduleRegistry) {
       this._moduleRegistry = new ModuleRegistry();

addon/resolvers/classic/index.js

@@ -364,7 +364,12 @@ const Resolver = EmberObject.extend({
       'Attempted to lookup "'+moduleName+'" which ' +
       'was not found. Please rename "'+partializedModuleName+'" '+
       'to "'+moduleName+'" instead.', false,
-      { id: 'ember-resolver.underscored-modules', until: '3.0.0' });
+      {
+        id: 'ember-resolver.underscored-modules',
+        until: '3.0.0',
+        for: 'ember-resolver',
+        since: '0.1.0'
+      });
 
       return partializedModuleName;
     }

app/initializers/container-debug-adapter.js

@@ -7,6 +7,5 @@ export default {
     let app = arguments[1] || arguments[0];
 
     app.register('container-debug-adapter:main', ContainerDebugAdapter);
-    app.inject('container-debug-adapter:main', 'namespace', 'application:main');
   }
 };

package.json

@@ -46,6 +46,7 @@
     "@ember/test-helpers": "^2.2.5",
     "babel-eslint": "^10.1.0",
     "broccoli-asset-rev": "^3.0.0",
+    "ember-auto-import": "^1",
     "ember-cli": "~3.27.0",
     "ember-cli-dependency-checker": "^3.2.0",
     "ember-cli-htmlbars": "^5.7.1",
@@ -55,20 +56,20 @@
     "ember-qunit": "^5.1.4",
     "ember-source": "3.27.2",
     "ember-source-channel-url": "^3.0.0",
+    "ember-template-lint": "^3.4.2",
     "ember-try": "^1.4.0",
     "eslint": "^7.32.0",
-    "ember-template-lint": "^3.4.2",
     "eslint-plugin-ember": "^7.8.1",
     "eslint-plugin-node": "^11.1.0",
     "eslint-plugin-prettier": "^3.4.0",
     "eslint-plugin-qunit": "^6.1.1",
     "loader.js": "^4.7.0",
     "npm-run-all": "^4.1.5",
+    "prettier": "^2.3.0",
+    "qunit": "^2.17.1",
     "qunit-dom": "^1.6.0",
     "release-it": "^14.10.1",
-    "release-it-lerna-changelog": "^3.1.0",
-    "prettier": "^2.3.0",
-    "qunit": "^2.15.0"
+    "release-it-lerna-changelog": "^3.1.0"
   },
   "engines": {
     "node": ">= 10.*"

tests/unit/resolvers/classic/basic-test.js

@@ -3,7 +3,7 @@
 /* eslint-disable no-console */
 
 import Ember from 'ember';
-import { merge } from '@ember/polyfills';
+import { assign } from '@ember/polyfills';
 import { module, test } from 'qunit';
 import Resolver from 'ember-resolver/resolvers/classic';
 
@@ -18,12 +18,12 @@ function setupResolver(options = {}) {
 
 function resetRegistry() {
   requirejs.clear();
-  merge(requirejs.entries, originalRegistryEntries);
+  assign(requirejs.entries, originalRegistryEntries);
 }
 
 module('ember-resolver/resolvers/classic', {
   beforeEach() {
-    originalRegistryEntries = merge({}, requirejs.entries);
+    originalRegistryEntries = assign({}, requirejs.entries);
     originalConsoleInfo = console ? console.info : null;
 
     setupResolver();

yarn.lock

@@ -4301,7 +4301,7 @@ elliptic@^6.5.3:
     minimalistic-assert "^1.0.1"
     minimalistic-crypto-utils "^1.0.1"
 
-ember-auto-import@^1.10.1:
+ember-auto-import@^1, ember-auto-import@^1.10.1:
   version "1.12.0"
   resolved "https://registry.yarnpkg.com/ember-auto-import/-/ember-auto-import-1.12.0.tgz#52246b04891090e2608244e65c4c6af7710df12b"
   integrity sha512-fzMGnyHGfUNFHchpLbJ98Vs/c5H2wZBMR9r/XwW+WOWPisZDGLUPPyhJQsSREPoUQ+o8GvyLaD/rkrKqW8bmgw==
@@ -9395,10 +9395,10 @@ qunit-dom@^1.6.0:
     ember-cli-babel "^7.23.0"
     ember-cli-version-checker "^5.1.1"
 
-qunit@^2.15.0:
-  version "2.17.0"
-  resolved "https://registry.yarnpkg.com/qunit/-/qunit-2.17.0.tgz#4c2dd5a4ee91cd8f8462708a37e710a3e622c321"
-  integrity sha512-3zXO4T3KT8liCXYDqu68SmK6D7JgI80R6gUPGjzxXwh9rjwdmmx09YZhGLfT466PC/XlORr8xvxlNx3i3S72Rw==
+qunit@^2.17.1:
+  version "2.17.1"
+  resolved "https://registry.yarnpkg.com/qunit/-/qunit-2.17.1.tgz#1969efe4c9b776b4b8cd4fc2fb9634e8f762e177"
+  integrity sha512-Gx1tpSfYbjRe4TRKCVBLlnCaVThF5Pdnmbbv/zLFfgWKddeQHV/eNi1BG392hw4gEDh2sflMj8kmPJlT7+kVMA==
   dependencies:
     commander "7.1.0"
     node-watch "0.7.1"