adjust assertion to allow for either undefined or null values

.travis.yml

@@ -38,7 +38,7 @@ branches:
   only:
     - master
     - beta
-    - stable
+    - release
     # npm version tags
     - /^v\d+\.\d+\.\d+/
 
@@ -63,11 +63,10 @@ env:
     - secure: e0yxVfwVW61d3Mi/QBOsY6Rfd1mZd3VXUd9xNRoz/fkvQJRuVwDe7oG3NOuJ4LZzvMw7BJ+zpDV9D8nKhAyPEEOgpkkMHUB7Ds83pHG4qSMzm4EAwBCadDLXCQirldz8dzN5FAqgGucXoj5fj/p2SKOkO6qWIZveGr8pdBJEG1E=
   matrix:
     - TEST_SUITE=browserstack
-    - TEST_SUITE=each-package-tests BUILD_TYPE=canary PUBLISH=true
+    - TEST_SUITE=each-package-tests BUILD_TYPE=release PUBLISH=true
     - TEST_SUITE=built-tests EMBER_ENV=production
     - TEST_SUITE=old-jquery-and-extend-prototypes
     - TEST_SUITE=node
     - TEST_SUITE=blueprints
     - TEST_SUITE=travis-browsers
-    - TEST_SUITE=each-package-tests BUILD_TYPE=alpha PUBLISH=true
     - TEST_SUITE=code-quality

CHANGELOG.md

@@ -1,5 +1,21 @@
 # Ember Changelog
 
