fix rest of karma tests

microsoft · Jan 31, 2024 · 515991e · 515991e
1 parent 28f48a1
commit 515991e
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 4 deletions.
diff --git a/karma.conf.js b/karma.conf.js
@@ -1,5 +1,5 @@
 const puppeteer = require('puppeteer');
-// process.env.CHROME_BIN = puppeteer.executablePath()
+process.env.CHROME_BIN = puppeteer.executablePath()
 console.log(`chromium: `, process.env.CHROME_BIN)
 
 // Karma configuration
@@ -72,7 +72,7 @@ module.exports = function(config) {
 
     // Continuous Integration mode
     // if true, Karma captures browsers, runs the tests and exits
-    singleRun: false,
+    singleRun: true,
 
     // Concurrency level
     // how many browser should be started simultaneous

diff --git a/newblocks/compiler/compiler.ts b/newblocks/compiler/compiler.ts
@@ -1208,7 +1208,7 @@ function compileArgument(e: Environment, b: Blockly.Block, p: pxt.blocks.BlockPa
             return prefixWithSemicolon(compileExpression(e, target, comments));
         }
 
-        if (p.shadowOptions && p.shadowOptions.toString && isStringType(returnType(e, target))) {
+        if (p.shadowOptions && p.shadowOptions.toString && !isStringType(returnType(e, target))) {
             return pxt.blocks.H.mkSimpleCall("+", [pxt.blocks.H.mkStringLiteral(""), pxt.blocks.H.mkParenthesizedExpression(compileExpression(e, target, comments))]);
         }
 

diff --git a/tests/blocklycompiler-test/fieldUserEnum.spec.ts b/tests/blocklycompiler-test/fieldUserEnum.spec.ts
@@ -1,5 +1,6 @@
 /// <reference path="..\..\built\pxtlib.d.ts" />
-/// <reference path="..\..\built\pxtblocks.d.ts" />
+
+import * as pxtblockly from "../../newblocks";
 
 describe("field user enum (when picking new enum values)", () => {
     it("should start at 0 if no flag is set", () => {

diff --git a/tests/blocklycompiler-test/test.spec.ts b/tests/blocklycompiler-test/test.spec.ts
@@ -5,6 +5,9 @@ import * as Blockly from "blockly";
 import * as pxtblockly from "../../newblocks";
 import { DuplicateOnDragConnectionChecker } from "../../newblocks/plugins/duplicateOnDrag";
 
+import "./commentparsing.spec";
+import "./fieldUserEnum.spec";
+
 const WEB_PREFIX = "http://localhost:9876";
 
 // Blockly crashes if this isn't defined