Fix merge issue

Author: Otto Giron

server/test/routes/index.js

@@ -4,11 +4,8 @@ var Code = require('code');
 var Config = require('../../src/config');
 var Hapi = require('hapi');
 
-
-var IndexRoute = require('../../src/routes/index').default;
-var Injector = require('di').Injector;
-
-
+import IndexRoute from '../../src/routes/index';
+import {Injector} from 'di';
 var lab = exports.lab = Lab.script();
 var request, server;
 

server/test/transformer.js

@@ -13,7 +13,7 @@ module.exports = [
         transform: function (content, filename) {
 
             // Make sure to only transform your code or the dependencies you want
-            if (filename.indexOf('src') >= 0) {
+            if (filename.indexOf('src') >= 0 || filename.indexOf('test') >=0) {
               //console.log('about transform this.', filename);
                 var result = api.compile(content, options, filename);
                 //console.log(result);