Merge branch 'release-6.0.0' of https://github.com/rokucommunity/rooibos

into rooibos-cli
rokucommunity · Oct 1, 2024 · 336ef18 · 336ef18
2 parents 6c84500 + 435b2d4
commit 336ef18
Show file tree

Hide file tree

Showing 11 changed files with 176 additions and 39 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -39,7 +39,7 @@ jobs:
         with:
           node-version: "16.20.2"
           architecture: 'x64' # fix for macos-latest
-      - run: echo "//registry.npmjs.org/:_authToken=${NPM_TOKEN}" > ./.npmrc
+      - run: cd bsc-plugin && echo "//registry.npmjs.org/:_authToken=${NPM_TOKEN}" > ./.npmrc
       - run: cd bsc-plugin && npm ci
       - run: cd bsc-plugin && npm run build
       #create npm package

diff --git a/bsc-plugin/CHANGELOG.md b/bsc-plugin/CHANGELOG.md
diff --git a/bsc-plugin/package-lock.json b/bsc-plugin/package-lock.json
diff --git a/bsc-plugin/package.json b/bsc-plugin/package.json
@@ -1,6 +1,6 @@
 {
     "name": "rooibos-roku",
-    "version": "6.0.0-alpha.1",
+    "version": "6.0.0-alpha.38",
     "description": "simple, flexible, fun brightscript test framework for roku scenegraph apps - roku brighterscript plugin",
     "scripts": {
         "preversion": "npm run build && npm run lint && npm run test",
@@ -49,7 +49,7 @@
         "@types/yargs": "^15.0.5",
         "@typescript-eslint/eslint-plugin": "^5.27.0",
         "@typescript-eslint/parser": "^5.27.0",
-        "brighterscript": "^1.0.0-alpha.36",
+        "brighterscript": "^1.0.0-alpha.38",
         "chai": "^4.2.0",
         "chai-subset": "^1.6.0",
         "coveralls": "^3.0.0",

diff --git a/bsc-plugin/src/lib/rooibos/CodeCoverageProcessor.ts b/bsc-plugin/src/lib/rooibos/CodeCoverageProcessor.ts
@@ -130,9 +130,6 @@ export class CodeCoverageProcessor {
             ForEachStatement: (ds, parent, owner, key) => {
                 this.addStatement(ds);
                 ds.tokens.forEach.text = `${this.getFuncCallText(ds.location.range.start.line, CodeCoverageLineType.code)}: for each`;
-            },
-            ExitWhileStatement: (ds, parent, owner, key) => {
-
             },
             PrintStatement: (ds, parent, owner, key) => {
                 this.addStatement(ds);

diff --git a/bsc-plugin/src/lib/rooibos/RawCodeExpression.ts b/bsc-plugin/src/lib/rooibos/RawCodeExpression.ts
@@ -1,6 +1,4 @@
-import type { BscFile,
-    WalkOptions,
-    WalkVisitor } from 'brighterscript';
+import type { BscFile, WalkOptions, WalkVisitor } from 'brighterscript';
 import { Expression } from 'brighterscript';
 import * as brighterscript from 'brighterscript';
 import type { BrsTranspileState } from 'brighterscript/dist/parser/BrsTranspileState';
@@ -33,4 +31,8 @@ export class RawCodeExpression extends Expression {
     public walk(visitor: WalkVisitor, options: WalkOptions) {
         //nothing to walk
     }
+
+    public clone() {
+        return new RawCodeExpression(this.source, this.sourceFile, brighterscript.util.cloneLocation({ range: this.range } as any).range);
+    }
 }
diff --git a/bsc-plugin/src/lib/rooibos/RawCodeStatement.ts b/bsc-plugin/src/lib/rooibos/RawCodeStatement.ts
@@ -47,6 +47,10 @@ export class RawCodeStatement extends Statement {
     public walk(visitor: WalkVisitor, options: WalkOptions) {
         //nothing to walk
     }
+
+    public clone() {
+        return new RawCodeStatement(this.source, this.sourceFile, util.cloneLocation({ range: this.range } as any).range);
+    }
 }
 
 export class RawCodeExpression extends Expression {
@@ -81,4 +85,8 @@ export class RawCodeExpression extends Expression {
     public walk(visitor: WalkVisitor, options: WalkOptions) {
         //nothing to walk
     }
+
+    public clone() {
+        return new RawCodeExpression(this.source, this.sourceFile, util.cloneLocation({ range: this.range } as any).range);
+    }
 }
diff --git a/bsc-plugin/src/lib/rooibos/TestSuiteBuilder.spec.ts b/bsc-plugin/src/lib/rooibos/TestSuiteBuilder.spec.ts
@@ -1115,7 +1115,6 @@ end namespace
       @suite("Rooibos assertion tests")
       class AssertionTests extends rooibos.BaseTestSuite
       @describe("group1")
-
       @it("one")
       @params("http://google.com/thing", true)
       @params("#'_!!@#%", false)

diff --git a/bsc-plugin/src/lib/rooibos/TestSuiteBuilder.ts b/bsc-plugin/src/lib/rooibos/TestSuiteBuilder.ts
@@ -2,9 +2,11 @@
 import type {
     BrsFile,
     ClassStatement,
+    FunctionStatement,
     MethodStatement
 } from 'brighterscript';
 import {
+    isFunctionStatement,
     isMethodStatement,
     util
 } from 'brighterscript';
@@ -203,7 +205,7 @@ export class TestSuiteBuilder {
 
         let sanitizedTestName = this.sanitizeFunctionName(this.currentGroup.name) + '_' + this.sanitizeFunctionName(annotation.name);
         statement.tokens.name.text = sanitizedTestName;
-        statement.func.functionStatement.tokens.name.text = sanitizedTestName;
+        statement.func.findAncestor<MethodStatement>(isMethodStatement).tokens.name.text = sanitizedTestName;
 
         if (numberOfParams > 0) {
             let index = 0;

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "rooibos",
+  "name": "rooibos-roku",
   "version": "6.0.0-alpha.1",
   "description": "simple, flexible, fun brightscript test framework for roku scenegraph apps",
   "scripts": {