Merge pull request #51 from 201-created/test-helpers

Test helpers

Author: rwjblue

lib/engines/classic/config-file-info.js

@@ -5,11 +5,10 @@ var ConfigFileInfo = ClassicFileInfo.extend({
 
 
   init: function(options) {
+    this._super(options);
     options.type = 'config';
     options.base = '.';
     options.sourceRoot = '.';
-
-    this._super(options);
   },
 
   populateCollection: function() {

lib/engines/classic/index.js

@@ -61,6 +61,7 @@ module.exports = {
       var testSubjectType;
 
       if (testType === 'unit' || testType === 'integration') {
+        options.base = 'src';
         options.testType = testType;
 
         topLevelDirectory = pathParts[2];
@@ -70,6 +71,10 @@ module.exports = {
         options.type = testSubjectType + '-' + testType + '-test';
 
         return new TestFileInfo(options);
+      } else if (testType !== 'acceptance') {
+        options.type = testType;
+        options.base = 'tests';
+        return new ClassicFileInfo(options);
       }
     } else if (sourceRoot === 'config') {
       return new ConfigFileInfo(options);

lib/models/file-info.js

@@ -22,7 +22,7 @@ var FileInfo = CoreObject.extend({
     this.type = options.type;
 
     this.ext = options.ext;
-    this.base = options.base;
+    this.base = options.base || 'src';
     this.name = options.name;
     this._bucket = options.bucket;
     this.namespace = options.namespace;
@@ -48,7 +48,7 @@ var FileInfo = CoreObject.extend({
 
   populateBucket: function() {
     this.bucket = path.join(
-      'src',
+      this.base,
       this.collectionGroup,
       this.collection,
       this.namespace,
@@ -195,7 +195,7 @@ var FileInfo = CoreObject.extend({
 Object.defineProperty(FileInfo.prototype, 'destRelativePath', {
   get: function() {
     var baseRelativePath = path.join(
-      'src/',
+      this.base + '/',
       this.collectionGroup,
       this.collection
     );

test/fixtures/config/input.js

@@ -13,6 +13,10 @@ module.exports = {
     'environment.js': '"ENV"'
   },
   tests: {
+    'helpers': {
+      'resolver.js': 'import config from "../../config/environment";',
+      'start-app.js': 'import config from "my-app/config/environment";'
+    },
     unit: {
       utils: {
         'first-test.js': 'import config from "../../../config/environment";',

test/fixtures/config/output.js

@@ -20,5 +20,11 @@ module.exports = {
   },
   config: {
     'environment.js': '"ENV"'
+  },
+  tests: {
+    'helpers': {
+      'resolver.js': 'import config from "../../config/environment";',
+      'start-app.js': 'import config from "my-app/config/environment";'
+    }
   }
 };

test/fixtures/test-helpers/input.js

@@ -0,0 +1,15 @@
+module.exports = {
+  app: {
+    'app.js': '// app',
+    'resolver.js': '// resolver'
+  },
+  config: {
+    'environment.js': '"ENV"'
+  },
+  tests: {
+    helpers: {
+      'resolver.js': 'import Resolver from "../../resolver";',
+      'start-app.js': 'import App from "../../app";'
+    }
+  }
+};

test/fixtures/test-helpers/output.js

@@ -0,0 +1,15 @@
+module.exports = {
+  src: {
+    'main.js': '// app',
+    'resolver.js': '// resolver'
+  },
+  config: {
+    'environment.js': '"ENV"'
+  },
+  tests: {
+    'helpers': {
+      'resolver.js': 'import Resolver from "../../src/resolver";',
+      'start-app.js': 'import App from "../../src/main";'
+    }
+  }
+};