fix _tmp file path

ShMcK · ShMcK · commit 5b9ea3fce8a3 · 2016-05-01T09:43:39.000-07:00
diff --git a/lib/reducers/test-run/run.js b/lib/reducers/test-run/run.js
@@ -10,7 +10,7 @@ function runTaskTests(setup) {
         var dir = store_1.default.getState().dir;
         var tutorialConfig = store_1.default.getState().tutorial.config;
         var output = parse_loaders_1.default(tests, tutorialConfig.testSuffix);
-        var target = path_1.join(tutorialConfig.dir || dir, "_tmp." + tutorialConfig.testSuffix);
+        var target = path_1.join(tutorialConfig.dir || dir, "_tmp" + tutorialConfig.testSuffix);
         fs_1.writeFileSync(target, output, 'utf8');
         var config = {
             dir: dir,
diff --git a/lib/reducers/tutorial/tutorial-config.js b/lib/reducers/tutorial/tutorial-config.js
@@ -7,9 +7,12 @@ function tutorialConfig(tutorialPj) {
     var config = tutorialPj.config, name = tutorialPj.name;
     var repo = loadRepo(tutorialPj.repo);
     var dir = store_1.default.getState().dir;
+    var testSuffix = config.testSuffix;
     return {
         dir: path_1.join(dir, 'node_modules', name, config.dir),
-        testSuffix: config.testSuffix || null,
+        testSuffix: testSuffix.length && testSuffix[0] === '.'
+            ? testSuffix
+            : '.' + testSuffix || null,
         runner: config.runner,
         runnerOptions: config.runnerOptions || null,
         run: loadRunner(name, config.runner, dir),
diff --git a/src/reducers/test-run/run.ts b/src/reducers/test-run/run.ts
@@ -15,7 +15,7 @@ export function runTaskTests(setup?: boolean): boolean {
     // write temporary test file in tutorial directory
     let target = join(
       tutorialConfig.dir || dir,
-      `_tmp.${tutorialConfig.testSuffix}`
+      `_tmp${tutorialConfig.testSuffix}`
     );
     writeFileSync(target, output, 'utf8');
 
diff --git a/src/reducers/tutorial/tutorial-config.ts b/src/reducers/tutorial/tutorial-config.ts
@@ -5,13 +5,14 @@ import store from '../../store';
 
 export function tutorialConfig(tutorialPj: PackageJson): Tutorial.Config {
   const {config, name} = tutorialPj;
-  const repo = loadRepo(tutorialPj.repo);
-  const dir = store.getState().dir;
+  const repo: string = loadRepo(tutorialPj.repo);
+  const dir: string = store.getState().dir;
+  const testSuffix: string = config.testSuffix;
   return {
-    dir: join(
-      dir, 'node_modules', name, config.dir
-    ),
-    testSuffix: config.testSuffix || null,
+    dir: join(dir, 'node_modules', name, config.dir),
+    testSuffix: testSuffix.length && testSuffix[0] === '.'
+      ? testSuffix
+      : '.' + testSuffix || null,
     runner: config.runner,
     runnerOptions: config.runnerOptions || null,
     run: loadRunner(name, config.runner, dir),
@@ -21,12 +22,7 @@ export function tutorialConfig(tutorialPj: PackageJson): Tutorial.Config {
   };
 }
 
-// function getTestSuffix(suffix: string) {
-//   console.log(suffix);
-//   return suffix.substring(suffix.lastIndexOf('.') + 1, suffix.length);
-// }
-
-function getIssuesPath(bugs?: {url: string}) {
+function getIssuesPath(bugs?: { url: string }) {
   return bugs && bugs.url ? bugs.url : null;
 }
 
@@ -68,7 +64,7 @@ function loadRunner(name: string, runner: string, dir: string): () => any {
   }
 }
 
-function loadRepo(repo?: {url: string}): string {
+function loadRepo(repo?: { url: string }): string {
   if (repo && repo.url) {
     let url: string = repo.url;
     if (!!url.match(/\.git$/)) {
diff --git a/src/typings/cr/tutorial.d.ts b/src/typings/cr/tutorial.d.ts
@@ -9,7 +9,7 @@ declare namespace Tutorial {
   interface Config {
     dir: string;
     runner: string;
-    runnerOptions?: RunnerOptions;
+    runnerOptions?: Object;
     run: any;
     testSuffix?: string;
     issuesPath?: string;
