Merge pull request #15138 from sly7-7/fix-mocha-service-test-blueprint

[BUGFIX Release]fix mocha blueprint service test filename
emberjs · May 2, 2017 · 7e0af2e · 7e0af2e
2 parents 69c9f1e + 91e1e17
commit 7e0af2e
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 0 deletions.
diff --git a/...iles/tests/unit/__path__/__name__-test.js → ....12-files/tests/unit/__path__/__test__.js b/...iles/tests/unit/__path__/__name__-test.js → ....12-files/tests/unit/__path__/__test__.js
diff --git a/...iles/tests/unit/__path__/__name__-test.js → ...cha-files/tests/unit/__path__/__test__.js b/...iles/tests/unit/__path__/__name__-test.js → ...cha-files/tests/unit/__path__/__test__.js
diff --git a/node-tests/blueprints/service-test.js b/node-tests/blueprints/service-test.js
@@ -183,6 +183,22 @@ describe('Acceptance: ember generate and destroy service', function() {
       }));
   });
 
+  it('service-test foo for mocha --pod', function() {
+    var args = ['service-test', 'foo', '--pod'];
+
+    return emberNew()
+      .then(() => modifyPackages([
+        { name: 'ember-cli-qunit', delete: true },
+        { name: 'ember-cli-mocha', dev: true }
+      ]))
+      .then(() => generateFakePackageManifest('ember-cli-mocha', '0.11.0'))
+      .then(() => emberGenerateDestroy(args, _file => {
+        expect(_file('tests/unit/foo/service-test.js'))
+          .to.contain("import { describeModule, it } from 'ember-mocha';")
+          .to.contain("describeModule('service:foo', 'Unit | Service | foo'");
+      }));
+  });
+
   it('service-test foo for mocha v0.12+', function() {
     var args = ['service-test', 'foo'];
 
@@ -200,4 +216,22 @@ describe('Acceptance: ember generate and destroy service', function() {
           .to.contain("setupTest('service:foo',");
       }));
   });
+
+  it('service-test foo for mocha v0.12+ --pod', function() {
+    var args = ['service-test', 'foo', '--pod'];
+
+    return emberNew()
+      .then(() => modifyPackages([
+        { name: 'ember-cli-qunit', delete: true },
+        { name: 'ember-cli-mocha', dev: true }
+      ]))
+      .then(() => generateFakePackageManifest('ember-cli-mocha', '0.12.0'))
+      .then(() => emberGenerateDestroy(args, _file => {
+        expect(_file('tests/unit/foo/service-test.js'))
+          .to.contain("import { describe, it } from 'mocha';")
+          .to.contain("import { setupTest } from 'ember-mocha';")
+          .to.contain("describe('Unit | Service | foo', function() {")
+          .to.contain("setupTest('service:foo',");
+      }));
+  });
 });