Resolve correctly relative imports from tests

Author: andyhot

lib/transforms/import-declarations.js

@@ -15,9 +15,23 @@ function transformer(file, api) {
         return;
       }
 
+      // determine the actual path that importPath points to
+      // TODO: extract these resolutions into classic-file-info and test-file-info
       var relative = path_utils.isRelative(importPath);
       if (relative) {
-        importPath = path_utils.makeAbsolute(appName + '/' + file.fileInfo.sourceRelativePath, importPath);
+        var sourceRelativePath = file.fileInfo.sourceRelativePath;
+
+        if (sourceRelativePath.startsWith('tests/')) {
+          importPath = path_utils.makeAbsolute(appName + '/app/' + sourceRelativePath, importPath);
+
+          // see if we stayed within tests
+          var inTestsPrefix = appName + '/app/tests/';
+          if (importPath.startsWith(inTestsPrefix)) {
+            importPath = appName + '/tests/' + importPath.substring(inTestsPrefix.length);
+          }
+        } else {
+          importPath = path_utils.makeAbsolute(appName + '/' + sourceRelativePath, importPath);
+        }
       } else {
         // check if import path starts with appName and add /app
         if (importPath.startsWith(appName + '/') && !importPath.startsWith(appName + '/app/')) {