code clean up

Author: kiwiupover

test-packages/basic-app/test/server-assets-test.js

@@ -3,9 +3,9 @@
 const RSVP = require('rsvp');
 const request = RSVP.denodeify(require('request'));
 const expect = require('chai').use(require('chai-string')).expect;
-const { startServer, stopServer } = require('../../test-libs/index');
+const { startServer, stopServer } = require('../../test-libs');
 
-describe.only('serve assets acceptance', function() {
+describe('serve assets acceptance', function() {
   this.timeout(20000);
 
   before(function() {

test-packages/basic-app/test/shoebox-test.js

@@ -3,7 +3,7 @@
 const RSVP = require('rsvp');
 const request = RSVP.denodeify(require('request'));
 const expect = require('chai').use(require('chai-string')).expect;
-const { startServer, stopServer } = require('../../test-libs/index');
+const { startServer, stopServer } = require('../../test-libs');
 
 describe('shoebox - put', function() {
   this.timeout(20000);

test-packages/basic-app/test/simple-test.js

@@ -3,7 +3,7 @@
 const RSVP = require('rsvp');
 const request = RSVP.denodeify(require('request'));
 const expect = require('chai').use(require('chai-string')).expect;
-const { startServer, stopServer } = require('../../test-libs/index');
+const { startServer, stopServer } = require('../../test-libs');
 
 describe('simple acceptance', function() {
   this.timeout(30000);

test-packages/test-libs/index.js

@@ -6,15 +6,16 @@ const killCliProcess = require('./kill-cli-process');
 let server;
 let longRunningServerPromise;
 
-const startServer = function(options) {
-  return runServer(options)
-    .then(result => {
-      server = result.server;
-      longRunningServerPromise = result.longRunningServerPromise;
-    });
+const startServer = async (options) =>  {
+  const result = await runServer(options);
+
+  server = result.server;
+  longRunningServerPromise = result.longRunningServerPromise;
+
+  return result;
 };
 
-const stopServer = function() {
+const stopServer = () => {
   if (!server) {
     throw new Error('You must call `startServer()` before calling `stopServer()`.');
   }

test-packages/test-libs/kill-cli-process.js

@@ -1,6 +1,6 @@
 'use strict';
 
-module.exports = function(childProcess) {
+module.exports = childProcess => {
   if (process.platform === 'win32') {
     childProcess.send({ kill: true });
   } else {

test-packages/test-libs/run-command.js

@@ -12,7 +12,7 @@ const exec           = denodeify(childProcess.exec);
 
 const isWindows = process.platform === 'win32';
 
-module.exports = function run(/* command, args, options */) {
+module.exports = function run() {
   let command = arguments[0];
   let args = Array.prototype.slice.call(arguments, 1);
   let options = {};
@@ -21,7 +21,7 @@ module.exports = function run(/* command, args, options */) {
     options = args.pop();
   }
 
-  debug('running command=' + command + '; args=' + args + '; cwd=' + process.cwd());
+  debug(`running command=${command} args=${args}`);
 
   if (isWindows && (command === 'npm' || command === 'bower')) {
     return exec(command + ' ' + args.join(' '));

test-packages/test-libs/run-ember.js

@@ -4,7 +4,7 @@ const path = require('path');
 const findup = require('findup-sync');
 const runCommand = require('./run-command');
 
-module.exports = function(command, options) {
+module.exports = (command, options) => {
   let emberCLIPath = findup('node_modules/ember-cli');
 
   let args = [path.join(emberCLIPath, 'bin', 'ember'), command].concat(options);

test-packages/test-libs/run-server.js

@@ -4,7 +4,7 @@ const debug    = require('./debug');
 const runEmber = require('./run-ember');
 const defaults = require('lodash/defaults');
 
-module.exports = function runServer(options) {
+const runServer = options => {
   return new Promise((resolve, reject) => {
     options = options || { };
 
@@ -49,6 +49,8 @@ module.exports = function runServer(options) {
   });
 };
 
+module.exports = runServer;
+
 function detectServerStart(output) {
   let indicators = [
     'Ember FastBoot running at',