Merge pull request #16894 from Dhaulagiri/br-232-controller

add RFC 232 mocha controller tests

blueprints/controller-test/mocha-rfc-232-files/__root__/__testType__/__path__/__test__.js

@@ -0,0 +1,13 @@
+import { expect } from 'chai';
+import { describe, it } from 'mocha';
+import { setupTest } from 'ember-mocha';
+
+describe('<%= friendlyTestDescription %>', function() {
+  setupTest();
+
+  // Replace this with your real tests.
+  it('exists', function() {
+    let controller = this.owner.lookup('controller:<%= controllerPathName %>');
+    expect(controller).to.be.ok;
+  });
+});

node-tests/blueprints/controller-test-test.js

@@ -110,6 +110,32 @@ describe('Blueprint: controller-test', function() {
         });
       });
     });
+
+    describe('with ember-mocha@0.14.0', function() {
+      beforeEach(function() {
+        modifyPackages([
+          { name: 'ember-cli-qunit', delete: true },
+          { name: 'ember-mocha', dev: true },
+        ]);
+        generateFakePackageManifest('ember-mocha', '0.14.0');
+      });
+
+      it('controller-test foo', function() {
+        return emberGenerateDestroy(['controller-test', 'foo'], _file => {
+          expect(_file('tests/unit/controllers/foo-test.js')).to.equal(
+            fixture('controller-test/mocha-rfc232.js')
+          );
+        });
+      });
+
+      it('controller-test foo/bar', function() {
+        return emberGenerateDestroy(['controller-test', 'foo/bar'], _file => {
+          expect(_file('tests/unit/controllers/foo/bar-test.js')).to.equal(
+            fixture('controller-test/mocha-rfc232-nested.js')
+          );
+        });
+      });
+    });
   });
 
   describe('in app - module unification', function() {
@@ -206,6 +232,32 @@ describe('Blueprint: controller-test', function() {
         });
       });
     });
+
+    describe('with ember-mocha@0.14.0', function() {
+      beforeEach(function() {
+        modifyPackages([
+          { name: 'ember-cli-qunit', delete: true },
+          { name: 'ember-mocha', dev: true },
+        ]);
+        generateFakePackageManifest('ember-mocha', '0.14.0');
+      });
+
+      it('controller-test foo', function() {
+        return emberGenerateDestroy(['controller-test', 'foo'], _file => {
+          expect(_file('src/ui/routes/foo/controller-test.js')).to.equal(
+            fixture('controller-test/mocha-rfc232.js')
+          );
+        });
+      });
+
+      it('controller-test foo/bar', function() {
+        return emberGenerateDestroy(['controller-test', 'foo/bar'], _file => {
+          expect(_file('src/ui/routes/foo/bar/controller-test.js')).to.equal(
+            fixture('controller-test/mocha-rfc232-nested.js')
+          );
+        });
+      });
+    });
   });
 
   describe('in addon', function() {

node-tests/fixtures/controller-test/mocha-rfc232-nested.js

@@ -0,0 +1,13 @@
+import { expect } from 'chai';
+import { describe, it } from 'mocha';
+import { setupTest } from 'ember-mocha';
+
+describe('Unit | Controller | foo/bar', function() {
+  setupTest();
+
+  // Replace this with your real tests.
+  it('exists', function() {
+    let controller = this.owner.lookup('controller:foo/bar');
+    expect(controller).to.be.ok;
+  });
+});

node-tests/fixtures/controller-test/mocha-rfc232.js

@@ -0,0 +1,13 @@
+import { expect } from 'chai';
+import { describe, it } from 'mocha';
+import { setupTest } from 'ember-mocha';
+
+describe('Unit | Controller | foo', function() {
+  setupTest();
+
+  // Replace this with your real tests.
+  it('exists', function() {
+    let controller = this.owner.lookup('controller:foo');
+    expect(controller).to.be.ok;
+  });
+});