Merge branch 'master' into angle-built-ins

emberjs · Mar 18, 2019 · 04ff55b · 04ff55b
2 parents 0617786 + 873afa6
commit 04ff55b
Show file tree

Hide file tree

Showing 22 changed files with 656 additions and 618 deletions.
diff --git a/...ints/initializer-test/mocha-rfc-232-files/__root__/__testType__/__path__/__name__-test.js b/...ints/initializer-test/mocha-rfc-232-files/__root__/__testType__/__path__/__name__-test.js
@@ -1,6 +1,5 @@
 import { expect } from 'chai';
 import { describe, it, beforeEach, afterEach } from 'mocha';
-import { setupTest } from 'ember-mocha';
 import Application from '@ember/application';
 import { initialize } from '<%= modulePrefix %>/initializers/<%= dasherizedModuleName %>';
 <% if (destroyAppExists) { %>import destroyApp from '../../helpers/destroy-app';<% } else { %>import { run } from '@ember/runloop';<% } %>

diff --git a/...ints/initializer-test/qunit-rfc-232-files/__root__/__testType__/__path__/__name__-test.js b/...ints/initializer-test/qunit-rfc-232-files/__root__/__testType__/__path__/__name__-test.js
@@ -2,7 +2,6 @@ import Application from '@ember/application';
 
 import { initialize } from '<%= modulePrefix %>/initializers/<%= dasherizedModuleName %>';
 import { module, test } from 'qunit';
