rooibos-roku 5.1.0 → 5.2.1

package/dist/lib/framework/BaseTestSuite.bs

@@ -1121,23 +1121,26 @@ namespace rooibos
 
     end function
 
-    function assertClass(value, typeStr, msg = "") as dynamic
+    function assertClass(value, func, msg = "") as dynamic
       if m.currentResult.isFail
         return false
       end if
+      if rooibos.Common.isFunction(func)
+        func = value.toStr().mid(10).replace("_", ".")
+      end if
       try
         if not Rooibos.Common.isAssociativeArray(value)
           if msg = ""
             expr_as_string = Rooibos.Common.asString(value)
-            msg = expr_as_string + " was not an aa, so could not match Class " + typeStr
+            msg = expr_as_string + " was not an aa, so could not match Class " + func
           end if
           m.currentResult.fail(msg, m.currentAssertLineNumber)
           return false
         end if
         className = `${value.__classname}`
-        if className <> typeStr
+        if className <> func
           if msg = ""
-            msg = `Expected class: ${typeStr} got ${className}`
+            msg = `Expected class: ${func} got ${className}`
           end if
           m.currentResult.fail(msg, m.currentAssertLineNumber)
           return false
@@ -1619,7 +1622,7 @@ namespace rooibos
 
     function _expectCalled(target, methodName, rootObject = invalid as dynamic, fullPath = invalid as dynamic, expectedArgs = invalid, returnValue = invalid as dynamic) as object
       try
-        if fullPath <> invalid
+        if type(target) <> "roAssociativeArray" and fullPath <> invalid
           target = rooibos.Common.makePathStubbable(rootObject, fullPath)
         end if
         return m.mock(target, methodName, 1, expectedArgs, returnValue, true)
@@ -1637,7 +1640,7 @@ namespace rooibos
 
     function _stubCall(target, methodName, rootObject = invalid as dynamic, fullPath = invalid as dynamic, returnValue = invalid as dynamic) as object
       try
-        if fullPath <> invalid
+        if type(target) <> "roAssociativeArray" and fullPath <> invalid
           target = rooibos.Common.makePathStubbable(rootObject, fullPath)
         end if
         return m.stub(target, methodName, returnValue, true)
@@ -1656,7 +1659,7 @@ namespace rooibos
 
     function _expectNotCalled(target, methodName, rootObject = invalid as dynamic, fullPath = invalid as dynamic) as object
       try
-        if fullPath <> invalid
+        if type(target) <> "roAssociativeArray" and fullPath <> invalid
           target = rooibos.Common.makePathStubbable(rootObject, fullPath)
         end if
         return m.mock(target, methodName, 0, invalid, invalid, true)

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "rooibos-roku",
-    "version": "5.1.0",
+    "version": "5.2.1",
     "description": "simple, flexible, fun brightscript test framework for roku scenegraph apps - roku brighterscript plugin",
     "repository": {
         "type": "git",
@@ -26,7 +26,7 @@
         "@types/node": "^17.0.29",
         "@typescript-eslint/eslint-plugin": "^4.4.1",
         "@typescript-eslint/parser": "^4.4.1",
-        "brighterscript": "^0.50.1",
+        "brighterscript": "^0.52.1",
         "chai": "^4.2.0",
         "chai-subset": "^1.6.0",
         "coveralls": "^3.0.0",
@@ -42,9 +42,6 @@
         "typescript": "^3.8.3",
         "undent": "^0.1.0"
     },
-    "peerDependencies": {
-        "brighterscript": "^0.50.1"
-    },
     "scripts": {
         "preversion": "npm run build && npm run lint && npm run test",
         "clean": "rm -rf ./dist && mkdir dist",