expanded tests for turtleactions

Author: blenbot

.gitignore

@@ -1,2 +1,3 @@
 node_modules/
 *~
+coverage/

jest.config.js

@@ -1,6 +1,15 @@
 module.exports = {
-    testMatch: ["**/__tests__/**/*.test.js", "**/?(*.)+(spec|test).[jt]s?(x)"],
-    clearMocks: true,
-    moduleFileExtensions: ["js", "json", "node"],
-    testEnvironment: "jsdom",
+  testMatch: ["**/__tests__/**/*.test.js", "**/?(*.)+(spec|test).[jt]s?(x)"],
+  clearMocks: true,
+  moduleFileExtensions: ["js", "json", "node"],
+  testEnvironment: "jsdom",
+  collectCoverage: true,
+  coverageReporters: ["json", "lcov", "text", "clover"],
+  coverageDirectory: "coverage",
+  collectCoverageFrom: [
+    "js/**/*.js",
+    "!js/lib/**",
+    "!js/external/**",
+    "!**/node_modules/**"
+  ]
 };

js/turtleactions/DictActions.js

@@ -174,9 +174,11 @@ function setupDictActions(activity) {
             this_dict["y"] = activity.turtles.screenY2turtleY(targetTur.container.y);
             this_dict["x"] = activity.turtles.screenX2turtleX(targetTur.container.x);
 
-            if (target in activity.logo.turtleDicts[turtle]) {
-                for (const key in activity.logo.turtleDicts[turtle][target]) {
-                    this_dict[key] = activity.logo.turtleDicts[turtle][target][key];
+            // Safely handle when no custom dicts have been set for this turtle
+            const tdicts = activity.logo.turtleDicts[turtle] || {};
+            if (target in tdicts) {
+                for (const key in tdicts[target]) {
+                    this_dict[key] = tdicts[target][key];
                 }
             }
             return JSON.stringify(this_dict);

js/turtleactions/IntervalsActions.js

@@ -192,7 +192,13 @@ function setupIntervalsActions(activity) {
          * @returns {String}
          */
         static getCurrentMode(turtle) {
-            return activity.turtles.ithTurtle(turtle).singer.keySignature.split(" ")[1];
+            const keySignature = activity.turtles.ithTurtle(turtle).singer.keySignature;
+            // guard against null/undefined/non‐string
+            if (!keySignature || typeof keySignature !== "string") {
+                return "";
+            }
+            const parts = keySignature.split(" ");
+            return parts.slice(1).join(" ") || "";
         }
 
         /**
@@ -457,3 +463,5 @@ function setupIntervalsActions(activity) {
         }
     };
 }
+
+module.exports = setupIntervalsActions;

js/turtleactions/PitchActions.js

@@ -322,13 +322,13 @@ function setupPitchActions(activity) {
                 switch (accidental) {
                     case _("sharp"):
                         value = 1;
-                        return;
+                        break;
                     case _("flat"):
                         value = -1;
-                        return;
+                        break;
                     default:
                         value = 0;
-                        return;
+                        break;
                 }
             } else {
                 value = ACCIDENTALVALUES[i];

js/turtleactions/RhythmActions.js

@@ -457,3 +457,5 @@ function setupRhythmActions(activity) {
         }
     };
 }
+
+module.exports = { setupRhythmActions };