Merge pull request ember-cli-code-coverage#277 from Turbo87/functions

Use shorthand methods and named functions

Author: Turbo87

index.js

@@ -26,12 +26,12 @@ module.exports = {
   fileLookup: null,
 
   // Ember Methods
-  init: function () {
+  init() {
     this._super.init.apply(this, arguments);
     this.fileLookup = {};
   },
 
-  included: function (appOrAddon) {
+  included(appOrAddon) {
     this._super.included.apply(this, arguments);
 
     this.parentRegistry = appOrAddon.registry;
@@ -59,7 +59,7 @@ module.exports = {
     }
   },
 
-  contentFor: function (type) {
+  contentFor(type) {
     if (type === 'test-body-footer' && this._isCoverageEnabled()) {
       var template = fs
         .readFileSync(path.join(__dirname, 'lib', 'templates', 'test-body-footer.html'))
@@ -73,7 +73,7 @@ module.exports = {
     return undefined;
   },
 
-  includedCommands: function () {
+  includedCommands() {
     return {
       'coverage-merge': require('./lib/coverage-merge'),
     };
@@ -83,7 +83,7 @@ module.exports = {
    * If coverage is enabled attach coverage middleware to the express server run by ember-cli
    * @param {Object} startOptions - Express server start options
    */
-  serverMiddleware: function (startOptions) {
+  serverMiddleware(startOptions) {
     if (!this._isCoverageEnabled()) {
       return;
     }
@@ -94,7 +94,7 @@ module.exports = {
     });
   },
 
-  testemMiddleware: function (app) {
+  testemMiddleware(app) {
     if (!this._isCoverageEnabled()) {
       return;
     }
@@ -118,15 +118,15 @@ module.exports = {
    * Get project configuration
    * @returns {Configuration} project configuration
    */
-  _getConfig: function () {
+  _getConfig() {
     return config(this.project.configPath());
   },
 
   /**
    * Get paths to include for coverage
    * @returns {Array<String>} include paths
    */
-  _getIncludes: function () {
+  _getIncludes() {
     return [
       ...this._getIncludesForAppDirectory(),
       ...this._getIncludesForAddonDirectory(),
@@ -138,7 +138,7 @@ module.exports = {
    * Get paths to include for covering the "app" directory.
    * @returns {Array<String>} include paths
    */
-  _getIncludesForAppDirectory: function () {
+  _getIncludesForAppDirectory() {
     const dir = path.join(this.project.root, 'app');
     let prefix = this.parent.isEmberCLIAddon() ? 'dummy' : this.parent.name();
     return this._getIncludesForDir(dir, prefix);
@@ -148,7 +148,7 @@ module.exports = {
    * Get paths to include for covering the "addon" directory.
    * @returns {Array<String>} include paths
    */
-  _getIncludesForAddonDirectory: function () {
+  _getIncludesForAddonDirectory() {
     let addon = this._findCoveredAddon();
     if (addon) {
       const addonDir = path.join(this.project.root, 'addon');
@@ -167,7 +167,7 @@ module.exports = {
    * Get paths to include for covering the in-repo-addon directories in "lib/*".
    * @returns {Array<String>} include paths
    */
-  _getIncludesForInRepoAddonDirectories: function () {
+  _getIncludesForInRepoAddonDirectories() {
     return this._findInRepoAddons().reduce((acc, addon) => {
       let addonDir = path.join(this.project.root, 'lib', addon.name);
       let addonAppDir = path.join(addonDir, 'app');
@@ -189,7 +189,7 @@ module.exports = {
    * @param {String} prefix The prefix to the ember module ('app', 'dummy' or the name of the addon).
    * @returns {Array<String>} include paths
    */
-  _getIncludesForDir: function (dir, prefix) {
+  _getIncludesForDir(dir, prefix) {
     const hasEmberCliTypescript =
       this.project &&
       this.project.findAddonByName &&
@@ -213,15 +213,15 @@ module.exports = {
    * Get paths to exclude from coverage
    * @returns {Array<String>} exclude paths
    */
-  _getExcludes: function () {
+  _getExcludes() {
     return this._getConfig().excludes || [];
   },
 
   /**
    * Determine whether or not coverage is enabled
    * @returns {Boolean} whether or not coverage is enabled
    */
-  _isCoverageEnabled: function () {
+  _isCoverageEnabled() {
     var value = process.env[this._getConfig().coverageEnvVar] || false;
 
     if (value.toLowerCase) {
@@ -235,7 +235,7 @@ module.exports = {
    * Determine the name of the parent app or addon.
    * @returns {String} the name of the parent
    */
-  _parentName: function () {
+  _parentName() {
     if (this.parent.isEmberCLIAddon()) {
       return this._findCoveredAddon().name;
     } else {
@@ -247,7 +247,7 @@ module.exports = {
    * Find the addon (if any) that's being covered.
    * @returns {Addon} the addon under test
    */
-  _findCoveredAddon: function () {
+  _findCoveredAddon() {
     if (!this._coveredAddon) {
       this._coveredAddon = this.project.findAddonByName(this.project.pkg.name);
     }
@@ -259,7 +259,7 @@ module.exports = {
    * Find the app's in-repo addons (if any).
    * @returns {Array<Addon>} the in-repo addons
    */
-  _findInRepoAddons: function () {
+  _findInRepoAddons() {
     if (!this._inRepoAddons) {
       const pkg = this.project.pkg;
       const inRepoAddonPaths = pkg['ember-addon'] && pkg['ember-addon'].paths;

lib/attach-middleware.js

@@ -60,7 +60,7 @@ function coverageHandler(map, options, req, res) {
 
 // Used when app is in dev mode (`ember serve`).
 // Creates a new coverage map on every request.
-const serverMiddleware = function (app, options) {
+function serverMiddleware(app, options) {
   app.post(
     WRITE_COVERAGE,
     bodyParser,
@@ -70,14 +70,14 @@ const serverMiddleware = function (app, options) {
     },
     logError
   );
-};
+}
 
 // Used when app is in ci mode (`ember test`).
 // Collects the coverage on each request and merges it into the coverage map.
-const testMiddleware = function (app, options) {
+function testMiddleware(app, options) {
   let map = istanbul.libCoverage.createCoverageMap();
   app.post(WRITE_COVERAGE, bodyParser, coverageHandler.bind(null, map, options), logError);
-};
+}
 
 module.exports = {
   serverMiddleware,

lib/coverage-merge.js

@@ -11,7 +11,8 @@ var dir = require('node-dir');
 module.exports = {
   name: 'coverage-merge',
   description: 'Merge multiple coverage files together.',
-  run: function () {
+
+  run() {
     var istanbul = require('istanbul-api');
     var config = this._getConfig();
 
@@ -56,7 +57,7 @@ module.exports = {
    * Get project configuration
    * @returns {Configuration} project configuration
    */
-  _getConfig: function () {
+  _getConfig() {
     return getConfig(this.project.configPath());
   },
 };

test/unit/index-test.js

@@ -14,7 +14,7 @@ describe('index.js', function () {
     Index.parent = Index.project = Index.app = Index.IstanbulPlugin = Index.parentRegistry = null;
     sandbox.stub(Index, 'fileLookup').value({});
     sandbox.stub(Index, 'parentRegistry').value({
-      extensionsForType: function () {
+      extensionsForType() {
         return ['js'];
       },
     });
@@ -44,7 +44,7 @@ describe('index.js', function () {
           'some/other/module.js': 'some/other/file.js',
         });
         sandbox.stub(Index, 'parent').value({
-          isEmberCLIAddon: function () {
+          isEmberCLIAddon() {
             return false;
           },
         });
@@ -165,10 +165,10 @@ describe('index.js', function () {
   describe('_getExcludes', function () {
     beforeEach(function () {
       sandbox.stub(Index, 'parent').value({
-        isEmberCLIAddon: function () {
+        isEmberCLIAddon() {
           return false;
         },
-        name: function () {
+        name() {
           return 'test';
         },
       });
@@ -301,10 +301,10 @@ describe('index.js', function () {
 
     beforeEach(function () {
       sandbox.stub(Index, 'parent').value({
-        name: function () {
+        name() {
           return 'parent-app';
         },
-        isEmberCLIAddon: function () {
+        isEmberCLIAddon() {
           return isAddon;
         },
       });