Update blueprints to use native JS classes

blueprints/controller/index.js

@@ -1,9 +1,10 @@
 'use strict';
 
+const useNativeDetector = require('../native-detector');
 const isModuleUnificationProject = require('../module-unification').isModuleUnificationProject;
 const path = require('path');
 
-module.exports = {
+module.exports = useNativeDetector({
   description: 'Generates a controller.',
   fileMapTokens() {
     if (isModuleUnificationProject(this.project)) {
@@ -26,4 +27,4 @@ module.exports = {
       };
     }
   },
-};
+});

blueprints/controller/native-files/__root__/__path__/__name__.js

@@ -0,0 +1,4 @@
+import Controller from '@ember/controller';
+
+export default class <%= classifiedModuleName %>Controller extends Controller {
+};

blueprints/native-detector.js

@@ -0,0 +1,12 @@
+'use strict';
+
+const path = require('path');
+
+module.exports = function(blueprint) {
+  blueprint.filesPath = function() {
+    let rootPath = process.env.EMBER_VERSION === 'OCTANE' ? 'native-files' : 'files';
+    return path.join(this.path, rootPath);
+  };
+
+  return blueprint;
+};

node-tests/blueprints/controller-test.js

@@ -13,6 +13,7 @@ const expect = chai.expect;
 
 const generateFakePackageManifest = require('../helpers/generate-fake-package-manifest');
 const enableModuleUnification = require('../helpers/module-unification').enableModuleUnification;
+const enableOctane = require('../helpers/setup-test-environment').enableOctane;
 const fixture = require('../helpers/fixture');
 
 describe('Blueprint: controller', function() {
@@ -302,6 +303,138 @@ describe('Blueprint: controller', function() {
     });
   });
 
+  describe('in app - octane', function() {
+    enableOctane();
+
+    beforeEach(function() {
+      return emberNew()
+        .then(() =>
+          modifyPackages([
+            { name: 'ember-qunit', delete: true },
+            { name: 'ember-cli-qunit', dev: true },
+          ])
+        )
+        .then(() => generateFakePackageManifest('ember-cli-qunit', '4.1.0'));
+    });
+
+    it('controller foo', function() {
+      return emberGenerateDestroy(['controller', 'foo'], _file => {
+        expect(_file('src/ui/routes/foo/controller.js')).to.equal(
+          fixture('controller/native-controller.js')
+        );
+
+        expect(_file('src/ui/routes/foo/controller-test.js')).to.equal(
+          fixture('controller-test/default.js')
+        );
+      });
+    });
+
+    it('controller foo/bar', function() {
+      return emberGenerateDestroy(['controller', 'foo/bar'], _file => {
+        expect(_file('src/ui/routes/foo/bar/controller.js')).to.equal(
+          fixture('controller/native-controller-nested.js')
+        );
+
+        expect(_file('src/ui/routes/foo/bar/controller-test.js')).to.equal(
+          fixture('controller-test/default-nested.js')
+        );
+      });
+    });
+
+    describe('with podModulePrefix', function() {
+      beforeEach(function() {
+        setupPodConfig({ podModulePrefix: true });
+      });
+
+      it('controller foo --pod podModulePrefix', function() {
+        return expectError(
+          emberGenerateDestroy(['controller', 'foo', '--pod']),
+          "Pods aren't supported within a module unification app"
+        );
+      });
+    });
+  });
+
+  describe('in addon - octane', function() {
+    enableOctane();
+
+    beforeEach(function() {
+      return emberNew({ target: 'addon' })
+        .then(() =>
+          modifyPackages([
+            { name: 'ember-qunit', delete: true },
+            { name: 'ember-cli-qunit', dev: true },
+          ])
+        )
+        .then(() => generateFakePackageManifest('ember-cli-qunit', '4.1.0'));
+    });
+
+    it('controller foo', function() {
+      return emberGenerateDestroy(['controller', 'foo'], _file => {
+        expect(_file('src/ui/routes/foo/controller.js')).to.equal(
+          fixture('controller/native-controller.js')
+        );
+
+        expect(_file('src/ui/routes/foo/controller-test.js')).to.equal(
+          fixture('controller-test/default.js')
+        );
+
+        expect(_file('app/controllers/foo.js')).to.not.exist;
+      });
+    });
+
+    it('controller foo/bar', function() {
+      return emberGenerateDestroy(['controller', 'foo/bar'], _file => {
+        expect(_file('src/ui/routes/foo/bar/controller.js')).to.equal(
+          fixture('controller/native-controller-nested.js')
+        );
+
+        expect(_file('src/ui/routes/foo/bar/controller-test.js')).to.equal(
+          fixture('controller-test/default-nested.js')
+        );
+
+        expect(_file('app/controllers/foo/bar.js')).to.not.exist;
+      });
+    });
+
+    it('controller foo --dummy', function() {
+      return emberGenerateDestroy(['controller', 'foo', '--dummy'], _file => {
+        expect(_file('tests/dummy/src/ui/routes/foo/controller.js')).to.equal(
+          fixture('controller/native-controller.js')
+        );
+
+        expect(_file('src/ui/routes/foo/controller.js')).to.not.exist;
+
+        expect(_file('src/ui/routes/foo/controller-test.js')).to.not.exist;
+      });
+    });
+
+    it('controller foo/bar --dummy', function() {
+      return emberGenerateDestroy(['controller', 'foo/bar', '--dummy'], _file => {
+        expect(_file('tests/dummy/src/ui/routes/foo/bar/controller.js')).to.equal(
+          fixture('controller/native-controller-nested.js')
+        );
+
+        expect(_file('src/ui/routes/foo/bar/controller.js')).to.not.exist;
+
+        expect(_file('src/ui/routes/foo/bar/controller-test.js')).to.not.exist;
+      });
+    });
+
+    describe('with podModulePrefix', function() {
+      beforeEach(function() {
+        setupPodConfig({ podModulePrefix: true });
+      });
+
+      it('controller foo --pod podModulePrefix', function() {
+        return expectError(
+          emberGenerateDestroy(['controller', 'foo', '--pod']),
+          "Pods aren't supported within a module unification app"
+        );
+      });
+    });
+  });
+
   describe('in in-repo-addon', function() {
     beforeEach(function() {
       return emberNew({ target: 'in-repo-addon' })

node-tests/fixtures/controller/native-controller-nested.js

@@ -0,0 +1,4 @@
+import Controller from '@ember/controller';
+
+export default class FooBarController extends Controller {
+};

node-tests/fixtures/controller/native-controller.js

@@ -0,0 +1,4 @@
+import Controller from '@ember/controller';
+
+export default class FooController extends Controller {
+};

node-tests/helpers/setup-test-environment.js

@@ -0,0 +1,15 @@
+function enableOctane() {
+  beforeEach(function() {
+    process.env.EMBER_CLI_MODULE_UNIFICATION = 'true';
+    process.env.EMBER_VERSION = 'OCTANE';
+  });
+
+  afterEach(function() {
+    delete process.env.EMBER_CLI_MODULE_UNIFICATION;
+    delete process.env.EMBER_VERSION;
+  });
+}
+
+module.exports = {
+  enableOctane,
+};