diff --git a/docs/version.txt b/docs/version.txt index acf9bf09..0fa4ae48 100644 --- a/docs/version.txt +++ b/docs/version.txt @@ -1 +1 @@ -3.2.2 \ No newline at end of file +3.3.0 \ No newline at end of file diff --git a/package-lock.json b/package-lock.json index 512a9306..3253b9f4 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "rooibos", - "version": "3.2.2", + "version": "3.3.0", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -5674,7 +5674,7 @@ "request": "2.88.0", "request-promise": "4.2.4", "splice-string": "2.0.0", - "typescript": "3.3.1" + "typescript": "3.7.4" }, "dependencies": { "brs": { @@ -6439,9 +6439,9 @@ "dev": true }, "typescript": { - "version": "3.3.1", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.3.1.tgz", - "integrity": "sha512-cTmIDFW7O0IHbn1DPYjkiebHxwtCMU+eTy30ZtJNBPF9j2O1ITu5XH2YnBeVRKWHqF+3JQwWJv0Q0aUgX8W7IA==", + "version": "3.7.4", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.7.4.tgz", + "integrity": "sha512-A25xv5XCtarLwXpcDNZzCGvW2D1S3/bACratYBx2sax8PefsFhlYmkQicKHvpYflFS8if4zne5zT5kpJ7pzuvw==", "dev": true }, "typical": { diff --git a/package.json b/package.json index 41142e0c..b4198cc0 100644 --- a/package.json +++ b/package.json @@ -27,7 +27,7 @@ "minami": "^1.2.3", "roku-deploy": "^2.0.0", "rooibos-cli": "^1.0.1", - "typescript": "^3.3.1", + "typescript": "3.7.4", "vinyl-paths": "^2.1.0" }, "scripts": { diff --git a/src/TestLogger.bs b/src/TestLogger.bs index 61933d3e..55da5ae1 100644 --- a/src/TestLogger.bs +++ b/src/TestLogger.bs @@ -92,10 +92,16 @@ public sub PrintTestStatistic(testCase as object) end if locationText = "pkg:/" + testCase.filePath.trim() + "(" + locationLine + ")" + if m.config.printTestTimes = true + timeText = " (" + stri(metaTestCase.time).trim() +"ms)" + else + timeText = "" + end if + insetText = "" if (metaTestcase.isParamTest <> true) messageLine = RBS_LOGGER_FillText(" " + testChar + " |--" + metaTestCase.Name + " : ", ".", 80) - ? messageLine ; testCase.Result ; " (" + stri(metaTestCase.time).trim() +"ms)" + ? messageLine ; testCase.Result ; timeText else if ( metaTestcase.paramTestIndex = 0) name = metaTestCase.Name if (len(name) > 1 and right(name, 1) = "0") @@ -107,7 +113,7 @@ public sub PrintTestStatistic(testCase as object) if (metaTestcase.isParamTest = true) insetText = " " messageLine = m.fillText(" " + testChar + insetText + " |--" + formatJson(metaTestCase.rawParams) + " : ", ".", 80) - ? messageLine ; testCase.Result ; " (" + stri(metaTestCase.time).trim() +"ms)" + ? messageLine ; testCase.Result ; timeText end if if LCase(testCase.Result) <> "success"