+### v3.1.0 (April 10, 2018)
+- [#16293](https://github.com/emberjs/ember.js/pull/16293) [BUGFIX] Ignore --pod for -addon blueprints: helper, initializer, and instance-initializer
+- [#16312](https://github.com/emberjs/ember.js/pull/16312) [DEPRECATION] Deprecate `Route.prototype.router` in favor of `Route.prototype._router`
+- [#16326](https://github.com/emberjs/ember.js/pull/16326) [BUGFIX] Expanded syntax error for if handlebars helper to include source of error
+- [#16350](https://github.com/emberjs/ember.js/pull/16350) [BUGFIX] Fix initializers tests blueprints
+- [#16294](https://github.com/emberjs/ember.js/pull/16294) [BUGFIX] Fix input macro params handling
+- [#16307](https://github.com/emberjs/ember.js/pull/16307) [BUGFIX] Ensure proper .toString() of default components.
+- [#16287](https://github.com/emberjs/ember.js/pull/16287) [BUGFIX] Update to router_js@2.0.0-beta.2.
+- [#16245](https://github.com/emberjs/ember.js/pull/16245) [BUGFIX] Ensure errors in deferred component hooks can be recovered.
+- [#16246](https://github.com/emberjs/ember.js/pull/16246) [BUGFIX] computed.sort should not sort if sortProperties is empty
+- [emberjs/rfcs#276](https://github.com/emberjs/rfcs/blob/master/text/0276-named-args.md) [FEATURE named-args] enabled by default.
+- [emberjs/rfcs#278](https://github.com/emberjs/rfcs/blob/master/text/0278-template-only-components.md) [FEATURE template-only-glimmer-components] Enable-able via `@ember/optional-features` addon.
+- [emberjs/rfcs#280](https://github.com/emberjs/rfcs/blob/master/text/0280-remove-application-wrapper.md) [FEATURE application-template-wrapper] Enable-able via `@ember/optional-features` addon.
+- [emberjs/rfcs#281](https://github.com/emberjs/rfcs/blob/master/text/0281-es5-getters.md) [FEATURE native-es5-getters] Enabled by default.
+- [#15828](https://github.com/emberjs/ember.js/pull/15828) Upgrade glimmer-vm to latest version.
+
 ### v3.0.0 (February 13, 2018)
 
 - [#16218](https://github.com/emberjs/ember.js/pull/16218) [BUGFIX beta] Prevent errors when using const `(get arr 1)`.

blueprints/-addon-import.js

@@ -10,15 +10,9 @@ module.exports = {
   fileMapTokens: function() {
     return {
       __name__: function(options) {
-        if (options.pod && options.hasPathToken) {
-          return options.locals.blueprintName;
-        }
         return options.dasherizedModuleName;
       },
       __path__: function(options) {
-        if (options.pod && options.hasPathToken) {
-          return path.join(options.podPath, options.dasherizedModuleName);
-        }
         return inflector.pluralize(options.locals.blueprintName);
       },
       __root__: function(options) {
@@ -42,10 +36,6 @@ module.exports = {
       modulePathSegments = [addonName, inflector.pluralize(blueprintName), fileName];
     }
 
-    if (options.pod) {
-      modulePathSegments = [addonName, fileName, blueprintName];
-    }
-
     return {
       modulePath: modulePathSegments.join('/'),
       blueprintName: blueprintName

blueprints/acceptance-test/index.js

@@ -25,7 +25,7 @@ module.exports = useTestFrameworkDetector({
     return {
       testFolderRoot: testFolderRoot,
       friendlyTestName,
-      destroyAppExists: destroyAppExists
+      destroyAppExists
     };
   }
 });

blueprints/initializer-test/index.js

@@ -1,6 +1,8 @@
 'use strict';
 
+const path = require('path');
 const stringUtils = require('ember-cli-string-utils');
+const existsSync = require('exists-sync');
 
 const useTestFrameworkDetector = require('../test-framework-detector');
 
@@ -9,7 +11,8 @@ module.exports = useTestFrameworkDetector({
   locals: function(options) {
     return {
       friendlyTestName: ['Unit', 'Initializer', options.entity.name].join(' | '),
-      dasherizedModulePrefix: stringUtils.dasherize(options.project.config().modulePrefix)
+      dasherizedModulePrefix: stringUtils.dasherize(options.project.config().modulePrefix),
+      destroyAppExists: existsSync(path.join(this.project.root, '/tests/helpers/destroy-app.js'))
     };
   }
 });

blueprints/initializer-test/qunit-files/tests/unit/initializers/__name__-test.js

@@ -3,7 +3,7 @@ import { run } from '@ember/runloop';
 
 import { initialize } from '<%= dasherizedModulePrefix %>/initializers/<%= dasherizedModuleName %>';
 import { module, test } from 'qunit';
-import destroyApp from '../../helpers/destroy-app';
+<% if (destroyAppExists) { %>import destroyApp from '../../helpers/destroy-app';<% } else { %>import { run } from '@ember/runloop'; <% } %>
 
 module('<%= friendlyTestName %>', {
   beforeEach() {
@@ -13,7 +13,7 @@ module('<%= friendlyTestName %>', {
     });
   },
   afterEach() {
-    destroyApp(this.application);
+    <% if (destroyAppExists) { %>destroyApp(this.application);<% } else { %>run(this.application, 'destroy');<% } %>
   }
 });
 

blueprints/initializer-test/qunit-rfc-232-files/tests/unit/initializers/__name__-test.js

@@ -3,7 +3,7 @@ import Application from '@ember/application';
 import { initialize } from '<%= dasherizedModulePrefix %>/initializers/<%= dasherizedModuleName %>';
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
-import destroyApp from '../../helpers/destroy-app';
+<% if (destroyAppExists) { %>import destroyApp from '../../helpers/destroy-app';<% } else { %>import { run } from '@ember/runloop';<% } %>
 
 module('<%= friendlyTestName %>', function(hooks) {
   setupTest(hooks);
@@ -19,7 +19,7 @@ module('<%= friendlyTestName %>', function(hooks) {
   });
 
   hooks.afterEach(function() {
-    destroyApp(this.application);
+    <% if (destroyAppExists) { %>destroyApp(this.application);<% } else { %>run(this.application, 'destroy');<% } %>
   });
 
   // Replace this with your real tests.

blueprints/instance-initializer-test/index.js

@@ -1,5 +1,7 @@
 'use strict';
 
+const path = require('path');
+const existsSync = require('exists-sync');
 const stringUtils = require('ember-cli-string-utils');
 
 const useTestFrameworkDetector = require('../test-framework-detector');
@@ -9,7 +11,8 @@ module.exports = useTestFrameworkDetector({
   locals: function(options) {
     return {
       friendlyTestName: ['Unit', 'Instance Initializer', options.entity.name].join(' | '),
-      dasherizedModulePrefix: stringUtils.dasherize(options.project.config().modulePrefix)
+      dasherizedModulePrefix: stringUtils.dasherize(options.project.config().modulePrefix),
+      destroyAppExists: existsSync(path.join(this.project.root, '/tests/helpers/destroy-app.js'))
     };
   }
 });

blueprints/instance-initializer-test/qunit-files/tests/unit/instance-initializers/__name__-test.js

@@ -1,8 +1,8 @@
 import Application from '@ember/application';
 import { run } from '@ember/runloop';
 import { initialize } from '<%= dasherizedModulePrefix %>/instance-initializers/<%= dasherizedModuleName %>';
-import { module, test } from 'qunit';
-import destroyApp from '../../helpers/destroy-app';
+import { module, test } from 'qunit';<% if (destroyAppExists) { %>
+import destroyApp from '../../helpers/destroy-app';<% } %>
 
 module('<%= friendlyTestName %>', {
   beforeEach() {
@@ -13,7 +13,7 @@ module('<%= friendlyTestName %>', {
   },
   afterEach() {
     run(this.appInstance, 'destroy');
-    destroyApp(this.application);
+    <% if (destroyAppExists) { %>destroyApp(this.application);<% } else { %>run(this.application, 'destroy');<% } %>
   }
 });
 

blueprints/instance-initializer-test/qunit-rfc-232-files/tests/unit/instance-initializers/__name__-test.js

@@ -3,7 +3,7 @@ import Application from '@ember/application';
 import { initialize } from '<%= dasherizedModulePrefix %>/instance-initializers/<%= dasherizedModuleName %>';
 import { module, test } from 'qunit';
 import { setupTest } from 'ember-qunit';
-import destroyApp from '../../helpers/destroy-app';
+<% if (destroyAppExists) { %>import destroyApp from '../../helpers/destroy-app';<% } else { %>import { run } from '@ember/runloop';<% } %>
 
 module('<%= friendlyTestName %>', function(hooks) {
   setupTest(hooks);
@@ -18,8 +18,8 @@ module('<%= friendlyTestName %>', function(hooks) {
     this.instance = this.application.buildInstance();
   });
   hooks.afterEach(function() {
-    destroyApp(this.application);
-    destroyApp(this.instance);
+    <% if (destroyAppExists) { %>destroyApp(this.application);<% } else { %>run(this.application, 'destroy');<% } %>
+    <% if (destroyAppExists) { %>destroyApp(this.instance);<% } else { %>run(this.instance, 'destroy');<% } %>
   });
 
   // Replace this with your real tests.

broccoli/version.js

@@ -29,7 +29,7 @@ module.exports.VERSION = (() => {
   let sha = info.sha || '';
   let suffix = process.env.BUILD_TYPE || info.branch;
   // * remove illegal non-alphanumeric characters from branch name.
-  suffix = suffix && suffix.replace(/[^a-zA-Z\d\s-]/, '-');
+  suffix = suffix && suffix.replace(/[^a-zA-Z\d\s-]/g, '-');
   let metadata = sha.slice(0, 8);
 
   return `${packageVersion}${suffix ? '-' + suffix : ''}+${metadata}`;

features.json

@@ -1,15 +1,15 @@
 {
   "features": {
-    "features-stripped-test": null,
-    "ember-libraries-isregistered": null,
-    "ember-improved-instrumentation": null,
+    "features-stripped-test": false,
+    "ember-libraries-isregistered": false,
+    "ember-improved-instrumentation": false,
     "ember-glimmer-named-arguments": true,
     "ember-metal-es5-getters": true,
     "ember-routing-router-service": true,
     "ember-engines-mount-params": true,
-    "ember-module-unification": null,
-    "glimmer-custom-component-manager": null,
-    "ember-template-block-let-helper": null
+    "ember-module-unification": false,
+    "glimmer-custom-component-manager": false,
+    "ember-template-block-let-helper": false
   },
   "deprecations": {
     "container-lookupFactory": "2.12.0",

node-tests/blueprints/helper-addon-test.js

@@ -24,5 +24,12 @@ describe('Blueprint: helper-addon', function() {
           .to.equal(fixture('helper-addon.js'));
       });
     });
+
+    it('helper-addon foo/bar-baz --pod', function() {
+      return emberGenerateDestroy(['helper-addon', 'foo/bar-baz', '--pod'], _file => {
+        expect(_file('app/helpers/foo/bar-baz.js'))
+          .to.equal(fixture('helper-addon.js'));
+      });
+    });
   });
 });

node-tests/blueprints/initializer-addon-test.js

@@ -22,5 +22,12 @@ describe('Blueprint: initializer-addon', function() {
           .to.contain("export { default, initialize } from 'my-addon/initializers/foo';");
       });
     });
+
+    it('initializer-addon foo --pod', function() {
+      return emberGenerateDestroy(['initializer-addon', 'foo', '--pod'], _file => {
+        expect(_file('app/initializers/foo.js'))
+          .to.contain("export { default, initialize } from 'my-addon/initializers/foo';");
+      });
+    });
   });
 });

node-tests/blueprints/instance-initializer-addon-test.js

@@ -22,5 +22,12 @@ describe('Blueprint: instance-initializer-addon', function() {
           .to.contain("export { default, initialize } from 'my-addon/instance-initializers/foo';");
       });
     });
+
+    it('instance-initializer-addon foo --pod', function() {
+      return emberGenerateDestroy(['instance-initializer-addon', 'foo', '--pod'], _file => {
+        expect(_file('app/instance-initializers/foo.js'))
+          .to.contain("export { default, initialize } from 'my-addon/instance-initializers/foo';");
+      });
+    });
   });
 });

package.json

@@ -59,13 +59,13 @@
     "resolve": "^1.5.0"
   },
   "devDependencies": {
-    "@glimmer/compiler": "^0.32.0",
-    "@glimmer/interfaces": "^0.32.0",
-    "@glimmer/node": "^0.32.0",
-    "@glimmer/opcode-compiler": "^0.32.0",
-    "@glimmer/program": "^0.32.0",
-    "@glimmer/reference": "^0.32.0",
-    "@glimmer/runtime": "^0.32.0",
+    "@glimmer/compiler": "^0.32.1",
+    "@glimmer/interfaces": "^0.32.1",
+    "@glimmer/node": "^0.32.1",
+    "@glimmer/opcode-compiler": "^0.32.1",
+    "@glimmer/program": "^0.32.1",
+    "@glimmer/reference": "^0.32.1",
+    "@glimmer/runtime": "^0.32.1",
     "@types/rsvp": "^4.0.1",
     "auto-dist-tag": "^0.1.5",
     "aws-sdk": "^2.46.0",
@@ -85,7 +85,7 @@
     "babel-plugin-transform-es2015-template-literals": "^6.22.0",
     "babel-plugin-transform-proto-to-assign": "^6.26.0",
     "babel-template": "^6.26.0",
-    "backburner.js": "^2.2.0",
+    "backburner.js": "2.1.0",
     "broccoli-babel-transpiler": "^6.1.2",
     "broccoli-concat": "^3.2.2",
     "broccoli-debug": "^0.6.4",
@@ -120,8 +120,8 @@
     "puppeteer": "^0.13.0",
     "qunit": "^2.5.0",
     "route-recognizer": "^0.3.3",
-    "router_js": "^2.0.0-beta.1",
-    "rsvp": "^4.8.0",
+    "router_js": "^2.0.0-beta.2",
+    "rsvp": "^4.8.2",
     "semver": "^5.5.0",
     "serve-static": "^1.12.2",
     "simple-dom": "^0.3.0",

packages/ember-application/lib/system/engine.js

@@ -502,7 +502,7 @@ function commonSetupRegistry(registry) {
   registry.injection('router', '_bucketCache', P`-bucket-cache:main`);
   registry.injection('route', '_bucketCache', P`-bucket-cache:main`);
 
-  registry.injection('route', 'router', 'router:main');
+  registry.injection('route', '_router', 'router:main');
 
   // Register the routing service...
   registry.register('service:-routing', RoutingService);

packages/ember-application/tests/system/application_test.js

@@ -135,7 +135,7 @@ moduleFor('Application', class extends ApplicationTestCase {
     verifyInjection(assert, application, 'router', '_bucketCache', P`-bucket-cache:main`);
     verifyInjection(assert, application, 'route', '_bucketCache', P`-bucket-cache:main`);
 
-    verifyInjection(assert, application, 'route', 'router', 'router:main');
+    verifyInjection(assert, application, 'route', '_router', 'router:main');
 
     verifyRegistration(assert, application, 'component:-text-field');
     verifyRegistration(assert, application, 'component:-text-area');

packages/ember-application/tests/system/engine_test.js

@@ -54,7 +54,7 @@ moduleFor('Engine', class extends TestCase {
     verifyInjection(assert, engine, 'router', '_bucketCache', P`-bucket-cache:main`);
     verifyInjection(assert, engine, 'route', '_bucketCache', P`-bucket-cache:main`);
 
-    verifyInjection(assert, engine, 'route', 'router', 'router:main');
+    verifyInjection(assert, engine, 'route', '_router', 'router:main');
 
     verifyRegistration(assert, engine, 'component:-text-field');
     verifyRegistration(assert, engine, 'component:-text-area');