fix: fixes incorrect reporting of version numbers during test run

rokucommunity · Sep 23, 2019 · e820831 · e820831
1 parent ff2a592
commit e820831
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,5 @@
+#### 3.2.2 (2019-09-23)
+
 #### 3.2.1 (2019-09-23)
 
 ##### Chores

diff --git a/gulpfile.ts b/gulpfile.ts
@@ -160,7 +160,15 @@ export function updateVersion(cb) {
   cb();
 }
 
-exports.build = series(clean, createDirectories, compile, squash, copyToSamples, copyToTests);
+function insertVersionNumber(cb) {
+  const filePath = path.join(buildDir, 'Rooibos.brs');
+  let text = fs.readFileSync(filePath, 'utf8');
+  text = text.replace('#ROOIBOS_VERSION#', pkg.version);
+  fs.writeFileSync(filePath, text, 'utf8');
+  cb();
+}
+
+exports.build = series(clean, createDirectories, compile, insertVersionNumber, squash, copyToSamples, copyToTests);
 exports.runFrameworkTests = series(exports.build, prepareFrameworkTests, zipFrameworkTests, deployFrameworkTests)
 exports.prePublishFrameworkTests = series(exports.build, prepareFrameworkTests)
 exports.prePublishFrameworkCodeCoverage = series(exports.build, prepareCodeCoverageTests)

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "rooibos",
-  "version": "3.2.1",
+  "version": "3.2.2",
   "description": "simple, flexible, fun brihhtscript test framework for roku scenegraph apps",
   "main": "index.js",
   "directories": {

diff --git a/src/Rooibos.bs b/src/Rooibos.bs
@@ -55,7 +55,7 @@ function Init(preTestSetup = invalid, testUtilsDecoratorMethodName = invalid, te
 
   args.testScene = scene
   args.global = m.global
-  rooibosVersion = "3.1.1"
+  rooibosVersion = "#ROOIBOS_VERSION#"
   requiredRooibosPreprocessorVersion = "1.0.0"
 
   if not RBS_CMN.isFunction(RBSFM_getPreprocessorVersion)
@@ -72,7 +72,7 @@ function Init(preTestSetup = invalid, testUtilsDecoratorMethodName = invalid, te
     ? "######################################################"
     ? ""
     ? "# rooibos framework version: " ; rooibosVersion
-    ? "# tests parsed with rooibosC version: " ; rooibosVersion
+    ? "# tests parsed with rooibosC version: " ; RBSFM_getPreprocessorVersion()
     ? "######################################################"
     ? ""