-import { setupTest } from 'ember-qunit';
 <% if (destroyAppExists) { %>import destroyApp from '../../helpers/destroy-app';<% } else { %>import { run } from '@ember/runloop';<% } %>
 
 module('<%= friendlyTestName %>', function(hooks) {

diff --git a/node-tests/blueprints/mixin-test.js b/node-tests/blueprints/mixin-test.js
@@ -6,6 +6,7 @@ const emberNew = blueprintHelpers.emberNew;
 const emberGenerateDestroy = blueprintHelpers.emberGenerateDestroy;
 const setupPodConfig = blueprintHelpers.setupPodConfig;
 const expectError = require('../helpers/expect-error');
+const EOL = require('os').EOL;
 
 const chai = require('ember-cli-blueprint-test-helpers/chai');
 const expect = chai.expect;
@@ -25,7 +26,7 @@ describe('Blueprint: mixin', function() {
       return emberGenerateDestroy(['mixin', 'foo'], _file => {
         expect(_file('app/mixins/foo.js'))
           .to.contain("import Mixin from '@ember/object/mixin';")
-          .to.contain('export default Mixin.create({\n});');
+          .to.contain(`export default Mixin.create({${EOL}});`);
 
         expect(_file('tests/unit/mixins/foo-test.js')).to.contain(
           "import FooMixin from 'my-app/mixins/foo';"
@@ -37,7 +38,7 @@ describe('Blueprint: mixin', function() {
       return emberGenerateDestroy(['mixin', 'foo/bar'], _file => {
         expect(_file('app/mixins/foo/bar.js'))
           .to.contain("import Mixin from '@ember/object/mixin';")
-          .to.contain('export default Mixin.create({\n});');
+          .to.contain(`export default Mixin.create({${EOL}});`);
 
         expect(_file('tests/unit/mixins/foo/bar-test.js')).to.contain(
           "import FooBarMixin from 'my-app/mixins/foo/bar';"
@@ -57,7 +58,7 @@ describe('Blueprint: mixin', function() {
       return emberGenerateDestroy(['mixin', 'foo', '--pod'], _file => {
         expect(_file('app/mixins/foo.js'))
           .to.contain("import Mixin from '@ember/object/mixin';")
-          .to.contain('export default Mixin.create({\n});');
+          .to.contain(`export default Mixin.create({${EOL}});`);
 
         expect(_file('tests/unit/mixins/foo-test.js')).to.contain(
           "import FooMixin from 'my-app/mixins/foo';"
@@ -69,7 +70,7 @@ describe('Blueprint: mixin', function() {
       return emberGenerateDestroy(['mixin', 'foo/bar', '--pod'], _file => {
         expect(_file('app/mixins/foo/bar.js'))
           .to.contain("import Mixin from '@ember/object/mixin';")
-          .to.contain('export default Mixin.create({\n});');
+          .to.contain(`export default Mixin.create({${EOL}});`);
 
         expect(_file('tests/unit/mixins/foo/bar-test.js')).to.contain(
           "import FooBarMixin from 'my-app/mixins/foo/bar';"
@@ -94,7 +95,7 @@ describe('Blueprint: mixin', function() {
         return emberGenerateDestroy(['mixin', 'foo', '--pod'], _file => {
           expect(_file('app/mixins/foo.js'))
             .to.contain("import Mixin from '@ember/object/mixin';")
-            .to.contain('export default Mixin.create({\n});');
+            .to.contain(`export default Mixin.create({${EOL}});`);
 
           expect(_file('tests/unit/mixins/foo-test.js')).to.contain(
             "import FooMixin from 'my-app/mixins/foo';"
@@ -106,7 +107,7 @@ describe('Blueprint: mixin', function() {
         return emberGenerateDestroy(['mixin', 'foo/bar', '--pod'], _file => {
           expect(_file('app/mixins/foo/bar.js'))
             .to.contain("import Mixin from '@ember/object/mixin';")
-            .to.contain('export default Mixin.create({\n});');
+            .to.contain(`export default Mixin.create({${EOL}});`);
 
           expect(_file('tests/unit/mixins/foo/bar-test.js')).to.contain(
             "import FooBarMixin from 'my-app/mixins/foo/bar';"
@@ -127,7 +128,7 @@ describe('Blueprint: mixin', function() {
       return emberGenerateDestroy(['mixin', 'foo'], _file => {
         expect(_file('src/mixins/foo.js'))
           .to.contain("import Mixin from '@ember/object/mixin';")
-          .to.contain('export default Mixin.create({\n});');
+          .to.contain(`export default Mixin.create({${EOL}});`);
 
         expect(_file('src/mixins/foo-test.js')).to.contain(
           "import FooMixin from 'my-app/mixins/foo';"
@@ -139,7 +140,7 @@ describe('Blueprint: mixin', function() {
       return emberGenerateDestroy(['mixin', 'foo/bar'], _file => {
         expect(_file('src/mixins/foo/bar.js'))
           .to.contain("import Mixin from '@ember/object/mixin';")
-          .to.contain('export default Mixin.create({\n});');
+          .to.contain(`export default Mixin.create({${EOL}});`);
 
         expect(_file('src/mixins/foo/bar-test.js')).to.contain(
           "import FooBarMixin from 'my-app/mixins/foo/bar';"
@@ -151,7 +152,7 @@ describe('Blueprint: mixin', function() {
       return emberGenerateDestroy(['mixin', 'foo/bar/baz'], _file => {
         expect(_file('src/mixins/foo/bar/baz.js'))
           .to.contain("import Mixin from '@ember/object/mixin';")
-          .to.contain('export default Mixin.create({\n});');
+          .to.contain(`export default Mixin.create({${EOL}});`);
 
         expect(_file('src/mixins/foo/bar/baz-test.js')).to.contain(
           "import FooBarBazMixin from 'my-app/mixins/foo/bar/baz';"
@@ -176,7 +177,7 @@ describe('Blueprint: mixin', function() {
       return emberGenerateDestroy(['mixin', 'foo'], _file => {
         expect(_file('addon/mixins/foo.js'))
           .to.contain("import Mixin from '@ember/object/mixin';")
-          .to.contain('export default Mixin.create({\n});');
+          .to.contain(`export default Mixin.create({${EOL}});`);
 
         expect(_file('tests/unit/mixins/foo-test.js')).to.contain(
           "import FooMixin from 'my-addon/mixins/foo';"
@@ -190,7 +191,7 @@ describe('Blueprint: mixin', function() {
       return emberGenerateDestroy(['mixin', 'foo/bar'], _file => {
         expect(_file('addon/mixins/foo/bar.js'))
           .to.contain("import Mixin from '@ember/object/mixin';")
-          .to.contain('export default Mixin.create({\n});');
+          .to.contain(`export default Mixin.create({${EOL}});`);
 
         expect(_file('tests/unit/mixins/foo/bar-test.js')).to.contain(
           "import FooBarMixin from 'my-addon/mixins/foo/bar';"
@@ -204,7 +205,7 @@ describe('Blueprint: mixin', function() {
       return emberGenerateDestroy(['mixin', 'foo/bar/baz'], _file => {
         expect(_file('addon/mixins/foo/bar/baz.js'))
           .to.contain("import Mixin from '@ember/object/mixin';")
-          .to.contain('export default Mixin.create({\n});');
+          .to.contain(`export default Mixin.create({${EOL}});`);
 
         expect(_file('tests/unit/mixins/foo/bar/baz-test.js')).to.contain(
           "import FooBarBazMixin from 'my-addon/mixins/foo/bar/baz';"
@@ -218,7 +219,7 @@ describe('Blueprint: mixin', function() {
       return emberGenerateDestroy(['mixin', 'foo/bar/baz', '--dummy'], _file => {
         expect(_file('tests/dummy/app/mixins/foo/bar/baz.js'))
           .to.contain("import Mixin from '@ember/object/mixin';")
-          .to.contain('export default Mixin.create({\n});');
+          .to.contain(`export default Mixin.create({${EOL}});`);
 
         expect(_file('addon/mixins/foo/bar/baz.js')).to.not.exist;
       });
@@ -236,7 +237,7 @@ describe('Blueprint: mixin', function() {
       return emberGenerateDestroy(['mixin', 'foo'], _file => {
         expect(_file('src/mixins/foo.js'))
           .to.contain("import Mixin from '@ember/object/mixin';")
-          .to.contain('export default Mixin.create({\n});');
+          .to.contain(`export default Mixin.create({${EOL}});`);
 
         expect(_file('src/mixins/foo-test.js')).to.contain(
           "import FooMixin from 'my-addon/mixins/foo';"
@@ -248,7 +249,7 @@ describe('Blueprint: mixin', function() {
       return emberGenerateDestroy(['mixin', 'foo/bar'], _file => {
         expect(_file('src/mixins/foo/bar.js'))
           .to.contain("import Mixin from '@ember/object/mixin';")
-          .to.contain('export default Mixin.create({\n});');
+          .to.contain(`export default Mixin.create({${EOL}});`);
 
         expect(_file('src/mixins/foo/bar-test.js')).to.contain(
           "import FooBarMixin from 'my-addon/mixins/foo/bar';"
@@ -260,7 +261,7 @@ describe('Blueprint: mixin', function() {
       return emberGenerateDestroy(['mixin', 'foo/bar/baz'], _file => {
         expect(_file('src/mixins/foo/bar/baz.js'))
           .to.contain("import Mixin from '@ember/object/mixin';")
-          .to.contain('export default Mixin.create({\n});');
+          .to.contain(`export default Mixin.create({${EOL}});`);
 
         expect(_file('src/mixins/foo/bar/baz-test.js')).to.contain(
           "import FooBarBazMixin from 'my-addon/mixins/foo/bar/baz';"
@@ -272,7 +273,7 @@ describe('Blueprint: mixin', function() {
       return emberGenerateDestroy(['mixin', 'foo/bar/baz', '--dummy'], _file => {
         expect(_file('tests/dummy/src/mixins/foo/bar/baz.js'))
           .to.contain("import Mixin from '@ember/object/mixin';")
-          .to.contain('export default Mixin.create({\n});');
+          .to.contain(`export default Mixin.create({${EOL}});`);
 
         expect(_file('src/mixins/foo/bar/baz.js')).to.not.exist;
       });
@@ -288,7 +289,7 @@ describe('Blueprint: mixin', function() {
       return emberGenerateDestroy(['mixin', 'foo', '--in-repo-addon=my-addon'], _file => {
         expect(_file('lib/my-addon/addon/mixins/foo.js'))
           .to.contain("import Mixin from '@ember/object/mixin';")
-          .to.contain('export default Mixin.create({\n});');
+          .to.contain(`export default Mixin.create({${EOL}});`);
 
         expect(_file('tests/unit/mixins/foo-test.js')).to.contain(
           "import FooMixin from 'my-addon/mixins/foo';"
@@ -300,7 +301,7 @@ describe('Blueprint: mixin', function() {
       return emberGenerateDestroy(['mixin', 'foo/bar', '--in-repo-addon=my-addon'], _file => {
         expect(_file('lib/my-addon/addon/mixins/foo/bar.js'))
           .to.contain("import Mixin from '@ember/object/mixin';")
-          .to.contain('export default Mixin.create({\n});');
+          .to.contain(`export default Mixin.create({${EOL}});`);
 
         expect(_file('tests/unit/mixins/foo/bar-test.js')).to.contain(
           "import FooBarMixin from 'my-addon/mixins/foo/bar';"

diff --git a/node-tests/fixtures/initializer-test/mocha-rfc232.js b/node-tests/fixtures/initializer-test/mocha-rfc232.js
@@ -1,6 +1,5 @@
 import { expect } from 'chai';
 import { describe, it, beforeEach, afterEach } from 'mocha';
-import { setupTest } from 'ember-mocha';
 import Application from '@ember/application';
 import { initialize } from 'my-app/initializers/foo';
 import { run } from '@ember/runloop';

diff --git a/node-tests/fixtures/initializer-test/module-unification/mocha-rfc232.js b/node-tests/fixtures/initializer-test/module-unification/mocha-rfc232.js
@@ -1,6 +1,5 @@
 import { expect } from 'chai';
 import { describe, it, beforeEach, afterEach } from 'mocha';
-import { setupTest } from 'ember-mocha';
 import Application from '@ember/application';
 import { initialize } from 'my-app/init/initializers/foo';
 import { run } from '@ember/runloop';

diff --git a/node-tests/fixtures/initializer-test/module-unification/rfc232.js b/node-tests/fixtures/initializer-test/module-unification/rfc232.js
@@ -2,7 +2,6 @@ import Application from '@ember/application';
 
 import { initialize } from 'my-app/init/initializers/foo';
 import { module, test } from 'qunit';
-import { setupTest } from 'ember-qunit';
 import { run } from '@ember/runloop';
 
 module('Unit | Initializer | foo', function(hooks) {

diff --git a/node-tests/fixtures/initializer-test/rfc232.js b/node-tests/fixtures/initializer-test/rfc232.js
@@ -2,7 +2,6 @@ import Application from '@ember/application';
 
 import { initialize } from 'my-app/initializers/foo';
 import { module, test } from 'qunit';
-import { setupTest } from 'ember-qunit';
 import { run } from '@ember/runloop';
 
 module('Unit | Initializer | foo', function(hooks) {

diff --git a/package.json b/package.json
@@ -129,7 +129,7 @@
     "ember-cli-dependency-checker": "^3.1.0",
     "ember-cli-yuidoc": "^0.8.8",
     "ember-publisher": "0.0.7",
-    "eslint": "^5.15.1",
+    "eslint": "^5.15.2",
     "eslint-config-prettier": "^4.1.0",
     "eslint-import-resolver-node": "^0.3.2",
     "eslint-plugin-ember-internal": "^1.1.1",