breaking change: test load & run

Author: ShMcK

.gitignore

@@ -1,4 +1,4 @@
 node_modules
 src/*.js
 test/**/*.ts
-lib/.tmp.js
+.tmp/

lib/index.js

@@ -6,15 +6,17 @@ var settings = {
     dir: null,
     tutorial: null,
     tests: '',
-    step: 0,
+    pagePosition: 0,
     testPath: '',
 };
-exports.combineTests = function (options) {
+function load(options) {
     options.testPath = testPath_1.default(options);
     settings = Object.assign(settings, options);
     writeTests_1.default(options);
-};
-function start(_a) {
+}
+exports.load = load;
+;
+function run(_a) {
     var taskPosition = _a.taskPosition, handleResult = _a.handleResult;
     var dir = settings.dir;
     runner_1.default({
@@ -23,5 +25,4 @@ function start(_a) {
         handleResult: handleResult,
     });
 }
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = start;
+exports.run = run;

lib/testPath.js

@@ -1,11 +1,12 @@
 "use strict";
 var path_1 = require('path');
 function tmpTestName(_a) {
-    var tutorial = _a.tutorial, step = _a.step;
-    if (!tutorial || !tutorial.name || !tutorial.version || !step) {
+    var tutorial = _a.tutorial, pagePosition = _a.pagePosition;
+    console.log(tutorial, tutorial.name, tutorial.version, pagePosition);
+    if (!tutorial || !tutorial.name || !tutorial.version || typeof pagePosition !== 'number') {
         console.log('Error creating temporary test name');
     }
-    return path_1.join(__dirname, '..', '..', '.tmp', tutorial.name, tutorial.version, step + '.js');
+    return path_1.join(__dirname, '..', '.tmp', tutorial.name + "__" + tutorial.version + "__" + pagePosition + ".js");
 }
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = tmpTestName;

lib/writeTests/helpers/babel-register.js

@@ -1,4 +1,4 @@
 "use strict";
-var babelRegister = "require(\"babel-register\")({\"plugins\": [[\"transform-es2015-modules-commonjs\", {\"strict\": true,\"loose\": true}]]});";
+var babelRegister = "require(\"babel-register\")({\"plugins\": [[\"transform-es2015-modules-commonjs\", {\"strict\": true,\"loose\": true}]]});\n\n";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = babelRegister;

lib/writeTests/compiler.js renamed to lib/writeTests/helpers/compiler.js

@@ -6,17 +6,17 @@ let settings: CombineTestsOptions = {
   dir: null,
   tutorial: null,
   tests: '',
-  step: 0,
+  pagePosition: 0,
   testPath: '',
 };
 
-export const combineTests = (options: CombineTestsOptions) => {
+export function load(options: CombineTestsOptions) {
   options.testPath = getTestPath(options);
   settings = Object.assign(settings, options);
   writeTests(options);
 };
 
-export default function start({ taskPosition, handleResult }) {
+export function run({ taskPosition, handleResult }) {
   const { dir } = settings;
   runner({
     dir,

src/index.ts

@@ -1,11 +1,12 @@
 import { join } from 'path';
 
-export default function tmpTestName({tutorial, step}): string {
-  if (!tutorial || !tutorial.name || !tutorial.version || !step) {
+export default function tmpTestName({tutorial, pagePosition}): string {
+  console.log(tutorial, tutorial.name, tutorial.version, pagePosition);
+  if (!tutorial || !tutorial.name || !tutorial.version || typeof pagePosition !== 'number') {
     console.log('Error creating temporary test name');
   }
   return join(
-    __dirname, '..', '..', '.tmp',
-    tutorial.name, tutorial.version, step + '.js'
+    __dirname, '..', '.tmp',
+    `${tutorial.name}__${tutorial.version}__${pagePosition}.js`
   );
 }

src/testPath.ts

@@ -13,6 +13,6 @@ interface CombineTestsOptions {
     version: string;
   };
   tests: string;
-  step: number;
+  pagePosition: number;
   testPath: string;
 }

src/typings/tsd.d.ts

@@ -1,2 +1,2 @@
-const babelRegister = `require("babel-register")({"plugins": [["transform-es2015-modules-commonjs", {"strict": true,"loose": true}]]});`;
+const babelRegister = `require("babel-register")({"plugins": [["transform-es2015-modules-commonjs", {"strict": true,"loose": true}]]});\n\n`;
 export default babelRegister;

src/writeTests/helpers/babel-register.ts

@@ -35,8 +35,8 @@
         "src/typings/process-console-log/index.d.ts",
         "src/typings/set/set.d.ts",
         "src/typings/tsd.d.ts",
-        "src/writeTests/compiler.ts",
         "src/writeTests/helpers/babel-register.ts",
+        "src/writeTests/helpers/compiler.ts",
         "src/writeTests/helpers/exists.ts",
         "src/writeTests/import-paths.ts",
         "src/writeTests/index.ts"