Merge pull request CodewarsClone#88 from CodewarsClone/dataBaseEntry

Finished up most all work with testCtrl

Author: Jon Myrick

KataParser.js

@@ -18,6 +18,8 @@ const _ = {
 		return str
 	},
 
+	
+	
 	cleanDesc(str) {
 		str = str.replace(/\n/g, '\\n')
 			.replace(/'/gi, `''`);
@@ -37,67 +39,58 @@ const _ = {
 
 	JSON(obj) {
 		return JSON.stringify(obj)
-	}
+	},
+	
+	cleanExample(str) {
+		str = str.replace(/\n\s*\./g, `.`)
+			.replace(/\n/g, ` \\n`)
+			.replace(/"/gi, `'`)
+			.replace(/'/gi, `''`);
+		return JSON.stringify([
+			{test: str}
+		]).replace(/\\\\n/g, `\\n`)
+	},
 
 };
 
 // Paste the languages into the array
 let languages = [
-	`JavaScript`,
-	`CoffeeScript`,
-	`Crystal`,
-	`Python`,
-	`Ruby`
+	``,
 ];
 // Paste the tags into the array
 let tags = [
-	`FUNDAMENTALS`,
-	`STRINGS`,
+	``,
 ];
 
 // Paste the Test Suite here
 let tests = [
 	`
-	Test.describe('tests', _ => {
-  Test.it('fixed tests', _ => {
-    Test.assertEquals(kebabize('myCamelCasedString'), 'my-camel-cased-string');
-    Test.assertEquals(kebabize('myCamelHas3Humps'), 'my-camel-has-humps');
-  });
-  
-  Test.it('random tests', _ => {
-    function fixture (str) {
-    	return str.replace(/\d/g,'')
-        .split(/(?=[A-Z])/).map(s => s.toLowerCase()).join('-')
-    }
-    
-    for (let i = 0; i <= 100; i += 1) {
-      let token = Test.randomToken();
-      
-      let camel = token.split('').map(c => {
-    	  const rand = Math.random();
-    	  return rand > 0.9 ? c.toUpperCase() : c
-      }).join('')
-        
-      Test.assertEquals(kebabize(camel), fixture(camel));
-    }
-  });
-});
 `,
-
 ];
 
 
 // Paste the example script here
-let examples = [
-	`Test.assertSimilar(generateRange(2, 10, 2), [2,4,6,8,10]);`,
-	`Test.assertSimilar(generateRange(1, 10, 1), [1,2,3,4,5,6,7,8,9,10]);`,
-];
+let examples =
+	`Test.describe("generateRange(2, 10, 2)", function() {
+  Test.assertSimilar(generateRange(2, 10, 2), [2,4,6,8,10]);
+});`;
 
 // Introduction to the Kata Here
 let description =
-	`
-	
-`;
+	`Implement a function named generateRange(min, max, step), which takes three arguments and generates a range of integers from min to max, with the step. The first integer is the minimum value, the second is the maximum of the range and the third is the step. (min < max)
+
+Task
+
+Implement a function named
+
+generateRange(2, 10, 2) // should return array of [2,4,6,8,10]
+generateRange(1, 10, 3) // should return array of [1,4,7,10]
+, which takes three arguments and generates a range of integers from min to max, with given step. The first is minimum value, second is maximum of range and the third is step.
+
+Note
+
+min < max
+step > 0`;
 // Paste the starting script here
 let startScript = ``;
 
@@ -107,11 +100,9 @@ let winScript = `
 
 `;
 
-
+// Past a solution here and it will corrently parse it into the console for you
 let solution = `
-function descendingOrder(n){
-  return parseInt(n.toString().split('').sort((a, b) => b - a).join(''));
-}
+
 
 `
 
@@ -131,7 +122,7 @@ console.log(_.cleanStr(startScript));
 console.log('\nDescription');
 console.log(_.cleanDesc(description));
 console.log('\n\n\nExampes');
-console.log(_.testObjectify(examples));
+console.log(_.cleanExample(examples));
 console.log('\nTests');
 console.log(_.testObjectify(tests));
 

controllers/testCtrl.js

@@ -17,7 +17,7 @@ const util = require('util');
 function timeParser(str) {
 	str = str.replace(/<COMPLETEDIN::>/, '');
 	if (!parseInt(str)) {
-		return 0
+		return 1
 	} else {
 		return parseInt(str)
 	}
@@ -69,42 +69,32 @@ function objectifer(arr) {
 
 
 
-function nester(arr) {
-	let count = 0;
+function nester(array) {
 	let testCount = 0;
 	let passCount = 0;
-	console.log(arr.length);
-	for (let i = arr.length - 1; i >= 0; i--) {
-		if (arr[i]) {
-			if (arr[i].type == 'test') {
+	for (let i = array.length - 1; i >= 0; i--) {
+		if (array[i]) {
+			if (array[i].type == 'test') {
 				testCount += 1;
-				if (arr[i].passed == true) passCount += 1
+				if (array[i].passed == true) passCount += 1
 			}
-			if (arr[i].type === 'describe' || arr[i].type === 'it') {
-				count += 1;
+			if (array[i].type === 'describe' || array[i].type === 'it') {
 				let j = i + 1;
 				let recurs = true;
 				while (recurs) {
-					if (arr[j].type !== 'completed') {
-						if (arr[j].type == 'it') count += 1;
-						arr[i].nest.push(arr.splice(j, 1)[0])
+					if (array[j].type !== 'completed') {
+						array[i].nest.push(array.splice(j, 1)[0])
 					} else {
-						count -= 1;
-						arr.splice(j, 1);
+						array[i].time = array[j].time;
+						array.splice(j, 1);
 						recurs = false
 					}
 				}
 			}
-		} else {
-			
-			
-			console.log('didn\'t have type');
-			console.log(arr[i]);
 		}
-		
 	}
 	return {
-		nest: arr,
+		nest: array,
 		testCount: testCount,
 		passCount: passCount
 	}
@@ -115,7 +105,6 @@ function nester(arr) {
 function testRunner(script, test) {
 	let defer = Q.defer();
 
-	
 	exec(`docker run --rm codewars/node-runner run -l javascript -c "${script}" -t cw -f "${test}"`,
 		(err, stdOut, stdErr) => {
 			if (err) console.log(err);
@@ -126,6 +115,7 @@ function testRunner(script, test) {
 			let output = stdOut.split(/\n/g);
 			for (let i = output.length - 1; i >= 0; i--) if (output[i] === '') output.splice(i, 1);
 			let newArr = objectifer(output);
+//			console.log(output);
 			newArr = nester(newArr);
 			defer.resolve(newArr);
 			return
@@ -148,19 +138,18 @@ module.exports = {
 
 			testRunner(body.script, test).then((response) => {
 				res.json(response);
-				console.log(util.inspect(response, false, null));
+//				console.log(util.inspect(response, false, null));
 				return
 			});
 		});
 	},
 
 	testExamplesKata: (req, res, next) => {
 		let body = req.body;
-		console.log(body.script);
 
 		testRunner(body.script, body.examples).then((response) => {
 			res.json(response);
-			console.log(util.inspect(response, false, null));
+//			console.log(util.inspect(response, false, null));
 			return
 		});
 	}