Merge 1a1e585 into 9363be9

ember-cli · Apr 15, 2015 · da96f9a · da96f9a
2 parents 9363be9 + 1a1e585
commit da96f9a
Show file tree

Hide file tree

Showing 16 changed files with 106 additions and 413 deletions.
diff --git a/blueprints/acceptance-test/files/tests/acceptance/__name__-test.js b/blueprints/acceptance-test/files/tests/acceptance/__name__-test.js
@@ -1,8 +1,5 @@
 import Ember from 'ember';
-import {
-  module,
-  test
-} from 'qunit';
+import { module, test } from 'qunit';
 import startApp from '<%= dasherizedPackageName %>/tests/helpers/start-app';
 
 var application;

diff --git a/blueprints/adapter-test/files/tests/unit/__path__/__test__.js b/blueprints/adapter-test/files/tests/unit/__path__/__test__.js
@@ -1,7 +1,4 @@
-import {
-  moduleFor,
-  test
-} from 'ember-qunit';
+import { moduleFor, test } from 'ember-qunit';
 
 moduleFor('adapter:<%= dasherizedModuleName %>', '<%= classifiedModuleName %>Adapter', {
   // Specify the other units that are required for this test.

diff --git a/blueprints/component-test/files/tests/unit/__path__/__test__.js b/blueprints/component-test/files/tests/unit/__path__/__test__.js
@@ -1,7 +1,4 @@
-import {
-  moduleForComponent,
-  test
-} from 'ember-qunit';
+import { moduleForComponent, test } from 'ember-qunit';
 
 moduleForComponent('<%= dasherizedModuleName %>', {
   // Specify the other units that are required for this test

diff --git a/blueprints/controller-test/files/tests/unit/__path__/__test__.js b/blueprints/controller-test/files/tests/unit/__path__/__test__.js
@@ -1,7 +1,4 @@
-import {
-  moduleFor,
-  test
-} from 'ember-qunit';
+import { moduleFor, test } from 'ember-qunit';
 
 moduleFor('controller:<%= dasherizedModuleName %>', {
   // Specify the other units that are required for this test.

diff --git a/blueprints/helper-test/files/tests/unit/helpers/__name__-test.js b/blueprints/helper-test/files/tests/unit/helpers/__name__-test.js
@@ -1,6 +1,4 @@
-import {
-  <%= camelizedModuleName %>
-} from '../../../helpers/<%= dasherizedModuleName %>';
+import { <%= camelizedModuleName %> } from '../../../helpers/<%= dasherizedModuleName %>';
 import { module, test } from 'qunit';
 
 module('<%= classifiedModuleName %>Helper');

diff --git a/blueprints/model-test/files/tests/unit/__path__/__test__.js b/blueprints/model-test/files/tests/unit/__path__/__test__.js
@@ -1,7 +1,4 @@
-import {
-  moduleForModel,
-  test
-} from 'ember-qunit';
+import { moduleForModel, test } from 'ember-qunit';
 
 moduleForModel('<%= dasherizedModuleName %>', {
   // Specify the other units that are required for this test.

diff --git a/blueprints/route-test/files/tests/unit/__path__/__test__.js b/blueprints/route-test/files/tests/unit/__path__/__test__.js
@@ -1,7 +1,4 @@
-import {
-  moduleFor,
-  test
-} from 'ember-qunit';
+import { moduleFor, test } from 'ember-qunit';
 
 moduleFor('route:<%= dasherizedModuleName %>', {
   // Specify the other units that are required for this test.

diff --git a/blueprints/serializer-test/files/tests/unit/__path__/__test__.js b/blueprints/serializer-test/files/tests/unit/__path__/__test__.js
@@ -1,7 +1,4 @@
-import {
-  moduleForModel,
-  test
-} from 'ember-qunit';
+import { moduleForModel, test } from 'ember-qunit';
 
 moduleForModel('<%= dasherizedModuleName %>', {
   // Specify the other units that are required for this test.

diff --git a/blueprints/service-test/files/tests/unit/services/__name__-test.js b/blueprints/service-test/files/tests/unit/services/__name__-test.js
@@ -1,7 +1,4 @@
-import {
-  moduleFor,
-  test
-} from 'ember-qunit';
+import { moduleFor, test } from 'ember-qunit';
 
 moduleFor('service:<%= dasherizedModuleName %>', {
   // Specify the other units that are required for this test.

diff --git a/blueprints/transform-test/files/tests/unit/__path__/__test__.js b/blueprints/transform-test/files/tests/unit/__path__/__test__.js
@@ -1,7 +1,4 @@
-import {
-  moduleFor,
-  test
-} from 'ember-qunit';
+import { moduleFor, test } from 'ember-qunit';
 
 moduleFor('transform:<%= dasherizedModuleName %>', {
   // Specify the other units that are required for this test.

diff --git a/blueprints/view-test/files/tests/unit/__path__/__test__.js b/blueprints/view-test/files/tests/unit/__path__/__test__.js
@@ -1,7 +1,4 @@
-import {
-  moduleFor,
-  test
-} from 'ember-qunit';
+import { moduleFor, test } from 'ember-qunit';
 
 moduleFor('view:<%= dasherizedModuleName %>');
 

diff --git a/tests/acceptance/addon-generate-test.js b/tests/acceptance/addon-generate-test.js
@@ -72,10 +72,7 @@ describe('Acceptance: ember generate in-addon', function() {
       });
       assertFile('tests/unit/controllers/foo-test.js', {
         contains: [
-          "import {" + EOL +
-          "  moduleFor," + EOL +
-          "  test" + EOL +
-          "} from 'ember-qunit';",
+          "import { moduleFor, test } from 'ember-qunit';",
           "moduleFor('controller:foo'"
         ]
       });
@@ -97,10 +94,7 @@ describe('Acceptance: ember generate in-addon', function() {
       });
       assertFile('tests/unit/controllers/foo/bar-test.js', {
         contains: [
-          "import {" + EOL +
-          "  moduleFor," + EOL +
-          "  test" + EOL +
-          "} from 'ember-qunit';",
+          "import { moduleFor, test } from 'ember-qunit';",
           "moduleFor('controller:foo/bar'"
         ]
       });
@@ -128,10 +122,7 @@ describe('Acceptance: ember generate in-addon', function() {
       });
       assertFile('tests/unit/components/x-foo-test.js', {
         contains: [
-          "import {" + EOL +
-          "  moduleForComponent," + EOL +
-          "  test" + EOL +
-          "} from 'ember-qunit';",
+          "import { moduleForComponent, test } from 'ember-qunit';",
           "moduleForComponent('x-foo'"
         ]
       });
@@ -159,10 +150,7 @@ describe('Acceptance: ember generate in-addon', function() {
       });
       assertFile('tests/unit/components/nested/x-foo-test.js', {
         contains: [
-          "import {" + EOL +
-          "  moduleForComponent," + EOL +
-          "  test" + EOL +
-          "} from 'ember-qunit';",
+          "import { moduleForComponent, test } from 'ember-qunit';",
           "moduleForComponent('nested/x-foo'"
         ]
       });
@@ -184,9 +172,7 @@ describe('Acceptance: ember generate in-addon', function() {
         ]
       });
       assertFile('tests/unit/helpers/foo-bar-test.js', {
-        contains: "import {" + EOL +
-          "  fooBar" + EOL +
-          "} from '../../../helpers/foo-bar';"
+        contains: "import { fooBar } from '../../../helpers/foo-bar';"
       });
     });
   });
@@ -206,9 +192,7 @@ describe('Acceptance: ember generate in-addon', function() {
         ]
       });
       assertFile('tests/unit/helpers/foo/bar-baz-test.js', {
-        contains: "import {" + EOL +
-          "  fooBarBaz" + EOL +
-          "} from '../../../helpers/foo/bar-baz';"
+        contains: "import { fooBarBaz } from '../../../helpers/foo/bar-baz';"
       });
     });
   });
@@ -228,10 +212,7 @@ describe('Acceptance: ember generate in-addon', function() {
       });
       assertFile('tests/unit/models/foo-test.js', {
         contains: [
-          "import {" + EOL +
-          "  moduleForModel," + EOL +
-          "  test" + EOL +
-          "} from 'ember-qunit';",
+          "import { moduleForModel, test } from 'ember-qunit';",
           "moduleForModel('foo'"
         ]
       });
@@ -316,10 +297,7 @@ describe('Acceptance: ember generate in-addon', function() {
       });
       assertFile('tests/unit/models/foo/bar-test.js', {
         contains: [
-          "import {" + EOL +
-          "  moduleForModel," + EOL +
-          "  test" + EOL +
-          "} from 'ember-qunit';",
+          "import { moduleForModel, test } from 'ember-qunit';",
           "moduleForModel('foo/bar'"
         ]
       });
@@ -360,10 +338,7 @@ describe('Acceptance: ember generate in-addon', function() {
       });
       assertFile('tests/unit/views/foo-test.js', {
         contains: [
-          "import {" + EOL +
-          "  moduleFor," + EOL +
-          "  test" + EOL +
-          "} from 'ember-qunit';",
+          "import { moduleFor, test } from 'ember-qunit';",
           "moduleFor('view:foo'"
         ]
       });
@@ -385,10 +360,7 @@ describe('Acceptance: ember generate in-addon', function() {
       });
       assertFile('tests/unit/views/foo/bar-test.js', {
         contains: [
-          "import {" + EOL +
-          "  moduleFor," + EOL +
-          "  test" + EOL +
-          "} from 'ember-qunit';",
+          "import { moduleFor, test } from 'ember-qunit';",
           "moduleFor('view:foo/bar'"
         ]
       });
@@ -501,10 +473,7 @@ describe('Acceptance: ember generate in-addon', function() {
       });
       assertFile('tests/unit/adapters/application-test.js', {
         contains: [
-          "import {" + EOL +
-          "  moduleFor," + EOL +
-          "  test" + EOL +
-          "} from 'ember-qunit';",
+          "import { moduleFor, test } from 'ember-qunit';",
           "moduleFor('adapter:application'"
         ]
       });
@@ -526,10 +495,7 @@ describe('Acceptance: ember generate in-addon', function() {
       });
       assertFile('tests/unit/adapters/foo-test.js', {
         contains: [
-          "import {" + EOL +
-          "  moduleFor," + EOL +
-          "  test" + EOL +
-          "} from 'ember-qunit';",
+          "import { moduleFor, test } from 'ember-qunit';",
           "moduleFor('adapter:foo'"
         ]
       });
@@ -568,10 +534,7 @@ describe('Acceptance: ember generate in-addon', function() {
       });
       assertFile('tests/unit/serializers/foo-test.js', {
         contains: [
-          "import {" + EOL +
-          "  moduleForModel," + EOL +
-          "  test" + EOL +
-          "} from 'ember-qunit';",
+          "import { moduleForModel, test } from 'ember-qunit';",
         ]
       });
     });
@@ -592,10 +555,7 @@ describe('Acceptance: ember generate in-addon', function() {
       });
       assertFile('tests/unit/serializers/foo/bar-test.js', {
         contains: [
-          "import {" + EOL +
-          "  moduleForModel," + EOL +
-          "  test" + EOL +
-          "} from 'ember-qunit';",
+          "import { moduleForModel, test } from 'ember-qunit';",
           "moduleForModel('foo/bar'"
         ]
       });
@@ -625,10 +585,7 @@ describe('Acceptance: ember generate in-addon', function() {
       });
       assertFile('tests/unit/transforms/foo-test.js', {
         contains: [
-          "import {" + EOL +
-          "  moduleFor," + EOL +
-          "  test" + EOL +
-          "} from 'ember-qunit';",
+          "import { moduleFor, test } from 'ember-qunit';",
           "moduleFor('transform:foo'"
         ]
       });
@@ -658,10 +615,7 @@ describe('Acceptance: ember generate in-addon', function() {
       });
       assertFile('tests/unit/transforms/foo/bar-test.js', {
         contains: [
-          "import {" + EOL +
-          "  moduleFor," + EOL +
-          "  test" + EOL +
-          "} from 'ember-qunit';",
+          "import { moduleFor, test } from 'ember-qunit';",
           "moduleFor('transform:foo/bar'"
         ]
       });
@@ -723,10 +677,7 @@ describe('Acceptance: ember generate in-addon', function() {
       });
       assertFile('tests/unit/services/foo-test.js', {
         contains: [
-          "import {" + EOL +
-          "  moduleFor," + EOL +
-          "  test" + EOL +
-          "} from 'ember-qunit';",
+          "import { moduleFor, test } from 'ember-qunit';",
           "moduleFor('service:foo'"
         ]
       });
@@ -748,10 +699,7 @@ describe('Acceptance: ember generate in-addon', function() {
       });
       assertFile('tests/unit/services/foo/bar-test.js', {
         contains: [
-          "import {" + EOL +
-          "  moduleFor," + EOL +
-          "  test" + EOL +
-          "} from 'ember-qunit';",
+          "import { moduleFor, test } from 'ember-qunit';",
           "moduleFor('service:foo/bar'"
         ]
       });