rename back to concat-tests

ShMcK · ShMcK · commit b57c0abf41ae · 2016-04-01T13:27:08.000-07:00
diff --git a/lib/reducers/run-tests/parse-loaders.js b/lib/reducers/run-tests/parse-loaders.js
@@ -2,20 +2,20 @@
 var path = require('path');
 var fs = require('fs');
 var supportedFileTypes = ['js', 'jsx', 'ts', 'py'];
-var js = /^\/\/\s?load\(['"`](.+)['"`]\)$/;
+var js = /^\/\/\s?load\(['"`](.+)['"`]\)$/m;
 var loaderMatch = {
     js: js,
     ts: js,
     jsx: js,
-    py: /\#\s?load\(['"`](.+)['"`]\)$/
+    py: /^#\s?load\(['"`](.+)['"`]\)$/m
 };
 function parseLoaders(data, fileType) {
     if (supportedFileTypes.indexOf(fileType) < 0) {
         console.log("File type \"" + fileType + "\" not supported.");
         return '';
     }
     var imports = '';
-    var i = 0;
+    var i = -1;
     var lines = data.split('\n');
     while (i < lines.length - 1) {
         i += 1;
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "atom-coderoad",
   "main": "./lib/atom/main",
-  "version": "0.5.7",
+  "version": "0.6.0",
   "description": "Interactive tutorial plugin for Atom",
   "author": "Shawn McKay <shawn.j.mckay@gmail.com>",
   "keywords": [
diff --git a/src/reducers/run-tests/parse-loaders.ts b/src/reducers/run-tests/parse-loaders.ts
@@ -2,12 +2,12 @@ import * as path from 'path';
 import * as fs from 'fs';
 
 const supportedFileTypes = ['js', 'jsx', 'ts', 'py'];
-const js = /^\/\/\s?load\(['"`](.+)['"`]\)$/;
+const js = /^\/\/\s?load\(['"`](.+)['"`]\)$/m;
 const loaderMatch = {
   js,  // // load('file'),
   ts: js,
   jsx: js,
-  py: /\#\s?load\(['"`](.+)['"`]\)$/      // # load('file')
+  py: /^#\s?load\(['"`](.+)['"`]\)$/m      // # load('file')
 };
 
 export default function parseLoaders(data: string, fileType: string) {
@@ -19,7 +19,7 @@ export default function parseLoaders(data: string, fileType: string) {
 
   let imports = '';
   // loop over lines and add editor files
-  let i = 0;
+  let i = -1;
   let lines = data.split('\n');
 
   while (i < lines.length - 1) {
diff --git a/src/reducers/task-tests/concat-tests.ts b/src/reducers/task-tests/concat-tests.ts
@@ -20,7 +20,7 @@ function readAppend(targetFile: string, file: string): boolean {
   }
 }
 
-function concatTests(targetFile: string, files: any): string {
+export default function concatTests(targetFile: string, files: any): string {
   // delete previous file
   unlink(targetFile).then(() => {
     // load tests in order
@@ -33,7 +33,3 @@ function concatTests(targetFile: string, files: any): string {
   });
   return;
 }
-
-export default function load(targetFile: string, files: any) {
-  concatTests(targetFile, files);
-}
diff --git a/src/reducers/task-tests/task-tests.ts b/src/reducers/task-tests/task-tests.ts
@@ -1,13 +1,13 @@
-'use strict';
 import * as path from 'path';
+import * as fs from 'fs';
 import * as Type from '../../actions/actionTypes';
-import load from './loader';
+import concatTests from './concat-tests';
 
 export default function taskTestsReducer(taskTests = '', action: CR.Action): string {
   switch (action.type) {
     case Type.SET_PAGE:
       let target = path.join(window.coderoad.tutorialDir || window.coderoad.dir, `_tmpTests${window.coderoad.suffix}`);
-      load(target, action.payload.taskTests);
+      concatTests(target, action.payload.taskTests);
       return target;
     default:
       return taskTests;
diff --git a/tsconfig.json b/tsconfig.json
@@ -84,7 +84,7 @@
     "src/reducers/run-tests/run.ts",
     "src/reducers/run-tests/test-result.ts",
     "src/reducers/task-position/task-position.ts",
-    "src/reducers/task-tests/loader.ts",
+    "src/reducers/task-tests/concat-tests.ts",
     "src/reducers/task-tests/task-tests.ts",
     "src/reducers/tasks/tasks.ts",
     "src/reducers/tutorials/tutorials.ts",

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "atom-coderoad",`
`3`	`3`	`"main": "./lib/atom/main",`
`4`		`- "version": "0.5.7",`
	`4`	`+ "version": "0.6.0",`
`5`	`5`	`"description": "Interactive tutorial plugin for Atom",`
`6`	`6`	`"author": "Shawn McKay <shawn.j.mckay@gmail.com>",`
`7`	`7`	`"keywords": [`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ function readAppend(targetFile: string, file: string): boolean {`
`20`	`20`	`}`
`21`	`21`	`}`
`22`	`22`
`23`		`-function concatTests(targetFile: string, files: any): string {`
	`23`	`+export default function concatTests(targetFile: string, files: any): string {`
`24`	`24`	`// delete previous file`
`25`	`25`	`unlink(targetFile).then(() => {`
`26`	`26`	`// load tests in order`
`@@ -33,7 +33,3 @@ function concatTests(targetFile: string, files: any): string {`
`33`	`33`	`});`
`34`	`34`	`return;`
`35`	`35`	`}`
`36`		`-`
`37`		`-export default function load(targetFile: string, files: any) {`
`38`		`- concatTests(targetFile, files);`
`39`		`-}`