diff --git a/cypress/e2e/AssignedActivity/singlepageActivities.cy.js b/cypress/e2e/AssignedActivity/singlepageActivities.cy.js
index efd9446aa5..12fdbb3687 100644
--- a/cypress/e2e/AssignedActivity/singlepageActivities.cy.js
+++ b/cypress/e2e/AssignedActivity/singlepageActivities.cy.js
@@ -1630,9 +1630,9 @@ describe("Single page activity tests", function () {
const doenetML = `
A video
State:
-Time:
-Duration:
+State: $v.state{assignNames="state"}
+Time: $v.time{assignNames="time"}
+Duration: $v.duration{assignNames="duration"}
Play action Pause action
log(32x+c)
-
-
-
@@ -179,13 +179,13 @@ describe("Allow error in numbers validation tests", function () {
log(32x+c)
-
-
-
@@ -336,10 +336,10 @@ describe("Allow error in numbers validation tests", function () {
10 exp(7x^2/(3-sqrt(y)))
-
-
@@ -416,7 +416,7 @@ describe("Allow error in numbers validation tests", function () {
10x^2-4
-
@@ -424,7 +424,7 @@ describe("Allow error in numbers validation tests", function () {
Allow for error in exponents
-
@@ -547,13 +547,13 @@ describe("Allow error in numbers validation tests", function () {
log(32x+c)
-
-
-
@@ -853,13 +853,13 @@ describe("Allow error in numbers validation tests", function () {
10000 exp(7x^2/(0.00003-sqrt(y)))
-
-
-
@@ -990,13 +990,13 @@ describe("Allow error in numbers validation tests", function () {
10000 exp(7x^2/(0.00003-sqrt(y)))
-
-
-
@@ -1137,7 +1137,7 @@ describe("Allow error in numbers validation tests", function () {
10x^2-4
-
@@ -1145,7 +1145,7 @@ describe("Allow error in numbers validation tests", function () {
Allow for error in exponents
-
@@ -1268,7 +1268,7 @@ describe("Allow error in numbers validation tests", function () {
2.15234262pi+e*25.602348230
-
@@ -1390,7 +1390,7 @@ describe("Allow error in numbers validation tests", function () {
sin(2pi+1x+4x+pi+6)
-
@@ -1500,7 +1500,7 @@ describe("Allow error in numbers validation tests", function () {
sin(2pi+1x+4x+pi+6)
-
@@ -1611,7 +1611,7 @@ describe("Allow error in numbers validation tests", function () {
sin(2pi+1x+4x+pi+6)
-
@@ -1722,7 +1722,7 @@ describe("Allow error in numbers validation tests", function () {
(log(32x+c), 42)
-
@@ -1824,7 +1824,7 @@ describe("Allow error in numbers validation tests", function () {
(42, log(32x+c))
-
diff --git a/cypress/e2e/DoenetML/answerValidation/pointlocation.cy.js b/cypress/e2e/DoenetML/answerValidation/pointlocation.cy.js
index c9ac77f3ae..a7a279f020 100644
--- a/cypress/e2e/DoenetML/answerValidation/pointlocation.cy.js
+++ b/cypress/e2e/DoenetML/answerValidation/pointlocation.cy.js
@@ -16,12 +16,12 @@ describe("Point location validation tests", function () {
(-3.9,4.5)
- $_point1
- Credit for answer:
+ Credit for answer: $_answer1.creditAchieved
`,
},
"*",
@@ -238,12 +238,12 @@ describe("Point location validation tests", function () {
(-3.9,4.5)
- $_point1
- Credit for answer:
+ Credit for answer: $_answer1.creditAchieved
`;
cy.get("#testRunner_toggleControls").click();
@@ -507,19 +507,19 @@ describe("Point location validation tests", function () {
doenetML: `
a
(-4.1, 7.4)
- Move point to
+ Move point to $goal.coords
- $goal
-
- Credit for answer:
+ Credit for answer: $_answer1.creditAchieved
`,
},
"*",
@@ -672,25 +672,25 @@ describe("Point location validation tests", function () {
Criterion distance:
Partial credit distance:
- (
+ $criterion.value^2
+ $partialcriterion.value^2
+ ($A.x - $goal.x)^2 +
+ ($A.y - $goal.y)^2
- Move point to within distance of
+ Move point to within distance of $criterion.value to $goal.coords
(4.9, -1.1)
-
- $A
- Credit for answer:
+ Credit for answer: $_answer1.creditAchieved
`,
},
"*",
@@ -939,18 +939,18 @@ describe("Point location validation tests", function () {
a
(-4.1, 7.4)
(6.8, 9.1)
- Move points to
+ Move points to $goal1.coords $goal2.coords
- $goal1
+ $goal2
- $goal1
+ $goal2
@@ -961,8 +961,8 @@ describe("Point location validation tests", function () {
- Credit for answer:
- Submitted responses:
+ Credit for answer: $_answer1.creditAchieved{assignNames="ca"}
+ Submitted responses: $_answer1.submittedResponses
`,
},
"*",
@@ -989,7 +989,7 @@ describe("Point location validation tests", function () {
cy.get(cesc("#\\/_answer1_submit")).click();
cy.get(cesc(`#\\/srs`) + ` .mjx-mrow`).should(
"contain.text",
- "((4.9,−1.1),(−2.3,−3.4))",
+ "(4.9,−1.1),(−2.3,−3.4)",
);
cy.get(cesc("#\\/_answer1_submit")).should("not.exist");
cy.get(cesc("#\\/_answer1_correct")).should("not.exist");
@@ -1005,9 +1005,7 @@ describe("Point location validation tests", function () {
.eq(0)
.invoke("text")
.then((text) => {
- expect(text.trim().replace(/−/g, "-")).equal(
- "((4.9,-1.1),(-2.3,-3.4))",
- );
+ expect(text.trim().replace(/−/g, "-")).equal("(4.9,-1.1),(-2.3,-3.4)");
});
cy.window().then(async (win) => {
@@ -1051,9 +1049,7 @@ describe("Point location validation tests", function () {
.eq(0)
.invoke("text")
.then((text) => {
- expect(text.trim().replace(/−/g, "-")).equal(
- "((-4.1,7.4),(-2.3,-3.4))",
- );
+ expect(text.trim().replace(/−/g, "-")).equal("(-4.1,7.4),(-2.3,-3.4)");
});
cy.window().then(async (win) => {
@@ -1096,7 +1092,7 @@ describe("Point location validation tests", function () {
.eq(0)
.invoke("text")
.then((text) => {
- expect(text.trim().replace(/−/g, "-")).equal("((-3.7,7),(-2.3,-3.4))");
+ expect(text.trim().replace(/−/g, "-")).equal("(-3.7,7),(-2.3,-3.4)");
});
cy.window().then(async (win) => {
let stateVariables = await win.returnAllStateVariables1();
@@ -1139,7 +1135,7 @@ describe("Point location validation tests", function () {
.eq(0)
.invoke("text")
.then((text) => {
- expect(text.trim().replace(/−/g, "-")).equal("((-3.7,7),(-4.1,7.4))");
+ expect(text.trim().replace(/−/g, "-")).equal("(-3.7,7),(-4.1,7.4)");
});
cy.window().then(async (win) => {
@@ -1184,7 +1180,7 @@ describe("Point location validation tests", function () {
.eq(0)
.invoke("text")
.then((text) => {
- expect(text.trim().replace(/−/g, "-")).equal("((6.8,9.1),(-4.1,7.4))");
+ expect(text.trim().replace(/−/g, "-")).equal("(6.8,9.1),(-4.1,7.4)");
});
cy.window().then(async (win) => {
@@ -1228,7 +1224,7 @@ describe("Point location validation tests", function () {
.eq(0)
.invoke("text")
.then((text) => {
- expect(text.trim().replace(/−/g, "-")).equal("((6.8,9.1),(-9.9,-8.8))");
+ expect(text.trim().replace(/−/g, "-")).equal("(6.8,9.1),(-9.9,-8.8)");
});
cy.window().then(async (win) => {
@@ -1272,7 +1268,7 @@ describe("Point location validation tests", function () {
.eq(0)
.invoke("text")
.then((text) => {
- expect(text.trim().replace(/−/g, "-")).equal("((6.8,9.1),(6.8,9.1))");
+ expect(text.trim().replace(/−/g, "-")).equal("(6.8,9.1),(6.8,9.1)");
});
cy.window().then(async (win) => {
@@ -1316,7 +1312,7 @@ describe("Point location validation tests", function () {
.eq(0)
.invoke("text")
.then((text) => {
- expect(text.trim().replace(/−/g, "-")).equal("((0.1,-1.1),(6.8,9.1))");
+ expect(text.trim().replace(/−/g, "-")).equal("(0.1,-1.1),(6.8,9.1)");
});
cy.window().then(async (win) => {
@@ -1360,7 +1356,7 @@ describe("Point location validation tests", function () {
.eq(0)
.invoke("text")
.then((text) => {
- expect(text.trim().replace(/−/g, "-")).equal("((-4.1,7.4),(6.8,9.1))");
+ expect(text.trim().replace(/−/g, "-")).equal("(-4.1,7.4),(6.8,9.1)");
});
cy.window().then(async (win) => {
@@ -1377,18 +1373,18 @@ describe("Point location validation tests", function () {
a
(-4.1, 7.4)
(6.8, 9.1)
- Move points to
+ Move points to $goal1.coords $goal2.coords
- $goal1
+ $goal2
- $goal1
+ $goal2
@@ -1399,8 +1395,8 @@ describe("Point location validation tests", function () {
- Credit for answer:
- Submitted responses:
+ Credit for answer: $_answer1.creditAchieved{assignNames="ca"}
+ Submitted responses: $_answer1.submittedResponses
`,
},
"*",
@@ -1449,9 +1445,7 @@ describe("Point location validation tests", function () {
.eq(0)
.invoke("text")
.then((text) => {
- expect(text.trim().replace(/−/g, "-")).equal(
- "((4.9,-1.1),(-2.3,-3.4))",
- );
+ expect(text.trim().replace(/−/g, "-")).equal("(4.9,-1.1),(-2.3,-3.4)");
});
cy.window().then(async (win) => {
@@ -1495,9 +1489,7 @@ describe("Point location validation tests", function () {
.eq(0)
.invoke("text")
.then((text) => {
- expect(text.trim().replace(/−/g, "-")).equal(
- "((-4.1,7.4),(-2.3,-3.4))",
- );
+ expect(text.trim().replace(/−/g, "-")).equal("(-4.1,7.4),(-2.3,-3.4)");
});
cy.window().then(async (win) => {
@@ -1540,7 +1532,7 @@ describe("Point location validation tests", function () {
.eq(0)
.invoke("text")
.then((text) => {
- expect(text.trim().replace(/−/g, "-")).equal("((-3.7,7),(-2.3,-3.4))");
+ expect(text.trim().replace(/−/g, "-")).equal("(-3.7,7),(-2.3,-3.4)");
});
cy.window().then(async (win) => {
let stateVariables = await win.returnAllStateVariables1();
@@ -1583,7 +1575,7 @@ describe("Point location validation tests", function () {
.eq(0)
.invoke("text")
.then((text) => {
- expect(text.trim().replace(/−/g, "-")).equal("((-3.7,7),(-4.1,7.4))");
+ expect(text.trim().replace(/−/g, "-")).equal("(-3.7,7),(-4.1,7.4)");
});
cy.window().then(async (win) => {
@@ -1628,7 +1620,7 @@ describe("Point location validation tests", function () {
.eq(0)
.invoke("text")
.then((text) => {
- expect(text.trim().replace(/−/g, "-")).equal("((6.8,9.1),(-4.1,7.4))");
+ expect(text.trim().replace(/−/g, "-")).equal("(6.8,9.1),(-4.1,7.4)");
});
cy.window().then(async (win) => {
@@ -1672,7 +1664,7 @@ describe("Point location validation tests", function () {
.eq(0)
.invoke("text")
.then((text) => {
- expect(text.trim().replace(/−/g, "-")).equal("((6.8,9.1),(-9.9,-8.8))");
+ expect(text.trim().replace(/−/g, "-")).equal("(6.8,9.1),(-9.9,-8.8)");
});
cy.window().then(async (win) => {
@@ -1716,7 +1708,7 @@ describe("Point location validation tests", function () {
.eq(0)
.invoke("text")
.then((text) => {
- expect(text.trim().replace(/−/g, "-")).equal("((6.8,9.1),(6.8,9.1))");
+ expect(text.trim().replace(/−/g, "-")).equal("(6.8,9.1),(6.8,9.1)");
});
cy.window().then(async (win) => {
@@ -1760,7 +1752,7 @@ describe("Point location validation tests", function () {
.eq(0)
.invoke("text")
.then((text) => {
- expect(text.trim().replace(/−/g, "-")).equal("((0.1,-1.1),(6.8,9.1))");
+ expect(text.trim().replace(/−/g, "-")).equal("(0.1,-1.1),(6.8,9.1)");
});
cy.window().then(async (win) => {
@@ -1804,7 +1796,7 @@ describe("Point location validation tests", function () {
.eq(0)
.invoke("text")
.then((text) => {
- expect(text.trim().replace(/−/g, "-")).equal("((-4.1,7.4),(6.8,9.1))");
+ expect(text.trim().replace(/−/g, "-")).equal("(-4.1,7.4),(6.8,9.1)");
});
cy.window().then(async (win) => {
@@ -1821,18 +1813,18 @@ describe("Point location validation tests", function () {
a
(-4.1, 7.4)
(6.8, 9.1)
- Move points to
+ Move points to $goal1.coords $goal2.coords
- $goal1
+ $goal2
- $goal1
+ $goal2
@@ -1843,8 +1835,8 @@ describe("Point location validation tests", function () {
- Credit for answer:
- Submitted responses:
+ Credit for answer: $_answer1.creditAchieved{assignNames="ca"}
+ Submitted responses: $_answer1.submittedResponses
`,
},
"*",
@@ -1883,9 +1875,7 @@ describe("Point location validation tests", function () {
.eq(0)
.invoke("text")
.then((text) => {
- expect(text.trim().replace(/−/g, "-")).equal(
- "((4.9,-1.1),(-2.3,-3.4))",
- );
+ expect(text.trim().replace(/−/g, "-")).equal("(4.9,-1.1),(-2.3,-3.4)");
});
cy.window().then(async (win) => {
@@ -1929,9 +1919,7 @@ describe("Point location validation tests", function () {
.eq(0)
.invoke("text")
.then((text) => {
- expect(text.trim().replace(/−/g, "-")).equal(
- "((-4.1,7.4),(-2.3,-3.4))",
- );
+ expect(text.trim().replace(/−/g, "-")).equal("(-4.1,7.4),(-2.3,-3.4)");
});
cy.window().then(async (win) => {
@@ -1974,7 +1962,7 @@ describe("Point location validation tests", function () {
.eq(0)
.invoke("text")
.then((text) => {
- expect(text.trim().replace(/−/g, "-")).equal("((-3.7,7),(-2.3,-3.4))");
+ expect(text.trim().replace(/−/g, "-")).equal("(-3.7,7),(-2.3,-3.4)");
});
cy.window().then(async (win) => {
let stateVariables = await win.returnAllStateVariables1();
@@ -2017,7 +2005,7 @@ describe("Point location validation tests", function () {
.eq(0)
.invoke("text")
.then((text) => {
- expect(text.trim().replace(/−/g, "-")).equal("((-3.7,7),(-4.1,7.4))");
+ expect(text.trim().replace(/−/g, "-")).equal("(-3.7,7),(-4.1,7.4)");
});
cy.window().then(async (win) => {
@@ -2062,7 +2050,7 @@ describe("Point location validation tests", function () {
.eq(0)
.invoke("text")
.then((text) => {
- expect(text.trim().replace(/−/g, "-")).equal("((6.8,9.1),(-4.1,7.4))");
+ expect(text.trim().replace(/−/g, "-")).equal("(6.8,9.1),(-4.1,7.4)");
});
cy.window().then(async (win) => {
@@ -2106,7 +2094,7 @@ describe("Point location validation tests", function () {
.eq(0)
.invoke("text")
.then((text) => {
- expect(text.trim().replace(/−/g, "-")).equal("((6.8,9.1),(-9.9,-8.8))");
+ expect(text.trim().replace(/−/g, "-")).equal("(6.8,9.1),(-9.9,-8.8)");
});
cy.window().then(async (win) => {
@@ -2150,7 +2138,7 @@ describe("Point location validation tests", function () {
.eq(0)
.invoke("text")
.then((text) => {
- expect(text.trim().replace(/−/g, "-")).equal("((6.8,9.1),(6.8,9.1))");
+ expect(text.trim().replace(/−/g, "-")).equal("(6.8,9.1),(6.8,9.1)");
});
cy.window().then(async (win) => {
@@ -2194,7 +2182,7 @@ describe("Point location validation tests", function () {
.eq(0)
.invoke("text")
.then((text) => {
- expect(text.trim().replace(/−/g, "-")).equal("((0.1,-1.1),(6.8,9.1))");
+ expect(text.trim().replace(/−/g, "-")).equal("(0.1,-1.1),(6.8,9.1)");
});
cy.window().then(async (win) => {
@@ -2238,7 +2226,7 @@ describe("Point location validation tests", function () {
.eq(0)
.invoke("text")
.then((text) => {
- expect(text.trim().replace(/−/g, "-")).equal("((-4.1,7.4),(6.8,9.1))");
+ expect(text.trim().replace(/−/g, "-")).equal("(-4.1,7.4),(6.8,9.1)");
});
cy.window().then(async (win) => {
@@ -2255,18 +2243,18 @@ describe("Point location validation tests", function () {
a
(-4.1, 7.4)
(6.8, 9.1)
- Move points to
+ Move points to $goal1.coords $goal2.coords
- $goal1
+ $goal2
- $goal1
+ $goal2
@@ -2277,8 +2265,8 @@ describe("Point location validation tests", function () {
- Credit for answer:
- Submitted responses:
+ Credit for answer: $_answer1.creditAchieved{assignNames="ca"}
+ Submitted responses: $_answer1.submittedResponses
`,
},
"*",
@@ -2317,9 +2305,7 @@ describe("Point location validation tests", function () {
.eq(0)
.invoke("text")
.then((text) => {
- expect(text.trim().replace(/−/g, "-")).equal(
- "((4.9,-1.1),(-2.3,-3.4))",
- );
+ expect(text.trim().replace(/−/g, "-")).equal("(4.9,-1.1),(-2.3,-3.4)");
});
cy.window().then(async (win) => {
@@ -2363,9 +2349,7 @@ describe("Point location validation tests", function () {
.eq(0)
.invoke("text")
.then((text) => {
- expect(text.trim().replace(/−/g, "-")).equal(
- "((-4.1,7.4),(-2.3,-3.4))",
- );
+ expect(text.trim().replace(/−/g, "-")).equal("(-4.1,7.4),(-2.3,-3.4)");
});
cy.window().then(async (win) => {
@@ -2408,7 +2392,7 @@ describe("Point location validation tests", function () {
.eq(0)
.invoke("text")
.then((text) => {
- expect(text.trim().replace(/−/g, "-")).equal("((-3.7,7),(-2.3,-3.4))");
+ expect(text.trim().replace(/−/g, "-")).equal("(-3.7,7),(-2.3,-3.4)");
});
cy.window().then(async (win) => {
let stateVariables = await win.returnAllStateVariables1();
@@ -2451,7 +2435,7 @@ describe("Point location validation tests", function () {
.eq(0)
.invoke("text")
.then((text) => {
- expect(text.trim().replace(/−/g, "-")).equal("((-3.7,7),(-4.1,7.4))");
+ expect(text.trim().replace(/−/g, "-")).equal("(-3.7,7),(-4.1,7.4)");
});
cy.window().then(async (win) => {
@@ -2496,7 +2480,7 @@ describe("Point location validation tests", function () {
.eq(0)
.invoke("text")
.then((text) => {
- expect(text.trim().replace(/−/g, "-")).equal("((6.8,9.1),(-4.1,7.4))");
+ expect(text.trim().replace(/−/g, "-")).equal("(6.8,9.1),(-4.1,7.4)");
});
cy.window().then(async (win) => {
@@ -2540,7 +2524,7 @@ describe("Point location validation tests", function () {
.eq(0)
.invoke("text")
.then((text) => {
- expect(text.trim().replace(/−/g, "-")).equal("((6.8,9.1),(-9.9,-8.8))");
+ expect(text.trim().replace(/−/g, "-")).equal("(6.8,9.1),(-9.9,-8.8)");
});
cy.window().then(async (win) => {
@@ -2584,7 +2568,7 @@ describe("Point location validation tests", function () {
.eq(0)
.invoke("text")
.then((text) => {
- expect(text.trim().replace(/−/g, "-")).equal("((6.8,9.1),(6.8,9.1))");
+ expect(text.trim().replace(/−/g, "-")).equal("(6.8,9.1),(6.8,9.1)");
});
cy.window().then(async (win) => {
@@ -2628,7 +2612,7 @@ describe("Point location validation tests", function () {
.eq(0)
.invoke("text")
.then((text) => {
- expect(text.trim().replace(/−/g, "-")).equal("((0.1,-1.1),(6.8,9.1))");
+ expect(text.trim().replace(/−/g, "-")).equal("(0.1,-1.1),(6.8,9.1)");
});
cy.window().then(async (win) => {
@@ -2672,7 +2656,7 @@ describe("Point location validation tests", function () {
.eq(0)
.invoke("text")
.then((text) => {
- expect(text.trim().replace(/−/g, "-")).equal("((-4.1,7.4),(6.8,9.1))");
+ expect(text.trim().replace(/−/g, "-")).equal("(-4.1,7.4),(6.8,9.1)");
});
cy.window().then(async (win) => {
@@ -2689,18 +2673,18 @@ describe("Point location validation tests", function () {
a
(-4.1, 7.4)
(6.8, 9.1)
- Move points to
+ Move points to $goal1.coords $goal2.coords
- $goal1
+ $goal2
- $goal1
+ $goal2
@@ -2711,8 +2695,8 @@ describe("Point location validation tests", function () {
- Credit for answer:
- Submitted responses:
+ Credit for answer: $_answer1.creditAchieved{assignNames="ca"}
+ Submitted responses: $_answer1.submittedResponses
`,
},
"*",
@@ -2751,9 +2735,7 @@ describe("Point location validation tests", function () {
.eq(0)
.invoke("text")
.then((text) => {
- expect(text.trim().replace(/−/g, "-")).equal(
- "((4.9,-1.1),(-2.3,-3.4))",
- );
+ expect(text.trim().replace(/−/g, "-")).equal("(4.9,-1.1),(-2.3,-3.4)");
});
cy.window().then(async (win) => {
@@ -2797,9 +2779,7 @@ describe("Point location validation tests", function () {
.eq(0)
.invoke("text")
.then((text) => {
- expect(text.trim().replace(/−/g, "-")).equal(
- "((-4.1,7.4),(-2.3,-3.4))",
- );
+ expect(text.trim().replace(/−/g, "-")).equal("(-4.1,7.4),(-2.3,-3.4)");
});
cy.window().then(async (win) => {
@@ -2842,7 +2822,7 @@ describe("Point location validation tests", function () {
.eq(0)
.invoke("text")
.then((text) => {
- expect(text.trim().replace(/−/g, "-")).equal("((-3.7,7),(-2.3,-3.4))");
+ expect(text.trim().replace(/−/g, "-")).equal("(-3.7,7),(-2.3,-3.4)");
});
cy.window().then(async (win) => {
let stateVariables = await win.returnAllStateVariables1();
@@ -2885,7 +2865,7 @@ describe("Point location validation tests", function () {
.eq(0)
.invoke("text")
.then((text) => {
- expect(text.trim().replace(/−/g, "-")).equal("((-3.7,7),(-4.1,7.4))");
+ expect(text.trim().replace(/−/g, "-")).equal("(-3.7,7),(-4.1,7.4)");
});
cy.window().then(async (win) => {
@@ -2930,7 +2910,7 @@ describe("Point location validation tests", function () {
.eq(0)
.invoke("text")
.then((text) => {
- expect(text.trim().replace(/−/g, "-")).equal("((6.8,9.1),(-4.1,7.4))");
+ expect(text.trim().replace(/−/g, "-")).equal("(6.8,9.1),(-4.1,7.4)");
});
cy.window().then(async (win) => {
@@ -2974,7 +2954,7 @@ describe("Point location validation tests", function () {
.eq(0)
.invoke("text")
.then((text) => {
- expect(text.trim().replace(/−/g, "-")).equal("((6.8,9.1),(-9.9,-8.8))");
+ expect(text.trim().replace(/−/g, "-")).equal("(6.8,9.1),(-9.9,-8.8)");
});
cy.window().then(async (win) => {
@@ -3018,7 +2998,7 @@ describe("Point location validation tests", function () {
.eq(0)
.invoke("text")
.then((text) => {
- expect(text.trim().replace(/−/g, "-")).equal("((6.8,9.1),(6.8,9.1))");
+ expect(text.trim().replace(/−/g, "-")).equal("(6.8,9.1),(6.8,9.1)");
});
cy.window().then(async (win) => {
@@ -3062,7 +3042,7 @@ describe("Point location validation tests", function () {
.eq(0)
.invoke("text")
.then((text) => {
- expect(text.trim().replace(/−/g, "-")).equal("((0.1,-1.1),(6.8,9.1))");
+ expect(text.trim().replace(/−/g, "-")).equal("(0.1,-1.1),(6.8,9.1)");
});
cy.window().then(async (win) => {
@@ -3106,7 +3086,7 @@ describe("Point location validation tests", function () {
.eq(0)
.invoke("text")
.then((text) => {
- expect(text.trim().replace(/−/g, "-")).equal("((-4.1,7.4),(6.8,9.1))");
+ expect(text.trim().replace(/−/g, "-")).equal("(-4.1,7.4),(6.8,9.1)");
});
cy.window().then(async (win) => {
@@ -3123,15 +3103,15 @@ describe("Point location validation tests", function () {
a
(-4.1, 7.4)
(6.8, 9.1)
- Move points to
+ Move points to $goal1.coords $goal2.coords
Number of points:
- $goal1
+ $goal2
@@ -3145,8 +3125,8 @@ describe("Point location validation tests", function () {
- Credit for answer:
- Submitted responses:
+ Credit for answer: $_answer1.creditAchieved{assignNames="ca"}
+ Submitted responses: $_answer1.submittedResponses
`,
},
"*",
@@ -3300,7 +3280,7 @@ describe("Point location validation tests", function () {
.eq(0)
.invoke("text")
.then((text) => {
- expect(text.trim().replace(/−/g, "-")).equal("((-3.7,7),(2,1))");
+ expect(text.trim().replace(/−/g, "-")).equal("(-3.7,7),(2,1)");
});
cy.log("Move point B close and submit");
@@ -3327,7 +3307,7 @@ describe("Point location validation tests", function () {
.eq(0)
.invoke("text")
.then((text) => {
- expect(text.trim().replace(/−/g, "-")).equal("((-3.7,7),(-4.1,7.4))");
+ expect(text.trim().replace(/−/g, "-")).equal("(-3.7,7),(-4.1,7.4)");
});
cy.log("Move point A close to other goal and submit");
@@ -3356,7 +3336,7 @@ describe("Point location validation tests", function () {
.eq(0)
.invoke("text")
.then((text) => {
- expect(text.trim().replace(/−/g, "-")).equal("((6.8,9.1),(-4.1,7.4))");
+ expect(text.trim().replace(/−/g, "-")).equal("(6.8,9.1),(-4.1,7.4)");
});
cy.log("Move point B away and submit");
@@ -3383,7 +3363,7 @@ describe("Point location validation tests", function () {
.eq(0)
.invoke("text")
.then((text) => {
- expect(text.trim().replace(/−/g, "-")).equal("((6.8,9.1),(-9.9,-8.8))");
+ expect(text.trim().replace(/−/g, "-")).equal("(6.8,9.1),(-9.9,-8.8)");
});
cy.log("Move point B close to second goal and submit");
@@ -3411,7 +3391,7 @@ describe("Point location validation tests", function () {
.eq(0)
.invoke("text")
.then((text) => {
- expect(text.trim().replace(/−/g, "-")).equal("((6.8,9.1),(6.8,9.1))");
+ expect(text.trim().replace(/−/g, "-")).equal("(6.8,9.1),(6.8,9.1)");
});
cy.log("Move point A away and submit");
@@ -3439,7 +3419,7 @@ describe("Point location validation tests", function () {
.eq(0)
.invoke("text")
.then((text) => {
- expect(text.trim().replace(/−/g, "-")).equal("((0.1,-1.1),(6.8,9.1))");
+ expect(text.trim().replace(/−/g, "-")).equal("(0.1,-1.1),(6.8,9.1)");
});
cy.log("Move point A near first goal and submit");
@@ -3466,7 +3446,7 @@ describe("Point location validation tests", function () {
.eq(0)
.invoke("text")
.then((text) => {
- expect(text.trim().replace(/−/g, "-")).equal("((-4.1,7.4),(6.8,9.1))");
+ expect(text.trim().replace(/−/g, "-")).equal("(-4.1,7.4),(6.8,9.1)");
});
cy.log("create point C and submit");
@@ -3489,7 +3469,7 @@ describe("Point location validation tests", function () {
.invoke("text")
.then((text) => {
expect(text.trim().replace(/−/g, "-")).equal(
- "((-4.1,7.4),(6.8,9.1),(3,1))",
+ "(-4.1,7.4),(6.8,9.1),(3,1)",
);
});
@@ -3518,7 +3498,7 @@ describe("Point location validation tests", function () {
.invoke("text")
.then((text) => {
expect(text.trim().replace(/−/g, "-")).equal(
- "((-4.1,7.4),(6.8,9.1),(-4.1,7.4))",
+ "(-4.1,7.4),(6.8,9.1),(-4.1,7.4)",
);
});
@@ -3541,7 +3521,7 @@ describe("Point location validation tests", function () {
.eq(0)
.invoke("text")
.then((text) => {
- expect(text.trim().replace(/−/g, "-")).equal("((-4.1,7.4),(6.8,9.1))");
+ expect(text.trim().replace(/−/g, "-")).equal("(-4.1,7.4),(6.8,9.1)");
});
});
@@ -3553,7 +3533,7 @@ describe("Point location validation tests", function () {
a
(-4.1, 7.4)
(6.8, 9.1)
- Move points to
+ Move points to $goal1.coords $goal2.coords
Number of points:
Number of points 2:
@@ -3561,16 +3541,16 @@ describe("Point location validation tests", function () {
- $goal1
+ $goal2
- $goal1
+ $goal2
@@ -3587,8 +3567,8 @@ describe("Point location validation tests", function () {
- Credit for answer:
- Submitted responses:
+ Credit for answer: $_answer1.creditAchieved{assignNames="ca"}
+ Submitted responses: $_answer1.submittedResponses
`,
},
"*",
@@ -3742,7 +3722,7 @@ describe("Point location validation tests", function () {
.eq(0)
.invoke("text")
.then((text) => {
- expect(text.trim().replace(/−/g, "-")).equal("((-3.7,7),(1,2))");
+ expect(text.trim().replace(/−/g, "-")).equal("(-3.7,7),(1,2)");
});
cy.log("Move point A2 close and submit");
@@ -3769,7 +3749,7 @@ describe("Point location validation tests", function () {
.eq(0)
.invoke("text")
.then((text) => {
- expect(text.trim().replace(/−/g, "-")).equal("((-3.7,7),(-4.1,7.4))");
+ expect(text.trim().replace(/−/g, "-")).equal("(-3.7,7),(-4.1,7.4)");
});
cy.log("Move point A1 close to other goal and submit");
@@ -3798,7 +3778,7 @@ describe("Point location validation tests", function () {
.eq(0)
.invoke("text")
.then((text) => {
- expect(text.trim().replace(/−/g, "-")).equal("((6.8,9.1),(-4.1,7.4))");
+ expect(text.trim().replace(/−/g, "-")).equal("(6.8,9.1),(-4.1,7.4)");
});
cy.log("Move point A2 away and submit");
@@ -3825,7 +3805,7 @@ describe("Point location validation tests", function () {
.eq(0)
.invoke("text")
.then((text) => {
- expect(text.trim().replace(/−/g, "-")).equal("((6.8,9.1),(-9.9,-8.8))");
+ expect(text.trim().replace(/−/g, "-")).equal("(6.8,9.1),(-9.9,-8.8)");
});
cy.log("Move point A2 close to second goal and submit");
@@ -3853,7 +3833,7 @@ describe("Point location validation tests", function () {
.eq(0)
.invoke("text")
.then((text) => {
- expect(text.trim().replace(/−/g, "-")).equal("((6.8,9.1),(6.8,9.1))");
+ expect(text.trim().replace(/−/g, "-")).equal("(6.8,9.1),(6.8,9.1)");
});
cy.log("Move point A1 away and submit");
@@ -3881,7 +3861,7 @@ describe("Point location validation tests", function () {
.eq(0)
.invoke("text")
.then((text) => {
- expect(text.trim().replace(/−/g, "-")).equal("((0.1,-1.1),(6.8,9.1))");
+ expect(text.trim().replace(/−/g, "-")).equal("(0.1,-1.1),(6.8,9.1)");
});
cy.log("Move point A1 near first goal and submit");
@@ -3908,7 +3888,7 @@ describe("Point location validation tests", function () {
.eq(0)
.invoke("text")
.then((text) => {
- expect(text.trim().replace(/−/g, "-")).equal("((-4.1,7.4),(6.8,9.1))");
+ expect(text.trim().replace(/−/g, "-")).equal("(-4.1,7.4),(6.8,9.1)");
});
cy.log("create point B1 and B2 and submit");
@@ -3931,7 +3911,7 @@ describe("Point location validation tests", function () {
.invoke("text")
.then((text) => {
expect(text.trim().replace(/−/g, "-")).equal(
- "((-4.1,7.4),(6.8,9.1),(2,1),(1,2))",
+ "(-4.1,7.4),(6.8,9.1),(2,1),(1,2)",
);
});
@@ -3960,7 +3940,7 @@ describe("Point location validation tests", function () {
.invoke("text")
.then((text) => {
expect(text.trim().replace(/−/g, "-")).equal(
- "((-4.1,7.4),(6.8,9.1),(6.8,9.1),(1,2))",
+ "(-4.1,7.4),(6.8,9.1),(6.8,9.1),(1,2)",
);
});
@@ -3983,7 +3963,7 @@ describe("Point location validation tests", function () {
.eq(0)
.invoke("text")
.then((text) => {
- expect(text.trim().replace(/−/g, "-")).equal("((-4.1,7.4),(6.8,9.1))");
+ expect(text.trim().replace(/−/g, "-")).equal("(-4.1,7.4),(6.8,9.1)");
});
});
});
diff --git a/cypress/e2e/DoenetML/answerValidation/symbolicequality.cy.js b/cypress/e2e/DoenetML/answerValidation/symbolicequality.cy.js
index ebefc1ced8..ae8b31da62 100644
--- a/cypress/e2e/DoenetML/answerValidation/symbolicequality.cy.js
+++ b/cypress/e2e/DoenetML/answerValidation/symbolicequality.cy.js
@@ -15,23 +15,23 @@ describe("Symbolic equality tests", function () {
1+3 :
- $_math1
3+1 :
- $_math2
Numeric versions
- $_math1
- $_math2
`,
},
@@ -223,13 +223,13 @@ describe("Symbolic equality tests", function () {
1x-0y+-3s :
- $_math1
Numeric version
- $_math1
`,
},
@@ -396,7 +396,7 @@ describe("Symbolic equality tests", function () {
Numeric versions
- $_math1
`,
},
@@ -567,7 +567,7 @@ describe("Symbolic equality tests", function () {
Numeric versions
- $_math1
`,
},
@@ -741,7 +741,7 @@ describe("Symbolic equality tests", function () {
Numeric versions
- $_math1
`,
},
@@ -914,7 +914,7 @@ describe("Symbolic equality tests", function () {
Numeric versions
- $_math1
`,
},
@@ -1067,7 +1067,7 @@ describe("Symbolic equality tests", function () {
Numeric versions
- $_math1
`,
},
@@ -1223,7 +1223,7 @@ describe("Symbolic equality tests", function () {
Numeric versions
- $_math1
`,
},
@@ -1378,7 +1378,7 @@ describe("Symbolic equality tests", function () {
Numeric versions
- $_math1
`,
},
@@ -1533,7 +1533,7 @@ describe("Symbolic equality tests", function () {
Numeric versions
- $_math1
`,
},
@@ -1628,14 +1628,14 @@ describe("Symbolic equality tests", function () {
What is -3-4 ?
- $expr{simplify}
Numeric versions
What is $expr?
- $expr{simplify}
`,
},
diff --git a/cypress/e2e/DoenetML/answerValidation/videoProgress.cy.js b/cypress/e2e/DoenetML/answerValidation/videoProgress.cy.js
index 70fb82573d..3df91bcb31 100644
--- a/cypress/e2e/DoenetML/answerValidation/videoProgress.cy.js
+++ b/cypress/e2e/DoenetML/answerValidation/videoProgress.cy.js
@@ -15,8 +15,8 @@ describe("Video progress tests", function () {
Duration: $v.duration
- Time:
- State:
+ Time: $v.time{assignNames="time"}
+ State: $v.state{assignNames="state"}
Seconds watched: $v.secondsWatched
Video progress: $v.fractionWatched*100 %
diff --git a/cypress/e2e/DoenetML/assignNames/basiccopy.cy.js b/cypress/e2e/DoenetML/assignNames/basiccopy.cy.js
index 98798c85f1..b353598770 100644
--- a/cypress/e2e/DoenetML/assignNames/basiccopy.cy.js
+++ b/cypress/e2e/DoenetML/assignNames/basiccopy.cy.js
@@ -7,28 +7,21 @@ describe("Basic copy assignName Tests", function () {
cy.visit("/src/Tools/cypressTest/");
});
- it("recursively copying and assigning names to text", () => {
+ // Note: this isn't using assignNames anymore given changes to how copies work
+ it("recursively copying and naming text", () => {
cy.window().then(async (win) => {
win.postMessage(
{
doenetML: `
- a
hello
- a
x+x
- $_math1
+ $s7{name="s8"}
+ $ex1{assignNames="s9"}
+ $m1
+ $s10{name="s11"}
+ $ex2{assignNames="s12"}
`,
},
@@ -169,37 +82,26 @@ describe("Basic copy assignName Tests", function () {
);
});
- cy.get(cesc("#\\/_text1")).should("have.text", "a"); // to wait for page to load
-
- cy.get(cesc("#\\/_math1"))
- .find(".mjx-mrow")
+ cy.get(cesc2("#/_math1") + " .mjx-mrow")
.eq(0)
- .invoke("text")
- .then((text) => {
- expect(text.trim()).equal("x+x");
- });
- cy.get(cesc("#\\/s1")).should("have.text", "none");
- cy.get(cesc("#\\/s2")).should("have.text", "none");
- cy.get(cesc("#\\/s3")).should("have.text", "none");
+ .should("have.text", "x+x");
+ cy.get(cesc2("#/s1")).should("have.text", "none");
+ cy.get(cesc2("#/s2")).should("have.text", "none");
+ cy.get(cesc2("#/s3")).should("have.text", "none");
- cy.get(cesc("#\\/m1"))
- .find(".mjx-mrow")
+ cy.get(cesc2("#/m1") + " .mjx-mrow")
.eq(0)
- .invoke("text")
- .then((text) => {
- expect(text.trim()).equal("2x");
- });
- cy.get(cesc("#\\/s4")).should("have.text", "full");
- cy.get(cesc("#\\/s5")).should("have.text", "full");
- cy.get(cesc("#\\/s6")).should("have.text", "full");
- cy.get(cesc("#\\/s7")).should("have.text", "full");
- cy.get(cesc("#\\/s8")).should("have.text", "full");
- cy.get(cesc("#\\/s9")).should("have.text", "full");
-
- cy.get(cesc("#\\/s10")).should("have.text", "none");
- cy.get(cesc("#\\/s11")).should("have.text", "none");
- cy.get(cesc("#\\/s12")).should("have.text", "full");
- cy.get(cesc("#\\/s13")).should("have.text", "full");
+ .should("have.text", "2x");
+ cy.get(cesc2("#/s4")).should("have.text", "full");
+ cy.get(cesc2("#/s5")).should("have.text", "full");
+ cy.get(cesc2("#/s6")).should("have.text", "full");
+
+ cy.get(cesc2("#/s7")).should("have.text", "none");
+ cy.get(cesc2("#/s8")).should("have.text", "none");
+ cy.get(cesc2("#/s9")).should("have.text", "none");
+ cy.get(cesc2("#/s10")).should("have.text", "full");
+ cy.get(cesc2("#/s11")).should("have.text", "full");
+ cy.get(cesc2("#/s12")).should("have.text", "full");
cy.window().then(async (win) => {
let stateVariables = await win.returnAllStateVariables1();
@@ -210,77 +112,16 @@ describe("Basic copy assignName Tests", function () {
expect(stateVariables["/s3"].stateValues.value).eq("none");
expect(stateVariables["/m1"].stateValues.value).eqls(["*", 2, "x"]);
-
expect(stateVariables["/s4"].stateValues.value).eq("full");
expect(stateVariables["/s5"].stateValues.value).eq("full");
expect(stateVariables["/s6"].stateValues.value).eq("full");
- expect(stateVariables["/s7"].stateValues.value).eq("full");
- expect(stateVariables["/s8"].stateValues.value).eq("full");
- expect(stateVariables["/s9"].stateValues.value).eq("full");
- expect(stateVariables["/s10"].stateValues.value).eq("none");
- expect(stateVariables["/s11"].stateValues.value).eq("none");
+ expect(stateVariables["/s7"].stateValues.value).eq("none");
+ expect(stateVariables["/s8"].stateValues.value).eq("none");
+ expect(stateVariables["/s9"].stateValues.value).eq("none");
+ expect(stateVariables["/s10"].stateValues.value).eq("full");
+ expect(stateVariables["/s11"].stateValues.value).eq("full");
expect(stateVariables["/s12"].stateValues.value).eq("full");
- expect(stateVariables["/s13"].stateValues.value).eq("full");
-
- expect(
- stateVariables[stateVariables["/cp1"].replacements[0].componentName]
- .stateValues.value,
- ).eq("none");
- expect(
- stateVariables[stateVariables["/cp2"].replacements[0].componentName]
- .stateValues.value,
- ).eq("none");
- expect(
- stateVariables[stateVariables["/cp3"].replacements[0].componentName]
- .stateValues.value,
- ).eq("none");
- expect(
- stateVariables[stateVariables["/cp4"].replacements[0].componentName]
- .stateValues.value,
- ).eqls(["*", 2, "x"]);
- expect(
- stateVariables[stateVariables["/cp5"].replacements[0].componentName]
- .stateValues.value,
- ).eq("full");
- expect(
- stateVariables[stateVariables["/cp6"].replacements[0].componentName]
- .stateValues.value,
- ).eq("full");
- expect(
- stateVariables[stateVariables["/cp7"].replacements[0].componentName]
- .stateValues.value,
- ).eq("full");
- expect(
- stateVariables[stateVariables["/cp8"].replacements[0].componentName]
- .stateValues.value,
- ).eq("full");
- expect(
- stateVariables[stateVariables["/cp9"].replacements[0].componentName]
- .stateValues.value,
- ).eq("full");
- expect(
- stateVariables[stateVariables["/cp10"].replacements[0].componentName]
- .stateValues.value,
- ).eq("full");
-
- expect(
- stateVariables[stateVariables["/cp11"].replacements[0].componentName]
- .stateValues.value,
- ).eq("none");
- expect(
- stateVariables[stateVariables["/cp12"].replacements[0].componentName]
- .stateValues.value,
- ).eq("full");
-
- expect(
- stateVariables[stateVariables["/ex1"].replacements[0].componentName]
- .stateValues.value,
- ).eq("none");
- expect(
- stateVariables[stateVariables["/ex2"].replacements[0].componentName]
- .stateValues.value,
- ).eq("full");
});
});
@@ -289,25 +130,23 @@ describe("Basic copy assignName Tests", function () {
win.postMessage(
{
doenetML: `
- a
-
-
-
-
- a
-
-
-
-
- a
-
- xs of points:
+ xs of points: $pts.x{assignNames="d e"}
- xs again:
`,
@@ -954,36 +603,18 @@ describe("Basic copy assignName Tests", function () {
);
});
- cy.get(cesc("#\\/_text1")).should("have.text", "a"); // to wait for page to load
-
- cy.get(cesc("#\\/d"))
- .find(".mjx-mrow")
+ cy.get(cesc("#\\/d") + " .mjx-mrow")
.eq(0)
- .invoke("text")
- .then((text) => {
- expect(text.trim()).equal("0");
- });
- cy.get(cesc("#\\/e"))
- .find(".mjx-mrow")
+ .should("have.text", "0");
+ cy.get(cesc("#\\/e") + " .mjx-mrow")
.eq(0)
- .invoke("text")
- .then((text) => {
- expect(text.trim()).equal("1");
- });
- cy.get(cesc("#\\/f"))
- .find(".mjx-mrow")
+ .should("have.text", "1");
+ cy.get(cesc("#\\/f") + " .mjx-mrow")
.eq(0)
- .invoke("text")
- .then((text) => {
- expect(text.trim()).equal("0");
- });
- cy.get(cesc("#\\/g"))
- .find(".mjx-mrow")
+ .should("have.text", "0");
+ cy.get(cesc("#\\/g") + " .mjx-mrow")
.eq(0)
- .invoke("text")
- .then((text) => {
- expect(text.trim()).equal("1");
- });
+ .should("have.text", "1");
cy.window().then(async (win) => {
let stateVariables = await win.returnAllStateVariables1();
@@ -1010,34 +641,18 @@ describe("Basic copy assignName Tests", function () {
args: { x: 5, y: -5 },
});
let stateVariables = await win.returnAllStateVariables1();
- cy.get(cesc("#\\/d"))
- .find(".mjx-mrow")
+ cy.get(cesc("#\\/d") + " .mjx-mrow")
.eq(0)
- .invoke("text")
- .then((text) => {
- expect(text.trim()).equal("5");
- });
- cy.get(cesc("#\\/e"))
- .find(".mjx-mrow")
+ .should("have.text", "5");
+ cy.get(cesc("#\\/e") + " .mjx-mrow")
.eq(0)
- .invoke("text")
- .then((text) => {
- expect(text.trim()).equal("1");
- });
- cy.get(cesc("#\\/f"))
- .find(".mjx-mrow")
+ .should("have.text", "1");
+ cy.get(cesc("#\\/f") + " .mjx-mrow")
.eq(0)
- .invoke("text")
- .then((text) => {
- expect(text.trim()).equal("5");
- });
- cy.get(cesc("#\\/g"))
- .find(".mjx-mrow")
+ .should("have.text", "5");
+ cy.get(cesc("#\\/g") + " .mjx-mrow")
.eq(0)
- .invoke("text")
- .then((text) => {
- expect(text.trim()).equal("1");
- });
+ .should("have.text", "1");
expect(stateVariables["/b"].stateValues.xs).eqls([5, -5]);
expect(stateVariables["/c"].stateValues.xs).eqls([1, 1]);
expect(stateVariables["/d"].stateValues.value).eq(5);
@@ -1054,34 +669,18 @@ describe("Basic copy assignName Tests", function () {
args: { x: 3, y: 4 },
});
let stateVariables = await win.returnAllStateVariables1();
- cy.get(cesc("#\\/d"))
- .find(".mjx-mrow")
+ cy.get(cesc("#\\/d") + " .mjx-mrow")
.eq(0)
- .invoke("text")
- .then((text) => {
- expect(text.trim()).equal("5");
- });
- cy.get(cesc("#\\/e"))
- .find(".mjx-mrow")
+ .should("have.text", "5");
+ cy.get(cesc("#\\/e") + " .mjx-mrow")
.eq(0)
- .invoke("text")
- .then((text) => {
- expect(text.trim()).equal("3");
- });
- cy.get(cesc("#\\/f"))
- .find(".mjx-mrow")
+ .should("have.text", "3");
+ cy.get(cesc("#\\/f") + " .mjx-mrow")
.eq(0)
- .invoke("text")
- .then((text) => {
- expect(text.trim()).equal("5");
- });
- cy.get(cesc("#\\/g"))
- .find(".mjx-mrow")
+ .should("have.text", "5");
+ cy.get(cesc("#\\/g") + " .mjx-mrow")
.eq(0)
- .invoke("text")
- .then((text) => {
- expect(text.trim()).equal("3");
- });
+ .should("have.text", "3");
expect(stateVariables["/b"].stateValues.xs).eqls([5, -5]);
expect(stateVariables["/c"].stateValues.xs).eqls([3, 4]);
expect(stateVariables["/d"].stateValues.value).eq(5);
@@ -1102,33 +701,33 @@ describe("Basic copy assignName Tests", function () {
- nothing 1:
- nothing 2:
- nothing 3:
- nothing 4:
+ nothing 1: $a1
+ nothing 2: $a2
+ nothing 3: $b1
+ nothing 4: $b2
-
- nothing 5:
- nothing 6:
- nothing 7:
- nothing 8:
+ $pts{name="ptsb" assignNames="(g1 g2) (h1 h2)"}
- nothing 9:
- nothing 10:
- nothing 11:
- nothing 12:
+ nothing 5: $g1
+ nothing 6: $g2
+ nothing 7: $h1
+ nothing 8: $h2
+
+ $ptsa{name="ptsc" assignNames="(i1 i2) (j1 j2)"}
+
+ nothing 9: $i1
+ nothing 10: $i2
+ nothing 11: $j1
+ nothing 12: $j2
`,
@@ -1142,93 +741,61 @@ describe("Basic copy assignName Tests", function () {
cy.window().then(async (win) => {
let stateVariables = await win.returnAllStateVariables1();
let point1Anchor = cesc2(
- "#" + stateVariables["/cp1"].replacements[0].componentName,
+ "#" + stateVariables["/pts"].replacements[0].componentName,
);
let point2Anchor = cesc2(
- "#" + stateVariables["/cp1"].replacements[1].componentName,
+ "#" + stateVariables["/pts"].replacements[1].componentName,
);
let point1aAnchor = cesc2(
- "#" + stateVariables["/cp3"].replacements[0].componentName,
+ "#" + stateVariables["/ptsb"].replacements[0].componentName,
);
let point2aAnchor = cesc2(
- "#" + stateVariables["/cp3"].replacements[1].componentName,
+ "#" + stateVariables["/ptsb"].replacements[1].componentName,
);
let point1bAnchor = cesc2(
- "#" + stateVariables["/cp4"].replacements[0].componentName,
+ "#" + stateVariables["/ptsc"].replacements[0].componentName,
);
let point2bAnchor = cesc2(
- "#" + stateVariables["/cp4"].replacements[1].componentName,
+ "#" + stateVariables["/ptsc"].replacements[1].componentName,
);
- cy.get(point1Anchor)
- .find(".mjx-mrow")
+ cy.get(point1Anchor + " .mjx-mrow")
.eq(0)
- .invoke("text")
- .then((text) => {
- expect(text.trim()).equal("(0,0)");
- });
- cy.get(point2Anchor)
- .find(".mjx-mrow")
+ .should("have.text", "(0,0)");
+ cy.get(point2Anchor + " .mjx-mrow")
.eq(0)
- .invoke("text")
- .then((text) => {
- expect(text.trim()).equal("(1,1)");
- });
+ .should("have.text", "(1,1)");
cy.get(cesc("#\\/n1")).should("have.text", "nothing 1: ");
cy.get(cesc("#\\/n2")).should("have.text", "nothing 2: ");
cy.get(cesc("#\\/n3")).should("have.text", "nothing 3: ");
cy.get(cesc("#\\/n4")).should("have.text", "nothing 4: ");
- cy.get(cesc("#\\/e"))
- .find(".mjx-mrow")
+ cy.get(cesc("#\\/e") + " .mjx-mrow")
.eq(0)
- .invoke("text")
- .then((text) => {
- expect(text.trim()).equal("(0,0)");
- });
- cy.get(cesc("#\\/f"))
- .find(".mjx-mrow")
+ .should("have.text", "(0,0)");
+ cy.get(cesc("#\\/f") + " .mjx-mrow")
.eq(0)
- .invoke("text")
- .then((text) => {
- expect(text.trim()).equal("(1,1)");
- });
+ .should("have.text", "(1,1)");
- cy.get(point1aAnchor)
- .find(".mjx-mrow")
+ cy.get(point1aAnchor + " .mjx-mrow")
.eq(0)
- .invoke("text")
- .then((text) => {
- expect(text.trim()).equal("(0,0)");
- });
- cy.get(point2aAnchor)
- .find(".mjx-mrow")
+ .should("have.text", "(0,0)");
+ cy.get(point2aAnchor + " .mjx-mrow")
.eq(0)
- .invoke("text")
- .then((text) => {
- expect(text.trim()).equal("(1,1)");
- });
+ .should("have.text", "(1,1)");
cy.get(cesc("#\\/n5")).should("have.text", "nothing 5: ");
cy.get(cesc("#\\/n6")).should("have.text", "nothing 6: ");
cy.get(cesc("#\\/n7")).should("have.text", "nothing 7: ");
cy.get(cesc("#\\/n8")).should("have.text", "nothing 8: ");
- cy.get(point1bAnchor)
- .find(".mjx-mrow")
+ cy.get(point1bAnchor + " .mjx-mrow")
.eq(0)
- .invoke("text")
- .then((text) => {
- expect(text.trim()).equal("(0,0)");
- });
- cy.get(point2bAnchor)
- .find(".mjx-mrow")
+ .should("have.text", "(0,0)");
+ cy.get(point2bAnchor + " .mjx-mrow")
.eq(0)
- .invoke("text")
- .then((text) => {
- expect(text.trim()).equal("(1,1)");
- });
+ .should("have.text", "(1,1)");
cy.get(cesc("#\\/n9")).should("have.text", "nothing 9: ");
cy.get(cesc("#\\/n10")).should("have.text", "nothing 10: ");
@@ -1258,62 +825,30 @@ describe("Basic copy assignName Tests", function () {
args: { x: 5, y: -5 },
});
let stateVariables = await win.returnAllStateVariables1();
- cy.get(point1Anchor)
- .find(".mjx-mrow")
- .eq(0)
- .invoke("text")
- .then((text) => {
- expect(text.trim()).equal("(5,−5)");
- });
- cy.get(point2Anchor)
- .find(".mjx-mrow")
- .eq(0)
- .invoke("text")
- .then((text) => {
- expect(text.trim()).equal("(1,1)");
- });
- cy.get(point1aAnchor)
- .find(".mjx-mrow")
- .eq(0)
- .invoke("text")
- .then((text) => {
- expect(text.trim()).equal("(5,−5)");
- });
- cy.get(point2aAnchor)
- .find(".mjx-mrow")
- .eq(0)
- .invoke("text")
- .then((text) => {
- expect(text.trim()).equal("(1,1)");
- });
- cy.get(point1bAnchor)
- .find(".mjx-mrow")
- .eq(0)
- .invoke("text")
- .then((text) => {
- expect(text.trim()).equal("(5,−5)");
- });
- cy.get(point2bAnchor)
- .find(".mjx-mrow")
- .eq(0)
- .invoke("text")
- .then((text) => {
- expect(text.trim()).equal("(1,1)");
- });
- cy.get(cesc("#\\/e"))
- .find(".mjx-mrow")
- .eq(0)
- .invoke("text")
- .then((text) => {
- expect(text.trim()).equal("(5,−5)");
- });
- cy.get(cesc("#\\/f"))
- .find(".mjx-mrow")
- .eq(0)
- .invoke("text")
- .then((text) => {
- expect(text.trim()).equal("(1,1)");
- });
+ cy.get(point1Anchor + " .mjx-mrow")
+ .eq(0)
+ .should("have.text", "(5,−5)");
+ cy.get(point2Anchor + " .mjx-mrow")
+ .eq(0)
+ .should("have.text", "(1,1)");
+ cy.get(point1aAnchor + " .mjx-mrow")
+ .eq(0)
+ .should("have.text", "(5,−5)");
+ cy.get(point2aAnchor + " .mjx-mrow")
+ .eq(0)
+ .should("have.text", "(1,1)");
+ cy.get(point1bAnchor + " .mjx-mrow")
+ .eq(0)
+ .should("have.text", "(5,−5)");
+ cy.get(point2bAnchor + " .mjx-mrow")
+ .eq(0)
+ .should("have.text", "(1,1)");
+ cy.get(cesc("#\\/e") + " .mjx-mrow")
+ .eq(0)
+ .should("have.text", "(5,−5)");
+ cy.get(cesc("#\\/f") + " .mjx-mrow")
+ .eq(0)
+ .should("have.text", "(1,1)");
cy.get(cesc("#\\/n1")).should("have.text", "nothing 1: ");
cy.get(cesc("#\\/n2")).should("have.text", "nothing 2: ");
cy.get(cesc("#\\/n3")).should("have.text", "nothing 3: ");
@@ -1341,62 +876,30 @@ describe("Basic copy assignName Tests", function () {
args: { x: 3, y: 4 },
});
let stateVariables = await win.returnAllStateVariables1();
- cy.get(point1Anchor)
- .find(".mjx-mrow")
- .eq(0)
- .invoke("text")
- .then((text) => {
- expect(text.trim()).equal("(5,−5)");
- });
- cy.get(point2Anchor)
- .find(".mjx-mrow")
- .eq(0)
- .invoke("text")
- .then((text) => {
- expect(text.trim()).equal("(3,4)");
- });
- cy.get(point1aAnchor)
- .find(".mjx-mrow")
- .eq(0)
- .invoke("text")
- .then((text) => {
- expect(text.trim()).equal("(5,−5)");
- });
- cy.get(point2aAnchor)
- .find(".mjx-mrow")
- .eq(0)
- .invoke("text")
- .then((text) => {
- expect(text.trim()).equal("(3,4)");
- });
- cy.get(point1bAnchor)
- .find(".mjx-mrow")
- .eq(0)
- .invoke("text")
- .then((text) => {
- expect(text.trim()).equal("(5,−5)");
- });
- cy.get(point2bAnchor)
- .find(".mjx-mrow")
- .eq(0)
- .invoke("text")
- .then((text) => {
- expect(text.trim()).equal("(3,4)");
- });
- cy.get(cesc("#\\/e"))
- .find(".mjx-mrow")
- .eq(0)
- .invoke("text")
- .then((text) => {
- expect(text.trim()).equal("(5,−5)");
- });
- cy.get(cesc("#\\/f"))
- .find(".mjx-mrow")
- .eq(0)
- .invoke("text")
- .then((text) => {
- expect(text.trim()).equal("(3,4)");
- });
+ cy.get(point1Anchor + " .mjx-mrow")
+ .eq(0)
+ .should("have.text", "(5,−5)");
+ cy.get(point2Anchor + " .mjx-mrow")
+ .eq(0)
+ .should("have.text", "(3,4)");
+ cy.get(point1aAnchor + " .mjx-mrow")
+ .eq(0)
+ .should("have.text", "(5,−5)");
+ cy.get(point2aAnchor + " .mjx-mrow")
+ .eq(0)
+ .should("have.text", "(3,4)");
+ cy.get(point1bAnchor + " .mjx-mrow")
+ .eq(0)
+ .should("have.text", "(5,−5)");
+ cy.get(point2bAnchor + " .mjx-mrow")
+ .eq(0)
+ .should("have.text", "(3,4)");
+ cy.get(cesc("#\\/e") + " .mjx-mrow")
+ .eq(0)
+ .should("have.text", "(5,−5)");
+ cy.get(cesc("#\\/f") + " .mjx-mrow")
+ .eq(0)
+ .should("have.text", "(3,4)");
cy.get(cesc("#\\/n1")).should("have.text", "nothing 1: ");
cy.get(cesc("#\\/n2")).should("have.text", "nothing 2: ");
cy.get(cesc("#\\/n3")).should("have.text", "nothing 3: ");
@@ -1424,62 +927,30 @@ describe("Basic copy assignName Tests", function () {
args: { x: -9, y: -8 },
});
let stateVariables = await win.returnAllStateVariables1();
- cy.get(point1Anchor)
- .find(".mjx-mrow")
- .eq(0)
- .invoke("text")
- .then((text) => {
- expect(text.trim()).equal("(−9,−8)");
- });
- cy.get(point2Anchor)
- .find(".mjx-mrow")
- .eq(0)
- .invoke("text")
- .then((text) => {
- expect(text.trim()).equal("(3,4)");
- });
- cy.get(point1aAnchor)
- .find(".mjx-mrow")
- .eq(0)
- .invoke("text")
- .then((text) => {
- expect(text.trim()).equal("(−9,−8)");
- });
- cy.get(point2aAnchor)
- .find(".mjx-mrow")
- .eq(0)
- .invoke("text")
- .then((text) => {
- expect(text.trim()).equal("(3,4)");
- });
- cy.get(point1bAnchor)
- .find(".mjx-mrow")
- .eq(0)
- .invoke("text")
- .then((text) => {
- expect(text.trim()).equal("(−9,−8)");
- });
- cy.get(point2bAnchor)
- .find(".mjx-mrow")
- .eq(0)
- .invoke("text")
- .then((text) => {
- expect(text.trim()).equal("(3,4)");
- });
- cy.get(cesc("#\\/e"))
- .find(".mjx-mrow")
- .eq(0)
- .invoke("text")
- .then((text) => {
- expect(text.trim()).equal("(−9,−8)");
- });
- cy.get(cesc("#\\/f"))
- .find(".mjx-mrow")
- .eq(0)
- .invoke("text")
- .then((text) => {
- expect(text.trim()).equal("(3,4)");
- });
+ cy.get(point1Anchor + " .mjx-mrow")
+ .eq(0)
+ .should("have.text", "(−9,−8)");
+ cy.get(point2Anchor + " .mjx-mrow")
+ .eq(0)
+ .should("have.text", "(3,4)");
+ cy.get(point1aAnchor + " .mjx-mrow")
+ .eq(0)
+ .should("have.text", "(−9,−8)");
+ cy.get(point2aAnchor + " .mjx-mrow")
+ .eq(0)
+ .should("have.text", "(3,4)");
+ cy.get(point1bAnchor + " .mjx-mrow")
+ .eq(0)
+ .should("have.text", "(−9,−8)");
+ cy.get(point2bAnchor + " .mjx-mrow")
+ .eq(0)
+ .should("have.text", "(3,4)");
+ cy.get(cesc("#\\/e") + " .mjx-mrow")
+ .eq(0)
+ .should("have.text", "(−9,−8)");
+ cy.get(cesc("#\\/f") + " .mjx-mrow")
+ .eq(0)
+ .should("have.text", "(3,4)");
cy.get(cesc("#\\/n1")).should("have.text", "nothing 1: ");
cy.get(cesc("#\\/n2")).should("have.text", "nothing 2: ");
cy.get(cesc("#\\/n3")).should("have.text", "nothing 3: ");
@@ -1507,62 +978,30 @@ describe("Basic copy assignName Tests", function () {
args: { x: -1, y: -3 },
});
let stateVariables = await win.returnAllStateVariables1();
- cy.get(point1Anchor)
- .find(".mjx-mrow")
- .eq(0)
- .invoke("text")
- .then((text) => {
- expect(text.trim()).equal("(−9,−8)");
- });
- cy.get(point2Anchor)
- .find(".mjx-mrow")
- .eq(0)
- .invoke("text")
- .then((text) => {
- expect(text.trim()).equal("(−1,−3)");
- });
- cy.get(point1aAnchor)
- .find(".mjx-mrow")
- .eq(0)
- .invoke("text")
- .then((text) => {
- expect(text.trim()).equal("(−9,−8)");
- });
- cy.get(point2aAnchor)
- .find(".mjx-mrow")
- .eq(0)
- .invoke("text")
- .then((text) => {
- expect(text.trim()).equal("(−1,−3)");
- });
- cy.get(point1bAnchor)
- .find(".mjx-mrow")
- .eq(0)
- .invoke("text")
- .then((text) => {
- expect(text.trim()).equal("(−9,−8)");
- });
- cy.get(point2bAnchor)
- .find(".mjx-mrow")
- .eq(0)
- .invoke("text")
- .then((text) => {
- expect(text.trim()).equal("(−1,−3)");
- });
- cy.get(cesc("#\\/e"))
- .find(".mjx-mrow")
- .eq(0)
- .invoke("text")
- .then((text) => {
- expect(text.trim()).equal("(−9,−8)");
- });
- cy.get(cesc("#\\/f"))
- .find(".mjx-mrow")
- .eq(0)
- .invoke("text")
- .then((text) => {
- expect(text.trim()).equal("(−1,−3)");
- });
+ cy.get(point1Anchor + " .mjx-mrow")
+ .eq(0)
+ .should("have.text", "(−9,−8)");
+ cy.get(point2Anchor + " .mjx-mrow")
+ .eq(0)
+ .should("have.text", "(−1,−3)");
+ cy.get(point1aAnchor + " .mjx-mrow")
+ .eq(0)
+ .should("have.text", "(−9,−8)");
+ cy.get(point2aAnchor + " .mjx-mrow")
+ .eq(0)
+ .should("have.text", "(−1,−3)");
+ cy.get(point1bAnchor + " .mjx-mrow")
+ .eq(0)
+ .should("have.text", "(−9,−8)");
+ cy.get(point2bAnchor + " .mjx-mrow")
+ .eq(0)
+ .should("have.text", "(−1,−3)");
+ cy.get(cesc("#\\/e") + " .mjx-mrow")
+ .eq(0)
+ .should("have.text", "(−9,−8)");
+ cy.get(cesc("#\\/f") + " .mjx-mrow")
+ .eq(0)
+ .should("have.text", "(−1,−3)");
cy.get(cesc("#\\/n1")).should("have.text", "nothing 1: ");
cy.get(cesc("#\\/n2")).should("have.text", "nothing 2: ");
cy.get(cesc("#\\/n3")).should("have.text", "nothing 3: ");
@@ -1596,43 +1035,43 @@ describe("Basic copy assignName Tests", function () {
- nothing 1:
- nothing 2:
- nothing 3:
- nothing 4:
+ nothing 1: $a1
+ nothing 2: $a2
+ nothing 3: $b1
+ nothing 4: $b2
-
- nothing 5:
- nothing 6:
- nothing 7:
- nothing 8:
+ nothing 5: $g1
+ nothing 6: $g2
+ nothing 7: $h1
+ nothing 8: $h2
- nothing 9:
- nothing 10:
- nothing 11:
- nothing 12:
+ nothing 9: $i1
+ nothing 10: $i2
+ nothing 11: $j1
+ nothing 12: $j2
- nothing 13:
- nothing 14:
- nothing 15:
- nothing 16:
+ nothing 13: $(hello/i1)
+ nothing 14: $(hello/i2)
+ nothing 15: $(hello/j1)
+ nothing 16: $(hello/j2)
`,
@@ -1646,113 +1085,73 @@ describe("Basic copy assignName Tests", function () {
cy.window().then(async (win) => {
let stateVariables = await win.returnAllStateVariables1();
let point1Anchor = cesc2(
- "#" + stateVariables["/hello/cp1"].replacements[0].componentName,
+ "#" + stateVariables["/hello/pts"].replacements[0].componentName,
);
let point2Anchor = cesc2(
- "#" + stateVariables["/hello/cp1"].replacements[1].componentName,
+ "#" + stateVariables["/hello/pts"].replacements[1].componentName,
);
let point1aAnchor = cesc2(
- "#" + stateVariables["/hello/cp3"].replacements[0].componentName,
+ "#" + stateVariables["/hello/ptsb"].replacements[0].componentName,
);
let point2aAnchor = cesc2(
- "#" + stateVariables["/hello/cp3"].replacements[1].componentName,
+ "#" + stateVariables["/hello/ptsb"].replacements[1].componentName,
);
let point1bAnchor = cesc2(
- "#" + stateVariables["/hello/cp4"].replacements[0].componentName,
+ "#" + stateVariables["/hello/ptsc"].replacements[0].componentName,
);
let point2bAnchor = cesc2(
- "#" + stateVariables["/hello/cp4"].replacements[1].componentName,
+ "#" + stateVariables["/hello/ptsc"].replacements[1].componentName,
);
- cy.get(point1Anchor)
- .find(".mjx-mrow")
+ cy.get(point1Anchor + " .mjx-mrow")
.eq(0)
- .invoke("text")
- .then((text) => {
- expect(text.trim()).equal("(0,0)");
- });
- cy.get(point2Anchor)
- .find(".mjx-mrow")
+ .should("have.text", "(0,0)");
+ cy.get(point2Anchor + " .mjx-mrow")
.eq(0)
- .invoke("text")
- .then((text) => {
- expect(text.trim()).equal("(1,1)");
- });
+ .should("have.text", "(1,1)");
cy.get(cesc2("#/hello/n1")).should("have.text", "nothing 1: ");
cy.get(cesc2("#/hello/n2")).should("have.text", "nothing 2: ");
cy.get(cesc2("#/hello/n3")).should("have.text", "nothing 3: ");
cy.get(cesc2("#/hello/n4")).should("have.text", "nothing 4: ");
- cy.get(cesc2("#/hello/e"))
- .find(".mjx-mrow")
+ cy.get(cesc2("#/hello/e") + " .mjx-mrow")
.eq(0)
- .invoke("text")
- .then((text) => {
- expect(text.trim()).equal("(0,0)");
- });
- cy.get(cesc2("#/hello/f"))
- .find(".mjx-mrow")
+ .should("have.text", "(0,0)");
+ cy.get(cesc2("#/hello/f") + " .mjx-mrow")
.eq(0)
- .invoke("text")
- .then((text) => {
- expect(text.trim()).equal("(1,1)");
- });
+ .should("have.text", "(1,1)");
- cy.get(point1aAnchor)
- .find(".mjx-mrow")
+ cy.get(point1aAnchor + " .mjx-mrow")
.eq(0)
- .invoke("text")
- .then((text) => {
- expect(text.trim()).equal("(0,0)");
- });
- cy.get(point2aAnchor)
- .find(".mjx-mrow")
+ .should("have.text", "(0,0)");
+ cy.get(point2aAnchor + " .mjx-mrow")
.eq(0)
- .invoke("text")
- .then((text) => {
- expect(text.trim()).equal("(1,1)");
- });
+ .should("have.text", "(1,1)");
cy.get(cesc2("#/hello/n5")).should("have.text", "nothing 5: ");
cy.get(cesc2("#/hello/n6")).should("have.text", "nothing 6: ");
cy.get(cesc2("#/hello/n7")).should("have.text", "nothing 7: ");
cy.get(cesc2("#/hello/n8")).should("have.text", "nothing 8: ");
- cy.get(point1bAnchor)
- .find(".mjx-mrow")
+ cy.get(point1bAnchor + " .mjx-mrow")
.eq(0)
- .invoke("text")
- .then((text) => {
- expect(text.trim()).equal("(0,0)");
- });
- cy.get(point2bAnchor)
- .find(".mjx-mrow")
+ .should("have.text", "(0,0)");
+ cy.get(point2bAnchor + " .mjx-mrow")
.eq(0)
- .invoke("text")
- .then((text) => {
- expect(text.trim()).equal("(1,1)");
- });
+ .should("have.text", "(1,1)");
cy.get(cesc2("#/hello/n9")).should("have.text", "nothing 9: ");
cy.get(cesc2("#/hello/n10")).should("have.text", "nothing 10: ");
cy.get(cesc2("#/hello/n11")).should("have.text", "nothing 11: ");
cy.get(cesc2("#/hello/n12")).should("have.text", "nothing 12: ");
- cy.get(cesc2("#/e"))
- .find(".mjx-mrow")
+ cy.get(cesc2("#/e") + " .mjx-mrow")
.eq(0)
- .invoke("text")
- .then((text) => {
- expect(text.trim()).equal("(0,0)");
- });
- cy.get(cesc2("#/f"))
- .find(".mjx-mrow")
+ .should("have.text", "(0,0)");
+ cy.get(cesc2("#/f") + " .mjx-mrow")
.eq(0)
- .invoke("text")
- .then((text) => {
- expect(text.trim()).equal("(1,1)");
- });
+ .should("have.text", "(1,1)");
cy.get(cesc2("#/n13")).should("have.text", "nothing 13: ");
cy.get(cesc2("#/n14")).should("have.text", "nothing 14: ");
@@ -1784,76 +1183,36 @@ describe("Basic copy assignName Tests", function () {
args: { x: 5, y: -5 },
});
let stateVariables = await win.returnAllStateVariables1();
- cy.get(point1Anchor)
- .find(".mjx-mrow")
- .eq(0)
- .invoke("text")
- .then((text) => {
- expect(text.trim()).equal("(5,−5)");
- });
- cy.get(point2Anchor)
- .find(".mjx-mrow")
- .eq(0)
- .invoke("text")
- .then((text) => {
- expect(text.trim()).equal("(1,1)");
- });
- cy.get(point1aAnchor)
- .find(".mjx-mrow")
- .eq(0)
- .invoke("text")
- .then((text) => {
- expect(text.trim()).equal("(5,−5)");
- });
- cy.get(point2aAnchor)
- .find(".mjx-mrow")
- .eq(0)
- .invoke("text")
- .then((text) => {
- expect(text.trim()).equal("(1,1)");
- });
- cy.get(point1bAnchor)
- .find(".mjx-mrow")
- .eq(0)
- .invoke("text")
- .then((text) => {
- expect(text.trim()).equal("(5,−5)");
- });
- cy.get(point2bAnchor)
- .find(".mjx-mrow")
- .eq(0)
- .invoke("text")
- .then((text) => {
- expect(text.trim()).equal("(1,1)");
- });
- cy.get(cesc2("#/hello/e"))
- .find(".mjx-mrow")
- .eq(0)
- .invoke("text")
- .then((text) => {
- expect(text.trim()).equal("(5,−5)");
- });
- cy.get(cesc2("#/hello/f"))
- .find(".mjx-mrow")
- .eq(0)
- .invoke("text")
- .then((text) => {
- expect(text.trim()).equal("(1,1)");
- });
- cy.get(cesc2("#/e"))
- .find(".mjx-mrow")
- .eq(0)
- .invoke("text")
- .then((text) => {
- expect(text.trim()).equal("(5,−5)");
- });
- cy.get(cesc2("#/f"))
- .find(".mjx-mrow")
- .eq(0)
- .invoke("text")
- .then((text) => {
- expect(text.trim()).equal("(1,1)");
- });
+ cy.get(point1Anchor + " .mjx-mrow")
+ .eq(0)
+ .should("have.text", "(5,−5)");
+ cy.get(point2Anchor + " .mjx-mrow")
+ .eq(0)
+ .should("have.text", "(1,1)");
+ cy.get(point1aAnchor + " .mjx-mrow")
+ .eq(0)
+ .should("have.text", "(5,−5)");
+ cy.get(point2aAnchor + " .mjx-mrow")
+ .eq(0)
+ .should("have.text", "(1,1)");
+ cy.get(point1bAnchor + " .mjx-mrow")
+ .eq(0)
+ .should("have.text", "(5,−5)");
+ cy.get(point2bAnchor + " .mjx-mrow")
+ .eq(0)
+ .should("have.text", "(1,1)");
+ cy.get(cesc2("#/hello/e") + " .mjx-mrow")
+ .eq(0)
+ .should("have.text", "(5,−5)");
+ cy.get(cesc2("#/hello/f") + " .mjx-mrow")
+ .eq(0)
+ .should("have.text", "(1,1)");
+ cy.get(cesc2("#/e") + " .mjx-mrow")
+ .eq(0)
+ .should("have.text", "(5,−5)");
+ cy.get(cesc2("#/f") + " .mjx-mrow")
+ .eq(0)
+ .should("have.text", "(1,1)");
cy.get(cesc2("#/hello/n1")).should("have.text", "nothing 1: ");
cy.get(cesc2("#/hello/n2")).should("have.text", "nothing 2: ");
cy.get(cesc2("#/hello/n3")).should("have.text", "nothing 3: ");
@@ -1887,76 +1246,36 @@ describe("Basic copy assignName Tests", function () {
args: { x: 3, y: 4 },
});
let stateVariables = await win.returnAllStateVariables1();
- cy.get(point1Anchor)
- .find(".mjx-mrow")
- .eq(0)
- .invoke("text")
- .then((text) => {
- expect(text.trim()).equal("(5,−5)");
- });
- cy.get(point2Anchor)
- .find(".mjx-mrow")
- .eq(0)
- .invoke("text")
- .then((text) => {
- expect(text.trim()).equal("(3,4)");
- });
- cy.get(point1aAnchor)
- .find(".mjx-mrow")
- .eq(0)
- .invoke("text")
- .then((text) => {
- expect(text.trim()).equal("(5,−5)");
- });
- cy.get(point2aAnchor)
- .find(".mjx-mrow")
- .eq(0)
- .invoke("text")
- .then((text) => {
- expect(text.trim()).equal("(3,4)");
- });
- cy.get(point1bAnchor)
- .find(".mjx-mrow")
- .eq(0)
- .invoke("text")
- .then((text) => {
- expect(text.trim()).equal("(5,−5)");
- });
- cy.get(point2bAnchor)
- .find(".mjx-mrow")
- .eq(0)
- .invoke("text")
- .then((text) => {
- expect(text.trim()).equal("(3,4)");
- });
- cy.get(cesc2("#/hello/e"))
- .find(".mjx-mrow")
- .eq(0)
- .invoke("text")
- .then((text) => {
- expect(text.trim()).equal("(5,−5)");
- });
- cy.get(cesc2("#/hello/f"))
- .find(".mjx-mrow")
- .eq(0)
- .invoke("text")
- .then((text) => {
- expect(text.trim()).equal("(3,4)");
- });
- cy.get(cesc2("#/e"))
- .find(".mjx-mrow")
- .eq(0)
- .invoke("text")
- .then((text) => {
- expect(text.trim()).equal("(5,−5)");
- });
- cy.get(cesc2("#/f"))
- .find(".mjx-mrow")
- .eq(0)
- .invoke("text")
- .then((text) => {
- expect(text.trim()).equal("(3,4)");
- });
+ cy.get(point1Anchor + " .mjx-mrow")
+ .eq(0)
+ .should("have.text", "(5,−5)");
+ cy.get(point2Anchor + " .mjx-mrow")
+ .eq(0)
+ .should("have.text", "(3,4)");
+ cy.get(point1aAnchor + " .mjx-mrow")
+ .eq(0)
+ .should("have.text", "(5,−5)");
+ cy.get(point2aAnchor + " .mjx-mrow")
+ .eq(0)
+ .should("have.text", "(3,4)");
+ cy.get(point1bAnchor + " .mjx-mrow")
+ .eq(0)
+ .should("have.text", "(5,−5)");
+ cy.get(point2bAnchor + " .mjx-mrow")
+ .eq(0)
+ .should("have.text", "(3,4)");
+ cy.get(cesc2("#/hello/e") + " .mjx-mrow")
+ .eq(0)
+ .should("have.text", "(5,−5)");
+ cy.get(cesc2("#/hello/f") + " .mjx-mrow")
+ .eq(0)
+ .should("have.text", "(3,4)");
+ cy.get(cesc2("#/e") + " .mjx-mrow")
+ .eq(0)
+ .should("have.text", "(5,−5)");
+ cy.get(cesc2("#/f") + " .mjx-mrow")
+ .eq(0)
+ .should("have.text", "(3,4)");
cy.get(cesc2("#/hello/n1")).should("have.text", "nothing 1: ");
cy.get(cesc2("#/hello/n2")).should("have.text", "nothing 2: ");
cy.get(cesc2("#/hello/n3")).should("have.text", "nothing 3: ");
@@ -1990,76 +1309,36 @@ describe("Basic copy assignName Tests", function () {
args: { x: -9, y: -8 },
});
let stateVariables = await win.returnAllStateVariables1();
- cy.get(point1Anchor)
- .find(".mjx-mrow")
- .eq(0)
- .invoke("text")
- .then((text) => {
- expect(text.trim()).equal("(−9,−8)");
- });
- cy.get(point2Anchor)
- .find(".mjx-mrow")
- .eq(0)
- .invoke("text")
- .then((text) => {
- expect(text.trim()).equal("(3,4)");
- });
- cy.get(point1aAnchor)
- .find(".mjx-mrow")
- .eq(0)
- .invoke("text")
- .then((text) => {
- expect(text.trim()).equal("(−9,−8)");
- });
- cy.get(point2aAnchor)
- .find(".mjx-mrow")
- .eq(0)
- .invoke("text")
- .then((text) => {
- expect(text.trim()).equal("(3,4)");
- });
- cy.get(point1bAnchor)
- .find(".mjx-mrow")
- .eq(0)
- .invoke("text")
- .then((text) => {
- expect(text.trim()).equal("(−9,−8)");
- });
- cy.get(point2bAnchor)
- .find(".mjx-mrow")
- .eq(0)
- .invoke("text")
- .then((text) => {
- expect(text.trim()).equal("(3,4)");
- });
- cy.get(cesc2("#/hello/e"))
- .find(".mjx-mrow")
- .eq(0)
- .invoke("text")
- .then((text) => {
- expect(text.trim()).equal("(−9,−8)");
- });
- cy.get(cesc2("#/hello/f"))
- .find(".mjx-mrow")
- .eq(0)
- .invoke("text")
- .then((text) => {
- expect(text.trim()).equal("(3,4)");
- });
- cy.get(cesc2("#/e"))
- .find(".mjx-mrow")
- .eq(0)
- .invoke("text")
- .then((text) => {
- expect(text.trim()).equal("(−9,−8)");
- });
- cy.get(cesc2("#/f"))
- .find(".mjx-mrow")
- .eq(0)
- .invoke("text")
- .then((text) => {
- expect(text.trim()).equal("(3,4)");
- });
+ cy.get(point1Anchor + " .mjx-mrow")
+ .eq(0)
+ .should("have.text", "(−9,−8)");
+ cy.get(point2Anchor + " .mjx-mrow")
+ .eq(0)
+ .should("have.text", "(3,4)");
+ cy.get(point1aAnchor + " .mjx-mrow")
+ .eq(0)
+ .should("have.text", "(−9,−8)");
+ cy.get(point2aAnchor + " .mjx-mrow")
+ .eq(0)
+ .should("have.text", "(3,4)");
+ cy.get(point1bAnchor + " .mjx-mrow")
+ .eq(0)
+ .should("have.text", "(−9,−8)");
+ cy.get(point2bAnchor + " .mjx-mrow")
+ .eq(0)
+ .should("have.text", "(3,4)");
+ cy.get(cesc2("#/hello/e") + " .mjx-mrow")
+ .eq(0)
+ .should("have.text", "(−9,−8)");
+ cy.get(cesc2("#/hello/f") + " .mjx-mrow")
+ .eq(0)
+ .should("have.text", "(3,4)");
+ cy.get(cesc2("#/e") + " .mjx-mrow")
+ .eq(0)
+ .should("have.text", "(−9,−8)");
+ cy.get(cesc2("#/f") + " .mjx-mrow")
+ .eq(0)
+ .should("have.text", "(3,4)");
cy.get(cesc2("#/hello/n1")).should("have.text", "nothing 1: ");
cy.get(cesc2("#/hello/n2")).should("have.text", "nothing 2: ");
cy.get(cesc2("#/hello/n3")).should("have.text", "nothing 3: ");
@@ -2093,76 +1372,36 @@ describe("Basic copy assignName Tests", function () {
args: { x: -1, y: -3 },
});
let stateVariables = await win.returnAllStateVariables1();
- cy.get(point1Anchor)
- .find(".mjx-mrow")
- .eq(0)
- .invoke("text")
- .then((text) => {
- expect(text.trim()).equal("(−9,−8)");
- });
- cy.get(point2Anchor)
- .find(".mjx-mrow")
- .eq(0)
- .invoke("text")
- .then((text) => {
- expect(text.trim()).equal("(−1,−3)");
- });
- cy.get(point1aAnchor)
- .find(".mjx-mrow")
- .eq(0)
- .invoke("text")
- .then((text) => {
- expect(text.trim()).equal("(−9,−8)");
- });
- cy.get(point2aAnchor)
- .find(".mjx-mrow")
- .eq(0)
- .invoke("text")
- .then((text) => {
- expect(text.trim()).equal("(−1,−3)");
- });
- cy.get(point1bAnchor)
- .find(".mjx-mrow")
- .eq(0)
- .invoke("text")
- .then((text) => {
- expect(text.trim()).equal("(−9,−8)");
- });
- cy.get(point2bAnchor)
- .find(".mjx-mrow")
- .eq(0)
- .invoke("text")
- .then((text) => {
- expect(text.trim()).equal("(−1,−3)");
- });
- cy.get(cesc2("#/hello/e"))
- .find(".mjx-mrow")
- .eq(0)
- .invoke("text")
- .then((text) => {
- expect(text.trim()).equal("(−9,−8)");
- });
- cy.get(cesc2("#/hello/f"))
- .find(".mjx-mrow")
- .eq(0)
- .invoke("text")
- .then((text) => {
- expect(text.trim()).equal("(−1,−3)");
- });
- cy.get(cesc2("#/e"))
- .find(".mjx-mrow")
- .eq(0)
- .invoke("text")
- .then((text) => {
- expect(text.trim()).equal("(−9,−8)");
- });
- cy.get(cesc2("#/f"))
- .find(".mjx-mrow")
- .eq(0)
- .invoke("text")
- .then((text) => {
- expect(text.trim()).equal("(−1,−3)");
- });
+ cy.get(point1Anchor + " .mjx-mrow")
+ .eq(0)
+ .should("have.text", "(−9,−8)");
+ cy.get(point2Anchor + " .mjx-mrow")
+ .eq(0)
+ .should("have.text", "(−1,−3)");
+ cy.get(point1aAnchor + " .mjx-mrow")
+ .eq(0)
+ .should("have.text", "(−9,−8)");
+ cy.get(point2aAnchor + " .mjx-mrow")
+ .eq(0)
+ .should("have.text", "(−1,−3)");
+ cy.get(point1bAnchor + " .mjx-mrow")
+ .eq(0)
+ .should("have.text", "(−9,−8)");
+ cy.get(point2bAnchor + " .mjx-mrow")
+ .eq(0)
+ .should("have.text", "(−1,−3)");
+ cy.get(cesc2("#/hello/e") + " .mjx-mrow")
+ .eq(0)
+ .should("have.text", "(−9,−8)");
+ cy.get(cesc2("#/hello/f") + " .mjx-mrow")
+ .eq(0)
+ .should("have.text", "(−1,−3)");
+ cy.get(cesc2("#/e") + " .mjx-mrow")
+ .eq(0)
+ .should("have.text", "(−9,−8)");
+ cy.get(cesc2("#/f") + " .mjx-mrow")
+ .eq(0)
+ .should("have.text", "(−1,−3)");
cy.get(cesc2("#/hello/n1")).should("have.text", "nothing 1: ");
cy.get(cesc2("#/hello/n2")).should("have.text", "nothing 2: ");
cy.get(cesc2("#/hello/n3")).should("have.text", "nothing 3: ");
@@ -2190,12 +1429,691 @@ describe("Basic copy assignName Tests", function () {
});
});
- it("assign names can access namespace", () => {
+ it("assign names to array prop, further copies", () => {
+ cy.window().then(async (win) => {
+ win.postMessage(
+ {
+ doenetML: `
+
+
+
+ $_line1.points{name="pts" assignNames="p1 p2"}
+ $_line1.points.y{name="ys" assignNames="y1 y2"}
+
+
+ ptsa: $pts{name="ptsa" assignNames="p1a p2a"}, repeat: $p1a{name="p1ac"}, $p2a{name="p2ac"}
+ ptsb: $ptsa{name="ptsb" assignNames="p1b p2b"}, repeat: $p1b{name="p1bc"}, $p2a{name="p2bc"}
+ ptsc: $ptsb{name="ptsc" assignNames="p1c p2c"}, repeat: $p1c{name="p1cc"}, $p2a{name="p2cc"}
+
+ ysa: $ys{name="ysa" assignNames="y1a y2a"}, repeat: $y1a{name="y1ac"}, $y2a{name="y2ac"}
+ ysb: $ysa{name="ysb" assignNames="y1b y2b"}, repeat: $y1b{name="y1bc"}, $y2b{name="y2bc"}
+ ysc: $ysb{name="ysc" assignNames="y1c y2c"}, repeat: $y1c{name="y1cc"}, $y2c{name="y2cc"}
+
+
+
+
+
+ `,
+ },
+ "*",
+ );
+ });
+
+ let ptsNames = [
+ "/pts",
+ "/ptsa",
+ "/ptsb",
+ "/ptsc",
+ "/sec2/ptsa",
+ "/sec2/ptsb",
+ "/sec2/ptsc",
+ "/sec3/ptsa",
+ "/sec3/ptsb",
+ "/sec3/ptsc",
+ ];
+ let p1Names = [
+ "/p1",
+ "/p1a",
+ "/p1ac",
+ "/p1b",
+ "/p1bc",
+ "/p1c",
+ "/p1cc",
+ "/sec2/p1a",
+ "/sec2/p1ac",
+ "/sec2/p1b",
+ "/sec2/p1bc",
+ "/sec2/p1c",
+ "/sec2/p1cc",
+ "/sec3/p1a",
+ "/sec3/p1ac",
+ "/sec3/p1b",
+ "/sec3/p1bc",
+ "/sec3/p1c",
+ "/sec3/p1cc",
+ ];
+ let p2Names = [
+ "/p2",
+ "/p2a",
+ "/p2ac",
+ "/p2b",
+ "/p2bc",
+ "/p2c",
+ "/p2cc",
+ "/sec2/p2a",
+ "/sec2/p2ac",
+ "/sec2/p2b",
+ "/sec2/p2bc",
+ "/sec2/p2c",
+ "/sec2/p2cc",
+ "/sec3/p2a",
+ "/sec3/p2ac",
+ "/sec3/p2b",
+ "/sec3/p2bc",
+ "/sec3/p2c",
+ "/sec3/p2cc",
+ ];
+
+ let ysNames = [
+ "/ys",
+ "/ysa",
+ "/ysb",
+ "/ysc",
+ "/sec2/ysa",
+ "/sec2/ysb",
+ "/sec2/ysc",
+ "/sec3/ysa",
+ "/sec3/ysb",
+ "/sec3/ysc",
+ ];
+ let y1Names = [
+ "/y1",
+ "/y1a",
+ "/y1ac",
+ "/y1b",
+ "/y1bc",
+ "/y1c",
+ "/y1cc",
+ "/sec2/y1a",
+ "/sec2/y1ac",
+ "/sec2/y1b",
+ "/sec2/y1bc",
+ "/sec2/y1c",
+ "/sec2/y1cc",
+ "/sec3/y1a",
+ "/sec3/y1ac",
+ "/sec3/y1b",
+ "/sec3/y1bc",
+ "/sec3/y1c",
+ "/sec3/y1cc",
+ ];
+ let y2Names = [
+ "/y2",
+ "/y2a",
+ "/y2ac",
+ "/y2b",
+ "/y2bc",
+ "/y2c",
+ "/y2cc",
+ "/sec2/y2a",
+ "/sec2/y2ac",
+ "/sec2/y2b",
+ "/sec2/y2bc",
+ "/sec2/y2c",
+ "/sec2/y2cc",
+ "/sec3/y2a",
+ "/sec3/y2ac",
+ "/sec3/y2b",
+ "/sec3/y2bc",
+ "/sec3/y2c",
+ "/sec3/y2cc",
+ ];
+
+ for (let ptsName of ptsNames) {
+ cy.get(cesc2("#" + ptsName) + " .mjx-mrow")
+ .eq(0)
+ .should("have.text", "(0,0)");
+ cy.get(cesc2("#" + ptsName) + " .mjx-mrow")
+ .eq(2)
+ .should("have.text", "(1,1)");
+ }
+
+ for (let p1Name of p1Names) {
+ cy.get(cesc2("#" + p1Name) + " .mjx-mrow")
+ .eq(0)
+ .should("have.text", "(0,0)");
+ }
+ for (let p2Name of p2Names) {
+ cy.get(cesc2("#" + p2Name) + " .mjx-mrow")
+ .eq(0)
+ .should("have.text", "(1,1)");
+ }
+
+ for (let ysName of ysNames) {
+ cy.get(cesc2("#" + ysName) + " .mjx-mrow")
+ .eq(0)
+ .should("have.text", "0");
+ cy.get(cesc2("#" + ysName) + " .mjx-mrow")
+ .eq(1)
+ .should("have.text", "1");
+ }
+
+ for (let y1Name of y1Names) {
+ cy.get(cesc2("#" + y1Name) + " .mjx-mrow")
+ .eq(0)
+ .should("have.text", "0");
+ }
+ for (let y2Name of y2Names) {
+ cy.get(cesc2("#" + y2Name) + " .mjx-mrow")
+ .eq(0)
+ .should("have.text", "1");
+ }
+
+ cy.log("move point p1");
+ cy.window().then(async (win) => {
+ await win.callAction1({
+ actionName: "movePoint",
+ componentName: "/p1",
+ args: { x: 5, y: -5 },
+ });
+ });
+ cy.get(cesc("#\\/p1") + " .mjx-mrow").should("contain.text", "(5,−5)");
+
+ for (let ptsName of ptsNames) {
+ cy.get(cesc2("#" + ptsName) + " .mjx-mrow")
+ .eq(0)
+ .should("have.text", "(5,−5)");
+ cy.get(cesc2("#" + ptsName) + " .mjx-mrow")
+ .eq(2)
+ .should("have.text", "(1,1)");
+ }
+
+ for (let p1Name of p1Names) {
+ cy.get(cesc2("#" + p1Name) + " .mjx-mrow")
+ .eq(0)
+ .should("have.text", "(5,−5)");
+ }
+ for (let p2Name of p2Names) {
+ cy.get(cesc2("#" + p2Name) + " .mjx-mrow")
+ .eq(0)
+ .should("have.text", "(1,1)");
+ }
+
+ for (let ysName of ysNames) {
+ cy.get(cesc2("#" + ysName) + " .mjx-mrow")
+ .eq(0)
+ .should("have.text", "−5");
+ cy.get(cesc2("#" + ysName) + " .mjx-mrow")
+ .eq(1)
+ .should("have.text", "1");
+ }
+
+ for (let y1Name of y1Names) {
+ cy.get(cesc2("#" + y1Name) + " .mjx-mrow")
+ .eq(0)
+ .should("have.text", "−5");
+ }
+ for (let y2Name of y2Names) {
+ cy.get(cesc2("#" + y2Name) + " .mjx-mrow")
+ .eq(0)
+ .should("have.text", "1");
+ }
+
+ cy.log("move point p2");
+ cy.window().then(async (win) => {
+ await win.callAction1({
+ actionName: "movePoint",
+ componentName: "/p2",
+ args: { x: 3, y: 4 },
+ });
+ });
+ cy.get(cesc("#\\/p2") + " .mjx-mrow").should("contain.text", "(3,4)");
+
+ for (let ptsName of ptsNames) {
+ cy.get(cesc2("#" + ptsName) + " .mjx-mrow")
+ .eq(0)
+ .should("have.text", "(5,−5)");
+ cy.get(cesc2("#" + ptsName) + " .mjx-mrow")
+ .eq(2)
+ .should("have.text", "(3,4)");
+ }
+
+ for (let p1Name of p1Names) {
+ cy.get(cesc2("#" + p1Name) + " .mjx-mrow")
+ .eq(0)
+ .should("have.text", "(5,−5)");
+ }
+ for (let p2Name of p2Names) {
+ cy.get(cesc2("#" + p2Name) + " .mjx-mrow")
+ .eq(0)
+ .should("have.text", "(3,4)");
+ }
+
+ for (let ysName of ysNames) {
+ cy.get(cesc2("#" + ysName) + " .mjx-mrow")
+ .eq(0)
+ .should("have.text", "−5");
+ cy.get(cesc2("#" + ysName) + " .mjx-mrow")
+ .eq(1)
+ .should("have.text", "4");
+ }
+
+ for (let y1Name of y1Names) {
+ cy.get(cesc2("#" + y1Name) + " .mjx-mrow")
+ .eq(0)
+ .should("have.text", "−5");
+ }
+ for (let y2Name of y2Names) {
+ cy.get(cesc2("#" + y2Name) + " .mjx-mrow")
+ .eq(0)
+ .should("have.text", "4");
+ }
+ });
+
+ it("assign names to array prop with copy component index, further copies", () => {
+ cy.window().then(async (win) => {
+ win.postMessage(
+ {
+ doenetML: `
+
+
+
+ xs = $_line1.points[$n].xs{name="xs" assignNames="x1 x2"}
+
+
+ xsa: $xs{name="xsa" assignNames="x1a x2a"}, repeat: $x1a{name="x1ac"}, $x2a{name="x2ac"}
+ xsb: $xsa{name="xsb" assignNames="x1b x2b"}, repeat: $x1b{name="x1bc"}, $x2b{name="x2bc"}
+ xsc: $xsb{name="xsc" assignNames="x1c x2c"}, repeat: $x1c{name="x1cc"}, $x2c{name="x2cc"}
+
+
+
+
+
+ `,
+ },
+ "*",
+ );
+ });
+
+ let xsNames = [
+ "/xs",
+ "/xsa",
+ "/xsb",
+ "/xsc",
+ "/sec2/xsa",
+ "/sec2/xsb",
+ "/sec2/xsc",
+ "/sec3/xsa",
+ "/sec3/xsb",
+ "/sec3/xsc",
+ ];
+ let x1Names = [
+ "/x1",
+ "/x1a",
+ "/x1ac",
+ "/x1b",
+ "/x1bc",
+ "/x1c",
+ "/x1cc",
+ "/sec2/x1a",
+ "/sec2/x1ac",
+ "/sec2/x1b",
+ "/sec2/x1bc",
+ "/sec2/x1c",
+ "/sec2/x1cc",
+ "/sec3/x1a",
+ "/sec3/x1ac",
+ "/sec3/x1b",
+ "/sec3/x1bc",
+ "/sec3/x1c",
+ "/sec3/x1cc",
+ ];
+ let x2Names = [
+ "/x2",
+ "/x2a",
+ "/x2ac",
+ "/x2b",
+ "/x2bc",
+ "/x2c",
+ "/x2cc",
+ "/sec2/x2a",
+ "/sec2/x2ac",
+ "/sec2/x2b",
+ "/sec2/x2bc",
+ "/sec2/x2c",
+ "/sec2/x2cc",
+ "/sec3/x2a",
+ "/sec3/x2ac",
+ "/sec3/x2b",
+ "/sec3/x2bc",
+ "/sec3/x2c",
+ "/sec3/x2cc",
+ ];
+
+ for (let xsName of xsNames) {
+ cy.get(cesc2("#" + xsName) + " .mjx-mrow")
+ .eq(0)
+ .should("have.text", "1");
+ cy.get(cesc2("#" + xsName) + " .mjx-mrow")
+ .eq(1)
+ .should("have.text", "2");
+ }
+
+ for (let x1Name of x1Names) {
+ cy.get(cesc2("#" + x1Name) + " .mjx-mrow")
+ .eq(0)
+ .should("have.text", "1");
+ }
+ for (let x2Name of x2Names) {
+ cy.get(cesc2("#" + x2Name) + " .mjx-mrow")
+ .eq(0)
+ .should("have.text", "2");
+ }
+
+ cy.log("switch point index");
+ cy.get(cesc2("#/n") + " textarea").type("{end}{backspace}2{enter}", {
+ force: true,
+ });
+ cy.get(cesc2("#/x1") + " .mjx-mrow").should("contain.text", "3");
+
+ for (let xsName of xsNames) {
+ cy.get(cesc2("#" + xsName) + " .mjx-mrow")
+ .eq(0)
+ .should("have.text", "3");
+ cy.get(cesc2("#" + xsName) + " .mjx-mrow")
+ .eq(1)
+ .should("have.text", "4");
+ }
+
+ for (let x1Name of x1Names) {
+ cy.get(cesc2("#" + x1Name) + " .mjx-mrow")
+ .eq(0)
+ .should("have.text", "3");
+ }
+ for (let x2Name of x2Names) {
+ cy.get(cesc2("#" + x2Name) + " .mjx-mrow")
+ .eq(0)
+ .should("have.text", "4");
+ }
+
+ cy.log("switch to invalid point index");
+ cy.get(cesc2("#/n") + " textarea").type("{end}{backspace}3{enter}", {
+ force: true,
+ });
+
+ for (let xsName of xsNames) {
+ cy.get(cesc2("#" + xsName) + " .mjx-mrow").should("not.exist");
+ }
+
+ for (let x1Name of x1Names) {
+ cy.get(cesc2("#" + x1Name) + " .mjx-mrow").should("not.exist");
+ }
+ for (let x2Name of x2Names) {
+ cy.get(cesc2("#" + x2Name) + " .mjx-mrow").should("not.exist");
+ }
+
+ cy.log("back to point 1");
+ cy.get(cesc2("#/n") + " textarea").type("{end}{backspace}1{enter}", {
+ force: true,
+ });
+
+ for (let xsName of xsNames) {
+ cy.get(cesc2("#" + xsName) + " .mjx-mrow")
+ .eq(0)
+ .should("have.text", "1");
+ cy.get(cesc2("#" + xsName) + " .mjx-mrow")
+ .eq(1)
+ .should("have.text", "2");
+ }
+
+ for (let x1Name of x1Names) {
+ cy.get(cesc2("#" + x1Name) + " .mjx-mrow")
+ .eq(0)
+ .should("have.text", "1");
+ }
+ for (let x2Name of x2Names) {
+ cy.get(cesc2("#" + x2Name) + " .mjx-mrow")
+ .eq(0)
+ .should("have.text", "2");
+ }
+ });
+
+ it("assign names to array prop, copy with component index", () => {
+ cy.window().then(async (win) => {
+ win.postMessage(
+ {
+ doenetML: `
+
+
+
+ $_line1.points{name="pts" assignNames="p1 p2"}
+
+
+ $pts[$n]{name="pt"}
+ $pt{name="pta"}
+ $pts[$n].xs{name="ptxs" assignNames="ptx1 ptx2"}
+ $ptxs{name="ptxsa" assignNames="ptx1a ptx2a"}
+ $p1.xs[$n]{name="p1xs" assignNames="p1x"}
+ $p1xs{name="p1xsa"}
+ $p1x{name="p1xa"}
+ $p2.xs[$n]{name="p2xs" assignNames="p2x"}
+ $p2xs{name="p2xsa"}
+ $p2x{name="p2xa"}
+
+
+
+
+
+ `,
+ },
+ "*",
+ );
+ });
+
+ let ptNames = [
+ "/pt",
+ "/pta",
+ "/sec2/pt",
+ "/sec2/pta",
+ "/sec3/pt",
+ "/sec3/pta",
+ ];
+ let ptxsNames = [
+ "/ptxs",
+ "/ptxsa",
+ "/sec2/ptxs",
+ "/sec2/ptxsa",
+ "/sec3/ptxs",
+ "/sec3/ptxsa",
+ ];
+ let ptx1Names = [
+ "/ptx1",
+ "/ptx1a",
+ "/sec2/ptx1",
+ "/sec2/ptx1a",
+ "/sec3/ptx1",
+ "/sec3/ptx1a",
+ ];
+ let ptx2Names = [
+ "/ptx2",
+ "/ptx2a",
+ "/sec2/ptx2",
+ "/sec2/ptx2a",
+ "/sec3/ptx2",
+ "/sec3/ptx2a",
+ ];
+ let p1xNames = [
+ "/p1x",
+ "/p1xa",
+ "/sec2/p1x",
+ "/sec2/p1xa",
+ "/sec3/p1x",
+ "/sec3/p1xa",
+ ];
+ let p2xNames = [
+ "/p2x",
+ "/p2xa",
+ "/sec2/p2x",
+ "/sec2/p2xa",
+ "/sec3/p2x",
+ "/sec3/p2xa",
+ ];
+
+ for (let ptName of ptNames) {
+ cy.get(cesc2("#" + ptName) + " .mjx-mrow")
+ .eq(0)
+ .should("have.text", "(1,2)");
+ }
+
+ for (let ptxsName of ptxsNames) {
+ cy.get(cesc2("#" + ptxsName) + " .mjx-mrow")
+ .eq(0)
+ .should("have.text", "1");
+ cy.get(cesc2("#" + ptxsName) + " .mjx-mrow")
+ .eq(1)
+ .should("have.text", "2");
+ }
+ for (let ptx1Name of ptx1Names) {
+ cy.get(cesc2("#" + ptx1Name) + " .mjx-mrow")
+ .eq(0)
+ .should("have.text", "1");
+ }
+ for (let ptx2Name of ptx2Names) {
+ cy.get(cesc2("#" + ptx2Name) + " .mjx-mrow")
+ .eq(0)
+ .should("have.text", "2");
+ }
+ for (let p1xName of p1xNames) {
+ cy.get(cesc2("#" + p1xName) + " .mjx-mrow")
+ .eq(0)
+ .should("have.text", "1");
+ }
+ for (let p2xName of p2xNames) {
+ cy.get(cesc2("#" + p2xName) + " .mjx-mrow")
+ .eq(0)
+ .should("have.text", "3");
+ }
+
+ cy.log("switch index");
+ cy.get(cesc2("#/n") + " textarea").type("{end}{backspace}2{enter}", {
+ force: true,
+ });
+ cy.get(cesc2("#/ptx1") + " .mjx-mrow").should("contain.text", "3");
+
+ for (let ptName of ptNames) {
+ cy.get(cesc2("#" + ptName) + " .mjx-mrow")
+ .eq(0)
+ .should("have.text", "(3,4)");
+ }
+
+ for (let ptxsName of ptxsNames) {
+ cy.get(cesc2("#" + ptxsName) + " .mjx-mrow")
+ .eq(0)
+ .should("have.text", "3");
+ cy.get(cesc2("#" + ptxsName) + " .mjx-mrow")
+ .eq(1)
+ .should("have.text", "4");
+ }
+ for (let ptx1Name of ptx1Names) {
+ cy.get(cesc2("#" + ptx1Name) + " .mjx-mrow")
+ .eq(0)
+ .should("have.text", "3");
+ }
+ for (let ptx2Name of ptx2Names) {
+ cy.get(cesc2("#" + ptx2Name) + " .mjx-mrow")
+ .eq(0)
+ .should("have.text", "4");
+ }
+ for (let p1xName of p1xNames) {
+ cy.get(cesc2("#" + p1xName) + " .mjx-mrow")
+ .eq(0)
+ .should("have.text", "2");
+ }
+ for (let p2xName of p2xNames) {
+ cy.get(cesc2("#" + p2xName) + " .mjx-mrow")
+ .eq(0)
+ .should("have.text", "4");
+ }
+
+ cy.log("switch to invalid index");
+ cy.get(cesc2("#/n") + " textarea").type("{end}{backspace}3{enter}", {
+ force: true,
+ });
+
+ for (let ptName of ptNames) {
+ cy.get(cesc2("#" + ptName) + " .mjx-mrow").should("not.exist");
+ }
+
+ for (let ptxsName of ptxsNames) {
+ cy.get(cesc2("#" + ptxsName) + " .mjx-mrow").should("not.exist");
+ }
+ for (let ptx1Name of ptx1Names) {
+ cy.get(cesc2("#" + ptx1Name) + " .mjx-mrow").should("not.exist");
+ }
+ for (let ptx2Name of ptx2Names) {
+ cy.get(cesc2("#" + ptx2Name) + " .mjx-mrow").should("not.exist");
+ }
+ for (let p1xName of p1xNames) {
+ cy.get(cesc2("#" + p1xName) + " .mjx-mrow").should("not.exist");
+ }
+ for (let p2xName of p2xNames) {
+ cy.get(cesc2("#" + p2xName) + " .mjx-mrow").should("not.exist");
+ }
+
+ cy.log("switch back to index 1");
+ cy.get(cesc2("#/n") + " textarea").type("{end}{backspace}1{enter}", {
+ force: true,
+ });
+
+ for (let ptName of ptNames) {
+ cy.get(cesc2("#" + ptName) + " .mjx-mrow")
+ .eq(0)
+ .should("have.text", "(1,2)");
+ }
+
+ for (let ptxsName of ptxsNames) {
+ cy.get(cesc2("#" + ptxsName) + " .mjx-mrow")
+ .eq(0)
+ .should("have.text", "1");
+ cy.get(cesc2("#" + ptxsName) + " .mjx-mrow")
+ .eq(1)
+ .should("have.text", "2");
+ }
+ for (let ptx1Name of ptx1Names) {
+ cy.get(cesc2("#" + ptx1Name) + " .mjx-mrow")
+ .eq(0)
+ .should("have.text", "1");
+ }
+ for (let ptx2Name of ptx2Names) {
+ cy.get(cesc2("#" + ptx2Name) + " .mjx-mrow")
+ .eq(0)
+ .should("have.text", "2");
+ }
+ for (let p1xName of p1xNames) {
+ cy.get(cesc2("#" + p1xName) + " .mjx-mrow")
+ .eq(0)
+ .should("have.text", "1");
+ }
+ for (let p2xName of p2xNames) {
+ cy.get(cesc2("#" + p2xName) + " .mjx-mrow")
+ .eq(0)
+ .should("have.text", "3");
+ }
+ });
+
+ //Note: the next 3 are not using assignNames anymore given changes to how copies work
+ it("names can access namespace", () => {
cy.window().then(async (win) => {
win.postMessage(
{
doenetML: `
- a
Hello, Jesse !
@@ -2205,21 +2123,19 @@ describe("Basic copy assignName Tests", function () {
-
+ $(_section1/_p1/person) $(_section1/person)
+$(a/_p1/person) $(a/person)
+$(b/_p1/person) $(b/person)
`,
},
"*",
);
});
- cy.get(cesc("#\\/_text1")).should("have.text", "a"); // to wait for page to load
-
cy.get(cesc("#\\/_section1\\/_p1")).should("have.text", "Hello, Jesse!");
cy.get(cesc("#\\/_section1\\/_p2")).should("have.text", "Hello, Jessica!");
cy.get(cesc("#\\/a\\/_p1")).should("have.text", "Hello, Jesse!");
@@ -2248,21 +2164,20 @@ describe("Basic copy assignName Tests", function () {
});
});
- it("assign names can access namespace, across namespaces", () => {
+ it("names can access namespace, across namespaces", () => {
cy.window().then(async (win) => {
win.postMessage(
{
doenetML: `
- a
Hello
Hello, Jesse !
-
+ $_p1{name="a"}
+ $(_p1/person) $(a/person) $(../bye/a/person)
Bye
-
+ $(../hello/_p1{name="a"})
+ $(../hello/_p1/person) $(../hello/a/person) $(a/person)
This grabs expression:
- This grabs expression:
- This grabs piece x:
- This grabs piece y:
- Should this grab piece x?
- Should this grab piece y?
+ This grabs expression: $(pOriginal/expression{name="expressionCopy"})
+ This grabs expression: $(pCopy/expression{name="expressionCopy2"})
+ This grabs piece x: $(pOriginal/x{name="xCopy"})
+ This grabs piece y: $(pOriginal/y{name="yCopy"})
+ Should this grab piece x? $(pCopy/x{name="xCopy2"})
+ Should this grab piece y? $(pCopy/y{name="yCopy2"})
`,
},
@@ -2316,61 +2229,29 @@ describe("Basic copy assignName Tests", function () {
});
cy.get(cesc("#\\/_text1")).should("have.text", "a"); // to wait for page to load
- cy.get(cesc(`#\\/pOriginal\\/expression`))
- .find(".mjx-mrow")
+ cy.get(cesc(`#\\/pOriginal\\/expression`) + " .mjx-mrow")
.eq(0)
- .invoke("text")
- .then((text) => {
- expect(text.trim()).equal("x+y");
- });
- cy.get(cesc(`#\\/pCopy\\/expression`))
- .find(".mjx-mrow")
+ .should("have.text", "x+y");
+ cy.get(cesc(`#\\/pCopy\\/expression`) + " .mjx-mrow")
.eq(0)
- .invoke("text")
- .then((text) => {
- expect(text.trim()).equal("x+y");
- });
- cy.get(cesc(`#\\/expressionCopy`))
- .find(".mjx-mrow")
+ .should("have.text", "x+y");
+ cy.get(cesc(`#\\/expressionCopy`) + " .mjx-mrow")
.eq(0)
- .invoke("text")
- .then((text) => {
- expect(text.trim()).equal("x+y");
- });
- cy.get(cesc(`#\\/expressionCopy2`))
- .find(".mjx-mrow")
+ .should("have.text", "x+y");
+ cy.get(cesc(`#\\/expressionCopy2`) + " .mjx-mrow")
.eq(0)
- .invoke("text")
- .then((text) => {
- expect(text.trim()).equal("x+y");
- });
- cy.get(cesc(`#\\/xCopy`))
- .find(".mjx-mrow")
+ .should("have.text", "x+y");
+ cy.get(cesc(`#\\/xCopy`) + " .mjx-mrow")
.eq(0)
- .invoke("text")
- .then((text) => {
- expect(text.trim()).equal("x");
- });
- cy.get(cesc(`#\\/xCopy2`))
- .find(".mjx-mrow")
+ .should("have.text", "x");
+ cy.get(cesc(`#\\/xCopy2`) + " .mjx-mrow")
.eq(0)
- .invoke("text")
- .then((text) => {
- expect(text.trim()).equal("x");
- });
- cy.get(cesc(`#\\/yCopy`))
- .find(".mjx-mrow")
+ .should("have.text", "x");
+ cy.get(cesc(`#\\/yCopy`) + " .mjx-mrow")
.eq(0)
- .invoke("text")
- .then((text) => {
- expect(text.trim()).equal("y");
- });
- cy.get(cesc(`#\\/yCopy2`))
- .find(".mjx-mrow")
+ .should("have.text", "y");
+ cy.get(cesc(`#\\/yCopy2`) + " .mjx-mrow")
.eq(0)
- .invoke("text")
- .then((text) => {
- expect(text.trim()).equal("y");
- });
+ .should("have.text", "y");
});
});
diff --git a/cypress/e2e/DoenetML/assignNames/collections.cy.js b/cypress/e2e/DoenetML/assignNames/collections.cy.js
index a65467eb37..6fc9cf76cc 100644
--- a/cypress/e2e/DoenetML/assignNames/collections.cy.js
+++ b/cypress/e2e/DoenetML/assignNames/collections.cy.js
@@ -21,41 +21,41 @@ describe("Collection assignName Tests", function () {
a:
- b:
+ a: $a.coords{assignNames="ashadow"}
+ b: $b.coords{assignNames="bshadow"}
u:
- v:
+ u: $u{name="ushadow"}
+ v: $v{name="vshadow"}
-
- a1:
- b1:
+ a1: $a1.coords{assignNames="a1shadow"}
+ b1: $b1.coords{assignNames="b1shadow"}
- u1:
- v1:
+ u1: $u1{name="u1shadow"}
+ v1: $v1{name="v1shadow"}
- u2:
- v2:
+ u2: $u2{name="u2shadow"}
+ v2: $v2{name="v2shadow"}
- $cl1
- u3:
- v3:
+ u3: $u3{name="u3shadow"}
+ v3: $v3{name="v3shadow"}
- $a1
+ $b1
- u4:
- v4:
+ u4: $u4{name="u4shadow"}
+ v4: $v4{name="v4shadow"}
`,
},
@@ -1036,50 +1036,50 @@ describe("Collection assignName Tests", function () {
a:
- b:
- c:
+ a: $a.coords{assignNames="ashadow"}
+ b: $b.coords{assignNames="bshadow"}
+ c: $c.coords{assignNames="cshadow"}
u:
- v:
- w:
+ u: $u{name="ushadow"}
+ v: $v{name="vshadow"}
+ w: $w{name="wshadow"}
-
- a1:
- b1:
- c1:
+ a1: $a1.coords{assignNames="a1shadow"}
+ b1: $b1.coords{assignNames="b1shadow"}
+ c1: $c1.coords{assignNames="c1shadow"}
- u1:
- v1:
- v1:
- x1:
+ u1: $u1{name="u1shadow"}
+ v1: $v1{name="v1shadow"}
+ v1: $w1{name="w1shadow"}
+ x1: $x1{name="x1shadow"}
- u2:
- v2:
+ u2: $u2{name="u2shadow"}
+ v2: $v2{name="v2shadow"}
- $cl1
- u3:
- v3:
- v3:
- x3:
+ u3: $u3{name="u3shadow"}
+ v3: $v3{name="v3shadow"}
+ v3: $w3{name="w3shadow"}
+ x3: $x3{name="x3shadow"}
- $a1
+ $b1
- u4:
- v4:
- v4:
- x4:
+ u4: $u4{name="u4shadow"}
+ v4: $v4{name="v4shadow"}
+ v4: $w4{name="w4shadow"}
+ x4: $x4{name="x4shadow"}
`,
},
@@ -2107,46 +2107,46 @@ describe("Collection assignName Tests", function () {
a:
- b:
- c:
- d:
-
- p:
- q:
- r:
- s:
-
- p1:
- q1:
- r1:
- s1:
-
- x11:
- x12:
- x21:
- x22:
- x31:
- x32:
- x41:
- x42:
-
- y11:
- y12:
- y21:
- y22:
- y31:
- y32:
- y41:
- y42:
+ a: $a.coords{assignNames="ashadow"}
+ b: $b.coords{assignNames="bshadow"}
+ c: $c.coords{assignNames="cshadow"}
+ d: $d.coords{assignNames="dshadow"}
+
+ $cl1.x{assignNames="p q r s"}
+
+ p: $p{name="pshadow"}
+ q: $q{name="qshadow"}
+ r: $r{name="rshadow"}
+ s: $s{name="sshadow"}
+
+ $cl1
+
+ p1: $p1{name="p1shadow"}
+ q1: $q1{name="q1shadow"}
+ r1: $r1{name="r1shadow"}
+ s1: $s1{name="s1shadow"}
+
+ $cl1.xs{assignNames="x11 x12 x21 x22 x31 x32 x41 x42"}
+
+ x11: $x11{name="x11shadow"}
+ x12: $x12{name="x12shadow"}
+ x21: $x21{name="x21shadow"}
+ x22: $x22{name="x22shadow"}
+ x31: $x31{name="x31shadow"}
+ x32: $x32{name="x32shadow"}
+ x41: $x41{name="x41shadow"}
+ x42: $x42{name="x42shadow"}
+
+ $cl1
+
+ y11: $y11{name="y11shadow"}
+ y12: $y12{name="y12shadow"}
+ y21: $y21{name="y21shadow"}
+ y22: $y22{name="y22shadow"}
+ y31: $y31{name="y31shadow"}
+ y32: $y32{name="y32shadow"}
+ y41: $y41{name="y41shadow"}
+ y42: $y42{name="y42shadow"}
`,
},
@@ -4063,58 +4063,58 @@ describe("Collection assignName Tests", function () {
p1:
- p2:
- p3:
- p4:
+ p1: $p1.coords{assignNames="p1shadow"}
+ p2: $p2.coords{assignNames="p2shadow"}
+ p3: $p3.coords{assignNames="p3shadow"}
+ p4: $p4.coords{assignNames="p4shadow"}
- q1:
- q2:
- q3:
- q4:
- q5:
- q6:
+ q1: $q1.coords{assignNames="q1shadow"}
+ q2: $q2.coords{assignNames="q2shadow"}
+ q3: $q3.coords{assignNames="q3shadow"}
+ q4: $q4.coords{assignNames="q4shadow"}
+ q5: $q5.coords{assignNames="q5shadow"}
+ q6: $q6.coords{assignNames="q6shadow"}
x11:
- x12:
- x13:
- x14:
- x15:
- x16:
+ x11: $x11{name="x11shadow"}
+ x12: $x12{name="x12shadow"}
+ x13: $x13{name="x13shadow"}
+ x14: $x14{name="x14shadow"}
+ x15: $x15{name="x15shadow"}
+ x16: $x16{name="x16shadow"}
- x21:
- x22:
- x23:
- x24:
+ x21: $x21{name="x21shadow"}
+ x22: $x22{name="x22shadow"}
+ x23: $x23{name="x23shadow"}
+ x24: $x24{name="x24shadow"}
- x31:
- x32:
- x33:
- x34:
+ x31: $x31{name="x31shadow"}
+ x32: $x32{name="x32shadow"}
+ x33: $x33{name="x33shadow"}
+ x34: $x34{name="x34shadow"}
- x41:
- x42:
- x43:
- x44:
+ x41: $x41{name="x41shadow"}
+ x42: $x42{name="x42shadow"}
+ x43: $x43{name="x43shadow"}
+ x44: $x44{name="x44shadow"}
- $allpoints
- x51:
- x52:
- x53:
- x54:
- x55:
- x56:
+ x51: $x51{name="x51shadow"}
+ x52: $x52{name="x52shadow"}
+ x53: $x53{name="x53shadow"}
+ x54: $x54{name="x54shadow"}
+ x55: $x55{name="x55shadow"}
+ x56: $x56{name="x56shadow"}
`,
@@ -8795,68 +8795,68 @@ describe("Collection assignName Tests", function () {
p1:
- p2:
- p3:
- p4:
+ p1: $p1.coords{assignNames="p1shadow"}
+ p2: $p2.coords{assignNames="p2shadow"}
+ p3: $p3.coords{assignNames="p3shadow"}
+ p4: $p4.coords{assignNames="p4shadow"}
- q1:
- q2:
- q3:
- q4:
- q5:
- q6:
+ q1: $q1.coords{assignNames="q1shadow"}
+ q2: $q2.coords{assignNames="q2shadow"}
+ q3: $q3.coords{assignNames="q3shadow"}
+ q4: $q4.coords{assignNames="q4shadow"}
+ q5: $q5.coords{assignNames="q5shadow"}
+ q6: $q6.coords{assignNames="q6shadow"}
xs11:
- xs12:
- xs13:
- xs14:
- xs15:
- xs16:
- xs17:
- xs18:
-
- xs21:
- xs22:
- xs23:
- xs24:
- xs25:
- xs26:
-
- xs31:
- xs32:
- xs33:
- xs34:
- xs35:
- xs36:
-
- xs41:
- xs42:
- xs43:
- xs44:
- xs45:
- xs46:
-
- xs51:
- xs52:
- xs53:
- xs54:
- xs55:
- xs56:
- xs57:
- xs58:
+ xs11: $xs11{name="xs11shadow"}
+ xs12: $xs12{name="xs12shadow"}
+ xs13: $xs13{name="xs13shadow"}
+ xs14: $xs14{name="xs14shadow"}
+ xs15: $xs15{name="xs15shadow"}
+ xs16: $xs16{name="xs16shadow"}
+ xs17: $xs17{name="xs17shadow"}
+ xs18: $xs18{name="xs18shadow"}
+
+ $allxs1{name="allxs2" assignNames="xs21 xs22 xs23 xs24 xs25 xs26"}
+
+ xs21: $xs21{name="xs21shadow"}
+ xs22: $xs22{name="xs22shadow"}
+ xs23: $xs23{name="xs23shadow"}
+ xs24: $xs24{name="xs24shadow"}
+ xs25: $xs25{name="xs25shadow"}
+ xs26: $xs26{name="xs26shadow"}
+
+ $allpoints.xs{name="allxs3" assignNames="xs31 xs32 xs33 xs34 xs35 xs36"}
+
+ xs31: $xs31{name="xs31shadow"}
+ xs32: $xs32{name="xs32shadow"}
+ xs33: $xs33{name="xs33shadow"}
+ xs34: $xs34{name="xs34shadow"}
+ xs35: $xs35{name="xs35shadow"}
+ xs36: $xs36{name="xs36shadow"}
+
+ $allpoints2.xs{name="allxs4" assignNames="xs41 xs42 xs43 xs44 xs45 xs46"}
+
+ xs41: $xs41{name="xs41shadow"}
+ xs42: $xs42{name="xs42shadow"}
+ xs43: $xs43{name="xs43shadow"}
+ xs44: $xs44{name="xs44shadow"}
+ xs45: $xs45{name="xs45shadow"}
+ xs46: $xs46{name="xs46shadow"}
+
+ $allpoints
+
+ xs51: $xs51{name="xs51shadow"}
+ xs52: $xs52{name="xs52shadow"}
+ xs53: $xs53{name="xs53shadow"}
+ xs54: $xs54{name="xs54shadow"}
+ xs55: $xs55{name="xs55shadow"}
+ xs56: $xs56{name="xs56shadow"}
+ xs57: $xs57{name="xs57shadow"}
+ xs58: $xs58{name="xs58shadow"}
`,
},
diff --git a/cypress/e2e/DoenetML/assignNames/selects.cy.js b/cypress/e2e/DoenetML/assignNames/selects.cy.js
index dfc2918321..993133954d 100644
--- a/cypress/e2e/DoenetML/assignNames/selects.cy.js
+++ b/cypress/e2e/DoenetML/assignNames/selects.cy.js
@@ -28,7 +28,7 @@ describe("selects assignName Tests", function () {
-
a:
- b:
+ a: $a{name="cpa"}
+ b: $b{name="cpb"}
-
- a1:
- b1:
- c1:
+ a1: $a1{name="cpa1"}
+ b1: $b1{name="cpb1"}
+ c1: $c1{name="cpc1"}
-
- a2:
- b2:
- c2:
- d2:
- e2:
+ a2: $a2{name="cpa2"}
+ b2: $b2{name="cpb2"}
+ c2: $c2{name="cpc2"}
+ d2: $d2{name="cpd2"}
+ e2: $e2{name="cpe2"}
-
- a3:
- b3:
- c3:
- d3:
+ a3: $a3{name="cpa3"}
+ b3: $b3{name="cpb3"}
+ c3: $c3{name="cpc3"}
+ d3: $d3{name="cpd3"}
`,
},
"*",
@@ -572,72 +572,72 @@ describe("sequence and map assignName Tests", function () {
doenetML: `
a
- Letter
+
+ Letter $i{name="n"} is $l{name="v"}.
- a:
- b:
+ a: $a{name="cpa"}
+ b: $b{name="cpb"}
- a/n:
- b/n:
+ a/n: $(a/n{name="cpan"})
+ b/n: $(b/n{name="cpbn"})
- a/v:
- b/v:
+ a/v: $(a/v{name="cpav"})
+ b/v: $(b/v{name="cpbv"})
-
- a1:
- b1:
- c1:
+
+ a1: $a1{name="cpa1"}
+ b1: $b1{name="cpb1"}
+ c1: $c1{name="cpc1"}
- a1/n:
- b1/n:
- c1/n:
+ a1/n: $(a1/n{name="cpan1"})
+ b1/n: $(b1/n{name="cpbn1"})
+ c1/n: $(c1/n{name="cpcn1"})
- a1/v:
- b1/v:
- c1/v:
+ a1/v: $(a1/v{name="cpav1"})
+ b1/v: $(b1/v{name="cpbv1"})
+ c1/v: $(c1/v{name="cpcv1"})
-
- a2:
- b2:
- c2:
- d2:
- e2:
+
+ a2: $a2{name="cpa2"}
+ b2: $b2{name="cpb2"}
+ c2: $c2{name="cpc2"}
+ d2: $d2{name="cpd2"}
+ e2: $e2{name="cpe2"}
- a2/n:
- b2/n:
- c2/n:
- d2/n:
- e2/n:
-
- a2/v:
- b2/v:
- c2/v:
- d2/v:
- e2/v:
-
-
-
- a3:
- b3:
- c3:
- d3:
-
- a3/n:
- b3/n:
- c3/n:
- d3/n:
-
- a3/v:
- b3/v:
- c3/v:
- d3/v:
+ a2/n: $(a2/n{name="cpan2"})
+ b2/n: $(b2/n{name="cpbn2"})
+ c2/n: $(c2/n{name="cpcn2"})
+ d2/n: $(d2/n{name="cpdn2"})
+ e2/n: $(e2/n{name="cpen2"})
+
+ a2/v: $(a2/v{name="cpav2"})
+ b2/v: $(b2/v{name="cpbv2"})
+ c2/v: $(c2/v{name="cpcv2"})
+ d2/v: $(d2/v{name="cpdv2"})
+ e2/v: $(e2/v{name="cpev2"})
+
+
+
+ a3: $a3{name="cpa3"}
+ b3: $b3{name="cpb3"}
+ c3: $c3{name="cpc3"}
+ d3: $d3{name="cpd3"}
+
+ a3/n: $(a3/n{name="cpan3"})
+ b3/n: $(b3/n{name="cpbn3"})
+ c3/n: $(c3/n{name="cpcn3"})
+ d3/n: $(d3/n{name="cpdn3"})
+
+ a3/v: $(a3/v{name="cpav3"})
+ b3/v: $(b3/v{name="cpbv3"})
+ c3/v: $(c3/v{name="cpcv3"})
+ d3/v: $(d3/v{name="cpdv3"})
`,
},
"*",
@@ -1543,55 +1543,43 @@ describe("sequence and map assignName Tests", function () {
cy.get(cesc("#\\/pev2")).should("have.text", "e2/v: ");
});
- it("copy source and index assign names", () => {
+ it("copy alias and index alias with names", () => {
cy.window().then(async (win) => {
win.postMessage(
{
doenetML: `
a
- Letter
+
+ Letter $i{name="n1"} is $m{name="v1"}.
- a:
- b:
+ a: $a{name="cpa"}
+ b: $b{name="cpb"}
- a/n1:
- b/n1:
- a/n2:
- b/n2:
+ a/n1: $(a/n1{name="cpan1"})
+ b/n1: $(b/n1{name="cpbn1"})
- a/v1:
- b/v1:
- a/v2:
- b/v2:
+ a/v1: $(a/v1{name="cpav1"})
+ b/v1: $(b/v1{name="cpbv1"})
-
- a1:
- b1:
- c1:
+ $_map1{name="cpall" assignNames="a1 b1 c1"}
+ a1: $a1{name="cpa1"}
+ b1: $b1{name="cpb1"}
+ c1: $c1{name="cpc1"}
- a1/n1:
- b1/n1:
- c1/n1:
+ a1/n1: $(a1/n1{name="cpan11"})
+ b1/n1: $(b1/n1{name="cpbn11"})
+ c1/n1: $(c1/n1{name="cpcn11"})
- a1/n2:
- b1/n2:
- c1/n2:
-
- a1/v1:
- b1/v1:
- c1/v1:
-
- a1/v2:
- b1/v2:
- c1/v2:
+ a1/v1: $(a1/v1{name="cpav11"})
+ b1/v1: $(b1/v1{name="cpbv11"})
+ c1/v1: $(c1/v1{name="cpcv11"})
`,
},
"*",
@@ -1608,34 +1596,24 @@ describe("sequence and map assignName Tests", function () {
cy.get(cesc("#\\/pan1")).should("have.text", "a/n1: 1");
cy.get(cesc("#\\/pan11")).should("have.text", "a1/n1: 1");
- cy.get(cesc("#\\/pan2")).should("have.text", "a/n2: ");
- cy.get(cesc("#\\/pan21")).should("have.text", "a1/n2: ");
cy.get(cesc("#\\/pav1")).should("have.text", "a/v1: a");
cy.get(cesc("#\\/pav11")).should("have.text", "a1/v1: a");
- cy.get(cesc("#\\/pav2")).should("have.text", "a/v2: ");
- cy.get(cesc("#\\/pav21")).should("have.text", "a1/v2: ");
cy.get(cesc("#\\/pb")).should("have.text", "b: ");
cy.get(cesc("#\\/pb1")).should("have.text", "b1: ");
cy.get(cesc("#\\/pbn1")).should("have.text", "b/n1: ");
cy.get(cesc("#\\/pbn11")).should("have.text", "b1/n1: ");
- cy.get(cesc("#\\/pbn2")).should("have.text", "b/n2: ");
- cy.get(cesc("#\\/pbn21")).should("have.text", "b1/n2: ");
cy.get(cesc("#\\/pbv1")).should("have.text", "b/v1: ");
cy.get(cesc("#\\/pbv11")).should("have.text", "b1/v1: ");
- cy.get(cesc("#\\/pbv2")).should("have.text", "b/v2: ");
- cy.get(cesc("#\\/pbv21")).should("have.text", "b1/v2: ");
cy.get(cesc("#\\/pc1")).should("have.text", "c1: ");
cy.get(cesc("#\\/pcn11")).should("have.text", "c1/n1: ");
- cy.get(cesc("#\\/pcn21")).should("have.text", "c1/n2: ");
cy.get(cesc("#\\/pcv11")).should("have.text", "c1/v1: ");
- cy.get(cesc("#\\/pcv21")).should("have.text", "c1/v2: ");
cy.log("change n to 2");
cy.get(cesc("#\\/n") + " textarea").type("{end}{backspace}2{enter}", {
@@ -1656,34 +1634,24 @@ describe("sequence and map assignName Tests", function () {
cy.get(cesc("#\\/pan1")).should("have.text", "a/n1: 1");
cy.get(cesc("#\\/pan11")).should("have.text", "a1/n1: 1");
- cy.get(cesc("#\\/pan2")).should("have.text", "a/n2: ");
- cy.get(cesc("#\\/pan21")).should("have.text", "a1/n2: ");
cy.get(cesc("#\\/pav1")).should("have.text", "a/v1: a");
cy.get(cesc("#\\/pav11")).should("have.text", "a1/v1: a");
- cy.get(cesc("#\\/pav2")).should("have.text", "a/v2: ");
- cy.get(cesc("#\\/pav21")).should("have.text", "a1/v2: ");
cy.get(cesc("#\\/pb")).should("have.text", "b: Letter 2 is b. ");
cy.get(cesc("#\\/pb1")).should("have.text", "b1: Letter 2 is b. ");
cy.get(cesc("#\\/pbn1")).should("have.text", "b/n1: 2");
cy.get(cesc("#\\/pbn11")).should("have.text", "b1/n1: 2");
- cy.get(cesc("#\\/pbn2")).should("have.text", "b/n2: ");
- cy.get(cesc("#\\/pbn21")).should("have.text", "b1/n2: ");
cy.get(cesc("#\\/pbv1")).should("have.text", "b/v1: b");
cy.get(cesc("#\\/pbv11")).should("have.text", "b1/v1: b");
- cy.get(cesc("#\\/pbv2")).should("have.text", "b/v2: ");
- cy.get(cesc("#\\/pbv21")).should("have.text", "b1/v2: ");
cy.get(cesc("#\\/pc1")).should("have.text", "c1: ");
cy.get(cesc("#\\/pcn11")).should("have.text", "c1/n1: ");
- cy.get(cesc("#\\/pcn21")).should("have.text", "c1/n2: ");
cy.get(cesc("#\\/pcv11")).should("have.text", "c1/v1: ");
- cy.get(cesc("#\\/pcv21")).should("have.text", "c1/v2: ");
cy.log("change n to 0");
cy.get(cesc("#\\/n") + " textarea").type("{end}{backspace}0{enter}", {
@@ -1698,34 +1666,24 @@ describe("sequence and map assignName Tests", function () {
cy.get(cesc("#\\/pan1")).should("have.text", "a/n1: ");
cy.get(cesc("#\\/pan11")).should("have.text", "a1/n1: ");
- cy.get(cesc("#\\/pan2")).should("have.text", "a/n2: ");
- cy.get(cesc("#\\/pan21")).should("have.text", "a1/n2: ");
cy.get(cesc("#\\/pav1")).should("have.text", "a/v1: ");
cy.get(cesc("#\\/pav11")).should("have.text", "a1/v1: ");
- cy.get(cesc("#\\/pav2")).should("have.text", "a/v2: ");
- cy.get(cesc("#\\/pav21")).should("have.text", "a1/v2: ");
cy.get(cesc("#\\/pb")).should("have.text", "b: ");
cy.get(cesc("#\\/pb1")).should("have.text", "b1: ");
cy.get(cesc("#\\/pbn1")).should("have.text", "b/n1: ");
cy.get(cesc("#\\/pbn11")).should("have.text", "b1/n1: ");
- cy.get(cesc("#\\/pbn2")).should("have.text", "b/n2: ");
- cy.get(cesc("#\\/pbn21")).should("have.text", "b1/n2: ");
cy.get(cesc("#\\/pbv1")).should("have.text", "b/v1: ");
cy.get(cesc("#\\/pbv11")).should("have.text", "b1/v1: ");
- cy.get(cesc("#\\/pbv2")).should("have.text", "b/v2: ");
- cy.get(cesc("#\\/pbv21")).should("have.text", "b1/v2: ");
cy.get(cesc("#\\/pc1")).should("have.text", "c1: ");
cy.get(cesc("#\\/pcn11")).should("have.text", "c1/n1: ");
- cy.get(cesc("#\\/pcn21")).should("have.text", "c1/n2: ");
cy.get(cesc("#\\/pcv11")).should("have.text", "c1/v1: ");
- cy.get(cesc("#\\/pcv21")).should("have.text", "c1/v2: ");
cy.log("change n to 3");
cy.get(cesc("#\\/n") + " textarea").type("{end}{backspace}3{enter}", {
@@ -1746,34 +1704,24 @@ describe("sequence and map assignName Tests", function () {
cy.get(cesc("#\\/pan1")).should("have.text", "a/n1: 1");
cy.get(cesc("#\\/pan11")).should("have.text", "a1/n1: 1");
- cy.get(cesc("#\\/pan2")).should("have.text", "a/n2: ");
- cy.get(cesc("#\\/pan21")).should("have.text", "a1/n2: ");
cy.get(cesc("#\\/pav1")).should("have.text", "a/v1: a");
cy.get(cesc("#\\/pav11")).should("have.text", "a1/v1: a");
- cy.get(cesc("#\\/pav2")).should("have.text", "a/v2: ");
- cy.get(cesc("#\\/pav21")).should("have.text", "a1/v2: ");
cy.get(cesc("#\\/pb")).should("have.text", "b: Letter 2 is b. ");
cy.get(cesc("#\\/pb1")).should("have.text", "b1: Letter 2 is b. ");
cy.get(cesc("#\\/pbn1")).should("have.text", "b/n1: 2");
cy.get(cesc("#\\/pbn11")).should("have.text", "b1/n1: 2");
- cy.get(cesc("#\\/pbn2")).should("have.text", "b/n2: ");
- cy.get(cesc("#\\/pbn21")).should("have.text", "b1/n2: ");
cy.get(cesc("#\\/pbv1")).should("have.text", "b/v1: b");
cy.get(cesc("#\\/pbv11")).should("have.text", "b1/v1: b");
- cy.get(cesc("#\\/pbv2")).should("have.text", "b/v2: ");
- cy.get(cesc("#\\/pbv21")).should("have.text", "b1/v2: ");
cy.get(cesc("#\\/pc1")).should("have.text", "c1: Letter 3 is c. ");
cy.get(cesc("#\\/pcn11")).should("have.text", "c1/n1: 3");
- cy.get(cesc("#\\/pcn21")).should("have.text", "c1/n2: ");
cy.get(cesc("#\\/pcv11")).should("have.text", "c1/v1: c");
- cy.get(cesc("#\\/pcv21")).should("have.text", "c1/v2: ");
cy.log("change n to 5");
cy.get(cesc("#\\/n") + " textarea").type("{end}{backspace}5{enter}", {
@@ -1794,51 +1742,41 @@ describe("sequence and map assignName Tests", function () {
cy.get(cesc("#\\/pan1")).should("have.text", "a/n1: 1");
cy.get(cesc("#\\/pan11")).should("have.text", "a1/n1: 1");
- cy.get(cesc("#\\/pan2")).should("have.text", "a/n2: ");
- cy.get(cesc("#\\/pan21")).should("have.text", "a1/n2: ");
cy.get(cesc("#\\/pav1")).should("have.text", "a/v1: a");
cy.get(cesc("#\\/pav11")).should("have.text", "a1/v1: a");
- cy.get(cesc("#\\/pav2")).should("have.text", "a/v2: ");
- cy.get(cesc("#\\/pav21")).should("have.text", "a1/v2: ");
cy.get(cesc("#\\/pb")).should("have.text", "b: Letter 2 is b. ");
cy.get(cesc("#\\/pb1")).should("have.text", "b1: Letter 2 is b. ");
cy.get(cesc("#\\/pbn1")).should("have.text", "b/n1: 2");
cy.get(cesc("#\\/pbn11")).should("have.text", "b1/n1: 2");
- cy.get(cesc("#\\/pbn2")).should("have.text", "b/n2: ");
- cy.get(cesc("#\\/pbn21")).should("have.text", "b1/n2: ");
cy.get(cesc("#\\/pbv1")).should("have.text", "b/v1: b");
cy.get(cesc("#\\/pbv11")).should("have.text", "b1/v1: b");
- cy.get(cesc("#\\/pbv2")).should("have.text", "b/v2: ");
- cy.get(cesc("#\\/pbv21")).should("have.text", "b1/v2: ");
cy.get(cesc("#\\/pc1")).should("have.text", "c1: Letter 3 is c. ");
cy.get(cesc("#\\/pcn11")).should("have.text", "c1/n1: 3");
- cy.get(cesc("#\\/pcn21")).should("have.text", "c1/n2: ");
cy.get(cesc("#\\/pcv11")).should("have.text", "c1/v1: c");
- cy.get(cesc("#\\/pcv21")).should("have.text", "c1/v2: ");
});
- it("copy source and index assign names, no new template namespace", () => {
+ it("copy alias and index alias with names, no new template namespace", () => {
cy.window().then(async (win) => {
win.postMessage(
{
doenetML: `
a
- Letter
+
+ Letter $i{name="n1"} is $m{name="v1"}. Repeat: letter $n1 is $v1.
-
+ $_map1{name="cpall"}
`,
},
"*",
@@ -1900,14 +1838,14 @@ describe("sequence and map assignName Tests", function () {
doenetML: `
a
- Letter
+
+ Letter $i{name="n1"} is $m{name="v1"}. Repeat: letter $n1 is $v1.
-
+ $(m1/_map1{name="cpall"})
`,
},
"*",
diff --git a/cypress/e2e/DoenetML/baseComponent/doenetMLtext.cy.js b/cypress/e2e/DoenetML/baseComponent/doenetMLtext.cy.js
index ed77e57373..b1a0eff41a 100644
--- a/cypress/e2e/DoenetML/baseComponent/doenetMLtext.cy.js
+++ b/cypress/e2e/DoenetML/baseComponent/doenetMLtext.cy.js
@@ -205,9 +205,9 @@ ${theDoenetML3}
-
@@ -350,9 +350,9 @@ ${theDoenetML3}
-
+
Grab the DoenetML from external pre:
$(external/_pre1.doenetML)
@@ -361,11 +361,11 @@ ${theDoenetML3}
- Atomic number:
- Name:
- Symbol:
- Atomic number:
- Group:
- Group Name:
- Atomic mass:
- Phase at STP:
- Charge of common ion:
- Metal category:
- Period:
- Ionization energy:
- Melting point:
- Boiling point:
- Atomic radius:
- Density:
- Electronegativity:
- Electron configuration:
- Orbital diagram: Name: $atom.name{assignNames="name"}
+ Symbol: $atom.symbol{assignNames="symbol"}
+ Atomic number: $atom.atomicNumber{assignNames="atomicNumber"}
+ Group: $atom.group{assignNames="group"}
+ Group Name: $atom.groupName{assignNames="groupName"}
+ Atomic mass: $atom.atomicMass{assignNames="atomicMass" displayDigits="10"}
+ Phase at STP: $atom.phaseAtSTP{assignNames="pahseAtSTP" displayDigits="10"}
+ Charge of common ion: $atom.chargeOfCommonIon{assignNames="chargeOfCommonIon" displayDigits="10"}
+ Metal category: $atom.metalCategory{assignNames="metalCategory" displayDigits="10"}
+ Period: $atom.period{assignNames="period" displayDigits="10"}
+ Ionization energy: $atom.ionizationEnergy{assignNames="ionizationEnergy" displayDigits="10"}
+ Melting point: $atom.meltingPoint{assignNames="meltingPoint" displayDigits="10"}
+ Boiling point: $atom.boilingPoint{assignNames="boilingPoint" displayDigits="10"}
+ Atomic radius: $atom.atomicRadius{assignNames="atomicRadius" displayDigits="10"}
+ Density: $atom.density{assignNames="density" displayDigits="10"}
+ Electronegativity: $atom.electronegativity{assignNames="electronegativity" displayDigits="10"}
+ Electron configuration: $atom.electronConfiguration{assignNames="electronConfiguration"}
+ Orbital diagram: $atom.orbitalDiagram{assignNames="orbitalDiagram"}
`,
},
diff --git a/cypress/e2e/DoenetML/dynamicalsystem/cobwebpolyline.cy.js b/cypress/e2e/DoenetML/dynamicalsystem/cobwebpolyline.cy.js
index 8fe7862e78..6da1fd0a4f 100644
--- a/cypress/e2e/DoenetML/dynamicalsystem/cobwebpolyline.cy.js
+++ b/cypress/e2e/DoenetML/dynamicalsystem/cobwebpolyline.cy.js
@@ -25,7 +25,7 @@ describe("CobwebPolyline Tag Tests", function () {
Initial condition is x_0 = 1 :
- (1,0)
+ $P1.coords = (1,0)
@@ -55,7 +55,7 @@ describe("CobwebPolyline Tag Tests", function () {
-
@@ -66,7 +66,7 @@ describe("CobwebPolyline Tag Tests", function () {
true
-
@@ -1798,7 +1798,7 @@ describe("CobwebPolyline Tag Tests", function () {
2x-x^2/3
- 2x-x^2/3
- Credit achieved:
`,
diff --git a/cypress/e2e/DoenetML/dynamicalsystem/equilibriumcurve.cy.js b/cypress/e2e/DoenetML/dynamicalsystem/equilibriumcurve.cy.js
index 3a0cdf647c..d9285f93be 100644
--- a/cypress/e2e/DoenetML/dynamicalsystem/equilibriumcurve.cy.js
+++ b/cypress/e2e/DoenetML/dynamicalsystem/equilibriumcurve.cy.js
@@ -24,20 +24,20 @@ describe("Equilibriumcurve Tag Tests", function () {
-
-
-
`,
diff --git a/cypress/e2e/DoenetML/dynamicalsystem/equilibriumline.cy.js b/cypress/e2e/DoenetML/dynamicalsystem/equilibriumline.cy.js
index 2eac420054..d3126cfea3 100644
--- a/cypress/e2e/DoenetML/dynamicalsystem/equilibriumline.cy.js
+++ b/cypress/e2e/DoenetML/dynamicalsystem/equilibriumline.cy.js
@@ -24,20 +24,20 @@ describe("Equilibriumline Tag Tests", function () {
-
-
-
`,
diff --git a/cypress/e2e/DoenetML/dynamicalsystem/equilibriumpoint.cy.js b/cypress/e2e/DoenetML/dynamicalsystem/equilibriumpoint.cy.js
index 2af61a08b2..0bf12ab8c6 100644
--- a/cypress/e2e/DoenetML/dynamicalsystem/equilibriumpoint.cy.js
+++ b/cypress/e2e/DoenetML/dynamicalsystem/equilibriumpoint.cy.js
@@ -24,20 +24,20 @@ describe("Equilibriumpoint Tag Tests", function () {
-
-
-
`,
diff --git a/cypress/e2e/DoenetML/dynamicalsystem/odesystem.cy.js b/cypress/e2e/DoenetML/dynamicalsystem/odesystem.cy.js
index f9fd019cbb..e23e301c83 100644
--- a/cypress/e2e/DoenetML/dynamicalsystem/odesystem.cy.js
+++ b/cypress/e2e/DoenetML/dynamicalsystem/odesystem.cy.js
@@ -22,7 +22,7 @@ describe("ODEsystem Tag Tests", function () {
-
@@ -34,7 +34,7 @@ describe("ODEsystem Tag Tests", function () {
0
-
-
-
@@ -572,8 +572,8 @@ describe("ODEsystem Tag Tests", function () {
- We started with
- x( .
+ x($ode.initialindependentvariablevalue) = 1 .
We end with
x($tf) = $$(ode.numericalSolution)($tf)
@@ -1234,7 +1234,7 @@ describe("ODEsystem Tag Tests", function () {
-
@@ -1624,25 +1624,25 @@ describe("ODEsystem Tag Tests", function () {
x/y
- RHS1:
- RHS2:
- RHS1:
- Both RHSs:
- RHS1:
- RHS2:
- RHS1:
- Both RHSs:
+ RHS1: $ode.rhs1{name="rhs1a"}
+ RHS2: $ode.rhs2{name="rhs2a"}
+ RHS1: $ode.rhs{name="rhs1b"}
+ Both RHSs: $ode.rhss{name="rhssa"}
+ RHS1: $ode.righthandside1{name="rhs1c"}
+ RHS2: $ode.righthandside2{name="rhs2b"}
+ RHS1: $ode.righthandside{name="rhs1d"}
+ Both RHSs: $ode.righthandsides{name="rhssb"}
- IC1:
- IC2:
- IC1:
- Both ICs:
+ IC1: $ode.initialcondition1{name="ic1a"}
+ IC2: $ode.initialcondition2{name="ic2a"}
+ IC1: $ode.initialcondition{name="ic1b"}
+ Both ICs: $ode.initialconditions{name="icsa"}
Swap right hand sides and keep initial conditions
- $ode.rhs2
+ $ode.rhs1
`,
},
diff --git a/cypress/e2e/DoenetML/errorsAndWarnings/errors.cy.js b/cypress/e2e/DoenetML/errorsAndWarnings/errors.cy.js
index 0c3dd73d29..dce8900299 100644
--- a/cypress/e2e/DoenetML/errorsAndWarnings/errors.cy.js
+++ b/cypress/e2e/DoenetML/errorsAndWarnings/errors.cy.js
@@ -585,7 +585,6 @@ a />
cat dog
-
`,
},
@@ -621,22 +620,16 @@ a />
cy.get(cesc2("#/g5")).should("contain.text", "line 5");
cy.get(cesc2("#/e")).should("have.text", "cat");
cy.get(cesc2("#/f")).should("have.text", "dog");
- cy.get(cesc2("#/_group7")).should(
- "contain.text",
- "Duplicate component name: f",
- );
- cy.get(cesc2("#/_group7")).should("contain.text", "Found in assignNames");
- cy.get(cesc2("#/_group7")).should("contain.text", "line 9");
cy.get(cesc2("#/_p1")).should(
"contain.text",
"Cannot assign names for component type p",
);
- cy.get(cesc2("#/_p1")).should("contain.text", "line 10");
+ cy.get(cesc2("#/_p1")).should("contain.text", "line 9");
cy.window().then(async (win) => {
let errorWarnings = await win.returnErrorWarnings1();
- expect(errorWarnings.errors.length).eq(7);
+ expect(errorWarnings.errors.length).eq(6);
expect(errorWarnings.warnings.length).eq(0);
expect(errorWarnings.errors[0].message).contain(
@@ -680,20 +673,12 @@ a />
expect(errorWarnings.errors[4].doenetMLrange.charEnd).eq(55);
expect(errorWarnings.errors[5].message).contain(
- "Duplicate component name: f",
+ "Cannot assign names for component type p",
);
expect(errorWarnings.errors[5].doenetMLrange.lineBegin).eq(9);
expect(errorWarnings.errors[5].doenetMLrange.charBegin).eq(1);
expect(errorWarnings.errors[5].doenetMLrange.lineEnd).eq(9);
- expect(errorWarnings.errors[5].doenetMLrange.charEnd).eq(27);
-
- expect(errorWarnings.errors[6].message).contain(
- "Cannot assign names for component type p",
- );
- expect(errorWarnings.errors[6].doenetMLrange.lineBegin).eq(10);
- expect(errorWarnings.errors[6].doenetMLrange.charBegin).eq(1);
- expect(errorWarnings.errors[6].doenetMLrange.lineEnd).eq(10);
- expect(errorWarnings.errors[6].doenetMLrange.charEnd).eq(21);
+ expect(errorWarnings.errors[5].doenetMLrange.charEnd).eq(21);
});
});
@@ -742,8 +727,8 @@ a />
doenetML: `
- (line 5).Found on line 4",
+ "Circular dependency involving these components: (line 4).Found on line 4",
);
cy.get(cesc2("#/_document1")).should(
"contain.text",
- "Possible circular dependency involving these components: (line 9).Found on line 7",
+ "Circular dependency involving these components: (line 7).Found on line 7",
);
cy.get(cesc2("#/_document1")).should(
"contain.text",
- "Possible circular dependency involving these components: (line 14).Found on line 11",
+ "Circular dependency involving these components: (line 11).Found on line 11",
);
cy.get(cesc2("#/_document1")).should(
"not.contain.text",
@@ -870,7 +855,7 @@ a />
expect(errorWarnings.errors[0].doenetMLrange.charEnd).eq(34);
expect(errorWarnings.errors[1].message).contain(
- "Possible circular dependency involving these components: (line 5)",
+ "Circular dependency involving these components: (line 4)",
);
expect(errorWarnings.errors[1].doenetMLrange.lineBegin).eq(4);
expect(errorWarnings.errors[1].doenetMLrange.charBegin).eq(1);
@@ -878,7 +863,7 @@ a />
expect(errorWarnings.errors[1].doenetMLrange.charEnd).eq(34);
expect(errorWarnings.errors[2].message).contain(
- "Possible circular dependency involving these components: (line 9)",
+ "Circular dependency involving these components: (line 7)",
);
expect(errorWarnings.errors[2].doenetMLrange.lineBegin).eq(7);
expect(errorWarnings.errors[2].doenetMLrange.charBegin).eq(1);
@@ -886,7 +871,7 @@ a />
expect(errorWarnings.errors[2].doenetMLrange.charEnd).eq(34);
expect(errorWarnings.errors[3].message).contain(
- "Possible circular dependency involving these components: (line 14)",
+ "Circular dependency involving these components: (line 11)",
);
expect(errorWarnings.errors[3].doenetMLrange.lineBegin).eq(11);
expect(errorWarnings.errors[3].doenetMLrange.charBegin).eq(1);
@@ -967,26 +952,10 @@ a />
);
});
- cy.get(cesc2("#/_document1")).should(
+ cy.document().should(
"contain.text",
- "Circular dependency detected involving component",
+ "Circular dependency involving these components: (line 1).",
);
- cy.get(cesc2("#/_document1")).should("contain.text", "Found on line 1");
-
- cy.window().then(async (win) => {
- let errorWarnings = await win.returnErrorWarnings1();
-
- expect(errorWarnings.errors.length).eq(1);
- expect(errorWarnings.warnings.length).eq(0);
-
- expect(errorWarnings.errors[0].message).contain(
- "Circular dependency detected involving component",
- );
- expect(errorWarnings.errors[0].doenetMLrange.lineBegin).eq(1);
- expect(errorWarnings.errors[0].doenetMLrange.charBegin).eq(17);
- expect(errorWarnings.errors[0].doenetMLrange.lineEnd).eq(1);
- expect(errorWarnings.errors[0].doenetMLrange.charEnd).eq(39);
- });
cy.window().then(async (win) => {
win.postMessage(
@@ -997,34 +966,18 @@ a />
);
});
- cy.get(cesc2("#/_document1")).should("contain.text", "Found on line 2");
- cy.get(cesc2("#/_document1")).should(
+ cy.document().should(
"contain.text",
- "Circular dependency detected involving component",
+ "Circular dependency involving these components: (line 1), (line 2).",
);
- cy.get(cesc2("#/_document1")).should("contain.text", "Found on line 1");
cy.window().then(async (win) => {
- let errorWarnings = await win.returnErrorWarnings1();
-
- expect(errorWarnings.errors.length).eq(2);
- expect(errorWarnings.warnings.length).eq(0);
-
- expect(errorWarnings.errors[0].message).contain(
- "Circular dependency detected involving component",
- );
- expect(errorWarnings.errors[0].doenetMLrange.lineBegin).eq(1);
- expect(errorWarnings.errors[0].doenetMLrange.charBegin).eq(17);
- expect(errorWarnings.errors[0].doenetMLrange.lineEnd).eq(1);
- expect(errorWarnings.errors[0].doenetMLrange.charEnd).eq(39);
-
- expect(errorWarnings.errors[1].message).contain(
- "Circular dependency detected involving component",
+ win.postMessage(
+ {
+ doenetML: doenetML3,
+ },
+ "*",
);
- expect(errorWarnings.errors[1].doenetMLrange.lineBegin).eq(2);
- expect(errorWarnings.errors[1].doenetMLrange.charBegin).eq(17);
- expect(errorWarnings.errors[1].doenetMLrange.lineEnd).eq(2);
- expect(errorWarnings.errors[1].doenetMLrange.charEnd).eq(39);
});
cy.window().then(async (win) => {
@@ -1036,35 +989,10 @@ a />
);
});
- cy.get(cesc2("#/_document1")).should("contain.text", "Found on line 3");
- cy.get(cesc2("#/_document1")).should(
+ cy.document().should(
"contain.text",
- "Circular dependency detected involving component",
+ "Circular dependency involving these components: (line 1), (line 2), (line 3).",
);
- cy.get(cesc2("#/_document1")).should("contain.text", "Found on line 2");
-
- cy.window().then(async (win) => {
- let errorWarnings = await win.returnErrorWarnings1();
-
- expect(errorWarnings.errors.length).eq(2);
- expect(errorWarnings.warnings.length).eq(0);
-
- expect(errorWarnings.errors[0].message).contain(
- "Circular dependency detected involving component",
- );
- expect(errorWarnings.errors[0].doenetMLrange.lineBegin).eq(2);
- expect(errorWarnings.errors[0].doenetMLrange.charBegin).eq(17);
- expect(errorWarnings.errors[0].doenetMLrange.lineEnd).eq(2);
- expect(errorWarnings.errors[0].doenetMLrange.charEnd).eq(39);
-
- expect(errorWarnings.errors[1].message).contain(
- "Circular dependency detected involving component",
- );
- expect(errorWarnings.errors[1].doenetMLrange.lineBegin).eq(3);
- expect(errorWarnings.errors[1].doenetMLrange.charBegin).eq(17);
- expect(errorWarnings.errors[1].doenetMLrange.lineEnd).eq(3);
- expect(errorWarnings.errors[1].doenetMLrange.charEnd).eq(39);
- });
});
it("Errors in macros", () => {
diff --git a/cypress/e2e/DoenetML/graphing/graphreferences.cy.js b/cypress/e2e/DoenetML/graphing/graphreferences.cy.js
index dc73c5d602..775e6c2d02 100644
--- a/cypress/e2e/DoenetML/graphing/graphreferences.cy.js
+++ b/cypress/e2e/DoenetML/graphing/graphreferences.cy.js
@@ -18,24 +18,24 @@ describe("Graph Reference Test", function () {
(-2,4)
y=x+1
$lineA$lineB
$pointA$pointB$lineA$lineB$pointC$pointD$lineC$lineD$pointE
-
-
-
-
-
-
- a
- Angle again: $_angle1
a
- Angle again: $_angle1
a
Angle again: $_angle1
@@ -504,8 +504,8 @@ describe("Angle Tag Tests", function () {
-
-
+ $_angle1.angle{assignNames="alpha"}
+ $_angle1.degrees{assignNames="alphadeg"}
Angle again: $_angle1
`,
},
@@ -1024,9 +1024,9 @@ describe("Angle Tag Tests", function () {
$_angle1
pi/2
- 2
- 2
- 2
+ 2$_angle1
+ 2$_angle1.angle
+ 2$_angle1.degrees
`,
},
@@ -1093,9 +1093,9 @@ describe("Angle Tag Tests", function () {
$_angle1
2
- 2
- 2
+ 2$_angle1
+ 2$_angle1.angle
+ 2$_angle1.degrees
`,
},
@@ -1162,9 +1162,9 @@ describe("Angle Tag Tests", function () {
$_angle1
2
- 2
- 2
+ 2$_angle1
+ 2$_angle1.angle
+ 2$_angle1.degrees
a
alpha
- 2
- 2
- 2
+ 2$_angle1
+ 2$_angle1.angle
+ 2$_angle1.degrees
`,
},
@@ -1304,9 +1304,9 @@ describe("Angle Tag Tests", function () {
doenetML: `
a
2
- 2
- 2
+ 2$_angle1
+ 2$_angle1.angle
+ 2$_angle1.degrees
`,
},
@@ -1369,9 +1369,9 @@ describe("Angle Tag Tests", function () {
doenetML: `
a
2
- 2
- 2
+ 2$_angle1
+ 2$_angle1.angle
+ 2$_angle1.degrees
`,
},
@@ -1430,9 +1430,9 @@ describe("Angle Tag Tests", function () {
$_angle1
$pi/2
- 2
- 2
- 2
+ 2$_angle1
+ 2$_angle1.angle
+ 2$_angle1.degrees
pi
`,
@@ -1491,14 +1491,14 @@ describe("Angle Tag Tests", function () {
doenetML: `
a
choose reflex angle:
-
(-6,5)
(0,0)
(4,2)
- angle:
+ angle: $alpha{name="alpha2"}
`,
},
"*",
@@ -1664,9 +1664,9 @@ describe("Angle Tag Tests", function () {
$_angle1
2
- 2
- 2
+ 2$_angle1
+ 2$_angle1.angle
+ 2$_angle1.degrees
`,
},
@@ -1732,10 +1732,10 @@ describe("Angle Tag Tests", function () {
$_angle1
2
- 2
- 2
- 2$_angle1
+ 2$_angle1.angle
+ 2$_angle1.degrees
+ $A{name="A2"}
`,
},
"*",
@@ -1867,11 +1867,11 @@ describe("Angle Tag Tests", function () {
$_angle1
2
- 2
- 2
- 2$_angle1
+ 2$_angle1.angle
+ 2$_angle1.degrees
+ $A{name="A2"}
+ $desiredRadians.value{assignNames="desiredRadians2"}
`,
},
"*",
@@ -2121,11 +2121,11 @@ describe("Angle Tag Tests", function () {
$_angle1
2
- 2
- 2
- 2$_angle1
+ 2$_angle1.angle
+ 2$_angle1.degrees
+ $A{name="A2"}
+ $desiredDegrees.value{assignNames="desiredDegrees2"}
`,
},
"*",
@@ -2361,10 +2361,10 @@ describe("Angle Tag Tests", function () {
$_angle1
2
- 2
- 2
- 2$_angle1
+ 2$_angle1.angle
+ 2$_angle1.degrees
+ $A{name="A2"}
`,
},
"*",
@@ -2502,11 +2502,11 @@ describe("Angle Tag Tests", function () {
$_angle1
2
- 2
- 2
- 2$_angle1
+ 2$_angle1.angle
+ 2$_angle1.degrees
+ $A{name="A2"}
+ $desiredRadians.value{assignNames="desiredRadians2"}
`,
},
"*",
@@ -2762,11 +2762,11 @@ describe("Angle Tag Tests", function () {
$_angle1
2
- 2
- 2
- 2$_angle1
+ 2$_angle1.angle
+ 2$_angle1.degrees
+ $A{name="A2"}
+ $desiredDegrees.value{assignNames="desiredDegrees2"}
`,
},
"*",
@@ -3007,10 +3007,10 @@ describe("Angle Tag Tests", function () {
$_angle1
2
- 2
- 2
- 2$_angle1
+ 2$_angle1.angle
+ 2$_angle1.degrees
+ $equation.value{assignNames="equation2"}
`,
},
"*",
@@ -3163,11 +3163,11 @@ describe("Angle Tag Tests", function () {
$_angle1
2
- 2
- 2
- 2$_angle1
+ 2$_angle1.angle
+ 2$_angle1.degrees
+ $equation.value{assignNames="equation2"}
+ $desiredRadians.value{assignNames="desiredRadians2"}
`,
},
"*",
@@ -3459,11 +3459,11 @@ describe("Angle Tag Tests", function () {
$_angle1
2
- 2
- 2
- 2$_angle1
+ 2$_angle1.angle
+ 2$_angle1.degrees
+ $equation.value{assignNames="equation2"}
+ $desiredDegrees.value{assignNames="desiredDegrees2"}
`,
},
"*",
diff --git a/cypress/e2e/DoenetML/tagSpecific/animatefromsequence.cy.js b/cypress/e2e/DoenetML/tagSpecific/animatefromsequence.cy.js
index fc4fc3e675..a9364e2722 100644
--- a/cypress/e2e/DoenetML/tagSpecific/animatefromsequence.cy.js
+++ b/cypress/e2e/DoenetML/tagSpecific/animatefromsequence.cy.js
@@ -19,7 +19,7 @@ describe("AnimateFromSequence Tag Tests", function () {
copy:
+ copy: $a{name="a2"}
`,
},
@@ -104,7 +104,7 @@ describe("AnimateFromSequence Tag Tests", function () {
copy:
+ copy: $a{name="a2"}
`,
},
@@ -178,7 +178,7 @@ describe("AnimateFromSequence Tag Tests", function () {
copy:
+ copy: $a{name="a2"}
`,
},
@@ -293,7 +293,7 @@ describe("AnimateFromSequence Tag Tests", function () {
copy:
+ copy: $a{name="a2"}
`,
},
@@ -363,7 +363,7 @@ describe("AnimateFromSequence Tag Tests", function () {
copy:
+ copy: $a{name="a2"}
`,
},
@@ -823,7 +823,7 @@ describe("AnimateFromSequence Tag Tests", function () {
a
Animation mode:
Animation direction:
+ Animation direction: $an.currentAnimationDirection{assignNames="cad"}
`;
cy.get("#testRunner_toggleControls").click();
@@ -916,7 +916,7 @@ describe("AnimateFromSequence Tag Tests", function () {
toggle
- copy:
+ copy: $a{name="a2"}
`,
},
@@ -2114,9 +2114,9 @@ describe("AnimateFromSequence Tag Tests", function () {
+ $nl{name="nl2"}
-
+ $nl.number3{assignNames="n3"}
`,
},
@@ -2322,9 +2322,9 @@ describe("AnimateFromSequence Tag Tests", function () {
+ $nl{name="nl2"}
-
+ $nl.number3{assignNames="n3"}
`,
},
@@ -2533,9 +2533,9 @@ describe("AnimateFromSequence Tag Tests", function () {
+ $nl{name="nl2"}
-
+ $nl.number3{assignNames="n3"}
`,
},
@@ -2829,7 +2829,7 @@ describe("AnimateFromSequence Tag Tests", function () {
copy:
+ copy: $a{name="a2"}
`,
},
diff --git a/cypress/e2e/DoenetML/tagSpecific/answer.cy.js b/cypress/e2e/DoenetML/tagSpecific/answer.cy.js
index 4b28f341dd..d403620df4 100644
--- a/cypress/e2e/DoenetML/tagSpecific/answer.cy.js
+++ b/cypress/e2e/DoenetML/tagSpecific/answer.cy.js
@@ -13,9 +13,9 @@ describe("Answer Tag Tests", function () {
doenetML: `
a
x+y
- Current response:
- Submitted response:
- Credit for submitted response:
+ Current response: $_answer1.currentResponse{assignNames="cr1"}
+ Submitted response:
+ Credit for submitted response: $_answer1.creditAchieved{assignNames="ca1"}
`,
},
"*",
@@ -230,9 +230,9 @@ describe("Answer Tag Tests", function () {
a
x+y
$xy
- Current response:
- Submitted response:
- Credit for submitted response:
+ Current response: $_answer1.currentResponse{assignNames="cr1"}
+ Submitted response:
+ Credit for submitted response: $_answer1.creditAchieved{assignNames="ca1"}
`,
},
"*",
@@ -448,9 +448,9 @@ describe("Answer Tag Tests", function () {
doenetML: `
a
x+y
- Current response:
- Submitted response:
- Credit for submitted response:
+ Current response: $_answer1.currentResponse{assignNames="cr1"}
+ Submitted response:
+ Credit for submitted response: $_answer1.creditAchieved{assignNames="ca1"}
`,
},
"*",
@@ -667,9 +667,9 @@ describe("Answer Tag Tests", function () {
a
x y $x+$y
- Current response:
- Submitted response:
- Credit for submitted response:
+ Current response: $_answer1.currentResponse{assignNames="cr1"}
+ Submitted response:
+ Credit for submitted response: $_answer1.creditAchieved{assignNames="ca1"}
`,
},
"*",
@@ -882,9 +882,9 @@ describe("Answer Tag Tests", function () {
doenetML: `
a
x +y
- Current response:
- Submitted response:
- Credit for submitted response:
+ Current response: $_answer1.currentResponse{assignNames="cr1"}
+ Submitted response:
+ Credit for submitted response: $_answer1.creditAchieved{assignNames="ca1"}
`,
},
"*",
@@ -1098,9 +1098,9 @@ describe("Answer Tag Tests", function () {
a
y x +$y
- Current response:
- Submitted response:
- Credit for submitted response:
+ Current response: $_answer1.currentResponse{assignNames="cr1"}
+ Submitted response:
+ Credit for submitted response: $_answer1.creditAchieved{assignNames="ca1"}
`,
},
"*",
@@ -1313,9 +1313,9 @@ describe("Answer Tag Tests", function () {
doenetML: `
a
hello there
- Current response:
- Submitted response:
- Credit for submitted response:
+ Current response: $_answer1.currentResponse{assignNames="cr1"}
+ Submitted response:
+ Credit for submitted response: $_answer1.creditAchieved{assignNames="ca1"}
`,
},
@@ -1504,9 +1504,9 @@ describe("Answer Tag Tests", function () {
doenetML: `
a
hello there
- Current response:
- Submitted response:
- Credit for submitted response:
+ Current response: $_answer1.currentResponse{assignNames="cr1"}
+ Submitted response:
+ Credit for submitted response: $_answer1.creditAchieved{assignNames="ca1"}
`,
},
@@ -1720,9 +1720,9 @@ describe("Answer Tag Tests", function () {
a
hello there
$h
- Current response:
- Submitted response:
- Credit for submitted response:
+ Current response: $_answer1.currentResponse{assignNames="cr1"}
+ Submitted response:
+ Credit for submitted response: $_answer1.creditAchieved{assignNames="ca1"}
`,
},
@@ -1911,9 +1911,9 @@ describe("Answer Tag Tests", function () {
doenetML: `
a
hello there
- Current response:
- Submitted response:
- Credit for submitted response:
+ Current response: $_answer1.currentResponse{assignNames="cr1"}
+ Submitted response:
+ Credit for submitted response: $_answer1.creditAchieved{assignNames="ca1"}
`,
},
@@ -2102,10 +2102,10 @@ describe("Answer Tag Tests", function () {
doenetML: `
a
hello there
-
- Current response:
- Submitted response:
- Credit for submitted response:
+
+ Current response: $_answer1.currentResponse{assignNames="cr1"}
+ Submitted response:
+ Credit for submitted response: $_answer1.creditAchieved{assignNames="ca1"}
`,
},
@@ -2295,9 +2295,9 @@ describe("Answer Tag Tests", function () {
a
hello there
$(h{createComponentOfType="text"})
- Current response:
- Submitted response:
- Credit for submitted response:
+ Current response: $_answer1.currentResponse{assignNames="cr1"}
+ Submitted response:
+ Credit for submitted response: $_answer1.creditAchieved{assignNames="ca1"}
`,
},
@@ -2487,9 +2487,9 @@ describe("Answer Tag Tests", function () {
a
hello $h there
- Current response:
- Submitted response:
- Credit for submitted response:
+ Current response: $_answer1.currentResponse{assignNames="cr1"}
+ Submitted response:
+ Credit for submitted response: $_answer1.creditAchieved{assignNames="ca1"}
`,
},
@@ -2678,9 +2678,9 @@ describe("Answer Tag Tests", function () {
doenetML: `
a
hello there
- Current response:
- Submitted response:
- Credit for submitted response:
+ Current response: $_answer1.currentResponse{assignNames="cr1"}
+ Submitted response:
+ Credit for submitted response: $_answer1.creditAchieved{assignNames="ca1"}
`,
},
@@ -2870,9 +2870,9 @@ describe("Answer Tag Tests", function () {
a
hello there $h $t
- Current response:
- Submitted response:
- Credit for submitted response:
+ Current response: $_answer1.currentResponse{assignNames="cr1"}
+ Submitted response:
+ Credit for submitted response: $_answer1.creditAchieved{assignNames="ca1"}
`,
},
@@ -3062,9 +3062,9 @@ describe("Answer Tag Tests", function () {
a
hello $h there
- Current response:
- Submitted response:
- Credit for submitted response:
+ Current response: $_answer1.currentResponse{assignNames="cr1"}
+ Submitted response:
+ Credit for submitted response: $_answer1.creditAchieved{assignNames="ca1"}
`,
},
@@ -3255,8 +3255,8 @@ describe("Answer Tag Tests", function () {
doenetML: `
a
hello there
- Submitted responses:
- To check how long to wait:
+ Submitted responses:
+ To check how long to wait:
`,
},
"*",
@@ -3405,9 +3405,9 @@ describe("Answer Tag Tests", function () {
doenetML: `
a
true
- Current response:
- Submitted response:
- Credit for submitted response:
+ Current response: $_answer1.currentResponse{assignNames="cr1"}
+ Submitted response: $_answer1.submittedResponse{name="sr1"}
+ Credit for submitted response: $_answer1.creditAchieved{assignNames="ca1"}
`,
},
@@ -3533,9 +3533,9 @@ describe("Answer Tag Tests", function () {
doenetML: `
a
true
- Current response:
- Submitted response:
- Credit for submitted response:
+ Current response: $_answer1.currentResponse{assignNames="cr1"}
+ Submitted response: $_answer1.submittedResponse{name="sr1"}
+ Credit for submitted response: $_answer1.creditAchieved{assignNames="ca1"}
`,
},
@@ -3662,9 +3662,9 @@ describe("Answer Tag Tests", function () {
a
false
not $b
- Current response:
- Submitted response:
- Credit for submitted response:
+ Current response: $_answer1.currentResponse{assignNames="cr1"}
+ Submitted response: $_answer1.submittedResponse{name="sr1"}
+ Credit for submitted response: $_answer1.creditAchieved{assignNames="ca1"}
`,
},
@@ -3790,9 +3790,9 @@ describe("Answer Tag Tests", function () {
doenetML: `
a
not false
- Current response:
- Submitted response:
- Credit for submitted response:
+ Current response: $_answer1.currentResponse{assignNames="cr1"}
+ Submitted response: $_answer1.submittedResponse{name="sr1"}
+ Credit for submitted response: $_answer1.creditAchieved{assignNames="ca1"}
`,
},
@@ -3957,9 +3957,9 @@ describe("Answer Tag Tests", function () {
doenetML: `
a
x+y
- Current response:
- Submitted response:
- Credit for submitted response:
+ Current response: $_answer1.currentResponse{assignNames="cr1"}
+ Submitted response:
+ Credit for submitted response: $_answer1.creditAchieved{assignNames="ca1"}
`,
},
"*",
@@ -4170,9 +4170,9 @@ describe("Answer Tag Tests", function () {
doenetML: `
a
x+y
- Current response:
- Submitted response:
- Credit for submitted response:
+ Current response: $_answer1.currentResponse{assignNames="cr1"}
+ Submitted response:
+ Credit for submitted response: $_answer1.creditAchieved{assignNames="ca1"}
`,
},
"*",
@@ -4384,9 +4384,9 @@ describe("Answer Tag Tests", function () {
a
x+y
$xy
- Current response:
- Submitted response:
- Credit for submitted response:
+ Current response: $_answer1.currentResponse{assignNames="cr1"}
+ Submitted response:
+ Credit for submitted response: $_answer1.creditAchieved{assignNames="ca1"}
`,
},
"*",
@@ -4598,9 +4598,9 @@ describe("Answer Tag Tests", function () {
a
x y $x+$y
- Current response:
- Submitted response:
- Credit for submitted response:
+ Current response: $_answer1.currentResponse{assignNames="cr1"}
+ Submitted response:
+ Credit for submitted response: $_answer1.creditAchieved{assignNames="ca1"}
`,
},
"*",
@@ -4812,9 +4812,9 @@ describe("Answer Tag Tests", function () {
a
x $x+y
- Current response:
- Submitted response:
- Credit for submitted response:
+ Current response: $_answer1.currentResponse{assignNames="cr1"}
+ Submitted response:
+ Credit for submitted response: $_answer1.creditAchieved{assignNames="ca1"}
`,
},
"*",
@@ -5025,10 +5025,10 @@ describe("Answer Tag Tests", function () {
doenetML: `
a
x $x+y
- Current response:
- Submitted response:
- Credit for submitted response:
+
+ Current response: $_answer1.currentResponse{assignNames="cr1"}
+ Submitted response:
+ Credit for submitted response: $_answer1.creditAchieved{assignNames="ca1"}
`,
},
"*",
@@ -5238,16 +5238,16 @@ describe("Answer Tag Tests", function () {
{
doenetML: `
a
- x+y-3+
- Current response:
- Submitted response:
- Credit for submitted response:
-
- x+y-3+$n
+ Current response: $_answer1.currentResponse{assignNames="cr1"}
+ Submitted response:
+ Credit for submitted response: $_answer1.creditAchieved{assignNames="ca1"}
+
+ $n3{name="n2"}
+ $num1{name="n"}
+ $n2+$num2
+ $n3+$num3
+ $num3{name="n3"}
1
`,
},
@@ -5459,9 +5459,9 @@ describe("Answer Tag Tests", function () {
doenetML: `
a
x+y z
- Current response:
- Submitted response:
- Credit for submitted response:
+ Current response: $_answer1.currentResponse{assignNames="cr1"}
+ Submitted response:
+ Credit for submitted response: $_answer1.creditAchieved{assignNames="ca1"}
`,
},
"*",
@@ -5762,9 +5762,9 @@ describe("Answer Tag Tests", function () {
doenetML: `
a
x+y z
- Current response:
- Submitted response:
- Credit for submitted response:
+ Current response: $_answer1.currentResponse{assignNames="cr1"}
+ Submitted response:
+ Credit for submitted response: $_answer1.creditAchieved{assignNames="ca1"}
`,
},
"*",
@@ -6068,9 +6068,9 @@ describe("Answer Tag Tests", function () {
$mi1 $mi2 = x+y z
Current response:
- Submitted response:
- Credit for submitted response:
+ Current response: $_answer1.currentResponses{assignNames="cr1 cr2"}
+ Submitted response: $_answer1.submittedResponses{assignNames="sr1 sr2" createComponentOfType="math" numComponents="2"}
+ Credit for submitted response: $_answer1.creditAchieved{assignNames="ca1"}
`,
},
"*",
@@ -6482,9 +6482,9 @@ describe("Answer Tag Tests", function () {
doenetML: `
a
1 2
- Current response:
- Submitted response:
- Credit for submitted response:
+ Current response: $_answer1.currentResponse{assignNames="cr1"}
+ Submitted response:
+ Credit for submitted response: $_answer1.creditAchieved{assignNames="ca1"}
`,
},
"*",
@@ -6780,9 +6780,9 @@ describe("Answer Tag Tests", function () {
doenetML: `
a
1 2
- Current response:
- Submitted response:
- Credit for submitted response:
+ Current response: $_answer1.currentResponse{assignNames="cr1"}
+ Submitted response:
+ Credit for submitted response: $_answer1.creditAchieved{assignNames="ca1"}
`,
},
"*",
@@ -7078,9 +7078,9 @@ describe("Answer Tag Tests", function () {
doenetML: `
a
hello there
- Current response:
- Submitted response:
- Credit for submitted response:
+ Current response: $_answer1.currentResponse{assignNames="cr1"}
+ Submitted response:
+ Credit for submitted response: $_answer1.creditAchieved{assignNames="ca1"}
`,
},
"*",
@@ -7268,9 +7268,9 @@ describe("Answer Tag Tests", function () {
doenetML: `
a
hello there
- Current response:
- Submitted response:
- Credit for submitted response:
+ Current response: $_answer1.currentResponse{assignNames="cr1"}
+ Submitted response:
+ Credit for submitted response: $_answer1.creditAchieved{assignNames="ca1"}
`,
},
"*",
@@ -7458,9 +7458,9 @@ describe("Answer Tag Tests", function () {
doenetML: `
a
hello there
- Current response:
- Submitted response:
- Credit for submitted response:
+ Current response: $_answer1.currentResponse{assignNames="cr1"}
+ Submitted response:
+ Credit for submitted response: $_answer1.creditAchieved{assignNames="ca1"}
`,
},
"*",
@@ -7649,9 +7649,9 @@ describe("Answer Tag Tests", function () {
a
hello $h there
- Current response:
- Submitted response:
- Credit for submitted response:
+ Current response: $_answer1.currentResponse{assignNames="cr1"}
+ Submitted response:
+ Credit for submitted response: $_answer1.creditAchieved{assignNames="ca1"}
`,
},
"*",
@@ -7839,9 +7839,9 @@ describe("Answer Tag Tests", function () {
doenetML: `
a
hello there
- Current response:
- Submitted response:
- Credit for submitted response:
+ Current response: $_answer1.currentResponse{assignNames="cr1"}
+ Submitted response:
+ Credit for submitted response: $_answer1.creditAchieved{assignNames="ca1"}
`,
},
"*",
@@ -8030,9 +8030,9 @@ describe("Answer Tag Tests", function () {
a
hello $h there
- Current response:
- Submitted response:
- Credit for submitted response:
+ Current response: $_answer1.currentResponse{assignNames="cr1"}
+ Submitted response:
+ Credit for submitted response: $_answer1.creditAchieved{assignNames="ca1"}
`,
},
"*",
@@ -8219,18 +8219,18 @@ describe("Answer Tag Tests", function () {
{
doenetML: `
a
-
- Current response:
- Submitted response:
- Credit for submitted response:
-
- $n
+ Current response: $_answer1.currentResponse{assignNames="cr1"}
+ Submitted response:
+ Credit for submitted response: $_answer1.creditAchieved{assignNames="ca1"}
+
+ $n3{name="n2"}
+ $text1{name="n"}
+ $n2 $text2
+ $n4
+ $text3{name="n3"}
hello
- there
`,
@@ -8420,9 +8420,9 @@ describe("Answer Tag Tests", function () {
doenetML: `
a
hello there
- Current response:
- Submitted response:
- Credit for submitted response:
+ Current response: $_answer1.currentResponse{assignNames="cr1"}
+ Submitted response:
+ Credit for submitted response: $_answer1.creditAchieved{assignNames="ca1"}
`,
},
"*",
@@ -8620,9 +8620,9 @@ describe("Answer Tag Tests", function () {
doenetML: `
a
hello there
- Current response:
- Submitted response:
- Credit for submitted response:
+ Current response: $_answer1.currentResponse{assignNames="cr1"}
+ Submitted response:
+ Credit for submitted response: $_answer1.creditAchieved{assignNames="ca1"}
`,
},
"*",
@@ -8823,9 +8823,9 @@ describe("Answer Tag Tests", function () {
$ti1 $ti2 = hello there
Current responses:
- Submitted responses:
- Credit for submitted response:
+ Current responses: $_answer1.currentResponses{assignNames="cr1 cr2"}
+ Submitted responses: $_answer1.submittedResponses{assignNames="sr1 sr2"}
+ Credit for submitted response: $_answer1.creditAchieved{assignNames="ca1"}
`,
},
"*",
@@ -9054,9 +9054,9 @@ describe("Answer Tag Tests", function () {
doenetML: `
a
true
- Current response:
- Submitted response:
- Credit for submitted response:
+ Current response: $_answer1.currentResponse{assignNames="cr1"}
+ Submitted response: $_answer1.submittedResponse{name="sr1"}
+ Credit for submitted response: $_answer1.creditAchieved{assignNames="ca1"}
`,
},
@@ -9182,9 +9182,9 @@ describe("Answer Tag Tests", function () {
doenetML: `
a
true
- Current response:
- Submitted response:
- Credit for submitted response:
+ Current response: $_answer1.currentResponse{assignNames="cr1"}
+ Submitted response: $_answer1.submittedResponse{name="sr1"}
+ Credit for submitted response: $_answer1.creditAchieved{assignNames="ca1"}
`,
},
@@ -9311,9 +9311,9 @@ describe("Answer Tag Tests", function () {
a
false
not $b
- Current response:
- Submitted response:
- Credit for submitted response:
+ Current response: $_answer1.currentResponse{assignNames="cr1"}
+ Submitted response: $_answer1.submittedResponse{name="sr1"}
+ Credit for submitted response: $_answer1.creditAchieved{assignNames="ca1"}
`,
},
@@ -9440,9 +9440,9 @@ describe("Answer Tag Tests", function () {
a
false
not false
- Current response:
- Submitted response:
- Credit for submitted response:
+ Current response: $_answer1.currentResponse{assignNames="cr1"}
+ Submitted response: $_answer1.submittedResponse{name="sr1"}
+ Credit for submitted response: $_answer1.creditAchieved{assignNames="ca1"}
`,
},
@@ -9568,9 +9568,9 @@ describe("Answer Tag Tests", function () {
doenetML: `
a
x+y x
- Current response:
- Submitted response:
- Credit for submitted response:
+ Current response: $_answer1.currentResponse{assignNames="cr1"}
+ Submitted response:
+ Credit for submitted response: $_answer1.creditAchieved{assignNames="ca1"}
`,
},
"*",
@@ -9853,17 +9853,17 @@ describe("Answer Tag Tests", function () {
{
doenetML: `
a
- x-3+
- Current response:
- Submitted response:
- Credit for submitted response:
-
- x+y-3+
- $rightAnswer x-3+$n
+ Current response: $_answer1.currentResponse{assignNames="cr1"}
+ Submitted response:
+ Credit for submitted response: $_answer1.creditAchieved{assignNames="ca1"}
+
+ x+y-3+$n
+ $n3{name="n2"}
+ $num1{name="n"}
+ $n2+$num2
+ $n3+$num3
+ $num3{name="n3"}
1
`,
},
@@ -10151,9 +10151,9 @@ describe("Answer Tag Tests", function () {
doenetML: `
a
hello there bye
- Current response:
- Submitted response:
- Credit for submitted response:
+ Current response: $_answer1.currentResponse{assignNames="cr1"}
+ Submitted response:
+ Credit for submitted response: $_answer1.creditAchieved{assignNames="ca1"}
`,
},
"*",
@@ -10333,9 +10333,9 @@ describe("Answer Tag Tests", function () {
doenetML: `
a
hello there bye
- Current response:
- Submitted response:
- Credit for submitted response:
+ Current response: $_answer1.currentResponse{assignNames="cr1"}
+ Submitted response:
+ Credit for submitted response: $_answer1.creditAchieved{assignNames="ca1"}
`,
},
"*",
@@ -10515,9 +10515,9 @@ describe("Answer Tag Tests", function () {
doenetML: `
a
hello there bye
- Current response:
- Submitted response:
- Credit for submitted response:
+ Current response: $_answer1.currentResponse{assignNames="cr1"}
+ Submitted response:
+ Credit for submitted response: $_answer1.creditAchieved{assignNames="ca1"}
`,
},
"*",
@@ -10701,9 +10701,9 @@ describe("Answer Tag Tests", function () {
x+y x Current response:
- Submitted response:
- Credit for submitted response:
+ Current response: $_answer1.currentResponse{assignNames="cr1"}
+ Submitted response:
+ Credit for submitted response: $_answer1.creditAchieved{assignNames="ca1"}
`,
@@ -10998,18 +10998,18 @@ describe("Answer Tag Tests", function () {
a
Enter values that sum to 3x :
- 3x 3 $_mathinput1.immediateValue{isResponse}+$_mathinput2.immediateValue{isResponse} = 3x $_mathinput1.immediateValue+$_mathinput2.immediateValue = 3
- First current response:
- First current response again:
- Second current response:
- Both current responses together:
- First submitted response:
- First submitted response again:
- Second submitted response:
- Both submitted responses together:
- Credit for submitted responses:
+ First current response: $_answer1.currentResponse{assignNames="cr"}
+ First current response again: $_answer1.currentResponse1{assignNames="cr1"}
+ Second current response: $_answer1.currentResponse2{assignNames="cr2"}
+ Both current responses together: $_answer1.currentResponses{assignNames="crsa crsb"}
+ First submitted response:
+ First submitted response again:
+ Second submitted response:
+ Both submitted responses together: $_answer1.submittedResponses{assignNames="srsa srsb"}
+ Credit for submitted responses: $_answer1.creditAchieved{assignNames="ca"}
`,
},
"*",
@@ -12124,15 +12124,15 @@ describe("Answer Tag Tests", function () {
$_mathinput1+$_mathinput2 = 3x $_mathinput1+$_mathinput2 = 3 First current response:
- First current response again:
- Second current response:
- Both current responses together:
- First submitted response:
- First submitted response again:
- Second submitted response:
- Both submitted responses together:
- Credit for submitted responses:
+ First current response: $_answer1.currentResponse{assignNames="cr"}
+ First current response again: $_answer1.currentResponse1{assignNames="cr1"}
+ Second current response: $_answer1.currentResponse2{assignNames="cr2"}
+ Both current responses together: $_answer1.currentResponses{assignNames="crsa crsb"}
+ First submitted response:
+ First submitted response again:
+ Second submitted response:
+ Both submitted responses together: $_answer1.submittedResponses{assignNames="srsa srsb"}
+ Credit for submitted responses: $_answer1.creditAchieved{assignNames="ca"}
`,
},
"*",
@@ -13156,18 +13156,18 @@ describe("Answer Tag Tests", function () {
Enter values that sum to 3x :
-
- First current response:
- First current response again:
- Second current response:
- Both current responses together:
- First submitted response:
- First submitted response again:
- Second submitted response:
- Both submitted responses together:
- Credit for submitted responses:
+ First current response: $_answer1.currentResponse{assignNames="cr"}
+ First current response again: $_answer1.currentResponse1{assignNames="cr1"}
+ Second current response: $_answer1.currentResponse2{assignNames="cr2"}
+ Both current responses together: $_answer1.currentResponses{assignNames="crsa crsb"}
+ First submitted response:
+ First submitted response again:
+ Second submitted response:
+ Both submitted responses together: $_answer1.submittedResponses{assignNames="srsa srsb"}
+ Credit for submitted responses: $_answer1.creditAchieved{assignNames="ca"}
`,
},
"*",
@@ -14185,22 +14185,22 @@ describe("Answer Tag Tests", function () {
a
Enter rain and snow in either order:
- rain snow snow rain $_textinput1.immediateValue{isResponse} $_textinput2.immediateValue{isResponse} = rain snow $_textinput1.immediateValue $_textinput2.immediateValue = snow rain $_textinput1.immediateValue = rain $_textinput1.immediateValue = snow $_textinput2.immediateValue = rain $_textinput2.immediateValue = snow
- First current response:
- First current response again:
- Second current response:
- Both current responses together:
- First submitted response:
- First submitted response again:
- Second submitted response:
- Both submitted responses together:
- Credit for submitted responses:
+ First current response: $_answer1.currentResponse{assignNames="cr"}
+ First current response again: $_answer1.currentResponse1{assignNames="cr1"}
+ Second current response: $_answer1.currentResponse2{assignNames="cr2"}
+ Both current responses together: $_answer1.currentResponses{assignNames="crsa crsb"}
+ First submitted response:
+ First submitted response again:
+ Second submitted response:
+ Both submitted responses together: $_answer1.submittedResponses{assignNames="srsa srsb"}
+ Credit for submitted responses: $_answer1.creditAchieved{assignNames="ca"}
`,
},
"*",
@@ -14883,8 +14883,8 @@ describe("Answer Tag Tests", function () {
$m > 5 $m < 2 Submitted response:
- Credit achieved:
+ Submitted response: $_answer1.submittedResponse{assignNames="sr"}
+ Credit achieved: $_answer1.creditAchieved{assignNames="ca"}
`,
},
"*",
@@ -14949,10 +14949,10 @@ describe("Answer Tag Tests", function () {
doenetML: `
a
-1 <= -1 <= $_mathinput1.immediateValue{isResponse} <= 1 Submitted response:
- Credit achieved:
+ Submitted response: $_answer1.submittedResponse{assignNames="sr"}
+ Credit achieved: $_answer1.creditAchieved{assignNames="ca"}
`,
},
"*",
@@ -14996,10 +14996,10 @@ describe("Answer Tag Tests", function () {
doenetML: `
b
-1 < -1 < $_mathinput1.immediateValue{isResponse} < 1 Submitted response:
- Credit achieved:
+ Submitted response: $_answer1.submittedResponse{assignNames="sr"}
+ Credit achieved: $_answer1.creditAchieved{assignNames="ca"}
`,
},
"*",
@@ -15042,10 +15042,10 @@ describe("Answer Tag Tests", function () {
doenetML: `
c
1 > 1 > $_mathinput1.immediateValue{isResponse} >= -1 Submitted response:
- Credit achieved:
+ Submitted response: $_answer1.submittedResponse{assignNames="sr"}
+ Credit achieved: $_answer1.creditAchieved{assignNames="ca"}
`,
},
"*",
@@ -15090,17 +15090,17 @@ describe("Answer Tag Tests", function () {
- ((y
- and y
+ and $_mathinput2.immediateValue != z
+ and $_mathinput2.immediateValue != q))
+ and $_mathinput3.immediateValue{isResponse} > 5
- Submitted responses:
- Credit achieved:
+ Submitted responses: $_answer1.submittedResponses{assignNames="sr1 sr2 sr3"}
+ Credit achieved: $_answer1.creditAchieved{assignNames="ca"}
`,
},
"*",
@@ -15157,9 +15157,9 @@ describe("Answer Tag Tests", function () {
Enter x^$n : x^$n
- Credit achieved:
- Current response:
- Submitted response:
+ Credit achieved: $_answer1.creditAchieved{assignNames="ca"}
+ Current response: $_answer1.currentResponse{assignNames="cr"}
+ Submitted response:
@@ -16178,12 +16178,12 @@ describe("Answer Tag Tests", function () {
a
Enter values that sum to 3x :
- 3x 3 $_mathinput1.immediateValue{isResponse}+$_mathinput2.immediateValue{isResponse} = 3x $_mathinput1.immediateValue+$_mathinput2.immediateValue = 3
-
-
+ $_mathinput1.immediateValue
+ $_mathinput2.immediateValue
`,
},
"*",
@@ -16484,12 +16484,12 @@ describe("Answer Tag Tests", function () {
a
Enter rain and snow in either order:
- rain snow snow rain $_textinput1.immediateValue{isResponse} $_textinput2.immediateValue{isResponse} = rain snow $_textinput1.immediateValue $_textinput2.immediateValue = snow rain $_textinput1.immediateValue = rain $_textinput1.immediateValue = snow $_textinput2.immediateValue = rain $_textinput2.immediateValue = snow
`,
},
@@ -16794,8 +16794,8 @@ describe("Answer Tag Tests", function () {
Enter variable:
$ans.immediatevalue{isResponse} = $var.immediatevalue $ans.immediatevalue = $var2.immediatevalue
`,
@@ -16957,9 +16957,9 @@ describe("Answer Tag Tests", function () {
monkey
.
- Current response:
- Submitted response:
- Credit for submitted response:
+ Current response: $_answer1.currentResponse
+ Submitted response: $_answer1.submittedResponse
+ Credit for submitted response: $_answer1.creditAchieved
`,
},
"*",
@@ -17265,9 +17265,9 @@ describe("Answer Tag Tests", function () {
dog
monkey
.
- Current response:
- Submitted response:
- Credit for submitted response:
+ Current response: $_answer1.currentResponse
+ Submitted response: $_answer1.submittedResponse
+ Credit for submitted response: $_answer1.creditAchieved
`,
},
"*",
@@ -17590,9 +17590,9 @@ describe("Answer Tag Tests", function () {
monkey
.
- Current response:
- Submitted response:
- Credit for submitted response:
+ Current response: $_answer1.currentResponse
+ Submitted response:
+ Credit for submitted response: $_answer1.creditAchieved
`,
},
"*",
@@ -17900,9 +17900,9 @@ describe("Answer Tag Tests", function () {
monkey
.
- Current response:
- Submitted response:
- Credit for submitted response:
+ Current response: $_answer1.currentResponse
+ Submitted response:
+ Credit for submitted response: $_answer1.creditAchieved
`,
},
"*",
@@ -18210,9 +18210,9 @@ describe("Answer Tag Tests", function () {
dog
monkey
.
- Current response:
- Submitted response:
- Credit for submitted response:
+ Current response: $_answer1.currentResponse
+ Submitted response:
+ Credit for submitted response: $_answer1.creditAchieved
`,
},
"*",
@@ -18537,9 +18537,9 @@ describe("Answer Tag Tests", function () {
monkey
.
- Current response:
- Submitted response:
- Credit for submitted response:
+ Current response: $_answer1.currentResponses
+ Submitted response: $_answer1.submittedResponses
+ Credit for submitted response: $_answer1.creditAchieved{name="credit"}
`,
},
"*",
@@ -18913,9 +18913,9 @@ describe("Answer Tag Tests", function () {
dog
monkey
.
- Current response:
- Submitted response:
- Credit for submitted response:
+ Current response: $_answer1.currentResponses
+ Submitted response: $_answer1.submittedResponses
+ Credit for submitted response: $_answer1.creditAchieved{name="credit"}
`,
},
"*",
@@ -19310,9 +19310,9 @@ describe("Answer Tag Tests", function () {
monkey
- Current response:
- Submitted response:
- Credit for submitted response:
+ Current response: $_answer1.currentResponse
+ Submitted response:
+ Credit for submitted response: $_answer1.creditAchieved
`,
},
"*",
@@ -19659,9 +19659,9 @@ describe("Answer Tag Tests", function () {
dog
monkey
- Current response:
- Submitted response:
- Credit for submitted response:
+ Current response: $_answer1.currentResponse
+ Submitted response:
+ Credit for submitted response: $_answer1.creditAchieved
`,
},
"*",
@@ -20024,9 +20024,9 @@ describe("Answer Tag Tests", function () {
monkey
.
- Current response:
- Submitted response:
- Credit for submitted response:
+ Current response: $_answer1.currentResponses
+ Submitted response: $_answer1.submittedResponses
+ Credit for submitted response: $_answer1.creditAchieved{name="credit"}
`,
},
"*",
@@ -20400,9 +20400,9 @@ describe("Answer Tag Tests", function () {
dog
monkey
.
- Current response:
- Submitted response:
- Credit for submitted response:
+ Current response: $_answer1.currentResponses
+ Submitted response: $_answer1.submittedResponses
+ Credit for submitted response: $_answer1.creditAchieved{name="credit"}
`,
},
"*",
@@ -20790,9 +20790,9 @@ describe("Answer Tag Tests", function () {
monkey
.
- Current response:
- Submitted response:
- Credit for submitted response:
+ Current response: $_answer1.currentResponses
+ Submitted response: $_answer1.submittedResponses
+ Credit for submitted response: $_answer1.creditAchieved{name="credit"}
`,
},
"*",
@@ -21175,9 +21175,9 @@ describe("Answer Tag Tests", function () {
dog
monkey
.
- Current response:
- Submitted response:
- Credit for submitted response:
+ Current response: $_answer1.currentResponses
+ Submitted response: $_answer1.submittedResponses
+ Credit for submitted response: $_answer1.creditAchieved{name="credit"}
`,
},
"*",
@@ -21571,9 +21571,9 @@ describe("Answer Tag Tests", function () {
monkey
.
- Current response:
- Submitted response:
- Credit for submitted response:
+ Current response: $_answer1.currentResponses
+ Submitted response: $_answer1.submittedResponses
+ Credit for submitted response: $_answer1.creditAchieved{name="credit"}
`,
},
"*",
@@ -22024,7 +22024,7 @@ describe("Answer Tag Tests", function () {
- Get
+ Get $m , plus a bit is $m+0.001
cat
dog
monkey
- $last.value
`,
@@ -22839,7 +22839,7 @@ describe("Answer Tag Tests", function () {
-
@@ -22897,7 +22897,7 @@ describe("Answer Tag Tests", function () {
- $element.immediatevalue elementof $set.value
@@ -22997,17 +22997,17 @@ describe("Answer Tag Tests", function () {
-
- Your current math answer is
- Your current text answer is
- Your submitted math answer is
- Your submitted text answer is
- Credit for your answers
+ Your current math answer is
+ Your current text answer is
+ Your submitted math answer is
+ Your submitted text answer is
+ Credit for your answers $a.creditAchieved{assignNames="ca"}
`,
},
"*",
@@ -23176,11 +23176,11 @@ describe("Answer Tag Tests", function () {
- Your current math answer is
- Your current text answer is
- Your submitted math answer is
- Your submitted text answer is
- Credit for your answers
+ Your current math answer is
+ Your current text answer is
+ Your submitted math answer is
+ Your submitted text answer is
+ Credit for your answers $a.creditAchieved{assignNames="ca"}
`,
},
"*",
@@ -23341,7 +23341,7 @@ describe("Answer Tag Tests", function () {
doenetML: `
a
Criterion:
- Move point so that its x-coordinate is larger than
+ Move point so that its x-coordinate is larger than $_mathinput1.value.
(0,0)
@@ -23349,13 +23349,13 @@ describe("Answer Tag Tests", function () {
-
- Your current answer:
- Your submitted answer:
- Credit for your answer
+ Your current answer:
+ Your submitted answer:
+ Credit for your answer $a.creditAchieved{assignNames="ca"}
`,
},
"*",
@@ -23597,9 +23597,9 @@ describe("Answer Tag Tests", function () {
$val > $min Current response
- Submitted response
- Credit:
+ Current response
+ Submitted response
+ Credit: $a.creditAchieved{assignNames="ca"}
`,
},
"*",
@@ -23706,9 +23706,9 @@ describe("Answer Tag Tests", function () {
$(QQ.x) > $(PP.x) and $(QQ.y) > $(PP.y) Current responses
- Submitted responses
- Credit:
+ Current responses $a.currentResponses{assignNames="cr1 cr2" createComponentOfType="math" numComponents="2"}
+ Submitted responses $a.submittedResponses{assignNames="sr1 sr2" createComponentOfType="math" numComponents="2"}
+ Credit: $a.creditAchieved{assignNames="ca"}
`,
},
"*",
@@ -23906,17 +23906,17 @@ describe("Answer Tag Tests", function () {
- $mi{isResponse name="v"} = x
$v = y
- $cm = z
+ $v = z
- Submitted responses of ans:
+ Submitted responses of ans: $ans.submittedResponses{assignNames="sr1 sr2 sr3"}
`,
@@ -23988,17 +23988,17 @@ describe("Answer Tag Tests", function () {
a1:
- $mi{name="v"} = x
$v = y
- $cm = z
+ $v = z
- Submitted responses of ans:
+ Submitted responses of ans: $ans.submittedResponses{assignNames="sr1 sr2 sr3"}
`,
@@ -24080,7 +24080,7 @@ describe("Answer Tag Tests", function () {
- Submitted responses of ans:
+ Submitted responses of ans: $ans.submittedResponses{assignNames="sr1 sr2 sr3"}
`,
@@ -24156,9 +24156,9 @@ describe("Answer Tag Tests", function () {
$val > $min Current responses
- Submitted response
- Credit:
+ Current responses $a.currentResponses{assignNames="cr1 cr2" createComponentOfType="math" numComponents="2"}
+ Submitted response $a.submittedResponses{assignNames="sr1 sr2" createComponentOfType="math" numComponents="2"}
+ Credit: $a.creditAchieved{assignNames="ca"}
`,
},
"*",
@@ -24347,9 +24347,9 @@ describe("Answer Tag Tests", function () {
$val > 3 Current response:
- Submitted response:
- Credit:
+ Current response:
+ Submitted response:
+ Credit: $a.creditAchieved{assignNames="ca"}
`,
},
"*",
@@ -24721,11 +24721,13 @@ describe("Answer Tag Tests", function () {
-
+ $a.feedbacks{assignNames="fb1 fb2 fb3 fb4 fb5"}
+
- Current responses:
- Submitted response:
- Credit:
+ Current responses: $a.currentResponses{assignNames="cr1 cr2" createComponentOfType="math" numComponents="2"}
+ Submitted response: $a.submittedResponses{assignNames="sr1 sr2" createComponentOfType="math" numComponents="2"}
+ Credit: $a.creditAchieved{assignNames="ca"}
`,
},
"*",
@@ -24939,6 +24941,17 @@ describe("Answer Tag Tests", function () {
cy.get(cesc("#\\/fb4")).should("not.exist");
cy.get(cesc("#\\/fb5")).should("not.exist");
+ // make sure don't have a comma displayed between feedbacks
+ cy.get(cesc("#\\/theFeedbacks")).should(
+ "contain.text",
+ "At least the first is a number",
+ );
+ cy.get(cesc("#\\/theFeedbacks")).should(
+ "contain.text",
+ "At least the second is a number",
+ );
+ cy.get(cesc("#\\/theFeedbacks")).should("not.contain.text", ",");
+
cy.get(cesc("#\\/cr1"))
.find(".mjx-mrow")
.eq(0)
@@ -25444,9 +25457,9 @@ describe("Answer Tag Tests", function () {
- Credit:
+ Credit: $a.creditAchieved{assignNames="ca"}
`,
},
@@ -25811,9 +25824,9 @@ describe("Answer Tag Tests", function () {
- Credit:
+ Credit: $a.creditAchieved{assignNames="ca"}
`,
},
@@ -25991,8 +26004,8 @@ describe("Answer Tag Tests", function () {
x+y hello
- Number of submissions 1:
- Number of submissions 2:
+ Number of submissions 1: $_answer1.numSubmissions{assignNames="nsubs1"}
+ Number of submissions 2: $_answer2.numSubmissions{assignNames="nsubs2"}
`,
},
"*",
@@ -26138,10 +26151,10 @@ describe("Answer Tag Tests", function () {
-
- $choice1.selectedValue = 4
@@ -26970,7 +26983,7 @@ describe("Answer Tag Tests", function () {
dog
monkey
- $_choiceinput1 = $_choiceinput1 = $ca.text a
Current Response:
- Submitted Response:
+ Current Response: $a.currentResponse{assignNames="cr"}
+ Submitted Response: $a.submittedResponse{assignNames="sr"}
Change current response:
Change submitted response:
@@ -27575,18 +27588,18 @@ describe("Answer Tag Tests", function () {
1.1
Number of responses:
- Submitted response:
+ Number of responses: $an.numResponses{name="nr"}
+ Submitted response: $an.submittedResponses{name="sr"}
First award awarded: $aw
First award awarded: $aw.awarded
- First award awarded:
- First award awarded:
+ First award awarded: $aw
+ First award awarded: $aw.awarded
First award awarded:
First award awarded:
Second award awarded: $aw2
Second award awarded: $aw2.awarded
- Second award awarded:
- Second award awarded:
+ Second award awarded: $aw2
+ Second award awarded: $aw2.awarded
Second award awarded:
Second award awarded:
@@ -27797,18 +27810,18 @@ describe("Answer Tag Tests", function () {
$mi=1.1 Number of responses:
- Submitted response:
+ Number of responses: $an.numResponses{name="nr"}
+ Submitted response: $an.submittedResponses{name="sr"}
First award awarded: $aw
First award awarded: $aw.awarded
- First award awarded:
- First award awarded:
+ First award awarded: $aw
+ First award awarded: $aw.awarded
First award awarded:
First award awarded:
Second award awarded: $aw2
Second award awarded: $aw2.awarded
- Second award awarded:
- Second award awarded:
+ Second award awarded: $aw2
+ Second award awarded: $aw2.awarded
Second award awarded:
Second award awarded:
@@ -28019,10 +28032,10 @@ describe("Answer Tag Tests", function () {
$mi=1.1
- Number of responses:
- Submitted response:
+ Number of responses: $an.numResponses{name="nr"}
+ Submitted response: $an.submittedResponses{name="sr"}
`,
},
@@ -28080,14 +28093,14 @@ describe("Answer Tag Tests", function () {
doenetML: `
a
x+y
- Current response:
- Submitted response:
- Credit for submitted response:
+ Current response: $ans1.currentResponse{assignNames="cr1"}
+ Submitted response:
+ Credit for submitted response: $ans1.creditAchieved{assignNames="ca1"}
- Current response:
- Submitted response:
- Credit for submitted response:
+ Current response: $ans2.currentResponse{assignNames="cr2"}
+ Submitted response:
+ Credit for submitted response: $ans2.creditAchieved{name="ca2"}
`,
@@ -28312,14 +28325,14 @@ describe("Answer Tag Tests", function () {
doenetML: `
a
x+y
- Current response:
- Submitted response:
- Credit for submitted response:
+ Current response: $ans1.currentResponse{assignNames="cr1"}
+ Submitted response:
+ Credit for submitted response: $ans1.creditAchieved{assignNames="ca1"}
- Current response:
- Submitted response:
- Credit for submitted response:
+ Current response: $ans2.currentResponse{assignNames="cr2"}
+ Submitted response:
+ Credit for submitted response: $ans2.creditAchieved{name="ca2"}
`,
@@ -28694,9 +28707,9 @@ describe("Answer Tag Tests", function () {
x^2-2x+3
x^2-2x+3
- Current response:
- Submitted response:
- Credit for submitted response:
+ Current response: $ans.currentResponse{assignNames="cr"}
+ Submitted response:
+ Credit for submitted response: $ans.creditAchieved{assignNames="ca"}
`,
},
@@ -29482,10 +29495,10 @@ describe("Answer Tag Tests", function () {
x^2
- $P.x > 0
- Submitted responses:
+ Submitted responses: $_answer1.submittedResponses{assignNames="sr1 sr2"}
`,
},
"*",
@@ -31137,7 +31150,7 @@ describe("Answer Tag Tests", function () {
- Submitted responses:
+ Submitted responses: $_answer1.submittedResponses{assignNames="sr1 sr2"}
`,
},
@@ -31586,6 +31599,18 @@ describe("Answer Tag Tests", function () {
});
cy.get(cesc2("#/_text1")).should("have.text", "a");
+ cy.get(cesc2("#/def_cr") + " .mjx-mrow")
+ .eq(0)
+ .should("have.text", "\uff3f");
+ cy.get(cesc2("#/short_cr") + " .mjx-mrow")
+ .eq(0)
+ .should("have.text", "\uff3f");
+ cy.get(cesc2("#/def_sr") + " .mjx-mrow")
+ .eq(0)
+ .should("have.text", "\uff3f");
+ cy.get(cesc2("#/short_sr") + " .mjx-mrow")
+ .eq(0)
+ .should("have.text", "\uff3f");
cy.get(cesc2("#/def") + " textarea")
.type("1.23456789", { force: true })
diff --git a/cypress/e2e/DoenetML/tagSpecific/bestfitline.cy.js b/cypress/e2e/DoenetML/tagSpecific/bestfitline.cy.js
index e4249ff748..72b0eb3ea0 100644
--- a/cypress/e2e/DoenetML/tagSpecific/bestfitline.cy.js
+++ b/cypress/e2e/DoenetML/tagSpecific/bestfitline.cy.js
@@ -27,7 +27,7 @@ describe("BestFitLine Tag Tests", function () {
- data: $l.data
`,
},
@@ -130,7 +130,7 @@ describe("BestFitLine Tag Tests", function () {
- data: $l.data
- data2: $l2.data
`,
},
diff --git a/cypress/e2e/DoenetML/tagSpecific/boolean.cy.js b/cypress/e2e/DoenetML/tagSpecific/boolean.cy.js
index 245ae87b67..6499661474 100644
--- a/cypress/e2e/DoenetML/tagSpecific/boolean.cy.js
+++ b/cypress/e2e/DoenetML/tagSpecific/boolean.cy.js
@@ -583,13 +583,13 @@ describe("Boolean Tag Tests", function () {
a
x+x = 2x
- -5e^(-t) = -5e^(-t)
- -5e^(-t) = -5e^(-t) = $orig.value{simplify}
`,
},
diff --git a/cypress/e2e/DoenetML/tagSpecific/booleaninput.cy.js b/cypress/e2e/DoenetML/tagSpecific/booleaninput.cy.js
index f24dbf90d5..48b8b2a529 100644
--- a/cypress/e2e/DoenetML/tagSpecific/booleaninput.cy.js
+++ b/cypress/e2e/DoenetML/tagSpecific/booleaninput.cy.js
@@ -15,8 +15,8 @@ describe("BooleanInput Tag Tests", function () {
hello
- a
green
-
+ $bi1.value{assignNames="v1"}
red
-
+ $bi2.value{assignNames="v2"}
`,
},
"*",
@@ -207,8 +207,8 @@ describe("BooleanInput Tag Tests", function () {
a
Original boolean: true
booleaninput based on boolean:
- Copied boolean:
- Copied boolean input:
+ Copied boolean: $_boolean1{name="b2"}
+ Copied boolean input: $_booleaninput1.value{assignNames="b3"}
`,
},
"*",
@@ -320,8 +320,8 @@ describe("BooleanInput Tag Tests", function () {
a
Original boolean: true
booleaninput based on boolean: $_boolean1
- Copied boolean:
- Copied boolean input:
+ Copied boolean: $_boolean1{name="b2"}
+ Copied boolean input: $_booleaninput1.value{assignNames="b3"}
`,
},
"*",
@@ -485,8 +485,8 @@ describe("BooleanInput Tag Tests", function () {
hello
- It is \\int_a^b f(x)\\,dx
Hello a/b
- Toggle labels
diff --git a/cypress/e2e/DoenetML/tagSpecific/booleanlist.cy.js b/cypress/e2e/DoenetML/tagSpecific/booleanlist.cy.js
index 78f2bc43c5..3e864f2b23 100644
--- a/cypress/e2e/DoenetML/tagSpecific/booleanlist.cy.js
+++ b/cypress/e2e/DoenetML/tagSpecific/booleanlist.cy.js
@@ -13,17 +13,17 @@ describe("BooleanList Tag Tests", function () {
doenetML: `
false true false
-
+ $_booleanlist1{hide="false" name="bl1a"}
true
false
- false
-
-
+
`,
},
"*",
@@ -377,12 +377,12 @@ describe("BooleanList Tag Tests", function () {
doenetML: `
a
true true false true false
-
-
+ $bl1{maxNumber="3" name="bl2"}
+ $bl2{maxNumber="" name="bl3"}
true true false true false
-
-
+ $bl4{maxNumber="4" name="bl5"}
+ $bl5{maxNumber="" name="bl6"}
`,
},
@@ -461,7 +461,7 @@ describe("BooleanList Tag Tests", function () {
doenetML: `
a
true true false true false
-
+
Maximum number 1:
Maximum number 2:
diff --git a/cypress/e2e/DoenetML/tagSpecific/booleanoperators.cy.js b/cypress/e2e/DoenetML/tagSpecific/booleanoperators.cy.js
index 8b12de8cca..c3fc0ed5a4 100644
--- a/cypress/e2e/DoenetML/tagSpecific/booleanoperators.cy.js
+++ b/cypress/e2e/DoenetML/tagSpecific/booleanoperators.cy.js
@@ -12,7 +12,7 @@ describe("Boolean Operator Tag Tests", function () {
{
doenetML: `
$_booleaninput1.value{assignNames="bv"}
true
false
`,
@@ -57,7 +57,7 @@ describe("Boolean Operator Tag Tests", function () {
{
doenetML: `
$_mathinput1.value{assignNames="mv"} > 1
-
-
-
-
`,
},
@@ -229,26 +229,26 @@ describe("Boolean Operator Tag Tests", function () {
-
-
-
-
`,
},
@@ -397,26 +397,26 @@ describe("Boolean Operator Tag Tests", function () {
-
-
-
-
`,
},
@@ -569,7 +569,7 @@ describe("Boolean Operator Tag Tests", function () {
(1,2)
- (1,2)
- points from graph:
@@ -98,7 +98,7 @@ describe("CallAction Tag Tests", function () {
delete point
-
+
`,
},
"*",
@@ -818,7 +818,7 @@ describe("CallAction Tag Tests", function () {
(-1,2)
-
@@ -1032,7 +1032,7 @@ describe("CallAction Tag Tests", function () {
(-1,2)
-
@@ -1194,7 +1194,7 @@ describe("CallAction Tag Tests", function () {
(-1,2)
-
roll dice
@@ -1372,7 +1372,7 @@ describe("CallAction Tag Tests", function () {
(-1,2)
-
@@ -1532,7 +1532,7 @@ describe("CallAction Tag Tests", function () {
(-1,2)
-
@@ -1784,7 +1784,7 @@ describe("CallAction Tag Tests", function () {
(-1,2)
-
diff --git a/cypress/e2e/DoenetML/tagSpecific/choiceinput.cy.js b/cypress/e2e/DoenetML/tagSpecific/choiceinput.cy.js
index 3ce032021d..2ab216d4f7 100644
--- a/cypress/e2e/DoenetML/tagSpecific/choiceinput.cy.js
+++ b/cypress/e2e/DoenetML/tagSpecific/choiceinput.cy.js
@@ -366,21 +366,21 @@ describe("ChoiceInput Tag Tests", function () {
e
f
- Selected values:
-
Selected indices:
-
`,
@@ -633,20 +633,20 @@ describe("ChoiceInput Tag Tests", function () {
a
The function is f(\\xi)=\\sin(\\xi) .
- The sum of lambda^2 and 2 lambda^2 is
+ The sum of lambda^2 and 2 lambda^2 is $lambda2+$twice .
The sequence is
Can't convert this latex: \\bar{x}^i .
- Selected values:
-
Selected indices:
-
`,
@@ -777,15 +777,15 @@ describe("ChoiceInput Tag Tests", function () {
Select by typing:
- Selected values:
-
Selected indices:
-
`,
@@ -935,15 +935,15 @@ describe("ChoiceInput Tag Tests", function () {
Select by typing:
- Selected values:
-
Selected indices:
-
`,
@@ -1122,18 +1122,18 @@ describe("ChoiceInput Tag Tests", function () {
Fixed to be: monkey
- Selected values:
-
Selected indices:
-
- Check for core round trip:
+ Check for core round trip:
`,
},
"*",
@@ -1197,15 +1197,15 @@ describe("ChoiceInput Tag Tests", function () {
Select by typing:
- Selected values:
-
Selected indices:
-
`,
@@ -2356,7 +2356,7 @@ describe("ChoiceInput Tag Tests", function () {
- Select an option Yes No
+
Yes No Select another option
+
Toggle labels
diff --git a/cypress/e2e/DoenetML/tagSpecific/circle.cy.js b/cypress/e2e/DoenetML/tagSpecific/circle.cy.js
index 6d08ebb68e..8dbca6fea8 100644
--- a/cypress/e2e/DoenetML/tagSpecific/circle.cy.js
+++ b/cypress/e2e/DoenetML/tagSpecific/circle.cy.js
@@ -24,15 +24,15 @@ describe("Circle Tag Tests", function () {
-
-
-
-
-
-
-
- a
- $_point1.x
(2,0)
-
-
-
-
-
-
-
-
-
-
-
-
-
- (2,-3) (3,4)
-
-
-
-
-
-
-
-
-
-
-
- (2,-3) (3,4) (-3,4)
-
-
-
-
-
- a
- $_point1.x
(2,0) (3,4)
-
-
-
-
-
- a
- $_point1.x
(2,0) (3,4) (5,6)
-
-
-
-
-
-
-
-
-
-
-
- a
- $_point1.x
(3,0)
(-3,5)
-
-
-
-
-
- a
- $_point1.x
(3,0) (-1,7)
- $_circle1
-
-
-
-
-
- (
-
-
- (
($fixedZero,
-
- (
- a
- $_circle1.center.y
- a
- a
- a
- a
- a
- a
- $_circle1.throughPoint1.y/2
- a
- a
- a
- a
- abs(
(1,2)
(3,4)
- a
-
(1,2)
-
- a
(1,2)
-
- a
(1,2)
-
-
- (
-
-
-
-
(3,4)
-
Change radius:
@@ -16887,14 +16869,14 @@ describe("Circle Tag Tests", function () {
(7,7)
-
Change radius:
Change center:
-
Set radius radius:
@@ -17276,8 +17258,8 @@ describe("Circle Tag Tests", function () {
radius:
- Center:
+ radius: $circ.radius{assignNames="r2"}
+ Center: $circ.center{assignNames="c"}
`;
cy.get("#testRunner_toggleControls").click();
@@ -17369,87 +17351,6 @@ describe("Circle Tag Tests", function () {
});
});
- it("copy propIndex of throughPoints", () => {
- cy.window().then(async (win) => {
- win.postMessage(
- {
- doenetML: `
- a
-
-
-
-
-
-
-
-
- `,
- },
- "*",
- );
- });
-
- cy.get(cesc("#\\/_text1")).should("have.text", "a"); // to wait for page to load
-
- let t1x = 2,
- t1y = -3;
- let t2x = 3,
- t2y = 4;
- let t3x = -3,
- t3y = 4;
-
- cy.get(cesc("#\\/P1") + " .mjx-mrow").should("not.exist");
- cy.get(cesc("#\\/P2") + " .mjx-mrow").should("not.exist");
- cy.get(cesc("#\\/P3") + " .mjx-mrow").should("not.exist");
- cy.get(cesc("#\\/x") + " .mjx-mrow").should("not.exist");
-
- cy.get(cesc("#\\/n") + " textarea").type("1{enter}", { force: true });
- cy.get(cesc("#\\/P1") + " .mjx-mrow").should(
- "contain.text",
- `(${nInDOM(t1x)},${nInDOM(t1y)})`,
- );
- cy.get(cesc("#\\/P2") + " .mjx-mrow").should("not.exist");
- cy.get(cesc("#\\/P3") + " .mjx-mrow").should("not.exist");
- cy.get(cesc("#\\/x") + " .mjx-mrow").should(
- "contain.text",
- `${nInDOM(t2x)}`,
- );
-
- cy.get(cesc("#\\/n") + " textarea").type("{end}{backspace}2{enter}", {
- force: true,
- });
- cy.get(cesc("#\\/P1") + " .mjx-mrow").should(
- "contain.text",
- `(${nInDOM(t2x)},${nInDOM(t2y)})`,
- );
- cy.get(cesc("#\\/P2") + " .mjx-mrow").should("not.exist");
- cy.get(cesc("#\\/P3") + " .mjx-mrow").should("not.exist");
- cy.get(cesc("#\\/x") + " .mjx-mrow").should(
- "contain.text",
- `${nInDOM(t2y)}`,
- );
-
- cy.get(cesc("#\\/n") + " textarea").type("{end}{backspace}3{enter}", {
- force: true,
- });
- cy.get(cesc("#\\/P1") + " .mjx-mrow").should(
- "contain.text",
- `(${nInDOM(t3x)},${nInDOM(t3y)})`,
- );
- cy.get(cesc("#\\/P2") + " .mjx-mrow").should("not.exist");
- cy.get(cesc("#\\/P3") + " .mjx-mrow").should("not.exist");
- cy.get(cesc("#\\/x") + " .mjx-mrow").should("not.exist");
-
- cy.get(cesc("#\\/n") + " textarea").type("{end}{backspace}4{enter}", {
- force: true,
- });
- cy.get(cesc("#\\/P1") + " .mjx-mrow").should("not.exist");
- cy.get(cesc("#\\/P2") + " .mjx-mrow").should("not.exist");
- cy.get(cesc("#\\/P3") + " .mjx-mrow").should("not.exist");
- cy.get(cesc("#\\/x") + " .mjx-mrow").should("not.exist");
- });
-
it("copy propIndex of throughPoints, dot and array notation", () => {
cy.window().then(async (win) => {
win.postMessage(
@@ -17462,9 +17363,9 @@ describe("Circle Tag Tests", function () {
-
+ $_circle1.throughPoints[$n]{assignNames="P1 P2 P3"}
-
+ $_circle1.throughPoint2[$n]{name="x"}
`,
},
"*",
@@ -17771,17 +17672,15 @@ describe("Circle Tag Tests", function () {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- a
-
+ $_codeeditor1.immediateValue
+ $_codeeditor1.value
`,
},
"*",
@@ -103,8 +103,8 @@ describe("Code Editor Tag Tests", function () {
a
-
+ $_codeeditor1.immediateValue
+ $_codeeditor1.value
`,
},
"*",
@@ -275,10 +275,10 @@ describe("Code Editor Tag Tests", function () {
a
-
+ $_codeeditor1.immediateValue
+ $_codeeditor1.value
- The value of the entered math is
+ The value of the entered math is $(/result/_math1.value{assignNames="m1"})
`,
},
"*",
@@ -529,10 +529,10 @@ describe("Code Editor Tag Tests", function () {
a
The value of the dynamic math is
- The value of the static math is
- The coords of the dynamic point are
- The coords of the static point are
+ The value of the dynamic math is $(/result/x.value{assignNames="x"})
+ The value of the static math is $(/static/x.value{assignNames="sx"})
+ The coords of the dynamic point are $(/result/P.coords{assignNames="P"})
+ The coords of the static point are $(/static/P.coords{assignNames="sP"})
`,
},
"*",
@@ -1322,7 +1322,7 @@ describe("Code Editor Tag Tests", function () {
a
+ $_codeeditor1.value
`;
cy.get("#testRunner_toggleControls").click();
@@ -1439,7 +1439,7 @@ describe("Code Editor Tag Tests", function () {
a
+ $_codeeditor1.value
`,
},
"*",
@@ -1513,16 +1513,16 @@ describe("Code Editor Tag Tests", function () {
a
+ $_codeeditor1.value
+ $_codeeditor2.value
+ $_codeeditor3.value
`,
},
"*",
diff --git a/cypress/e2e/DoenetML/tagSpecific/collect.cy.js b/cypress/e2e/DoenetML/tagSpecific/collect.cy.js
index 9e590e099e..f80677aa38 100644
--- a/cypress/e2e/DoenetML/tagSpecific/collect.cy.js
+++ b/cypress/e2e/DoenetML/tagSpecific/collect.cy.js
@@ -27,7 +27,7 @@ describe("Collect Tag Tests", function () {
- (4,2)
(
-
Enter expressions:
-
+
@@ -1558,26 +1558,26 @@ describe("Collect Tag Tests", function () {
Copied:
Copy aslist:
- Copy copied:
- Copy aslist containing copy:
- Copy copied aslist:
+ Copy copied: $values1a
+ Copy aslist containing copy: $al1a
+ Copy copied aslist: $al1b
Values collected:
Copied:
Copy aslist:
- Copy copied:
- Copy aslist containing copy:
- Copy copied aslist:
+ Copy copied: $values2a
+ Copy aslist containing copy: $al2a
+ Copy copied aslist: $al2b
Inputs collected:
Copied:
Copy aslist:
- Copy copied:
- Copy aslist containing copy:
- Copy copied aslist:
+ Copy copied: $cola
+ Copy aslist containing copy: $al3a
+ Copy copied aslist: $al3b
`,
},
@@ -1614,7 +1614,7 @@ describe("Collect Tag Tests", function () {
.then((text) => {
expect(text.trim()).equal("x");
});
- cy.get(cesc("#\\/p_1b") + " > span:nth-of-type(1)")
+ cy.get(cesc("#\\/p_1b") + " > span > span:nth-of-type(1)")
.find(".mjx-mrow")
.eq(0)
.invoke("text")
@@ -1628,14 +1628,14 @@ describe("Collect Tag Tests", function () {
.then((text) => {
expect(text.trim()).equal("x");
});
- cy.get(cesc("#\\/p_1d") + " > span:nth-of-type(1)")
+ cy.get(cesc("#\\/p_1d") + " > span > span:nth-of-type(1)")
.find(".mjx-mrow")
.eq(0)
.invoke("text")
.then((text) => {
expect(text.trim()).equal("x");
});
- cy.get(cesc("#\\/p_1e") + " > span:nth-of-type(1)")
+ cy.get(cesc("#\\/p_1e") + " > span > span:nth-of-type(1)")
.find(".mjx-mrow")
.eq(0)
.invoke("text")
@@ -1657,7 +1657,7 @@ describe("Collect Tag Tests", function () {
.then((text) => {
expect(text.trim()).equal("x");
});
- cy.get(cesc("#\\/p_2b") + " > span:nth-of-type(1)")
+ cy.get(cesc("#\\/p_2b") + " > span > span:nth-of-type(1)")
.find(".mjx-mrow")
.eq(0)
.invoke("text")
@@ -1671,14 +1671,14 @@ describe("Collect Tag Tests", function () {
.then((text) => {
expect(text.trim()).equal("x");
});
- cy.get(cesc("#\\/p_2d") + " > span:nth-of-type(1)")
+ cy.get(cesc("#\\/p_2d") + " > span > span:nth-of-type(1)")
.find(".mjx-mrow")
.eq(0)
.invoke("text")
.then((text) => {
expect(text.trim()).equal("x");
});
- cy.get(cesc("#\\/p_2e") + " > span:nth-of-type(1)")
+ cy.get(cesc("#\\/p_2e") + " > span > span:nth-of-type(1)")
.find(".mjx-mrow")
.eq(0)
.invoke("text")
@@ -1697,16 +1697,16 @@ describe("Collect Tag Tests", function () {
force: true,
});
- cy.get(cesc("#\\/p_original") + " > span:nth-of-type(2) textarea")
+ cy.get(cesc("#\\/p_original") + " span:nth-of-type(2) textarea")
.type("{end}{backspace}y", { force: true })
.blur();
- cy.get(cesc("#\\/p_original") + " > span:nth-of-type(3) textarea")
+ cy.get(cesc("#\\/p_original") + " span:nth-of-type(3) textarea")
.type("{end}{backspace}z", { force: true })
.blur();
- cy.get(cesc("#\\/p_original") + " > span:nth-of-type(4) textarea")
+ cy.get(cesc("#\\/p_original") + " span:nth-of-type(4) textarea")
.type("{end}{backspace}u", { force: true })
.blur();
- cy.get(cesc("#\\/p_original") + " > span:nth-of-type(5) textarea")
+ cy.get(cesc("#\\/p_original") + " span:nth-of-type(5) textarea")
.type("{end}{backspace}v", { force: true })
.blur();
@@ -1731,7 +1731,7 @@ describe("Collect Tag Tests", function () {
.then((text) => {
expect(text.trim()).equal("x");
});
- cy.get(cesc("#\\/p_1b") + " > span:nth-of-type(1)")
+ cy.get(cesc("#\\/p_1b") + " > span > span:nth-of-type(1)")
.find(".mjx-mrow")
.eq(0)
.invoke("text")
@@ -1745,14 +1745,14 @@ describe("Collect Tag Tests", function () {
.then((text) => {
expect(text.trim()).equal("x");
});
- cy.get(cesc("#\\/p_1d") + " > span:nth-of-type(1)")
+ cy.get(cesc("#\\/p_1d") + " > span > span:nth-of-type(1)")
.find(".mjx-mrow")
.eq(0)
.invoke("text")
.then((text) => {
expect(text.trim()).equal("x");
});
- cy.get(cesc("#\\/p_1e") + " > span:nth-of-type(1)")
+ cy.get(cesc("#\\/p_1e") + " > span > span:nth-of-type(1)")
.find(".mjx-mrow")
.eq(0)
.invoke("text")
@@ -1774,7 +1774,7 @@ describe("Collect Tag Tests", function () {
.then((text) => {
expect(text.trim()).equal("x");
});
- cy.get(cesc("#\\/p_2b") + " > span:nth-of-type(1)")
+ cy.get(cesc("#\\/p_2b") + " > span > span:nth-of-type(1)")
.find(".mjx-mrow")
.eq(0)
.invoke("text")
@@ -1788,14 +1788,14 @@ describe("Collect Tag Tests", function () {
.then((text) => {
expect(text.trim()).equal("x");
});
- cy.get(cesc("#\\/p_2d") + " > span:nth-of-type(1)")
+ cy.get(cesc("#\\/p_2d") + " > span > span:nth-of-type(1)")
.find(".mjx-mrow")
.eq(0)
.invoke("text")
.then((text) => {
expect(text.trim()).equal("x");
});
- cy.get(cesc("#\\/p_2e") + " > span:nth-of-type(1)")
+ cy.get(cesc("#\\/p_2e") + " > span > span:nth-of-type(1)")
.find(".mjx-mrow")
.eq(0)
.invoke("text")
@@ -1826,7 +1826,7 @@ describe("Collect Tag Tests", function () {
.then((text) => {
expect(text.trim()).equal("y");
});
- cy.get(cesc("#\\/p_1b") + " > span:nth-of-type(2)")
+ cy.get(cesc("#\\/p_1b") + " > span > span:nth-of-type(2)")
.find(".mjx-mrow")
.eq(0)
.invoke("text")
@@ -1840,14 +1840,14 @@ describe("Collect Tag Tests", function () {
.then((text) => {
expect(text.trim()).equal("y");
});
- cy.get(cesc("#\\/p_1d") + " > span:nth-of-type(2)")
+ cy.get(cesc("#\\/p_1d") + " > span > span:nth-of-type(2)")
.find(".mjx-mrow")
.eq(0)
.invoke("text")
.then((text) => {
expect(text.trim()).equal("y");
});
- cy.get(cesc("#\\/p_1e") + " > span:nth-of-type(2)")
+ cy.get(cesc("#\\/p_1e") + " > span > span:nth-of-type(2)")
.find(".mjx-mrow")
.eq(0)
.invoke("text")
@@ -1869,7 +1869,7 @@ describe("Collect Tag Tests", function () {
.then((text) => {
expect(text.trim()).equal("y");
});
- cy.get(cesc("#\\/p_2b") + " > span:nth-of-type(2)")
+ cy.get(cesc("#\\/p_2b") + " > span > span:nth-of-type(2)")
.find(".mjx-mrow")
.eq(0)
.invoke("text")
@@ -1883,14 +1883,14 @@ describe("Collect Tag Tests", function () {
.then((text) => {
expect(text.trim()).equal("y");
});
- cy.get(cesc("#\\/p_2d") + " > span:nth-of-type(2)")
+ cy.get(cesc("#\\/p_2d") + " > span > span:nth-of-type(2)")
.find(".mjx-mrow")
.eq(0)
.invoke("text")
.then((text) => {
expect(text.trim()).equal("y");
});
- cy.get(cesc("#\\/p_2e") + " > span:nth-of-type(2)")
+ cy.get(cesc("#\\/p_2e") + " > span > span:nth-of-type(2)")
.find(".mjx-mrow")
.eq(0)
.invoke("text")
@@ -1921,7 +1921,7 @@ describe("Collect Tag Tests", function () {
.then((text) => {
expect(text.trim()).equal("z");
});
- cy.get(cesc("#\\/p_1b") + " > span:nth-of-type(3)")
+ cy.get(cesc("#\\/p_1b") + " > span > span:nth-of-type(3)")
.find(".mjx-mrow")
.eq(0)
.invoke("text")
@@ -1935,14 +1935,14 @@ describe("Collect Tag Tests", function () {
.then((text) => {
expect(text.trim()).equal("z");
});
- cy.get(cesc("#\\/p_1d") + " > span:nth-of-type(3)")
+ cy.get(cesc("#\\/p_1d") + " > span > span:nth-of-type(3)")
.find(".mjx-mrow")
.eq(0)
.invoke("text")
.then((text) => {
expect(text.trim()).equal("z");
});
- cy.get(cesc("#\\/p_1e") + " > span:nth-of-type(3)")
+ cy.get(cesc("#\\/p_1e") + " > span > span:nth-of-type(3)")
.find(".mjx-mrow")
.eq(0)
.invoke("text")
@@ -1964,7 +1964,7 @@ describe("Collect Tag Tests", function () {
.then((text) => {
expect(text.trim()).equal("z");
});
- cy.get(cesc("#\\/p_2b") + " > span:nth-of-type(3)")
+ cy.get(cesc("#\\/p_2b") + " > span > span:nth-of-type(3)")
.find(".mjx-mrow")
.eq(0)
.invoke("text")
@@ -1978,14 +1978,14 @@ describe("Collect Tag Tests", function () {
.then((text) => {
expect(text.trim()).equal("z");
});
- cy.get(cesc("#\\/p_2d") + " > span:nth-of-type(3)")
+ cy.get(cesc("#\\/p_2d") + " > span > span:nth-of-type(3)")
.find(".mjx-mrow")
.eq(0)
.invoke("text")
.then((text) => {
expect(text.trim()).equal("z");
});
- cy.get(cesc("#\\/p_2e") + " > span:nth-of-type(3)")
+ cy.get(cesc("#\\/p_2e") + " > span > span:nth-of-type(3)")
.find(".mjx-mrow")
.eq(0)
.invoke("text")
@@ -2016,7 +2016,7 @@ describe("Collect Tag Tests", function () {
.then((text) => {
expect(text.trim()).equal("u");
});
- cy.get(cesc("#\\/p_1b") + " > span:nth-of-type(4)")
+ cy.get(cesc("#\\/p_1b") + " > span > span:nth-of-type(4)")
.find(".mjx-mrow")
.eq(0)
.invoke("text")
@@ -2030,14 +2030,14 @@ describe("Collect Tag Tests", function () {
.then((text) => {
expect(text.trim()).equal("u");
});
- cy.get(cesc("#\\/p_1d") + " > span:nth-of-type(4)")
+ cy.get(cesc("#\\/p_1d") + " > span > span:nth-of-type(4)")
.find(".mjx-mrow")
.eq(0)
.invoke("text")
.then((text) => {
expect(text.trim()).equal("u");
});
- cy.get(cesc("#\\/p_1e") + " > span:nth-of-type(4)")
+ cy.get(cesc("#\\/p_1e") + " > span > span:nth-of-type(4)")
.find(".mjx-mrow")
.eq(0)
.invoke("text")
@@ -2059,7 +2059,7 @@ describe("Collect Tag Tests", function () {
.then((text) => {
expect(text.trim()).equal("u");
});
- cy.get(cesc("#\\/p_2b") + " > span:nth-of-type(4)")
+ cy.get(cesc("#\\/p_2b") + " > span > span:nth-of-type(4)")
.find(".mjx-mrow")
.eq(0)
.invoke("text")
@@ -2073,14 +2073,14 @@ describe("Collect Tag Tests", function () {
.then((text) => {
expect(text.trim()).equal("u");
});
- cy.get(cesc("#\\/p_2d") + " > span:nth-of-type(4)")
+ cy.get(cesc("#\\/p_2d") + " > span > span:nth-of-type(4)")
.find(".mjx-mrow")
.eq(0)
.invoke("text")
.then((text) => {
expect(text.trim()).equal("u");
});
- cy.get(cesc("#\\/p_2e") + " > span:nth-of-type(4)")
+ cy.get(cesc("#\\/p_2e") + " > span > span:nth-of-type(4)")
.find(".mjx-mrow")
.eq(0)
.invoke("text")
@@ -2111,7 +2111,7 @@ describe("Collect Tag Tests", function () {
.then((text) => {
expect(text.trim()).equal("v");
});
- cy.get(cesc("#\\/p_1b") + " > span:nth-of-type(5)")
+ cy.get(cesc("#\\/p_1b") + " > span > span:nth-of-type(5)")
.find(".mjx-mrow")
.eq(0)
.invoke("text")
@@ -2125,14 +2125,14 @@ describe("Collect Tag Tests", function () {
.then((text) => {
expect(text.trim()).equal("v");
});
- cy.get(cesc("#\\/p_1d") + " > span:nth-of-type(5)")
+ cy.get(cesc("#\\/p_1d") + " > span > span:nth-of-type(5)")
.find(".mjx-mrow")
.eq(0)
.invoke("text")
.then((text) => {
expect(text.trim()).equal("v");
});
- cy.get(cesc("#\\/p_1e") + " > span:nth-of-type(5)")
+ cy.get(cesc("#\\/p_1e") + " > span > span:nth-of-type(5)")
.find(".mjx-mrow")
.eq(0)
.invoke("text")
@@ -2154,7 +2154,7 @@ describe("Collect Tag Tests", function () {
.then((text) => {
expect(text.trim()).equal("v");
});
- cy.get(cesc("#\\/p_2b") + " > span:nth-of-type(5)")
+ cy.get(cesc("#\\/p_2b") + " > span > span:nth-of-type(5)")
.find(".mjx-mrow")
.eq(0)
.invoke("text")
@@ -2168,14 +2168,14 @@ describe("Collect Tag Tests", function () {
.then((text) => {
expect(text.trim()).equal("v");
});
- cy.get(cesc("#\\/p_2d") + " > span:nth-of-type(5)")
+ cy.get(cesc("#\\/p_2d") + " > span > span:nth-of-type(5)")
.find(".mjx-mrow")
.eq(0)
.invoke("text")
.then((text) => {
expect(text.trim()).equal("v");
});
- cy.get(cesc("#\\/p_2e") + " > span:nth-of-type(5)")
+ cy.get(cesc("#\\/p_2e") + " > span > span:nth-of-type(5)")
.find(".mjx-mrow")
.eq(0)
.invoke("text")
@@ -2204,16 +2204,16 @@ describe("Collect Tag Tests", function () {
cy.get(cesc("#\\/p_1a") + " > span:nth-of-type(3) .mjx-mrow").should(
"not.exist",
);
- cy.get(cesc("#\\/p_1b") + " > span:nth-of-type(3) .mjx-mrow").should(
+ cy.get(cesc("#\\/p_1b") + " > span > span:nth-of-type(3) .mjx-mrow").should(
"not.exist",
);
cy.get(cesc("#\\/p_1c") + " > span:nth-of-type(3) .mjx-mrow").should(
"not.exist",
);
- cy.get(cesc("#\\/p_1d") + " > span:nth-of-type(3) .mjx-mrow").should(
+ cy.get(cesc("#\\/p_1d") + " > span > span:nth-of-type(3) .mjx-mrow").should(
"not.exist",
);
- cy.get(cesc("#\\/p_1e") + " > span:nth-of-type(3) .mjx-mrow").should(
+ cy.get(cesc("#\\/p_1e") + " > span > span:nth-of-type(3) .mjx-mrow").should(
"not.exist",
);
@@ -2223,16 +2223,16 @@ describe("Collect Tag Tests", function () {
cy.get(cesc("#\\/p_2a") + " > span:nth-of-type(3) .mjx-mrow").should(
"not.exist",
);
- cy.get(cesc("#\\/p_2b") + " > span:nth-of-type(3) .mjx-mrow").should(
+ cy.get(cesc("#\\/p_2b") + " > span > span:nth-of-type(3) .mjx-mrow").should(
"not.exist",
);
cy.get(cesc("#\\/p_2c") + " > span:nth-of-type(3) .mjx-mrow").should(
"not.exist",
);
- cy.get(cesc("#\\/p_2d") + " > span:nth-of-type(3) .mjx-mrow").should(
+ cy.get(cesc("#\\/p_2d") + " > span > span:nth-of-type(3) .mjx-mrow").should(
"not.exist",
);
- cy.get(cesc("#\\/p_2e") + " > span:nth-of-type(3) .mjx-mrow").should(
+ cy.get(cesc("#\\/p_2e") + " > span > span:nth-of-type(3) .mjx-mrow").should(
"not.exist",
);
@@ -2257,7 +2257,7 @@ describe("Collect Tag Tests", function () {
.then((text) => {
expect(text.trim()).equal("x");
});
- cy.get(cesc("#\\/p_1b") + " > span:nth-of-type(1)")
+ cy.get(cesc("#\\/p_1b") + " > span > span:nth-of-type(1)")
.find(".mjx-mrow")
.eq(0)
.invoke("text")
@@ -2271,14 +2271,14 @@ describe("Collect Tag Tests", function () {
.then((text) => {
expect(text.trim()).equal("x");
});
- cy.get(cesc("#\\/p_1d") + " > span:nth-of-type(1)")
+ cy.get(cesc("#\\/p_1d") + " > span > span:nth-of-type(1)")
.find(".mjx-mrow")
.eq(0)
.invoke("text")
.then((text) => {
expect(text.trim()).equal("x");
});
- cy.get(cesc("#\\/p_1e") + " > span:nth-of-type(1)")
+ cy.get(cesc("#\\/p_1e") + " > span > span:nth-of-type(1)")
.find(".mjx-mrow")
.eq(0)
.invoke("text")
@@ -2300,7 +2300,7 @@ describe("Collect Tag Tests", function () {
.then((text) => {
expect(text.trim()).equal("x");
});
- cy.get(cesc("#\\/p_2b") + " > span:nth-of-type(1)")
+ cy.get(cesc("#\\/p_2b") + " > span > span:nth-of-type(1)")
.find(".mjx-mrow")
.eq(0)
.invoke("text")
@@ -2314,14 +2314,14 @@ describe("Collect Tag Tests", function () {
.then((text) => {
expect(text.trim()).equal("x");
});
- cy.get(cesc("#\\/p_2d") + " > span:nth-of-type(1)")
+ cy.get(cesc("#\\/p_2d") + " > span > span:nth-of-type(1)")
.find(".mjx-mrow")
.eq(0)
.invoke("text")
.then((text) => {
expect(text.trim()).equal("x");
});
- cy.get(cesc("#\\/p_2e") + " > span:nth-of-type(1)")
+ cy.get(cesc("#\\/p_2e") + " > span > span:nth-of-type(1)")
.find(".mjx-mrow")
.eq(0)
.invoke("text")
@@ -2352,7 +2352,7 @@ describe("Collect Tag Tests", function () {
.then((text) => {
expect(text.trim()).equal("y");
});
- cy.get(cesc("#\\/p_1b") + " > span:nth-of-type(2)")
+ cy.get(cesc("#\\/p_1b") + " > span > span:nth-of-type(2)")
.find(".mjx-mrow")
.eq(0)
.invoke("text")
@@ -2366,14 +2366,14 @@ describe("Collect Tag Tests", function () {
.then((text) => {
expect(text.trim()).equal("y");
});
- cy.get(cesc("#\\/p_1d") + " > span:nth-of-type(2)")
+ cy.get(cesc("#\\/p_1d") + " > span > span:nth-of-type(2)")
.find(".mjx-mrow")
.eq(0)
.invoke("text")
.then((text) => {
expect(text.trim()).equal("y");
});
- cy.get(cesc("#\\/p_1e") + " > span:nth-of-type(2)")
+ cy.get(cesc("#\\/p_1e") + " > span > span:nth-of-type(2)")
.find(".mjx-mrow")
.eq(0)
.invoke("text")
@@ -2395,7 +2395,7 @@ describe("Collect Tag Tests", function () {
.then((text) => {
expect(text.trim()).equal("y");
});
- cy.get(cesc("#\\/p_2b") + " > span:nth-of-type(2)")
+ cy.get(cesc("#\\/p_2b") + " > span > span:nth-of-type(2)")
.find(".mjx-mrow")
.eq(0)
.invoke("text")
@@ -2409,14 +2409,14 @@ describe("Collect Tag Tests", function () {
.then((text) => {
expect(text.trim()).equal("y");
});
- cy.get(cesc("#\\/p_2d") + " > span:nth-of-type(2)")
+ cy.get(cesc("#\\/p_2d") + " > span > span:nth-of-type(2)")
.find(".mjx-mrow")
.eq(0)
.invoke("text")
.then((text) => {
expect(text.trim()).equal("y");
});
- cy.get(cesc("#\\/p_2e") + " > span:nth-of-type(2)")
+ cy.get(cesc("#\\/p_2e") + " > span > span:nth-of-type(2)")
.find(".mjx-mrow")
.eq(0)
.invoke("text")
@@ -2461,7 +2461,7 @@ describe("Collect Tag Tests", function () {
.then((text) => {
expect(text.trim()).equal("a");
});
- cy.get(cesc("#\\/p_1b") + " > span:nth-of-type(1)")
+ cy.get(cesc("#\\/p_1b") + " > span > span:nth-of-type(1)")
.find(".mjx-mrow")
.eq(0)
.invoke("text")
@@ -2475,14 +2475,14 @@ describe("Collect Tag Tests", function () {
.then((text) => {
expect(text.trim()).equal("a");
});
- cy.get(cesc("#\\/p_1d") + " > span:nth-of-type(1)")
+ cy.get(cesc("#\\/p_1d") + " > span > span:nth-of-type(1)")
.find(".mjx-mrow")
.eq(0)
.invoke("text")
.then((text) => {
expect(text.trim()).equal("a");
});
- cy.get(cesc("#\\/p_1e") + " > span:nth-of-type(1)")
+ cy.get(cesc("#\\/p_1e") + " > span > span:nth-of-type(1)")
.find(".mjx-mrow")
.eq(0)
.invoke("text")
@@ -2504,7 +2504,7 @@ describe("Collect Tag Tests", function () {
.then((text) => {
expect(text.trim()).equal("a");
});
- cy.get(cesc("#\\/p_2b") + " > span:nth-of-type(1)")
+ cy.get(cesc("#\\/p_2b") + " > span > span:nth-of-type(1)")
.find(".mjx-mrow")
.eq(0)
.invoke("text")
@@ -2518,14 +2518,14 @@ describe("Collect Tag Tests", function () {
.then((text) => {
expect(text.trim()).equal("a");
});
- cy.get(cesc("#\\/p_2d") + " > span:nth-of-type(1)")
+ cy.get(cesc("#\\/p_2d") + " > span > span:nth-of-type(1)")
.find(".mjx-mrow")
.eq(0)
.invoke("text")
.then((text) => {
expect(text.trim()).equal("a");
});
- cy.get(cesc("#\\/p_2e") + " > span:nth-of-type(1)")
+ cy.get(cesc("#\\/p_2e") + " > span > span:nth-of-type(1)")
.find(".mjx-mrow")
.eq(0)
.invoke("text")
@@ -2556,7 +2556,7 @@ describe("Collect Tag Tests", function () {
.then((text) => {
expect(text.trim()).equal("b");
});
- cy.get(cesc("#\\/p_1b") + " > span:nth-of-type(2)")
+ cy.get(cesc("#\\/p_1b") + " > span > span:nth-of-type(2)")
.find(".mjx-mrow")
.eq(0)
.invoke("text")
@@ -2570,14 +2570,14 @@ describe("Collect Tag Tests", function () {
.then((text) => {
expect(text.trim()).equal("b");
});
- cy.get(cesc("#\\/p_1d") + " > span:nth-of-type(2)")
+ cy.get(cesc("#\\/p_1d") + " > span > span:nth-of-type(2)")
.find(".mjx-mrow")
.eq(0)
.invoke("text")
.then((text) => {
expect(text.trim()).equal("b");
});
- cy.get(cesc("#\\/p_1e") + " > span:nth-of-type(2)")
+ cy.get(cesc("#\\/p_1e") + " > span > span:nth-of-type(2)")
.find(".mjx-mrow")
.eq(0)
.invoke("text")
@@ -2599,7 +2599,7 @@ describe("Collect Tag Tests", function () {
.then((text) => {
expect(text.trim()).equal("b");
});
- cy.get(cesc("#\\/p_2b") + " > span:nth-of-type(2)")
+ cy.get(cesc("#\\/p_2b") + " > span > span:nth-of-type(2)")
.find(".mjx-mrow")
.eq(0)
.invoke("text")
@@ -2613,14 +2613,14 @@ describe("Collect Tag Tests", function () {
.then((text) => {
expect(text.trim()).equal("b");
});
- cy.get(cesc("#\\/p_2d") + " > span:nth-of-type(2)")
+ cy.get(cesc("#\\/p_2d") + " > span > span:nth-of-type(2)")
.find(".mjx-mrow")
.eq(0)
.invoke("text")
.then((text) => {
expect(text.trim()).equal("b");
});
- cy.get(cesc("#\\/p_2e") + " > span:nth-of-type(2)")
+ cy.get(cesc("#\\/p_2e") + " > span > span:nth-of-type(2)")
.find(".mjx-mrow")
.eq(0)
.invoke("text")
@@ -2660,7 +2660,7 @@ describe("Collect Tag Tests", function () {
.then((text) => {
expect(text.trim()).equal("a");
});
- cy.get(cesc("#\\/p_1b") + " > span:nth-of-type(1)")
+ cy.get(cesc("#\\/p_1b") + " > span > span:nth-of-type(1)")
.find(".mjx-mrow")
.eq(0)
.invoke("text")
@@ -2674,14 +2674,14 @@ describe("Collect Tag Tests", function () {
.then((text) => {
expect(text.trim()).equal("a");
});
- cy.get(cesc("#\\/p_1d") + " > span:nth-of-type(1)")
+ cy.get(cesc("#\\/p_1d") + " > span > span:nth-of-type(1)")
.find(".mjx-mrow")
.eq(0)
.invoke("text")
.then((text) => {
expect(text.trim()).equal("a");
});
- cy.get(cesc("#\\/p_1e") + " > span:nth-of-type(1)")
+ cy.get(cesc("#\\/p_1e") + " > span > span:nth-of-type(1)")
.find(".mjx-mrow")
.eq(0)
.invoke("text")
@@ -2703,7 +2703,7 @@ describe("Collect Tag Tests", function () {
.then((text) => {
expect(text.trim()).equal("a");
});
- cy.get(cesc("#\\/p_2b") + " > span:nth-of-type(1)")
+ cy.get(cesc("#\\/p_2b") + " > span > span:nth-of-type(1)")
.find(".mjx-mrow")
.eq(0)
.invoke("text")
@@ -2717,14 +2717,14 @@ describe("Collect Tag Tests", function () {
.then((text) => {
expect(text.trim()).equal("a");
});
- cy.get(cesc("#\\/p_2d") + " > span:nth-of-type(1)")
+ cy.get(cesc("#\\/p_2d") + " > span > span:nth-of-type(1)")
.find(".mjx-mrow")
.eq(0)
.invoke("text")
.then((text) => {
expect(text.trim()).equal("a");
});
- cy.get(cesc("#\\/p_2e") + " > span:nth-of-type(1)")
+ cy.get(cesc("#\\/p_2e") + " > span > span:nth-of-type(1)")
.find(".mjx-mrow")
.eq(0)
.invoke("text")
@@ -2755,7 +2755,7 @@ describe("Collect Tag Tests", function () {
.then((text) => {
expect(text.trim()).equal("b");
});
- cy.get(cesc("#\\/p_1b") + " > span:nth-of-type(2)")
+ cy.get(cesc("#\\/p_1b") + " > span > span:nth-of-type(2)")
.find(".mjx-mrow")
.eq(0)
.invoke("text")
@@ -2769,14 +2769,14 @@ describe("Collect Tag Tests", function () {
.then((text) => {
expect(text.trim()).equal("b");
});
- cy.get(cesc("#\\/p_1d") + " > span:nth-of-type(2)")
+ cy.get(cesc("#\\/p_1d") + " > span > span:nth-of-type(2)")
.find(".mjx-mrow")
.eq(0)
.invoke("text")
.then((text) => {
expect(text.trim()).equal("b");
});
- cy.get(cesc("#\\/p_1e") + " > span:nth-of-type(2)")
+ cy.get(cesc("#\\/p_1e") + " > span > span:nth-of-type(2)")
.find(".mjx-mrow")
.eq(0)
.invoke("text")
@@ -2798,7 +2798,7 @@ describe("Collect Tag Tests", function () {
.then((text) => {
expect(text.trim()).equal("b");
});
- cy.get(cesc("#\\/p_2b") + " > span:nth-of-type(2)")
+ cy.get(cesc("#\\/p_2b") + " > span > span:nth-of-type(2)")
.find(".mjx-mrow")
.eq(0)
.invoke("text")
@@ -2812,14 +2812,14 @@ describe("Collect Tag Tests", function () {
.then((text) => {
expect(text.trim()).equal("b");
});
- cy.get(cesc("#\\/p_2d") + " > span:nth-of-type(2)")
+ cy.get(cesc("#\\/p_2d") + " > span > span:nth-of-type(2)")
.find(".mjx-mrow")
.eq(0)
.invoke("text")
.then((text) => {
expect(text.trim()).equal("b");
});
- cy.get(cesc("#\\/p_2e") + " > span:nth-of-type(2)")
+ cy.get(cesc("#\\/p_2e") + " > span > span:nth-of-type(2)")
.find(".mjx-mrow")
.eq(0)
.invoke("text")
@@ -2850,7 +2850,7 @@ describe("Collect Tag Tests", function () {
.then((text) => {
expect(text.trim()).equal("z");
});
- cy.get(cesc("#\\/p_1b") + " > span:nth-of-type(3)")
+ cy.get(cesc("#\\/p_1b") + " > span > span:nth-of-type(3)")
.find(".mjx-mrow")
.eq(0)
.invoke("text")
@@ -2864,14 +2864,14 @@ describe("Collect Tag Tests", function () {
.then((text) => {
expect(text.trim()).equal("z");
});
- cy.get(cesc("#\\/p_1d") + " > span:nth-of-type(3)")
+ cy.get(cesc("#\\/p_1d") + " > span > span:nth-of-type(3)")
.find(".mjx-mrow")
.eq(0)
.invoke("text")
.then((text) => {
expect(text.trim()).equal("z");
});
- cy.get(cesc("#\\/p_1e") + " > span:nth-of-type(3)")
+ cy.get(cesc("#\\/p_1e") + " > span > span:nth-of-type(3)")
.find(".mjx-mrow")
.eq(0)
.invoke("text")
@@ -2893,7 +2893,7 @@ describe("Collect Tag Tests", function () {
.then((text) => {
expect(text.trim()).equal("z");
});
- cy.get(cesc("#\\/p_2b") + " > span:nth-of-type(3)")
+ cy.get(cesc("#\\/p_2b") + " > span > span:nth-of-type(3)")
.find(".mjx-mrow")
.eq(0)
.invoke("text")
@@ -2907,14 +2907,14 @@ describe("Collect Tag Tests", function () {
.then((text) => {
expect(text.trim()).equal("z");
});
- cy.get(cesc("#\\/p_2d") + " > span:nth-of-type(3)")
+ cy.get(cesc("#\\/p_2d") + " > span > span:nth-of-type(3)")
.find(".mjx-mrow")
.eq(0)
.invoke("text")
.then((text) => {
expect(text.trim()).equal("z");
});
- cy.get(cesc("#\\/p_2e") + " > span:nth-of-type(3)")
+ cy.get(cesc("#\\/p_2e") + " > span > span:nth-of-type(3)")
.find(".mjx-mrow")
.eq(0)
.invoke("text")
@@ -2945,7 +2945,7 @@ describe("Collect Tag Tests", function () {
.then((text) => {
expect(text.trim()).equal("u");
});
- cy.get(cesc("#\\/p_1b") + " > span:nth-of-type(4)")
+ cy.get(cesc("#\\/p_1b") + " > span > span:nth-of-type(4)")
.find(".mjx-mrow")
.eq(0)
.invoke("text")
@@ -2959,14 +2959,14 @@ describe("Collect Tag Tests", function () {
.then((text) => {
expect(text.trim()).equal("u");
});
- cy.get(cesc("#\\/p_1d") + " > span:nth-of-type(4)")
+ cy.get(cesc("#\\/p_1d") + " > span > span:nth-of-type(4)")
.find(".mjx-mrow")
.eq(0)
.invoke("text")
.then((text) => {
expect(text.trim()).equal("u");
});
- cy.get(cesc("#\\/p_1e") + " > span:nth-of-type(4)")
+ cy.get(cesc("#\\/p_1e") + " > span > span:nth-of-type(4)")
.find(".mjx-mrow")
.eq(0)
.invoke("text")
@@ -2988,7 +2988,7 @@ describe("Collect Tag Tests", function () {
.then((text) => {
expect(text.trim()).equal("u");
});
- cy.get(cesc("#\\/p_2b") + " > span:nth-of-type(4)")
+ cy.get(cesc("#\\/p_2b") + " > span > span:nth-of-type(4)")
.find(".mjx-mrow")
.eq(0)
.invoke("text")
@@ -3002,14 +3002,14 @@ describe("Collect Tag Tests", function () {
.then((text) => {
expect(text.trim()).equal("u");
});
- cy.get(cesc("#\\/p_2d") + " > span:nth-of-type(4)")
+ cy.get(cesc("#\\/p_2d") + " > span > span:nth-of-type(4)")
.find(".mjx-mrow")
.eq(0)
.invoke("text")
.then((text) => {
expect(text.trim()).equal("u");
});
- cy.get(cesc("#\\/p_2e") + " > span:nth-of-type(4)")
+ cy.get(cesc("#\\/p_2e") + " > span > span:nth-of-type(4)")
.find(".mjx-mrow")
.eq(0)
.invoke("text")
@@ -3040,7 +3040,7 @@ describe("Collect Tag Tests", function () {
.then((text) => {
expect(text.trim()).equal("v");
});
- cy.get(cesc("#\\/p_1b") + " > span:nth-of-type(5)")
+ cy.get(cesc("#\\/p_1b") + " > span > span:nth-of-type(5)")
.find(".mjx-mrow")
.eq(0)
.invoke("text")
@@ -3054,14 +3054,14 @@ describe("Collect Tag Tests", function () {
.then((text) => {
expect(text.trim()).equal("v");
});
- cy.get(cesc("#\\/p_1d") + " > span:nth-of-type(5)")
+ cy.get(cesc("#\\/p_1d") + " > span > span:nth-of-type(5)")
.find(".mjx-mrow")
.eq(0)
.invoke("text")
.then((text) => {
expect(text.trim()).equal("v");
});
- cy.get(cesc("#\\/p_1e") + " > span:nth-of-type(5)")
+ cy.get(cesc("#\\/p_1e") + " > span > span:nth-of-type(5)")
.find(".mjx-mrow")
.eq(0)
.invoke("text")
@@ -3083,7 +3083,7 @@ describe("Collect Tag Tests", function () {
.then((text) => {
expect(text.trim()).equal("v");
});
- cy.get(cesc("#\\/p_2b") + " > span:nth-of-type(5)")
+ cy.get(cesc("#\\/p_2b") + " > span > span:nth-of-type(5)")
.find(".mjx-mrow")
.eq(0)
.invoke("text")
@@ -3097,14 +3097,14 @@ describe("Collect Tag Tests", function () {
.then((text) => {
expect(text.trim()).equal("v");
});
- cy.get(cesc("#\\/p_2d") + " > span:nth-of-type(5)")
+ cy.get(cesc("#\\/p_2d") + " > span > span:nth-of-type(5)")
.find(".mjx-mrow")
.eq(0)
.invoke("text")
.then((text) => {
expect(text.trim()).equal("v");
});
- cy.get(cesc("#\\/p_2e") + " > span:nth-of-type(5)")
+ cy.get(cesc("#\\/p_2e") + " > span > span:nth-of-type(5)")
.find(".mjx-mrow")
.eq(0)
.invoke("text")
@@ -3119,7 +3119,7 @@ describe("Collect Tag Tests", function () {
// cy.get(cesc('#\\/p_3d') + ' > span:nth-of-type(5) input').should('have.value', 'v');
// cy.get(cesc('#\\/p_3e') + ' > span:nth-of-type(5) input').should('have.value', 'v');
- cy.get(cesc("#\\/p_3b") + " > span:nth-of-type(3) textarea").type(
+ cy.get(cesc("#\\/p_3b") + " > span > span:nth-of-type(3) textarea").type(
"{end}{backspace}c{enter}",
{ force: true },
);
@@ -3127,7 +3127,7 @@ describe("Collect Tag Tests", function () {
"{end}{backspace}d{enter}",
{ force: true },
);
- cy.get(cesc("#\\/p_3d") + " > span:nth-of-type(5) textarea").type(
+ cy.get(cesc("#\\/p_3d") + " > span > span:nth-of-type(5) textarea").type(
"{end}{backspace}e{enter}",
{ force: true },
);
@@ -3153,7 +3153,7 @@ describe("Collect Tag Tests", function () {
.then((text) => {
expect(text.trim()).equal("a");
});
- cy.get(cesc("#\\/p_1b") + " > span:nth-of-type(1)")
+ cy.get(cesc("#\\/p_1b") + " > span > span:nth-of-type(1)")
.find(".mjx-mrow")
.eq(0)
.invoke("text")
@@ -3167,14 +3167,14 @@ describe("Collect Tag Tests", function () {
.then((text) => {
expect(text.trim()).equal("a");
});
- cy.get(cesc("#\\/p_1d") + " > span:nth-of-type(1)")
+ cy.get(cesc("#\\/p_1d") + " > span > span:nth-of-type(1)")
.find(".mjx-mrow")
.eq(0)
.invoke("text")
.then((text) => {
expect(text.trim()).equal("a");
});
- cy.get(cesc("#\\/p_1e") + " > span:nth-of-type(1)")
+ cy.get(cesc("#\\/p_1e") + " > span > span:nth-of-type(1)")
.find(".mjx-mrow")
.eq(0)
.invoke("text")
@@ -3196,7 +3196,7 @@ describe("Collect Tag Tests", function () {
.then((text) => {
expect(text.trim()).equal("a");
});
- cy.get(cesc("#\\/p_2b") + " > span:nth-of-type(1)")
+ cy.get(cesc("#\\/p_2b") + " > span > span:nth-of-type(1)")
.find(".mjx-mrow")
.eq(0)
.invoke("text")
@@ -3210,14 +3210,14 @@ describe("Collect Tag Tests", function () {
.then((text) => {
expect(text.trim()).equal("a");
});
- cy.get(cesc("#\\/p_2d") + " > span:nth-of-type(1)")
+ cy.get(cesc("#\\/p_2d") + " > span > span:nth-of-type(1)")
.find(".mjx-mrow")
.eq(0)
.invoke("text")
.then((text) => {
expect(text.trim()).equal("a");
});
- cy.get(cesc("#\\/p_2e") + " > span:nth-of-type(1)")
+ cy.get(cesc("#\\/p_2e") + " > span > span:nth-of-type(1)")
.find(".mjx-mrow")
.eq(0)
.invoke("text")
@@ -3248,7 +3248,7 @@ describe("Collect Tag Tests", function () {
.then((text) => {
expect(text.trim()).equal("b");
});
- cy.get(cesc("#\\/p_1b") + " > span:nth-of-type(2)")
+ cy.get(cesc("#\\/p_1b") + " > span > span:nth-of-type(2)")
.find(".mjx-mrow")
.eq(0)
.invoke("text")
@@ -3262,14 +3262,14 @@ describe("Collect Tag Tests", function () {
.then((text) => {
expect(text.trim()).equal("b");
});
- cy.get(cesc("#\\/p_1d") + " > span:nth-of-type(2)")
+ cy.get(cesc("#\\/p_1d") + " > span > span:nth-of-type(2)")
.find(".mjx-mrow")
.eq(0)
.invoke("text")
.then((text) => {
expect(text.trim()).equal("b");
});
- cy.get(cesc("#\\/p_1e") + " > span:nth-of-type(2)")
+ cy.get(cesc("#\\/p_1e") + " > span > span:nth-of-type(2)")
.find(".mjx-mrow")
.eq(0)
.invoke("text")
@@ -3291,7 +3291,7 @@ describe("Collect Tag Tests", function () {
.then((text) => {
expect(text.trim()).equal("b");
});
- cy.get(cesc("#\\/p_2b") + " > span:nth-of-type(2)")
+ cy.get(cesc("#\\/p_2b") + " > span > span:nth-of-type(2)")
.find(".mjx-mrow")
.eq(0)
.invoke("text")
@@ -3305,14 +3305,14 @@ describe("Collect Tag Tests", function () {
.then((text) => {
expect(text.trim()).equal("b");
});
- cy.get(cesc("#\\/p_2d") + " > span:nth-of-type(2)")
+ cy.get(cesc("#\\/p_2d") + " > span > span:nth-of-type(2)")
.find(".mjx-mrow")
.eq(0)
.invoke("text")
.then((text) => {
expect(text.trim()).equal("b");
});
- cy.get(cesc("#\\/p_2e") + " > span:nth-of-type(2)")
+ cy.get(cesc("#\\/p_2e") + " > span > span:nth-of-type(2)")
.find(".mjx-mrow")
.eq(0)
.invoke("text")
@@ -3343,7 +3343,7 @@ describe("Collect Tag Tests", function () {
.then((text) => {
expect(text.trim()).equal("c");
});
- cy.get(cesc("#\\/p_1b") + " > span:nth-of-type(3)")
+ cy.get(cesc("#\\/p_1b") + " > span > span:nth-of-type(3)")
.find(".mjx-mrow")
.eq(0)
.invoke("text")
@@ -3357,14 +3357,14 @@ describe("Collect Tag Tests", function () {
.then((text) => {
expect(text.trim()).equal("c");
});
- cy.get(cesc("#\\/p_1d") + " > span:nth-of-type(3)")
+ cy.get(cesc("#\\/p_1d") + " > span > span:nth-of-type(3)")
.find(".mjx-mrow")
.eq(0)
.invoke("text")
.then((text) => {
expect(text.trim()).equal("c");
});
- cy.get(cesc("#\\/p_1e") + " > span:nth-of-type(3)")
+ cy.get(cesc("#\\/p_1e") + " > span > span:nth-of-type(3)")
.find(".mjx-mrow")
.eq(0)
.invoke("text")
@@ -3386,7 +3386,7 @@ describe("Collect Tag Tests", function () {
.then((text) => {
expect(text.trim()).equal("c");
});
- cy.get(cesc("#\\/p_2b") + " > span:nth-of-type(3)")
+ cy.get(cesc("#\\/p_2b") + " > span > span:nth-of-type(3)")
.find(".mjx-mrow")
.eq(0)
.invoke("text")
@@ -3400,14 +3400,14 @@ describe("Collect Tag Tests", function () {
.then((text) => {
expect(text.trim()).equal("c");
});
- cy.get(cesc("#\\/p_2d") + " > span:nth-of-type(3)")
+ cy.get(cesc("#\\/p_2d") + " > span > span:nth-of-type(3)")
.find(".mjx-mrow")
.eq(0)
.invoke("text")
.then((text) => {
expect(text.trim()).equal("c");
});
- cy.get(cesc("#\\/p_2e") + " > span:nth-of-type(3)")
+ cy.get(cesc("#\\/p_2e") + " > span > span:nth-of-type(3)")
.find(".mjx-mrow")
.eq(0)
.invoke("text")
@@ -3438,7 +3438,7 @@ describe("Collect Tag Tests", function () {
.then((text) => {
expect(text.trim()).equal("d");
});
- cy.get(cesc("#\\/p_1b") + " > span:nth-of-type(4)")
+ cy.get(cesc("#\\/p_1b") + " > span > span:nth-of-type(4)")
.find(".mjx-mrow")
.eq(0)
.invoke("text")
@@ -3452,14 +3452,14 @@ describe("Collect Tag Tests", function () {
.then((text) => {
expect(text.trim()).equal("d");
});
- cy.get(cesc("#\\/p_1d") + " > span:nth-of-type(4)")
+ cy.get(cesc("#\\/p_1d") + " > span > span:nth-of-type(4)")
.find(".mjx-mrow")
.eq(0)
.invoke("text")
.then((text) => {
expect(text.trim()).equal("d");
});
- cy.get(cesc("#\\/p_1e") + " > span:nth-of-type(4)")
+ cy.get(cesc("#\\/p_1e") + " > span > span:nth-of-type(4)")
.find(".mjx-mrow")
.eq(0)
.invoke("text")
@@ -3481,7 +3481,7 @@ describe("Collect Tag Tests", function () {
.then((text) => {
expect(text.trim()).equal("d");
});
- cy.get(cesc("#\\/p_2b") + " > span:nth-of-type(4)")
+ cy.get(cesc("#\\/p_2b") + " > span > span:nth-of-type(4)")
.find(".mjx-mrow")
.eq(0)
.invoke("text")
@@ -3495,14 +3495,14 @@ describe("Collect Tag Tests", function () {
.then((text) => {
expect(text.trim()).equal("d");
});
- cy.get(cesc("#\\/p_2d") + " > span:nth-of-type(4)")
+ cy.get(cesc("#\\/p_2d") + " > span > span:nth-of-type(4)")
.find(".mjx-mrow")
.eq(0)
.invoke("text")
.then((text) => {
expect(text.trim()).equal("d");
});
- cy.get(cesc("#\\/p_2e") + " > span:nth-of-type(4)")
+ cy.get(cesc("#\\/p_2e") + " > span > span:nth-of-type(4)")
.find(".mjx-mrow")
.eq(0)
.invoke("text")
@@ -3533,7 +3533,7 @@ describe("Collect Tag Tests", function () {
.then((text) => {
expect(text.trim()).equal("e");
});
- cy.get(cesc("#\\/p_1b") + " > span:nth-of-type(5)")
+ cy.get(cesc("#\\/p_1b") + " > span > span:nth-of-type(5)")
.find(".mjx-mrow")
.eq(0)
.invoke("text")
@@ -3547,14 +3547,14 @@ describe("Collect Tag Tests", function () {
.then((text) => {
expect(text.trim()).equal("e");
});
- cy.get(cesc("#\\/p_1d") + " > span:nth-of-type(5)")
+ cy.get(cesc("#\\/p_1d") + " > span > span:nth-of-type(5)")
.find(".mjx-mrow")
.eq(0)
.invoke("text")
.then((text) => {
expect(text.trim()).equal("e");
});
- cy.get(cesc("#\\/p_1e") + " > span:nth-of-type(5)")
+ cy.get(cesc("#\\/p_1e") + " > span > span:nth-of-type(5)")
.find(".mjx-mrow")
.eq(0)
.invoke("text")
@@ -3576,7 +3576,7 @@ describe("Collect Tag Tests", function () {
.then((text) => {
expect(text.trim()).equal("e");
});
- cy.get(cesc("#\\/p_2b") + " > span:nth-of-type(5)")
+ cy.get(cesc("#\\/p_2b") + " > span > span:nth-of-type(5)")
.find(".mjx-mrow")
.eq(0)
.invoke("text")
@@ -3590,14 +3590,14 @@ describe("Collect Tag Tests", function () {
.then((text) => {
expect(text.trim()).equal("e");
});
- cy.get(cesc("#\\/p_2d") + " > span:nth-of-type(5)")
+ cy.get(cesc("#\\/p_2d") + " > span > span:nth-of-type(5)")
.find(".mjx-mrow")
.eq(0)
.invoke("text")
.then((text) => {
expect(text.trim()).equal("e");
});
- cy.get(cesc("#\\/p_2e") + " > span:nth-of-type(5)")
+ cy.get(cesc("#\\/p_2e") + " > span > span:nth-of-type(5)")
.find(".mjx-mrow")
.eq(0)
.invoke("text")
@@ -3633,8 +3633,8 @@ describe("Collect Tag Tests", function () {
$_collect1
$_group1
-
-
+ $_collect1
+ $_group1
`,
},
"*",
@@ -3840,7 +3840,7 @@ describe("Collect Tag Tests", function () {
cy.get(cesc("#\\/_p1")).should("have.text", "Hidden by default: public");
cy.get(cesc("#\\/_p2")).should(
"have.text",
- "Force to reveal: secretpublic",
+ "Force to reveal: secret, public",
);
});
@@ -3852,9 +3852,9 @@ describe("Collect Tag Tests", function () {
a
Hidden text: secret
- Hidden paragraph with hidden text: top secret
-
a
Hidden text: secret
- Hidden paragraph with hidden text: top secret
-
Number of points
- collect 1:
- collect 2:
+ collect 1:
+ collect 2:
`,
},
"*",
@@ -4034,6 +4034,26 @@ describe("Collect Tag Tests", function () {
);
});
+ it("asList", () => {
+ cy.window().then(async (win) => {
+ win.postMessage(
+ {
+ doenetML: `
+ We an apple , a banana , and a cherry .
+
+
+
+
+ `,
+ },
+ "*",
+ );
+ });
+
+ cy.get(cesc2("#/pdefault")).should("have.text", "apple, banana, cherry");
+ cy.get(cesc2("#/pnolist")).should("have.text", "applebananacherry");
+ });
+
it("collect warnings", () => {
cy.window().then(async (win) => {
win.postMessage(
@@ -4207,7 +4227,7 @@ describe("Collect Tag Tests", function () {
- (4,2)
(
${ind}
width:
- width as adapted number:
- width as adapted math:
- width as extracted number:
- extracted isAbsolute:
+ width: $ae.width{assignNames="w"}
+ width as adapted number: $ae.width
+ width as adapted math: $ae.width
+ width as extracted number: $ae.width
+ extracted isAbsolute: $ae.width
`,
},
@@ -152,11 +152,11 @@ describe("Component Size Tag Tests", function () {
width:
-width as adapted number:
-width as adapted math:
-width as extracted number:
-extracted isAbsolute:
+width: $ae.width{assignNames="w"}
+width as adapted number: $ae.width
+width as adapted math: $ae.width
+width as extracted number: $ae.width
+extracted isAbsolute: $ae.width
Change width 2:
`,
},
@@ -260,11 +260,11 @@ describe("Component Size Tag Tests", function () {
width:
-width as adapted number:
-width as adapted math:
-width as extracted number:
-extracted isAbsolute:
+width: $ae.width{assignNames="w"}
+width as adapted number: $ae.width
+width as adapted math: $ae.width
+width as extracted number: $ae.width
+extracted isAbsolute: $ae.width
Change width 2:
`,
@@ -383,8 +383,8 @@ describe("Component Size Tag Tests", function () {
width:
-height:
+width: $ae.width{assignNames="w"}
+height: $ae.height{assignNames="h"}
Change width 2:
Change height 2:
`,
diff --git a/cypress/e2e/DoenetML/tagSpecific/conditionalcontent.cy.js b/cypress/e2e/DoenetML/tagSpecific/conditionalcontent.cy.js
index 9312b67c10..67918bd2a4 100644
--- a/cypress/e2e/DoenetML/tagSpecific/conditionalcontent.cy.js
+++ b/cypress/e2e/DoenetML/tagSpecific/conditionalcontent.cy.js
@@ -36,9 +36,9 @@ describe("Conditional Content Tag Tests", function () {
);
});
- cy.get(cesc("#\\/_text1")).should("have.text", "a");
+ cy.get(cesc2("#/_text1")).should("have.text", "a");
- cy.get("p" + cesc("#\\/_p1"))
+ cy.get("p" + cesc2("#/_p1"))
.invoke("text")
.then((text) => {
expect(text.replace(/\s+/g, " ").trim()).equal(
@@ -46,10 +46,10 @@ describe("Conditional Content Tag Tests", function () {
);
});
- cy.get(cesc("#\\/n") + " textarea").type("10{enter}", { force: true });
+ cy.get(cesc2("#/n") + " textarea").type("10{enter}", { force: true });
- cy.get("p" + cesc("#\\/_p1")).should("contain.text", "a positive number.");
- cy.get("p" + cesc("#\\/_p1"))
+ cy.get("p" + cesc2("#/_p1")).should("contain.text", "a positive number.");
+ cy.get("p" + cesc2("#/_p1"))
.invoke("text")
.then((text) => {
expect(text.replace(/\s+/g, " ").trim()).equal(
@@ -57,12 +57,12 @@ describe("Conditional Content Tag Tests", function () {
);
});
- cy.get(cesc("#\\/n") + " textarea").type(
+ cy.get(cesc2("#/n") + " textarea").type(
"{end}{backspace}{backspace}-5/9{enter}",
{ force: true },
);
- cy.get("p" + cesc("#\\/_p1")).should("contain.text", "a negative number.");
- cy.get("p" + cesc("#\\/_p1"))
+ cy.get("p" + cesc2("#/_p1")).should("contain.text", "a negative number.");
+ cy.get("p" + cesc2("#/_p1"))
.invoke("text")
.then((text) => {
expect(text.replace(/\s+/g, " ").trim()).equal(
@@ -70,23 +70,23 @@ describe("Conditional Content Tag Tests", function () {
);
});
- cy.get(cesc("#\\/n") + " textarea").type(
+ cy.get(cesc2("#/n") + " textarea").type(
"{ctrl+home}{shift+end}{backspace}5-5{enter}",
{ force: true },
);
- cy.get("p" + cesc("#\\/_p1")).should("contain.text", "zero.");
- cy.get("p" + cesc("#\\/_p1"))
+ cy.get("p" + cesc2("#/_p1")).should("contain.text", "zero.");
+ cy.get("p" + cesc2("#/_p1"))
.invoke("text")
.then((text) => {
expect(text.replace(/\s+/g, " ").trim()).equal("You typed zero.");
});
- cy.get(cesc("#\\/n") + " textarea").type(
+ cy.get(cesc2("#/n") + " textarea").type(
"{ctrl+home}{shift+end}{backspace}-x{enter}",
{ force: true },
);
- cy.get("p" + cesc("#\\/_p1")).should("contain.text", "something else.");
- cy.get("p" + cesc("#\\/_p1"))
+ cy.get("p" + cesc2("#/_p1")).should("contain.text", "something else.");
+ cy.get("p" + cesc2("#/_p1"))
.invoke("text")
.then((text) => {
expect(text.replace(/\s+/g, " ").trim()).equal(
@@ -123,9 +123,9 @@ describe("Conditional Content Tag Tests", function () {
);
});
- cy.get(cesc("#\\/_text1")).should("have.text", "a");
+ cy.get(cesc2("#/_text1")).should("have.text", "a");
- cy.get("p" + cesc("#\\/_p1"))
+ cy.get("p" + cesc2("#/_p1"))
.invoke("text")
.then((text) => {
expect(text.replace(/\s+/g, " ").trim()).equal(
@@ -133,9 +133,9 @@ describe("Conditional Content Tag Tests", function () {
);
});
- cy.get(cesc("#\\/n") + " textarea").type("10{enter}", { force: true });
- cy.get("p" + cesc("#\\/_p1")).should("contain.text", "a positive number.");
- cy.get("p" + cesc("#\\/_p1"))
+ cy.get(cesc2("#/n") + " textarea").type("10{enter}", { force: true });
+ cy.get("p" + cesc2("#/_p1")).should("contain.text", "a positive number.");
+ cy.get("p" + cesc2("#/_p1"))
.invoke("text")
.then((text) => {
expect(text.replace(/\s+/g, " ").trim()).equal(
@@ -143,12 +143,12 @@ describe("Conditional Content Tag Tests", function () {
);
});
- cy.get(cesc("#\\/n") + " textarea").type(
+ cy.get(cesc2("#/n") + " textarea").type(
"{end}{backspace}{backspace}-5/9{enter}",
{ force: true },
);
- cy.get("p" + cesc("#\\/_p1")).should("contain.text", "a negative number.");
- cy.get("p" + cesc("#\\/_p1"))
+ cy.get("p" + cesc2("#/_p1")).should("contain.text", "a negative number.");
+ cy.get("p" + cesc2("#/_p1"))
.invoke("text")
.then((text) => {
expect(text.replace(/\s+/g, " ").trim()).equal(
@@ -156,23 +156,23 @@ describe("Conditional Content Tag Tests", function () {
);
});
- cy.get(cesc("#\\/n") + " textarea").type(
+ cy.get(cesc2("#/n") + " textarea").type(
"{ctrl+home}{shift+end}{backspace}5-5{enter}",
{ force: true },
);
- cy.get("p" + cesc("#\\/_p1")).should("contain.text", "zero.");
- cy.get("p" + cesc("#\\/_p1"))
+ cy.get("p" + cesc2("#/_p1")).should("contain.text", "zero.");
+ cy.get("p" + cesc2("#/_p1"))
.invoke("text")
.then((text) => {
expect(text.replace(/\s+/g, " ").trim()).equal("You typed zero.");
});
- cy.get(cesc("#\\/n") + " textarea").type(
+ cy.get(cesc2("#/n") + " textarea").type(
"{ctrl+home}{shift+end}{backspace}-x{enter}",
{ force: true },
);
- cy.get("p" + cesc("#\\/_p1")).should("contain.text", "something else.");
- cy.get("p" + cesc("#\\/_p1"))
+ cy.get("p" + cesc2("#/_p1")).should("contain.text", "something else.");
+ cy.get("p" + cesc2("#/_p1"))
.invoke("text")
.then((text) => {
expect(text.replace(/\s+/g, " ").trim()).equal(
@@ -215,12 +215,12 @@ describe("Conditional Content Tag Tests", function () {
);
});
- cy.get(cesc("#\\/_text1")).should("have.text", "a");
+ cy.get(cesc2("#/_text1")).should("have.text", "a");
- cy.get(cesc("#\\/_section1") + " p").should("not.exist");
- cy.get(cesc("#\\/_section2") + " p").should("not.exist");
- cy.get(cesc("#\\/_section3") + " p").should("not.exist");
- cy.get(cesc("#\\/_section4") + " p")
+ cy.get(cesc2("#/_section1") + " p").should("not.exist");
+ cy.get(cesc2("#/_section2") + " p").should("not.exist");
+ cy.get(cesc2("#/_section3") + " p").should("not.exist");
+ cy.get(cesc2("#/_section4") + " p")
.invoke("text")
.then((text) => {
expect(text.replace(/\s+/g, " ").trim()).equal(
@@ -228,67 +228,67 @@ describe("Conditional Content Tag Tests", function () {
);
});
- cy.get(cesc("#\\/n") + " textarea").type("10{enter}", { force: true });
- cy.get(cesc("#\\/_section1") + " p").should(
+ cy.get(cesc2("#/n") + " textarea").type("10{enter}", { force: true });
+ cy.get(cesc2("#/_section1") + " p").should(
"contain.text",
"a positive number.",
);
- cy.get(cesc("#\\/_section1") + " p")
+ cy.get(cesc2("#/_section1") + " p")
.invoke("text")
.then((text) => {
expect(text.replace(/\s+/g, " ").trim()).equal(
"You typed a positive number.",
);
});
- cy.get(cesc("#\\/_section2") + " p").should("not.exist");
- cy.get(cesc("#\\/_section3") + " p").should("not.exist");
- cy.get(cesc("#\\/_section4") + " p").should("not.exist");
+ cy.get(cesc2("#/_section2") + " p").should("not.exist");
+ cy.get(cesc2("#/_section3") + " p").should("not.exist");
+ cy.get(cesc2("#/_section4") + " p").should("not.exist");
- cy.get(cesc("#\\/n") + " textarea").type(
+ cy.get(cesc2("#/n") + " textarea").type(
"{end}{backspace}{backspace}-5/9{enter}",
{ force: true },
);
- cy.get(cesc("#\\/_section2") + " p").should(
+ cy.get(cesc2("#/_section2") + " p").should(
"contain.text",
"a negative number.",
);
- cy.get(cesc("#\\/_section1") + " p").should("not.exist");
- cy.get(cesc("#\\/_section2") + " p")
+ cy.get(cesc2("#/_section1") + " p").should("not.exist");
+ cy.get(cesc2("#/_section2") + " p")
.invoke("text")
.then((text) => {
expect(text.replace(/\s+/g, " ").trim()).equal(
"You typed a negative number.",
);
});
- cy.get(cesc("#\\/_section3") + " p").should("not.exist");
- cy.get(cesc("#\\/_section4") + " p").should("not.exist");
+ cy.get(cesc2("#/_section3") + " p").should("not.exist");
+ cy.get(cesc2("#/_section4") + " p").should("not.exist");
- cy.get(cesc("#\\/n") + " textarea").type(
+ cy.get(cesc2("#/n") + " textarea").type(
"{ctrl+home}{shift+end}{backspace}5-5{enter}",
{ force: true },
);
- cy.get(cesc("#\\/_section3") + " p").should("contain.text", "zero.");
- cy.get(cesc("#\\/_section1") + " p").should("not.exist");
- cy.get(cesc("#\\/_section2") + " p").should("not.exist");
- cy.get(cesc("#\\/_section3") + " p")
+ cy.get(cesc2("#/_section3") + " p").should("contain.text", "zero.");
+ cy.get(cesc2("#/_section1") + " p").should("not.exist");
+ cy.get(cesc2("#/_section2") + " p").should("not.exist");
+ cy.get(cesc2("#/_section3") + " p")
.invoke("text")
.then((text) => {
expect(text.replace(/\s+/g, " ").trim()).equal("You typed zero.");
});
- cy.get(cesc("#\\/_section4") + " p").should("not.exist");
+ cy.get(cesc2("#/_section4") + " p").should("not.exist");
- cy.get(cesc("#\\/n") + " textarea").type(
+ cy.get(cesc2("#/n") + " textarea").type(
"{ctrl+home}{shift+end}{backspace}-x{enter}",
{ force: true },
);
- cy.get(cesc("#\\/_section4") + " p").should(
+ cy.get(cesc2("#/_section4") + " p").should(
"contain.text",
"something else.",
);
- cy.get(cesc("#\\/_section1") + " p").should("not.exist");
- cy.get(cesc("#\\/_section2") + " p").should("not.exist");
- cy.get(cesc("#\\/_section3") + " p").should("not.exist");
- cy.get(cesc("#\\/_section4") + " p")
+ cy.get(cesc2("#/_section1") + " p").should("not.exist");
+ cy.get(cesc2("#/_section2") + " p").should("not.exist");
+ cy.get(cesc2("#/_section3") + " p").should("not.exist");
+ cy.get(cesc2("#/_section4") + " p")
.invoke("text")
.then((text) => {
expect(text.replace(/\s+/g, " ").trim()).equal(
@@ -309,7 +309,7 @@ describe("Conditional Content Tag Tests", function () {
stable unstable
-
@@ -328,65 +328,65 @@ describe("Conditional Content Tag Tests", function () {
);
});
- cy.get(cesc("#\\/_text1")).should("have.text", "a");
+ cy.get(cesc2("#/_text1")).should("have.text", "a");
- cy.get(cesc("#\\/_choiceinput1")).select(`stable`);
- cy.get(cesc("#\\/_choiceinput1_submit")).click();
- cy.get(cesc("#\\/_choiceinput1_incorrect")).should("be.visible");
- cy.get(cesc("#\\/_choiceinput1")).select(`unstable`);
- cy.get(cesc("#\\/_choiceinput1_submit")).click();
- cy.get(cesc("#\\/_choiceinput1_incorrect")).should("be.visible");
+ cy.get(cesc2("#/_choiceinput1")).select(`stable`);
+ cy.get(cesc2("#/_choiceinput1_submit")).click();
+ cy.get(cesc2("#/_choiceinput1_incorrect")).should("be.visible");
+ cy.get(cesc2("#/_choiceinput1")).select(`unstable`);
+ cy.get(cesc2("#/_choiceinput1_submit")).click();
+ cy.get(cesc2("#/_choiceinput1_incorrect")).should("be.visible");
- cy.get(cesc("#\\/m") + " textarea").type("3{enter}", { force: true });
- cy.get(cesc("#\\/_choiceinput1")).select(`stable`);
- cy.get(cesc("#\\/_choiceinput1_submit")).click();
- cy.get(cesc("#\\/_choiceinput1_incorrect")).should("be.visible");
- cy.get(cesc("#\\/_choiceinput1")).select(`unstable`);
- cy.get(cesc("#\\/_choiceinput1_submit")).click();
- cy.get(cesc("#\\/_choiceinput1_correct")).should("be.visible");
+ cy.get(cesc2("#/m") + " textarea").type("3{enter}", { force: true });
+ cy.get(cesc2("#/_choiceinput1")).select(`stable`);
+ cy.get(cesc2("#/_choiceinput1_submit")).click();
+ cy.get(cesc2("#/_choiceinput1_incorrect")).should("be.visible");
+ cy.get(cesc2("#/_choiceinput1")).select(`unstable`);
+ cy.get(cesc2("#/_choiceinput1_submit")).click();
+ cy.get(cesc2("#/_choiceinput1_correct")).should("be.visible");
- cy.get(cesc("#\\/m") + " textarea").type("{end}{backspace}-0.8{enter}", {
+ cy.get(cesc2("#/m") + " textarea").type("{end}{backspace}-0.8{enter}", {
force: true,
});
- cy.get(cesc("#\\/_choiceinput1")).select(`stable`);
- cy.get(cesc("#\\/_choiceinput1_submit")).click();
- cy.get(cesc("#\\/_choiceinput1_correct")).should("be.visible");
- cy.get(cesc("#\\/_choiceinput1")).select(`unstable`);
- cy.get(cesc("#\\/_choiceinput1_submit")).click();
- cy.get(cesc("#\\/_choiceinput1_incorrect")).should("be.visible");
-
- cy.get(cesc("#\\/m") + " textarea").type(
+ cy.get(cesc2("#/_choiceinput1")).select(`stable`);
+ cy.get(cesc2("#/_choiceinput1_submit")).click();
+ cy.get(cesc2("#/_choiceinput1_correct")).should("be.visible");
+ cy.get(cesc2("#/_choiceinput1")).select(`unstable`);
+ cy.get(cesc2("#/_choiceinput1_submit")).click();
+ cy.get(cesc2("#/_choiceinput1_incorrect")).should("be.visible");
+
+ cy.get(cesc2("#/m") + " textarea").type(
"{ctrl+home}{shift+end}{backspace}1/3{enter}",
{ force: true },
);
- cy.get(cesc("#\\/_choiceinput1")).select(`stable`);
- cy.get(cesc("#\\/_choiceinput1_submit")).click();
- cy.get(cesc("#\\/_choiceinput1_correct")).should("be.visible");
- cy.get(cesc("#\\/_choiceinput1")).select(`unstable`);
- cy.get(cesc("#\\/_choiceinput1_submit")).click();
- cy.get(cesc("#\\/_choiceinput1_incorrect")).should("be.visible");
+ cy.get(cesc2("#/_choiceinput1")).select(`stable`);
+ cy.get(cesc2("#/_choiceinput1_submit")).click();
+ cy.get(cesc2("#/_choiceinput1_correct")).should("be.visible");
+ cy.get(cesc2("#/_choiceinput1")).select(`unstable`);
+ cy.get(cesc2("#/_choiceinput1_submit")).click();
+ cy.get(cesc2("#/_choiceinput1_incorrect")).should("be.visible");
- cy.get(cesc("#\\/m") + " textarea").type(
+ cy.get(cesc2("#/m") + " textarea").type(
"{ctrl+home}{shift+end}{backspace}-7/5{enter}",
{ force: true },
);
- cy.get(cesc("#\\/_choiceinput1")).select(`stable`);
- cy.get(cesc("#\\/_choiceinput1_submit")).click();
- cy.get(cesc("#\\/_choiceinput1_incorrect")).should("be.visible");
- cy.get(cesc("#\\/_choiceinput1")).select(`unstable`);
- cy.get(cesc("#\\/_choiceinput1_submit")).click();
- cy.get(cesc("#\\/_choiceinput1_correct")).should("be.visible");
+ cy.get(cesc2("#/_choiceinput1")).select(`stable`);
+ cy.get(cesc2("#/_choiceinput1_submit")).click();
+ cy.get(cesc2("#/_choiceinput1_incorrect")).should("be.visible");
+ cy.get(cesc2("#/_choiceinput1")).select(`unstable`);
+ cy.get(cesc2("#/_choiceinput1_submit")).click();
+ cy.get(cesc2("#/_choiceinput1_correct")).should("be.visible");
- cy.get(cesc("#\\/m") + " textarea").type(
+ cy.get(cesc2("#/m") + " textarea").type(
"{ctrl+home}{shift+end}{backspace}1{enter}",
{ force: true },
);
- cy.get(cesc("#\\/_choiceinput1")).select(`stable`);
- cy.get(cesc("#\\/_choiceinput1_submit")).click();
- cy.get(cesc("#\\/_choiceinput1_incorrect")).should("be.visible");
- cy.get(cesc("#\\/_choiceinput1")).select(`unstable`);
- cy.get(cesc("#\\/_choiceinput1_submit")).click();
- cy.get(cesc("#\\/_choiceinput1_incorrect")).should("be.visible");
+ cy.get(cesc2("#/_choiceinput1")).select(`stable`);
+ cy.get(cesc2("#/_choiceinput1_submit")).click();
+ cy.get(cesc2("#/_choiceinput1_incorrect")).should("be.visible");
+ cy.get(cesc2("#/_choiceinput1")).select(`unstable`);
+ cy.get(cesc2("#/_choiceinput1_submit")).click();
+ cy.get(cesc2("#/_choiceinput1_incorrect")).should("be.visible");
});
it("conditional math used as correct answer", () => {
@@ -401,7 +401,7 @@ describe("Conditional Content Tag Tests", function () {
-
@@ -420,44 +420,44 @@ describe("Conditional Content Tag Tests", function () {
);
});
- cy.get(cesc("#\\/_text1")).should("have.text", "a");
- cy.get(cesc("#\\/x_submit")).click();
- cy.get(cesc("#\\/x_incorrect")).should("be.visible");
+ cy.get(cesc2("#/_text1")).should("have.text", "a");
+ cy.get(cesc2("#/x_submit")).click();
+ cy.get(cesc2("#/x_incorrect")).should("be.visible");
- cy.get(cesc("#\\/x") + " textarea").type("x > 0{enter}", { force: true });
- cy.get(cesc("#\\/x_incorrect")).should("be.visible");
+ cy.get(cesc2("#/x") + " textarea").type("x > 0{enter}", { force: true });
+ cy.get(cesc2("#/x_incorrect")).should("be.visible");
- cy.get(cesc("#\\/x") + " textarea").type(
+ cy.get(cesc2("#/x") + " textarea").type(
"{end}{backspace}{backspace}{backspace}< 0",
{ force: true },
);
- cy.get(cesc("#\\/x_submit")).should("be.visible");
- cy.get(cesc("#\\/x") + " textarea").type("{enter}", { force: true });
- cy.get(cesc("#\\/x_incorrect")).should("be.visible");
+ cy.get(cesc2("#/x_submit")).should("be.visible");
+ cy.get(cesc2("#/x") + " textarea").type("{enter}", { force: true });
+ cy.get(cesc2("#/x_incorrect")).should("be.visible");
- cy.get(cesc("#\\/c")).select(`negative`);
- cy.get(cesc("#\\/x_submit")).click();
- cy.get(cesc("#\\/x_correct")).should("be.visible");
+ cy.get(cesc2("#/c")).select(`negative`);
+ cy.get(cesc2("#/x_submit")).click();
+ cy.get(cesc2("#/x_correct")).should("be.visible");
- cy.get(cesc("#\\/x") + " textarea").type(
+ cy.get(cesc2("#/x") + " textarea").type(
"{end}{backspace}{backspace}{backspace}> 0",
{ force: true },
);
- cy.get(cesc("#\\/x_submit")).should("be.visible");
- cy.get(cesc("#\\/x") + " textarea").type("{enter}", { force: true });
- cy.get(cesc("#\\/x_incorrect")).should("be.visible");
+ cy.get(cesc2("#/x_submit")).should("be.visible");
+ cy.get(cesc2("#/x") + " textarea").type("{enter}", { force: true });
+ cy.get(cesc2("#/x_incorrect")).should("be.visible");
- cy.get(cesc("#\\/c")).select(`positive`);
- cy.get(cesc("#\\/x_submit")).click();
- cy.get(cesc("#\\/x_correct")).should("be.visible");
+ cy.get(cesc2("#/c")).select(`positive`);
+ cy.get(cesc2("#/x_submit")).click();
+ cy.get(cesc2("#/x_correct")).should("be.visible");
- cy.get(cesc("#\\/x") + " textarea").type(
+ cy.get(cesc2("#/x") + " textarea").type(
"{end}{backspace}{backspace}{backspace}< 0",
{ force: true },
);
- cy.get(cesc("#\\/x_submit")).should("be.visible");
- cy.get(cesc("#\\/x") + " textarea").type("{enter}", { force: true });
- cy.get(cesc("#\\/x_incorrect")).should("be.visible");
+ cy.get(cesc2("#/x_submit")).should("be.visible");
+ cy.get(cesc2("#/x") + " textarea").type("{enter}", { force: true });
+ cy.get(cesc2("#/x_incorrect")).should("be.visible");
});
it("include blank string between tags", () => {
@@ -480,23 +480,23 @@ describe("Conditional Content Tag Tests", function () {
);
});
- cy.get(cesc("#\\/_text1")).should("have.text", "a");
+ cy.get(cesc2("#/_text1")).should("have.text", "a");
- cy.get(cesc("#\\/p")).should("have.text", "");
+ cy.get(cesc2("#/p")).should("have.text", "");
- cy.get(cesc("#\\/b")).click();
+ cy.get(cesc2("#/b")).click();
- cy.get(cesc("#\\/p")).should("have.text", "The fox jumps.");
+ cy.get(cesc2("#/p")).should("have.text", "The fox jumps.");
});
- it("assignNames skips strings but strings still displayed", () => {
+ it("assignNames gives blanks for strings but strings still displayed", () => {
cy.window().then(async (win) => {
win.postMessage(
{
doenetML: `
a
+
dog mouse cat
@@ -504,12 +504,15 @@ describe("Conditional Content Tag Tests", function () {
$b
-
-
$c
-
+
+
+
$d
+ $e
+
+ $f
`,
},
@@ -517,36 +520,42 @@ describe("Conditional Content Tag Tests", function () {
);
});
- cy.get(cesc("#\\/_text1")).should("have.text", "a"); // to wait until loaded
+ cy.get(cesc2("#/_text1")).should("have.text", "a"); // to wait until loaded
- cy.get(cesc("#\\/p1")).should("have.text", "");
- cy.get(cesc("#\\/pa")).should("have.text", "");
- cy.get(cesc("#\\/pb")).should("have.text", "");
- cy.get(cesc("#\\/p2")).should("have.text", "");
- cy.get(cesc("#\\/pc")).should("have.text", "");
- cy.get(cesc("#\\/pd")).should("have.text", "");
+ cy.get(cesc2("#/p1")).should("have.text", "");
+ cy.get(cesc2("#/pa")).should("have.text", "");
+ cy.get(cesc2("#/pb")).should("have.text", "");
+ cy.get(cesc2("#/pc")).should("have.text", "");
+ cy.get(cesc2("#/p2")).should("have.text", "");
+ cy.get(cesc2("#/pd")).should("have.text", "");
+ cy.get(cesc2("#/pe")).should("have.text", "");
+ cy.get(cesc2("#/pf")).should("have.text", "");
cy.log("enter 1");
- cy.get(cesc("#\\/n") + " textarea").type("1{enter}", { force: true });
+ cy.get(cesc2("#/n") + " textarea").type("1{enter}", { force: true });
- cy.get(cesc("#\\/p1")).should("contain.text", "dog mouse cat");
- cy.get(cesc("#\\/pa")).should("have.text", "dog");
- cy.get(cesc("#\\/pb")).should("have.text", "cat");
- cy.get(cesc("#\\/p2")).should("contain.text", "dog mouse cat");
- cy.get(cesc("#\\/pc")).should("have.text", "dog");
- cy.get(cesc("#\\/pd")).should("have.text", "cat");
+ cy.get(cesc2("#/p1")).should("contain.text", "dog mouse cat");
+ cy.get(cesc2("#/pa")).should("have.text", "dog");
+ cy.get(cesc2("#/pb")).should("have.text", "");
+ cy.get(cesc2("#/pc")).should("have.text", "cat");
+ cy.get(cesc2("#/p2")).should("contain.text", "dog mouse cat");
+ cy.get(cesc2("#/pd")).should("have.text", "dog");
+ cy.get(cesc2("#/pe")).should("have.text", "");
+ cy.get(cesc2("#/pf")).should("have.text", "cat");
cy.log("enter 0");
- cy.get(cesc("#\\/n") + " textarea").type("{end}{backspace}0{enter}", {
+ cy.get(cesc2("#/n") + " textarea").type("{end}{backspace}0{enter}", {
force: true,
});
- cy.get(cesc("#\\/p1")).should("have.text", "");
- cy.get(cesc("#\\/pa")).should("have.text", "");
- cy.get(cesc("#\\/pb")).should("have.text", "");
- cy.get(cesc("#\\/p2")).should("have.text", "");
- cy.get(cesc("#\\/pc")).should("have.text", "");
- cy.get(cesc("#\\/pd")).should("have.text", "");
+ cy.get(cesc2("#/p1")).should("have.text", "");
+ cy.get(cesc2("#/pa")).should("have.text", "");
+ cy.get(cesc2("#/pb")).should("have.text", "");
+ cy.get(cesc2("#/pc")).should("have.text", "");
+ cy.get(cesc2("#/p2")).should("have.text", "");
+ cy.get(cesc2("#/pd")).should("have.text", "");
+ cy.get(cesc2("#/pe")).should("have.text", "");
+ cy.get(cesc2("#/pf")).should("have.text", "");
});
it("correctly withhold replacements when shadowing", () => {
@@ -563,7 +572,7 @@ describe("Conditional Content Tag Tests", function () {
Show copy:
-
+
$p
@@ -573,33 +582,33 @@ describe("Conditional Content Tag Tests", function () {
);
});
- cy.get(cesc("#\\/p")).should(
+ cy.get(cesc2("#/p")).should(
"have.text",
"Greeting is hidden: false. Greeting: Hello!",
);
- cy.get(cesc("#\\/p2")).should("not.exist");
+ cy.get(cesc2("#/p2")).should("not.exist");
- cy.get(cesc("#\\/hide")).click();
+ cy.get(cesc2("#/hide")).click();
- cy.get(cesc("#\\/p")).should(
+ cy.get(cesc2("#/p")).should(
"have.text",
"Greeting is hidden: true. Greeting: ",
);
- cy.get(cesc("#\\/p2")).should("not.exist");
+ cy.get(cesc2("#/p2")).should("not.exist");
- cy.get(cesc("#\\/show_copy")).click();
- cy.get(cesc("#\\/p2")).should(
+ cy.get(cesc2("#/show_copy")).click();
+ cy.get(cesc2("#/p2")).should(
"have.text",
"Greeting is hidden: true. Greeting: ",
);
- cy.get(cesc("#\\/hide")).click();
+ cy.get(cesc2("#/hide")).click();
- cy.get(cesc("#\\/p")).should(
+ cy.get(cesc2("#/p")).should(
"have.text",
"Greeting is hidden: false. Greeting: Hello!",
);
- cy.get(cesc("#\\/p2")).should(
+ cy.get(cesc2("#/p2")).should(
"have.text",
"Greeting is hidden: false. Greeting: Hello!",
);
@@ -620,11 +629,11 @@ describe("Conditional Content Tag Tests", function () {
mouse
- a1:
+ a1: $a{assignNames="a1"}
- b:
+ b:
- b1:
+ b1: $b{name="b1"}
`,
},
@@ -632,73 +641,73 @@ describe("Conditional Content Tag Tests", function () {
);
});
- cy.get(cesc("#\\/_text1")).should("have.text", "a"); // to wait until loaded
+ cy.get(cesc2("#/_text1")).should("have.text", "a"); // to wait until loaded
- cy.get(cesc("#\\/pa")).should("have.text", "a: mouse");
- cy.get(cesc("#\\/pa1")).should("have.text", "a1: mouse");
- cy.get(cesc("#\\/pb")).should("have.text", "b: mouse");
- cy.get(cesc("#\\/pb1")).should("have.text", "b1: mouse");
+ cy.get(cesc2("#/pa")).should("have.text", "a: mouse");
+ cy.get(cesc2("#/pa1")).should("have.text", "a1: mouse");
+ cy.get(cesc2("#/pb")).should("have.text", "b: mouse");
+ cy.get(cesc2("#/pb1")).should("have.text", "b1: mouse");
- cy.get(cesc("#\\/a1")).should("have.text", "mouse");
- cy.get(cesc("#\\/b")).should("have.text", "mouse");
- cy.get(cesc("#\\/b1")).should("have.text", "mouse");
+ cy.get(cesc2("#/a1")).should("have.text", "mouse");
+ cy.get(cesc2("#/b")).should("have.text", "mouse");
+ cy.get(cesc2("#/b1")).should("have.text", "mouse");
cy.log("enter 1");
- cy.get(cesc("#\\/n") + " textarea").type("1{enter}", { force: true });
+ cy.get(cesc2("#/n") + " textarea").type("1{enter}", { force: true });
- cy.get(cesc("#\\/pa")).should("have.text", "a: cat");
- cy.get(cesc("#\\/pa1")).should("have.text", "a1: cat");
- cy.get(cesc("#\\/pb")).should("have.text", "b: cat");
- cy.get(cesc("#\\/pb1")).should("have.text", "b1: cat");
+ cy.get(cesc2("#/pa")).should("have.text", "a: cat");
+ cy.get(cesc2("#/pa1")).should("have.text", "a1: cat");
+ cy.get(cesc2("#/pb")).should("have.text", "b: cat");
+ cy.get(cesc2("#/pb1")).should("have.text", "b1: cat");
- cy.get(cesc("#\\/a1")).should("have.text", "cat");
- cy.get(cesc("#\\/b")).should("have.text", "cat");
- cy.get(cesc("#\\/b1")).should("have.text", "cat");
+ cy.get(cesc2("#/a1")).should("have.text", "cat");
+ cy.get(cesc2("#/b")).should("have.text", "cat");
+ cy.get(cesc2("#/b1")).should("have.text", "cat");
cy.log("enter 10");
- cy.get(cesc("#\\/n") + " textarea").type(
+ cy.get(cesc2("#/n") + " textarea").type(
"{end}{backspace}{backspace}10{enter}",
{ force: true },
);
- cy.get(cesc("#\\/pa")).should("have.text", "a: mouse");
- cy.get(cesc("#\\/pa1")).should("have.text", "a1: mouse");
- cy.get(cesc("#\\/pb")).should("have.text", "b: mouse");
- cy.get(cesc("#\\/pb1")).should("have.text", "b1: mouse");
+ cy.get(cesc2("#/pa")).should("have.text", "a: mouse");
+ cy.get(cesc2("#/pa1")).should("have.text", "a1: mouse");
+ cy.get(cesc2("#/pb")).should("have.text", "b: mouse");
+ cy.get(cesc2("#/pb1")).should("have.text", "b1: mouse");
- cy.get(cesc("#\\/a1")).should("have.text", "mouse");
- cy.get(cesc("#\\/b")).should("have.text", "mouse");
- cy.get(cesc("#\\/b1")).should("have.text", "mouse");
+ cy.get(cesc2("#/a1")).should("have.text", "mouse");
+ cy.get(cesc2("#/b")).should("have.text", "mouse");
+ cy.get(cesc2("#/b1")).should("have.text", "mouse");
cy.log("enter -1");
- cy.get(cesc("#\\/n") + " textarea").type(
+ cy.get(cesc2("#/n") + " textarea").type(
"{ctrl+home}{shift+end}{backspace}-1{enter}",
{ force: true },
);
- cy.get(cesc("#\\/pa")).should("have.text", "a: dog");
- cy.get(cesc("#\\/pa1")).should("have.text", "a1: dog");
- cy.get(cesc("#\\/pb")).should("have.text", "b: dog");
- cy.get(cesc("#\\/pb1")).should("have.text", "b1: dog");
+ cy.get(cesc2("#/pa")).should("have.text", "a: dog");
+ cy.get(cesc2("#/pa1")).should("have.text", "a1: dog");
+ cy.get(cesc2("#/pb")).should("have.text", "b: dog");
+ cy.get(cesc2("#/pb1")).should("have.text", "b1: dog");
- cy.get(cesc("#\\/a1")).should("have.text", "dog");
- cy.get(cesc("#\\/b")).should("have.text", "dog");
- cy.get(cesc("#\\/b1")).should("have.text", "dog");
+ cy.get(cesc2("#/a1")).should("have.text", "dog");
+ cy.get(cesc2("#/b")).should("have.text", "dog");
+ cy.get(cesc2("#/b1")).should("have.text", "dog");
cy.log("enter x");
- cy.get(cesc("#\\/n") + " textarea").type(
+ cy.get(cesc2("#/n") + " textarea").type(
"{ctrl+home}{shift+end}{backspace}x{enter}",
{ force: true },
);
- cy.get(cesc("#\\/pa")).should("have.text", "a: mouse");
- cy.get(cesc("#\\/pa1")).should("have.text", "a1: mouse");
- cy.get(cesc("#\\/pb")).should("have.text", "b: mouse");
- cy.get(cesc("#\\/pb1")).should("have.text", "b1: mouse");
+ cy.get(cesc2("#/pa")).should("have.text", "a: mouse");
+ cy.get(cesc2("#/pa1")).should("have.text", "a1: mouse");
+ cy.get(cesc2("#/pb")).should("have.text", "b: mouse");
+ cy.get(cesc2("#/pb1")).should("have.text", "b1: mouse");
- cy.get(cesc("#\\/a1")).should("have.text", "mouse");
- cy.get(cesc("#\\/b")).should("have.text", "mouse");
- cy.get(cesc("#\\/b1")).should("have.text", "mouse");
+ cy.get(cesc2("#/a1")).should("have.text", "mouse");
+ cy.get(cesc2("#/b")).should("have.text", "mouse");
+ cy.get(cesc2("#/b1")).should("have.text", "mouse");
});
it("case/else with single text, initially assign sub", () => {
@@ -714,11 +723,11 @@ describe("Conditional Content Tag Tests", function () {
mouse
- a1:
+ a1: $a{name="a1"}
- b:
+ b: $_conditionalcontent1{assignNames="b"}
- b1:
+ b1: $b{assignNames="b1"}
`,
},
@@ -726,72 +735,72 @@ describe("Conditional Content Tag Tests", function () {
);
});
- cy.get(cesc("#\\/_text1")).should("have.text", "a"); // to wait until loaded
+ cy.get(cesc2("#/_text1")).should("have.text", "a"); // to wait until loaded
- cy.get(cesc("#\\/pa")).should("have.text", "a: mouse");
- cy.get(cesc("#\\/pa1")).should("have.text", "a1: mouse");
- cy.get(cesc("#\\/pb")).should("have.text", "b: mouse");
- cy.get(cesc("#\\/pb1")).should("have.text", "b1: mouse");
+ cy.get(cesc2("#/pa")).should("have.text", "a: mouse");
+ cy.get(cesc2("#/pa1")).should("have.text", "a1: mouse");
+ cy.get(cesc2("#/pb")).should("have.text", "b: mouse");
+ cy.get(cesc2("#/pb1")).should("have.text", "b1: mouse");
- cy.get(cesc("#\\/a")).should("have.text", "mouse");
- cy.get(cesc("#\\/a1")).should("have.text", "mouse");
- cy.get(cesc("#\\/b1")).should("have.text", "mouse");
+ cy.get(cesc2("#/a")).should("have.text", "mouse");
+ cy.get(cesc2("#/a1")).should("have.text", "mouse");
+ cy.get(cesc2("#/b1")).should("have.text", "mouse");
cy.log("enter 1");
- cy.get(cesc("#\\/n") + " textarea").type("1{enter}", { force: true });
+ cy.get(cesc2("#/n") + " textarea").type("1{enter}", { force: true });
- cy.get(cesc("#\\/pa")).should("have.text", "a: cat");
- cy.get(cesc("#\\/pa1")).should("have.text", "a1: cat");
- cy.get(cesc("#\\/pb")).should("have.text", "b: cat");
- cy.get(cesc("#\\/pb1")).should("have.text", "b1: cat");
+ cy.get(cesc2("#/pa")).should("have.text", "a: cat");
+ cy.get(cesc2("#/pa1")).should("have.text", "a1: cat");
+ cy.get(cesc2("#/pb")).should("have.text", "b: cat");
+ cy.get(cesc2("#/pb1")).should("have.text", "b1: cat");
- cy.get(cesc("#\\/a")).should("have.text", "cat");
- cy.get(cesc("#\\/a1")).should("have.text", "cat");
- cy.get(cesc("#\\/b1")).should("have.text", "cat");
+ cy.get(cesc2("#/a")).should("have.text", "cat");
+ cy.get(cesc2("#/a1")).should("have.text", "cat");
+ cy.get(cesc2("#/b1")).should("have.text", "cat");
cy.log("enter 10");
- cy.get(cesc("#\\/n") + " textarea").type("{end}{backspace}10{enter}", {
+ cy.get(cesc2("#/n") + " textarea").type("{end}{backspace}10{enter}", {
force: true,
});
- cy.get(cesc("#\\/pa")).should("have.text", "a: mouse");
- cy.get(cesc("#\\/pa1")).should("have.text", "a1: mouse");
- cy.get(cesc("#\\/pb")).should("have.text", "b: mouse");
- cy.get(cesc("#\\/pb1")).should("have.text", "b1: mouse");
+ cy.get(cesc2("#/pa")).should("have.text", "a: mouse");
+ cy.get(cesc2("#/pa1")).should("have.text", "a1: mouse");
+ cy.get(cesc2("#/pb")).should("have.text", "b: mouse");
+ cy.get(cesc2("#/pb1")).should("have.text", "b1: mouse");
- cy.get(cesc("#\\/a")).should("have.text", "mouse");
- cy.get(cesc("#\\/a1")).should("have.text", "mouse");
- cy.get(cesc("#\\/b1")).should("have.text", "mouse");
+ cy.get(cesc2("#/a")).should("have.text", "mouse");
+ cy.get(cesc2("#/a1")).should("have.text", "mouse");
+ cy.get(cesc2("#/b1")).should("have.text", "mouse");
cy.log("enter -11");
- cy.get(cesc("#\\/n") + " textarea").type(
+ cy.get(cesc2("#/n") + " textarea").type(
"{end}{backspace}{backspace}-1{enter}",
{ force: true },
);
- cy.get(cesc("#\\/pa")).should("have.text", "a: dog");
- cy.get(cesc("#\\/pa1")).should("have.text", "a1: dog");
- cy.get(cesc("#\\/pb")).should("have.text", "b: dog");
- cy.get(cesc("#\\/pb1")).should("have.text", "b1: dog");
+ cy.get(cesc2("#/pa")).should("have.text", "a: dog");
+ cy.get(cesc2("#/pa1")).should("have.text", "a1: dog");
+ cy.get(cesc2("#/pb")).should("have.text", "b: dog");
+ cy.get(cesc2("#/pb1")).should("have.text", "b1: dog");
- cy.get(cesc("#\\/a")).should("have.text", "dog");
- cy.get(cesc("#\\/a1")).should("have.text", "dog");
- cy.get(cesc("#\\/b1")).should("have.text", "dog");
+ cy.get(cesc2("#/a")).should("have.text", "dog");
+ cy.get(cesc2("#/a1")).should("have.text", "dog");
+ cy.get(cesc2("#/b1")).should("have.text", "dog");
cy.log("enter x");
- cy.get(cesc("#\\/n") + " textarea").type(
+ cy.get(cesc2("#/n") + " textarea").type(
"{end}{backspace}{backspace}x{enter}",
{ force: true },
);
- cy.get(cesc("#\\/pa")).should("have.text", "a: mouse");
- cy.get(cesc("#\\/pa1")).should("have.text", "a1: mouse");
- cy.get(cesc("#\\/pb")).should("have.text", "b: mouse");
- cy.get(cesc("#\\/pb1")).should("have.text", "b1: mouse");
+ cy.get(cesc2("#/pa")).should("have.text", "a: mouse");
+ cy.get(cesc2("#/pa1")).should("have.text", "a1: mouse");
+ cy.get(cesc2("#/pb")).should("have.text", "b: mouse");
+ cy.get(cesc2("#/pb1")).should("have.text", "b1: mouse");
- cy.get(cesc("#\\/a")).should("have.text", "mouse");
- cy.get(cesc("#\\/a1")).should("have.text", "mouse");
- cy.get(cesc("#\\/b1")).should("have.text", "mouse");
+ cy.get(cesc2("#/a")).should("have.text", "mouse");
+ cy.get(cesc2("#/a1")).should("have.text", "mouse");
+ cy.get(cesc2("#/b1")).should("have.text", "mouse");
});
it("case/else with text, math, and optional", () => {
@@ -811,75 +820,75 @@ describe("Conditional Content Tag Tests", function () {
- a1:
- b1:
- c1:
- d1:
+ a1: $a{name="a1"}
+ b1: $b{name="b1"}
+ c1: $c{name="c1"}
+ d1: $d{name="d1"}
- copy:
+ copy:
- e1:
- f1:
- g1:
- h1:
- i1:
+ e1: $e{name="e1"}
+ f1: $f{name="f1"}
+ g1: $g{name="g1"}
+ h1: $h{name="h1"}
+ i1: $i{name="i1"}
- copied copy:
+ copied copy:
- j1:
- k1:
- l1:
+ j1: $j{name="j1"}
+ k1: $k{name="k1"}
+ l1: $l{name="l1"}
`,
},
"*",
);
});
- cy.get(cesc("#\\/_text1")).should("have.text", "a"); // to wait until loaded
+ cy.get(cesc2("#/_text1")).should("have.text", "a"); // to wait until loaded
- cy.get(cesc("#\\/a")).should("have.text", "mouse");
- cy.get(cesc("#\\/a1")).should("have.text", "mouse");
- cy.get(cesc("#\\/e")).should("have.text", "mouse");
- cy.get(cesc("#\\/e1")).should("have.text", "mouse");
- cy.get(cesc("#\\/j")).should("have.text", "mouse");
- cy.get(cesc("#\\/j1")).should("have.text", "mouse");
+ cy.get(cesc2("#/a")).should("have.text", "mouse");
+ cy.get(cesc2("#/a1")).should("have.text", "mouse");
+ cy.get(cesc2("#/e")).should("have.text", "mouse");
+ cy.get(cesc2("#/e1")).should("have.text", "mouse");
+ cy.get(cesc2("#/j")).should("have.text", "mouse");
+ cy.get(cesc2("#/j1")).should("have.text", "mouse");
- cy.get(cesc("#\\/b"))
+ cy.get(cesc2("#/b"))
.find(".mjx-mrow")
.eq(0)
.invoke("text")
.then((text) => {
expect(text.trim()).equal("z");
});
- cy.get(cesc("#\\/b1"))
+ cy.get(cesc2("#/b1"))
.find(".mjx-mrow")
.eq(0)
.invoke("text")
.then((text) => {
expect(text.trim()).equal("z");
});
- cy.get(cesc("#\\/f"))
+ cy.get(cesc2("#/f"))
.find(".mjx-mrow")
.eq(0)
.invoke("text")
.then((text) => {
expect(text.trim()).equal("z");
});
- cy.get(cesc("#\\/f1"))
+ cy.get(cesc2("#/f1"))
.find(".mjx-mrow")
.eq(0)
.invoke("text")
.then((text) => {
expect(text.trim()).equal("z");
});
- cy.get(cesc("#\\/k"))
+ cy.get(cesc2("#/k"))
.find(".mjx-mrow")
.eq(0)
.invoke("text")
.then((text) => {
expect(text.trim()).equal("z");
});
- cy.get(cesc("#\\/k1"))
+ cy.get(cesc2("#/k1"))
.find(".mjx-mrow")
.eq(0)
.invoke("text")
@@ -887,66 +896,66 @@ describe("Conditional Content Tag Tests", function () {
expect(text.trim()).equal("z");
});
- cy.get(cesc("#\\/c")).should("not.exist");
- cy.get(cesc("#\\/c1")).should("not.exist");
- cy.get(cesc("#\\/g")).should("not.exist");
- cy.get(cesc("#\\/g1")).should("not.exist");
- cy.get(cesc("#\\/l")).should("not.exist");
- cy.get(cesc("#\\/l1")).should("not.exist");
+ cy.get(cesc2("#/c")).should("not.exist");
+ cy.get(cesc2("#/c1")).should("not.exist");
+ cy.get(cesc2("#/g")).should("not.exist");
+ cy.get(cesc2("#/g1")).should("not.exist");
+ cy.get(cesc2("#/l")).should("not.exist");
+ cy.get(cesc2("#/l1")).should("not.exist");
- cy.get(cesc("#\\/d")).should("not.exist");
- cy.get(cesc("#\\/d1")).should("not.exist");
- cy.get(cesc("#\\/h")).should("not.exist");
- cy.get(cesc("#\\/h1")).should("not.exist");
- cy.get(cesc("#\\/i")).should("not.exist");
- cy.get(cesc("#\\/i1")).should("not.exist");
+ cy.get(cesc2("#/d")).should("not.exist");
+ cy.get(cesc2("#/d1")).should("not.exist");
+ cy.get(cesc2("#/h")).should("not.exist");
+ cy.get(cesc2("#/h1")).should("not.exist");
+ cy.get(cesc2("#/i")).should("not.exist");
+ cy.get(cesc2("#/i1")).should("not.exist");
cy.log("enter 1");
- cy.get(cesc("#\\/n") + " textarea").type("1{enter}", { force: true });
+ cy.get(cesc2("#/n") + " textarea").type("1{enter}", { force: true });
- cy.get(cesc("#\\/a")).should("have.text", "cat");
- cy.get(cesc("#\\/a1")).should("have.text", "cat");
- cy.get(cesc("#\\/e")).should("have.text", "cat");
- cy.get(cesc("#\\/e1")).should("have.text", "cat");
- cy.get(cesc("#\\/j")).should("have.text", "cat");
- cy.get(cesc("#\\/j1")).should("have.text", "cat");
+ cy.get(cesc2("#/a")).should("have.text", "cat");
+ cy.get(cesc2("#/a1")).should("have.text", "cat");
+ cy.get(cesc2("#/e")).should("have.text", "cat");
+ cy.get(cesc2("#/e1")).should("have.text", "cat");
+ cy.get(cesc2("#/j")).should("have.text", "cat");
+ cy.get(cesc2("#/j1")).should("have.text", "cat");
- cy.get(cesc("#\\/b"))
+ cy.get(cesc2("#/b"))
.find(".mjx-mrow")
.eq(0)
.invoke("text")
.then((text) => {
expect(text.trim()).equal("y");
});
- cy.get(cesc("#\\/b1"))
+ cy.get(cesc2("#/b1"))
.find(".mjx-mrow")
.eq(0)
.invoke("text")
.then((text) => {
expect(text.trim()).equal("y");
});
- cy.get(cesc("#\\/f"))
+ cy.get(cesc2("#/f"))
.find(".mjx-mrow")
.eq(0)
.invoke("text")
.then((text) => {
expect(text.trim()).equal("y");
});
- cy.get(cesc("#\\/f1"))
+ cy.get(cesc2("#/f1"))
.find(".mjx-mrow")
.eq(0)
.invoke("text")
.then((text) => {
expect(text.trim()).equal("y");
});
- cy.get(cesc("#\\/k"))
+ cy.get(cesc2("#/k"))
.find(".mjx-mrow")
.eq(0)
.invoke("text")
.then((text) => {
expect(text.trim()).equal("y");
});
- cy.get(cesc("#\\/k1"))
+ cy.get(cesc2("#/k1"))
.find(".mjx-mrow")
.eq(0)
.invoke("text")
@@ -954,68 +963,68 @@ describe("Conditional Content Tag Tests", function () {
expect(text.trim()).equal("y");
});
- cy.get(cesc("#\\/c")).should("not.exist");
- cy.get(cesc("#\\/c1")).should("not.exist");
- cy.get(cesc("#\\/g")).should("not.exist");
- cy.get(cesc("#\\/g1")).should("not.exist");
- cy.get(cesc("#\\/l")).should("not.exist");
- cy.get(cesc("#\\/l1")).should("not.exist");
+ cy.get(cesc2("#/c")).should("not.exist");
+ cy.get(cesc2("#/c1")).should("not.exist");
+ cy.get(cesc2("#/g")).should("not.exist");
+ cy.get(cesc2("#/g1")).should("not.exist");
+ cy.get(cesc2("#/l")).should("not.exist");
+ cy.get(cesc2("#/l1")).should("not.exist");
- cy.get(cesc("#\\/d")).should("not.exist");
- cy.get(cesc("#\\/d1")).should("not.exist");
- cy.get(cesc("#\\/h")).should("not.exist");
- cy.get(cesc("#\\/h1")).should("not.exist");
- cy.get(cesc("#\\/i")).should("not.exist");
- cy.get(cesc("#\\/i1")).should("not.exist");
+ cy.get(cesc2("#/d")).should("not.exist");
+ cy.get(cesc2("#/d1")).should("not.exist");
+ cy.get(cesc2("#/h")).should("not.exist");
+ cy.get(cesc2("#/h1")).should("not.exist");
+ cy.get(cesc2("#/i")).should("not.exist");
+ cy.get(cesc2("#/i1")).should("not.exist");
cy.log("enter 10");
- cy.get(cesc("#\\/n") + " textarea").type("{end}{backspace}10{enter}", {
+ cy.get(cesc2("#/n") + " textarea").type("{end}{backspace}10{enter}", {
force: true,
});
- cy.get(cesc("#\\/a")).should("have.text", "mouse");
- cy.get(cesc("#\\/a1")).should("have.text", "mouse");
- cy.get(cesc("#\\/e")).should("have.text", "mouse");
- cy.get(cesc("#\\/e1")).should("have.text", "mouse");
- cy.get(cesc("#\\/j")).should("have.text", "mouse");
- cy.get(cesc("#\\/j1")).should("have.text", "mouse");
+ cy.get(cesc2("#/a")).should("have.text", "mouse");
+ cy.get(cesc2("#/a1")).should("have.text", "mouse");
+ cy.get(cesc2("#/e")).should("have.text", "mouse");
+ cy.get(cesc2("#/e1")).should("have.text", "mouse");
+ cy.get(cesc2("#/j")).should("have.text", "mouse");
+ cy.get(cesc2("#/j1")).should("have.text", "mouse");
- cy.get(cesc("#\\/b"))
+ cy.get(cesc2("#/b"))
.find(".mjx-mrow")
.eq(0)
.invoke("text")
.then((text) => {
expect(text.trim()).equal("z");
});
- cy.get(cesc("#\\/b1"))
+ cy.get(cesc2("#/b1"))
.find(".mjx-mrow")
.eq(0)
.invoke("text")
.then((text) => {
expect(text.trim()).equal("z");
});
- cy.get(cesc("#\\/f"))
+ cy.get(cesc2("#/f"))
.find(".mjx-mrow")
.eq(0)
.invoke("text")
.then((text) => {
expect(text.trim()).equal("z");
});
- cy.get(cesc("#\\/f1"))
+ cy.get(cesc2("#/f1"))
.find(".mjx-mrow")
.eq(0)
.invoke("text")
.then((text) => {
expect(text.trim()).equal("z");
});
- cy.get(cesc("#\\/k"))
+ cy.get(cesc2("#/k"))
.find(".mjx-mrow")
.eq(0)
.invoke("text")
.then((text) => {
expect(text.trim()).equal("z");
});
- cy.get(cesc("#\\/k1"))
+ cy.get(cesc2("#/k1"))
.find(".mjx-mrow")
.eq(0)
.invoke("text")
@@ -1023,69 +1032,69 @@ describe("Conditional Content Tag Tests", function () {
expect(text.trim()).equal("z");
});
- cy.get(cesc("#\\/c")).should("not.exist");
- cy.get(cesc("#\\/c1")).should("not.exist");
- cy.get(cesc("#\\/g")).should("not.exist");
- cy.get(cesc("#\\/g1")).should("not.exist");
- cy.get(cesc("#\\/l")).should("not.exist");
- cy.get(cesc("#\\/l1")).should("not.exist");
+ cy.get(cesc2("#/c")).should("not.exist");
+ cy.get(cesc2("#/c1")).should("not.exist");
+ cy.get(cesc2("#/g")).should("not.exist");
+ cy.get(cesc2("#/g1")).should("not.exist");
+ cy.get(cesc2("#/l")).should("not.exist");
+ cy.get(cesc2("#/l1")).should("not.exist");
- cy.get(cesc("#\\/d")).should("not.exist");
- cy.get(cesc("#\\/d1")).should("not.exist");
- cy.get(cesc("#\\/h")).should("not.exist");
- cy.get(cesc("#\\/h1")).should("not.exist");
- cy.get(cesc("#\\/i")).should("not.exist");
- cy.get(cesc("#\\/i1")).should("not.exist");
+ cy.get(cesc2("#/d")).should("not.exist");
+ cy.get(cesc2("#/d1")).should("not.exist");
+ cy.get(cesc2("#/h")).should("not.exist");
+ cy.get(cesc2("#/h1")).should("not.exist");
+ cy.get(cesc2("#/i")).should("not.exist");
+ cy.get(cesc2("#/i1")).should("not.exist");
cy.log("enter -11");
- cy.get(cesc("#\\/n") + " textarea").type(
+ cy.get(cesc2("#/n") + " textarea").type(
"{end}{backspace}{backspace}-1{enter}",
{ force: true },
);
- cy.get(cesc("#\\/a")).should("have.text", "dog");
- cy.get(cesc("#\\/a1")).should("have.text", "dog");
- cy.get(cesc("#\\/e")).should("have.text", "dog");
- cy.get(cesc("#\\/e1")).should("have.text", "dog");
- cy.get(cesc("#\\/j")).should("have.text", "dog");
- cy.get(cesc("#\\/j1")).should("have.text", "dog");
+ cy.get(cesc2("#/a")).should("have.text", "dog");
+ cy.get(cesc2("#/a1")).should("have.text", "dog");
+ cy.get(cesc2("#/e")).should("have.text", "dog");
+ cy.get(cesc2("#/e1")).should("have.text", "dog");
+ cy.get(cesc2("#/j")).should("have.text", "dog");
+ cy.get(cesc2("#/j1")).should("have.text", "dog");
- cy.get(cesc("#\\/b"))
+ cy.get(cesc2("#/b"))
.find(".mjx-mrow")
.eq(0)
.invoke("text")
.then((text) => {
expect(text.trim()).equal("x");
});
- cy.get(cesc("#\\/b1"))
+ cy.get(cesc2("#/b1"))
.find(".mjx-mrow")
.eq(0)
.invoke("text")
.then((text) => {
expect(text.trim()).equal("x");
});
- cy.get(cesc("#\\/f"))
+ cy.get(cesc2("#/f"))
.find(".mjx-mrow")
.eq(0)
.invoke("text")
.then((text) => {
expect(text.trim()).equal("x");
});
- cy.get(cesc("#\\/f1"))
+ cy.get(cesc2("#/f1"))
.find(".mjx-mrow")
.eq(0)
.invoke("text")
.then((text) => {
expect(text.trim()).equal("x");
});
- cy.get(cesc("#\\/k"))
+ cy.get(cesc2("#/k"))
.find(".mjx-mrow")
.eq(0)
.invoke("text")
.then((text) => {
expect(text.trim()).equal("x");
});
- cy.get(cesc("#\\/k1"))
+ cy.get(cesc2("#/k1"))
.find(".mjx-mrow")
.eq(0)
.invoke("text")
@@ -1093,69 +1102,69 @@ describe("Conditional Content Tag Tests", function () {
expect(text.trim()).equal("x");
});
- cy.get(cesc("#\\/c")).should("have.text", "optional text!");
- cy.get(cesc("#\\/c1")).should("have.text", "optional text!");
- cy.get(cesc("#\\/g")).should("have.text", "optional text!");
- cy.get(cesc("#\\/g1")).should("have.text", "optional text!");
- cy.get(cesc("#\\/l")).should("have.text", "optional text!");
- cy.get(cesc("#\\/l1")).should("have.text", "optional text!");
+ cy.get(cesc2("#/c")).should("have.text", "optional text!");
+ cy.get(cesc2("#/c1")).should("have.text", "optional text!");
+ cy.get(cesc2("#/g")).should("have.text", "optional text!");
+ cy.get(cesc2("#/g1")).should("have.text", "optional text!");
+ cy.get(cesc2("#/l")).should("have.text", "optional text!");
+ cy.get(cesc2("#/l1")).should("have.text", "optional text!");
- cy.get(cesc("#\\/d")).should("not.exist");
- cy.get(cesc("#\\/d1")).should("not.exist");
- cy.get(cesc("#\\/h")).should("not.exist");
- cy.get(cesc("#\\/h1")).should("not.exist");
- cy.get(cesc("#\\/i")).should("not.exist");
- cy.get(cesc("#\\/i1")).should("not.exist");
+ cy.get(cesc2("#/d")).should("not.exist");
+ cy.get(cesc2("#/d1")).should("not.exist");
+ cy.get(cesc2("#/h")).should("not.exist");
+ cy.get(cesc2("#/h1")).should("not.exist");
+ cy.get(cesc2("#/i")).should("not.exist");
+ cy.get(cesc2("#/i1")).should("not.exist");
cy.log("enter x");
- cy.get(cesc("#\\/n") + " textarea").type(
+ cy.get(cesc2("#/n") + " textarea").type(
"{end}{backspace}{backspace}x{enter}",
{ force: true },
);
- cy.get(cesc("#\\/a")).should("have.text", "mouse");
- cy.get(cesc("#\\/a1")).should("have.text", "mouse");
- cy.get(cesc("#\\/e")).should("have.text", "mouse");
- cy.get(cesc("#\\/e1")).should("have.text", "mouse");
- cy.get(cesc("#\\/j")).should("have.text", "mouse");
- cy.get(cesc("#\\/j1")).should("have.text", "mouse");
+ cy.get(cesc2("#/a")).should("have.text", "mouse");
+ cy.get(cesc2("#/a1")).should("have.text", "mouse");
+ cy.get(cesc2("#/e")).should("have.text", "mouse");
+ cy.get(cesc2("#/e1")).should("have.text", "mouse");
+ cy.get(cesc2("#/j")).should("have.text", "mouse");
+ cy.get(cesc2("#/j1")).should("have.text", "mouse");
- cy.get(cesc("#\\/b"))
+ cy.get(cesc2("#/b"))
.find(".mjx-mrow")
.eq(0)
.invoke("text")
.then((text) => {
expect(text.trim()).equal("z");
});
- cy.get(cesc("#\\/b1"))
+ cy.get(cesc2("#/b1"))
.find(".mjx-mrow")
.eq(0)
.invoke("text")
.then((text) => {
expect(text.trim()).equal("z");
});
- cy.get(cesc("#\\/f"))
+ cy.get(cesc2("#/f"))
.find(".mjx-mrow")
.eq(0)
.invoke("text")
.then((text) => {
expect(text.trim()).equal("z");
});
- cy.get(cesc("#\\/f1"))
+ cy.get(cesc2("#/f1"))
.find(".mjx-mrow")
.eq(0)
.invoke("text")
.then((text) => {
expect(text.trim()).equal("z");
});
- cy.get(cesc("#\\/k"))
+ cy.get(cesc2("#/k"))
.find(".mjx-mrow")
.eq(0)
.invoke("text")
.then((text) => {
expect(text.trim()).equal("z");
});
- cy.get(cesc("#\\/k1"))
+ cy.get(cesc2("#/k1"))
.find(".mjx-mrow")
.eq(0)
.invoke("text")
@@ -1163,19 +1172,19 @@ describe("Conditional Content Tag Tests", function () {
expect(text.trim()).equal("z");
});
- cy.get(cesc("#\\/c")).should("not.exist");
- cy.get(cesc("#\\/c1")).should("not.exist");
- cy.get(cesc("#\\/g")).should("not.exist");
- cy.get(cesc("#\\/g1")).should("not.exist");
- cy.get(cesc("#\\/l")).should("not.exist");
- cy.get(cesc("#\\/l1")).should("not.exist");
+ cy.get(cesc2("#/c")).should("not.exist");
+ cy.get(cesc2("#/c1")).should("not.exist");
+ cy.get(cesc2("#/g")).should("not.exist");
+ cy.get(cesc2("#/g1")).should("not.exist");
+ cy.get(cesc2("#/l")).should("not.exist");
+ cy.get(cesc2("#/l1")).should("not.exist");
- cy.get(cesc("#\\/d")).should("not.exist");
- cy.get(cesc("#\\/d1")).should("not.exist");
- cy.get(cesc("#\\/h")).should("not.exist");
- cy.get(cesc("#\\/h1")).should("not.exist");
- cy.get(cesc("#\\/i")).should("not.exist");
- cy.get(cesc("#\\/i1")).should("not.exist");
+ cy.get(cesc2("#/d")).should("not.exist");
+ cy.get(cesc2("#/d1")).should("not.exist");
+ cy.get(cesc2("#/h")).should("not.exist");
+ cy.get(cesc2("#/h1")).should("not.exist");
+ cy.get(cesc2("#/i")).should("not.exist");
+ cy.get(cesc2("#/i1")).should("not.exist");
});
it("case/else with text, math, and optional, new namespace", () => {
@@ -1195,75 +1204,75 @@ describe("Conditional Content Tag Tests", function () {
- a1:
- b1:
- c1:
- d1:
+ a1: $(s1/a{name="a1"})
+ b1: $(s1/b{name="b1"})
+ c1: $(s1/c{name="c1"})
+ d1: $(s1/d{name="d1"})
- copy:
+ copy:
- e1:
- f1:
- g1:
- h1:
- i1:
+ e1: $(s2/e{name="e1"})
+ f1: $(s2/f{name="f1"})
+ g1: $(s2/g{name="g1"})
+ h1: $(s2/h{name="h1"})
+ i1: $(s2/i{name="i1"})
- copied copy:
+ copied copy:
- j1:
- k1:
- l1:
+ j1: $(s3/j{name="j1"})
+ k1: $(s3/k{name="k1"})
+ l1: $(s3/l{name="l1"})
`,
},
"*",
);
});
- cy.get(cesc("#\\/_text1")).should("have.text", "a"); // to wait until loaded
+ cy.get(cesc2("#/_text1")).should("have.text", "a"); // to wait until loaded
- cy.get(cesc("#\\/s1\\/a")).should("have.text", "mouse");
- cy.get(cesc("#\\/a1")).should("have.text", "mouse");
- cy.get(cesc("#\\/e")).should("have.text", "mouse");
- cy.get(cesc("#\\/e1")).should("have.text", "mouse");
- cy.get(cesc("#\\/s3\\/j")).should("have.text", "mouse");
- cy.get(cesc("#\\/j1")).should("have.text", "mouse");
+ cy.get(cesc2("#/s1/a")).should("have.text", "mouse");
+ cy.get(cesc2("#/a1")).should("have.text", "mouse");
+ cy.get(cesc2("#/s2/e")).should("have.text", "mouse");
+ cy.get(cesc2("#/e1")).should("have.text", "mouse");
+ cy.get(cesc2("#/s3/j")).should("have.text", "mouse");
+ cy.get(cesc2("#/j1")).should("have.text", "mouse");
- cy.get(cesc("#\\/s1\\/b"))
+ cy.get(cesc2("#/s1/b"))
.find(".mjx-mrow")
.eq(0)
.invoke("text")
.then((text) => {
expect(text.trim()).equal("z");
});
- cy.get(cesc("#\\/b1"))
+ cy.get(cesc2("#/b1"))
.find(".mjx-mrow")
.eq(0)
.invoke("text")
.then((text) => {
expect(text.trim()).equal("z");
});
- cy.get(cesc("#\\/f"))
+ cy.get(cesc2("#/s2/f"))
.find(".mjx-mrow")
.eq(0)
.invoke("text")
.then((text) => {
expect(text.trim()).equal("z");
});
- cy.get(cesc("#\\/f1"))
+ cy.get(cesc2("#/f1"))
.find(".mjx-mrow")
.eq(0)
.invoke("text")
.then((text) => {
expect(text.trim()).equal("z");
});
- cy.get(cesc("#\\/s3\\/k"))
+ cy.get(cesc2("#/s3/k"))
.find(".mjx-mrow")
.eq(0)
.invoke("text")
.then((text) => {
expect(text.trim()).equal("z");
});
- cy.get(cesc("#\\/k1"))
+ cy.get(cesc2("#/k1"))
.find(".mjx-mrow")
.eq(0)
.invoke("text")
@@ -1271,66 +1280,66 @@ describe("Conditional Content Tag Tests", function () {
expect(text.trim()).equal("z");
});
- cy.get(cesc("#\\/s1\\/c")).should("not.exist");
- cy.get(cesc("#\\/c1")).should("not.exist");
- cy.get(cesc("#\\/g")).should("not.exist");
- cy.get(cesc("#\\/g1")).should("not.exist");
- cy.get(cesc("#\\/s3\\/l")).should("not.exist");
- cy.get(cesc("#\\/l1")).should("not.exist");
+ cy.get(cesc2("#/s1/c")).should("not.exist");
+ cy.get(cesc2("#/c1")).should("not.exist");
+ cy.get(cesc2("#/s2/g")).should("not.exist");
+ cy.get(cesc2("#/g1")).should("not.exist");
+ cy.get(cesc2("#/s3/l")).should("not.exist");
+ cy.get(cesc2("#/l1")).should("not.exist");
- cy.get(cesc("#\\/s1\\/d")).should("not.exist");
- cy.get(cesc("#\\/d1")).should("not.exist");
- cy.get(cesc("#\\/h")).should("not.exist");
- cy.get(cesc("#\\/h1")).should("not.exist");
- cy.get(cesc("#\\/i")).should("not.exist");
- cy.get(cesc("#\\/i1")).should("not.exist");
+ cy.get(cesc2("#/s1/d")).should("not.exist");
+ cy.get(cesc2("#/d1")).should("not.exist");
+ cy.get(cesc2("#/s2/h")).should("not.exist");
+ cy.get(cesc2("#/h1")).should("not.exist");
+ cy.get(cesc2("#/s2/i")).should("not.exist");
+ cy.get(cesc2("#/i1")).should("not.exist");
cy.log("enter 1");
- cy.get(cesc("#\\/n") + " textarea").type("1{enter}", { force: true });
+ cy.get(cesc2("#/n") + " textarea").type("1{enter}", { force: true });
- cy.get(cesc("#\\/s1\\/a")).should("have.text", "cat");
- cy.get(cesc("#\\/a1")).should("have.text", "cat");
- cy.get(cesc("#\\/e")).should("have.text", "cat");
- cy.get(cesc("#\\/e1")).should("have.text", "cat");
- cy.get(cesc("#\\/s3\\/j")).should("have.text", "cat");
- cy.get(cesc("#\\/j1")).should("have.text", "cat");
+ cy.get(cesc2("#/s1/a")).should("have.text", "cat");
+ cy.get(cesc2("#/a1")).should("have.text", "cat");
+ cy.get(cesc2("#/s2/e")).should("have.text", "cat");
+ cy.get(cesc2("#/e1")).should("have.text", "cat");
+ cy.get(cesc2("#/s3/j")).should("have.text", "cat");
+ cy.get(cesc2("#/j1")).should("have.text", "cat");
- cy.get(cesc("#\\/s1\\/b"))
+ cy.get(cesc2("#/s1/b"))
.find(".mjx-mrow")
.eq(0)
.invoke("text")
.then((text) => {
expect(text.trim()).equal("y");
});
- cy.get(cesc("#\\/b1"))
+ cy.get(cesc2("#/b1"))
.find(".mjx-mrow")
.eq(0)
.invoke("text")
.then((text) => {
expect(text.trim()).equal("y");
});
- cy.get(cesc("#\\/f"))
+ cy.get(cesc2("#/s2/f"))
.find(".mjx-mrow")
.eq(0)
.invoke("text")
.then((text) => {
expect(text.trim()).equal("y");
});
- cy.get(cesc("#\\/f1"))
+ cy.get(cesc2("#/f1"))
.find(".mjx-mrow")
.eq(0)
.invoke("text")
.then((text) => {
expect(text.trim()).equal("y");
});
- cy.get(cesc("#\\/s3\\/k"))
+ cy.get(cesc2("#/s3/k"))
.find(".mjx-mrow")
.eq(0)
.invoke("text")
.then((text) => {
expect(text.trim()).equal("y");
});
- cy.get(cesc("#\\/k1"))
+ cy.get(cesc2("#/k1"))
.find(".mjx-mrow")
.eq(0)
.invoke("text")
@@ -1338,69 +1347,69 @@ describe("Conditional Content Tag Tests", function () {
expect(text.trim()).equal("y");
});
- cy.get(cesc("#\\/s1\\/c")).should("not.exist");
- cy.get(cesc("#\\/c1")).should("not.exist");
- cy.get(cesc("#\\/g")).should("not.exist");
- cy.get(cesc("#\\/g1")).should("not.exist");
- cy.get(cesc("#\\/s3\\/l")).should("not.exist");
- cy.get(cesc("#\\/l1")).should("not.exist");
+ cy.get(cesc2("#/s1/c")).should("not.exist");
+ cy.get(cesc2("#/c1")).should("not.exist");
+ cy.get(cesc2("#/s2/g")).should("not.exist");
+ cy.get(cesc2("#/g1")).should("not.exist");
+ cy.get(cesc2("#/s3/l")).should("not.exist");
+ cy.get(cesc2("#/l1")).should("not.exist");
- cy.get(cesc("#\\/s1\\/d")).should("not.exist");
- cy.get(cesc("#\\/d1")).should("not.exist");
- cy.get(cesc("#\\/h")).should("not.exist");
- cy.get(cesc("#\\/h1")).should("not.exist");
- cy.get(cesc("#\\/i")).should("not.exist");
- cy.get(cesc("#\\/i1")).should("not.exist");
+ cy.get(cesc2("#/s1/d")).should("not.exist");
+ cy.get(cesc2("#/d1")).should("not.exist");
+ cy.get(cesc2("#/s2/h")).should("not.exist");
+ cy.get(cesc2("#h1")).should("not.exist");
+ cy.get(cesc2("#/s2/i")).should("not.exist");
+ cy.get(cesc2("#/i1")).should("not.exist");
cy.log("enter 10");
- cy.get(cesc("#\\/n") + " textarea").type(
+ cy.get(cesc2("#/n") + " textarea").type(
"{end}{backspace}{backspace}10{enter}",
{ force: true },
);
- cy.get(cesc("#\\/s1\\/a")).should("have.text", "mouse");
- cy.get(cesc("#\\/a1")).should("have.text", "mouse");
- cy.get(cesc("#\\/e")).should("have.text", "mouse");
- cy.get(cesc("#\\/e1")).should("have.text", "mouse");
- cy.get(cesc("#\\/s3\\/j")).should("have.text", "mouse");
- cy.get(cesc("#\\/j1")).should("have.text", "mouse");
+ cy.get(cesc2("#/s1/a")).should("have.text", "mouse");
+ cy.get(cesc2("#/a1")).should("have.text", "mouse");
+ cy.get(cesc2("#/s2/e")).should("have.text", "mouse");
+ cy.get(cesc2("#/e1")).should("have.text", "mouse");
+ cy.get(cesc2("#/s3/j")).should("have.text", "mouse");
+ cy.get(cesc2("#/j1")).should("have.text", "mouse");
- cy.get(cesc("#\\/s1\\/b"))
+ cy.get(cesc2("#/s1/b"))
.find(".mjx-mrow")
.eq(0)
.invoke("text")
.then((text) => {
expect(text.trim()).equal("z");
});
- cy.get(cesc("#\\/b1"))
+ cy.get(cesc2("#/b1"))
.find(".mjx-mrow")
.eq(0)
.invoke("text")
.then((text) => {
expect(text.trim()).equal("z");
});
- cy.get(cesc("#\\/f"))
+ cy.get(cesc2("#/s2/f"))
.find(".mjx-mrow")
.eq(0)
.invoke("text")
.then((text) => {
expect(text.trim()).equal("z");
});
- cy.get(cesc("#\\/f1"))
+ cy.get(cesc2("#/f1"))
.find(".mjx-mrow")
.eq(0)
.invoke("text")
.then((text) => {
expect(text.trim()).equal("z");
});
- cy.get(cesc("#\\/s3\\/k"))
+ cy.get(cesc2("#/s3/k"))
.find(".mjx-mrow")
.eq(0)
.invoke("text")
.then((text) => {
expect(text.trim()).equal("z");
});
- cy.get(cesc("#\\/k1"))
+ cy.get(cesc2("#/k1"))
.find(".mjx-mrow")
.eq(0)
.invoke("text")
@@ -1408,69 +1417,69 @@ describe("Conditional Content Tag Tests", function () {
expect(text.trim()).equal("z");
});
- cy.get(cesc("#\\/s1\\/c")).should("not.exist");
- cy.get(cesc("#\\/c1")).should("not.exist");
- cy.get(cesc("#\\/g")).should("not.exist");
- cy.get(cesc("#\\/g1")).should("not.exist");
- cy.get(cesc("#\\/s3\\/l")).should("not.exist");
- cy.get(cesc("#\\/l1")).should("not.exist");
+ cy.get(cesc2("#/s1/c")).should("not.exist");
+ cy.get(cesc2("#/c1")).should("not.exist");
+ cy.get(cesc2("#/s2/g")).should("not.exist");
+ cy.get(cesc2("#/g1")).should("not.exist");
+ cy.get(cesc2("#/s3/l")).should("not.exist");
+ cy.get(cesc2("#/l1")).should("not.exist");
- cy.get(cesc("#\\/s1\\/d")).should("not.exist");
- cy.get(cesc("#\\/d1")).should("not.exist");
- cy.get(cesc("#\\/h")).should("not.exist");
- cy.get(cesc("#\\/h1")).should("not.exist");
- cy.get(cesc("#\\/i")).should("not.exist");
- cy.get(cesc("#\\/i1")).should("not.exist");
+ cy.get(cesc2("#/s1/d")).should("not.exist");
+ cy.get(cesc2("#/d1")).should("not.exist");
+ cy.get(cesc2("#/s2/h")).should("not.exist");
+ cy.get(cesc2("#/h1")).should("not.exist");
+ cy.get(cesc2("#/s2/i")).should("not.exist");
+ cy.get(cesc2("#/i1")).should("not.exist");
cy.log("enter -1");
- cy.get(cesc("#\\/n") + " textarea").type(
+ cy.get(cesc2("#/n") + " textarea").type(
"{ctrl+home}{shift+end}{backspace}-1{enter}",
{ force: true },
);
- cy.get(cesc("#\\/s1\\/a")).should("have.text", "dog");
- cy.get(cesc("#\\/a1")).should("have.text", "dog");
- cy.get(cesc("#\\/e")).should("have.text", "dog");
- cy.get(cesc("#\\/e1")).should("have.text", "dog");
- cy.get(cesc("#\\/s3\\/j")).should("have.text", "dog");
- cy.get(cesc("#\\/j1")).should("have.text", "dog");
+ cy.get(cesc2("#/s1/a")).should("have.text", "dog");
+ cy.get(cesc2("#/a1")).should("have.text", "dog");
+ cy.get(cesc2("#/s2/e")).should("have.text", "dog");
+ cy.get(cesc2("#/e1")).should("have.text", "dog");
+ cy.get(cesc2("#/s3/j")).should("have.text", "dog");
+ cy.get(cesc2("#/j1")).should("have.text", "dog");
- cy.get(cesc("#\\/s1\\/b"))
+ cy.get(cesc2("#/s1/b"))
.find(".mjx-mrow")
.eq(0)
.invoke("text")
.then((text) => {
expect(text.trim()).equal("x");
});
- cy.get(cesc("#\\/b1"))
+ cy.get(cesc2("#/b1"))
.find(".mjx-mrow")
.eq(0)
.invoke("text")
.then((text) => {
expect(text.trim()).equal("x");
});
- cy.get(cesc("#\\/f"))
+ cy.get(cesc2("#/s2/f"))
.find(".mjx-mrow")
.eq(0)
.invoke("text")
.then((text) => {
expect(text.trim()).equal("x");
});
- cy.get(cesc("#\\/f1"))
+ cy.get(cesc2("#/f1"))
.find(".mjx-mrow")
.eq(0)
.invoke("text")
.then((text) => {
expect(text.trim()).equal("x");
});
- cy.get(cesc("#\\/s3\\/k"))
+ cy.get(cesc2("#/s3/k"))
.find(".mjx-mrow")
.eq(0)
.invoke("text")
.then((text) => {
expect(text.trim()).equal("x");
});
- cy.get(cesc("#\\/k1"))
+ cy.get(cesc2("#/k1"))
.find(".mjx-mrow")
.eq(0)
.invoke("text")
@@ -1478,69 +1487,69 @@ describe("Conditional Content Tag Tests", function () {
expect(text.trim()).equal("x");
});
- cy.get(cesc("#\\/s1\\/c")).should("have.text", "optional text!");
- cy.get(cesc("#\\/c1")).should("have.text", "optional text!");
- cy.get(cesc("#\\/g")).should("have.text", "optional text!");
- cy.get(cesc("#\\/g1")).should("have.text", "optional text!");
- cy.get(cesc("#\\/s3\\/l")).should("have.text", "optional text!");
- cy.get(cesc("#\\/l1")).should("have.text", "optional text!");
+ cy.get(cesc2("#/s1/c")).should("have.text", "optional text!");
+ cy.get(cesc2("#/c1")).should("have.text", "optional text!");
+ cy.get(cesc2("#/s2/g")).should("have.text", "optional text!");
+ cy.get(cesc2("#/g1")).should("have.text", "optional text!");
+ cy.get(cesc2("#/s3/l")).should("have.text", "optional text!");
+ cy.get(cesc2("#/l1")).should("have.text", "optional text!");
- cy.get(cesc("#\\/s1\\/d")).should("not.exist");
- cy.get(cesc("#\\/d1")).should("not.exist");
- cy.get(cesc("#\\/h")).should("not.exist");
- cy.get(cesc("#\\/h1")).should("not.exist");
- cy.get(cesc("#\\/i")).should("not.exist");
- cy.get(cesc("#\\/i1")).should("not.exist");
+ cy.get(cesc2("#/s1/d")).should("not.exist");
+ cy.get(cesc2("#/d1")).should("not.exist");
+ cy.get(cesc2("#/s2/h")).should("not.exist");
+ cy.get(cesc2("#/h1")).should("not.exist");
+ cy.get(cesc2("#/s2/i")).should("not.exist");
+ cy.get(cesc2("#/i1")).should("not.exist");
cy.log("enter x");
- cy.get(cesc("#\\/n") + " textarea").type(
+ cy.get(cesc2("#/n") + " textarea").type(
"{ctrl+home}{shift+end}{backspace}x{enter}",
{ force: true },
);
- cy.get(cesc("#\\/s1\\/a")).should("have.text", "mouse");
- cy.get(cesc("#\\/a1")).should("have.text", "mouse");
- cy.get(cesc("#\\/e")).should("have.text", "mouse");
- cy.get(cesc("#\\/e1")).should("have.text", "mouse");
- cy.get(cesc("#\\/s3\\/j")).should("have.text", "mouse");
- cy.get(cesc("#\\/j1")).should("have.text", "mouse");
+ cy.get(cesc2("#/s1/a")).should("have.text", "mouse");
+ cy.get(cesc2("#/a1")).should("have.text", "mouse");
+ cy.get(cesc2("#/s2/e")).should("have.text", "mouse");
+ cy.get(cesc2("#/e1")).should("have.text", "mouse");
+ cy.get(cesc2("#/s3/j")).should("have.text", "mouse");
+ cy.get(cesc2("#/j1")).should("have.text", "mouse");
- cy.get(cesc("#\\/s1\\/b"))
+ cy.get(cesc2("#/s1/b"))
.find(".mjx-mrow")
.eq(0)
.invoke("text")
.then((text) => {
expect(text.trim()).equal("z");
});
- cy.get(cesc("#\\/b1"))
+ cy.get(cesc2("#/b1"))
.find(".mjx-mrow")
.eq(0)
.invoke("text")
.then((text) => {
expect(text.trim()).equal("z");
});
- cy.get(cesc("#\\/f"))
+ cy.get(cesc2("#/s2/f"))
.find(".mjx-mrow")
.eq(0)
.invoke("text")
.then((text) => {
expect(text.trim()).equal("z");
});
- cy.get(cesc("#\\/f1"))
+ cy.get(cesc2("#/f1"))
.find(".mjx-mrow")
.eq(0)
.invoke("text")
.then((text) => {
expect(text.trim()).equal("z");
});
- cy.get(cesc("#\\/s3\\/k"))
+ cy.get(cesc2("#/s3/k"))
.find(".mjx-mrow")
.eq(0)
.invoke("text")
.then((text) => {
expect(text.trim()).equal("z");
});
- cy.get(cesc("#\\/k1"))
+ cy.get(cesc2("#/k1"))
.find(".mjx-mrow")
.eq(0)
.invoke("text")
@@ -1548,19 +1557,19 @@ describe("Conditional Content Tag Tests", function () {
expect(text.trim()).equal("z");
});
- cy.get(cesc("#\\/s1\\/c")).should("not.exist");
- cy.get(cesc("#\\/c1")).should("not.exist");
- cy.get(cesc("#\\/g")).should("not.exist");
- cy.get(cesc("#\\/g1")).should("not.exist");
- cy.get(cesc("#\\/s3\\/l")).should("not.exist");
- cy.get(cesc("#\\/l1")).should("not.exist");
+ cy.get(cesc2("#/s1/c")).should("not.exist");
+ cy.get(cesc2("#/c1")).should("not.exist");
+ cy.get(cesc2("#/s2/g")).should("not.exist");
+ cy.get(cesc2("#/g1")).should("not.exist");
+ cy.get(cesc2("#/s3/l")).should("not.exist");
+ cy.get(cesc2("#/l1")).should("not.exist");
- cy.get(cesc("#\\/s1\\/d")).should("not.exist");
- cy.get(cesc("#\\/d1")).should("not.exist");
- cy.get(cesc("#\\/h")).should("not.exist");
- cy.get(cesc("#\\/h1")).should("not.exist");
- cy.get(cesc("#\\/i")).should("not.exist");
- cy.get(cesc("#\\/i1")).should("not.exist");
+ cy.get(cesc2("#/s1/d")).should("not.exist");
+ cy.get(cesc2("#/d1")).should("not.exist");
+ cy.get(cesc2("#/s2/h")).should("not.exist");
+ cy.get(cesc2("#/h1")).should("not.exist");
+ cy.get(cesc2("#/s2/i")).should("not.exist");
+ cy.get(cesc2("#/i1")).should("not.exist");
});
it("references to internal and external components", () => {
@@ -1574,21 +1583,21 @@ describe("Conditional Content Tag Tests", function () {
mouse
original:
+ original:
- 3x a +
+ $x1
+ $y1
+ 3x a + $a1$b1
- 4y b +
+ $x2
+ $y2
+ 4y b + $a2$b2
- 5z c +
+ $x3
+ $y3
+ 5z c + $a3$b3
@@ -1597,17 +1606,17 @@ describe("Conditional Content Tag Tests", function () {
bush
Selected options repeated
- Whole thing repeated
- Selected options repeated from copy
- original:
- 3x a +
+ $(../x1{name="animal"})
+ $(../y1{name="plant"})
+ 3x a + $x$a
- 4y b +
+ $(../x2{name="animal"})
+ $(../y2{name="plant"})
+ 4y b + $x$a
- 5z c +
+ $(../x3{name="animal"})
+ $(../y3{name="plant"})
+ 5z c + $x$a
@@ -1821,21 +1830,21 @@ describe("Conditional Content Tag Tests", function () {
bush
Selected options repeated
- Whole thing repeated
- Selected options repeated from copy
- original:
- 3x a +
+ $(../../x1{name="animal"})
+ $(../../y1{name="plant"})
+ 3x a + $x$a
- 4y b +
+ $(../../x2{name="animal"})
+ $(../../y2{name="plant"})
+ 4y b + $x$a
- 5z c +
+ $(../../x3{name="animal"})
+ $(../../y3{name="plant"})
+ 5z c + $x$a
@@ -2170,21 +2179,21 @@ describe("Conditional Content Tag Tests", function () {
bush
Selected options repeated
- Whole thing repeated
- Selected options repeated from copy
- original:
- 3x a +
+ $x1{name="theanimal"}
+ $y1{name="theplant"}
+ 3x a + $thex$thea
- 4y b +
+ $(../x2{name="animal"})
+ $(../y2{name="plant"})
+ 4y b + $x$a
- 5z c +
+ $(../x3{name="animal"})
+ $(../y3{name="plant"})
+ 5z c + $x$a
@@ -2522,21 +2531,21 @@ describe("Conditional Content Tag Tests", function () {
bush
Selected options repeated
- Whole thing repeated
-
+
Selected options repeated from copy
-
What is your favorite animal?
- I like
+ I like
What is your name?
- Hello,
+ Hello,
Anything else?
- To repeat:
+ To repeat:
- The response:
+ The response:
- The response one more time:
+ The response one more time:
`,
},
"*",
);
});
- cy.get(cesc("#\\/_text1")).should("have.text", "a"); // to wait until loaded
+ cy.get(cesc2("#/_text1")).should("have.text", "a"); // to wait until loaded
- cy.get(cesc(`#\\/a\\/_p1`)).should("have.text", "What is your name? ");
- cy.get(cesc(`#\\/a\\/_p2`)).should("have.text", "Hello, !");
- cy.get(cesc(`#\\/_p1`)).should("have.text", "The response: ");
- cy.get(cesc(`#\\/b\\/_p1`)).should("have.text", "What is your name? ");
- cy.get(cesc(`#\\/b\\/_p2`)).should("have.text", "Hello, !");
- cy.get(cesc(`#\\/_p2`)).should("have.text", "The response one more time: ");
+ cy.get(cesc2(`#/a/_p1`)).should("have.text", "What is your name? ");
+ cy.get(cesc2(`#/a/_p2`)).should("have.text", "Hello, !");
+ cy.get(cesc2(`#/_p1`)).should("have.text", "The response: ");
+ cy.get(cesc2(`#/b/_p1`)).should("have.text", "What is your name? ");
+ cy.get(cesc2(`#/b/_p2`)).should("have.text", "Hello, !");
+ cy.get(cesc2(`#/_p2`)).should("have.text", "The response one more time: ");
- cy.get(cesc(`#\\/a\\/response_input`)).clear().type("Fred{enter}");
- cy.get(cesc(`#\\/a\\/_p2`)).should("have.text", "Hello, Fred!");
- cy.get(cesc(`#\\/_p1`)).should("have.text", "The response: Fred");
- cy.get(cesc(`#\\/b\\/_p2`)).should("have.text", "Hello, Fred!");
- cy.get(cesc(`#\\/_p2`)).should(
+ cy.get(cesc2(`#/a/response_input`)).clear().type("Fred{enter}");
+ cy.get(cesc2(`#/a/_p2`)).should("have.text", "Hello, Fred!");
+ cy.get(cesc2(`#/_p1`)).should("have.text", "The response: Fred");
+ cy.get(cesc2(`#/b/_p2`)).should("have.text", "Hello, Fred!");
+ cy.get(cesc2(`#/_p2`)).should(
"have.text",
"The response one more time: Fred",
);
- cy.get(cesc("#\\/n") + " textarea").type("{end}{backspace}-1{enter}", {
+ cy.get(cesc2("#/n") + " textarea").type("{end}{backspace}-1{enter}", {
force: true,
});
- cy.get(cesc(`#\\/a\\/_p1`)).should(
+ cy.get(cesc2(`#/a/_p1`)).should(
"have.text",
"What is your favorite animal? ",
);
- cy.get(cesc(`#\\/a\\/_p2`)).should("have.text", "I like , too.");
- cy.get(cesc(`#\\/_p1`)).should("have.text", "The response: ");
- cy.get(cesc(`#\\/b\\/_p1`)).should(
+ cy.get(cesc2(`#/a/_p2`)).should("have.text", "I like , too.");
+ cy.get(cesc2(`#/_p1`)).should("have.text", "The response: ");
+ cy.get(cesc2(`#/b/_p1`)).should(
"have.text",
"What is your favorite animal? ",
);
- cy.get(cesc(`#\\/b\\/_p2`)).should("have.text", "I like , too.");
- cy.get(cesc(`#\\/_p2`)).should("have.text", "The response one more time: ");
+ cy.get(cesc2(`#/b/_p2`)).should("have.text", "I like , too.");
+ cy.get(cesc2(`#/_p2`)).should("have.text", "The response one more time: ");
- cy.get(cesc(`#\\/a\\/response_input`)).clear().type("dogs{enter}");
- cy.get(cesc(`#\\/a\\/_p2`)).should("have.text", "I like dogs, too.");
- cy.get(cesc(`#\\/_p1`)).should("have.text", "The response: dogs");
- cy.get(cesc(`#\\/b\\/_p2`)).should("have.text", "I like dogs, too.");
- cy.get(cesc(`#\\/_p2`)).should(
+ cy.get(cesc2(`#/a/response_input`)).clear().type("dogs{enter}");
+ cy.get(cesc2(`#/a/_p2`)).should("have.text", "I like dogs, too.");
+ cy.get(cesc2(`#/_p1`)).should("have.text", "The response: dogs");
+ cy.get(cesc2(`#/b/_p2`)).should("have.text", "I like dogs, too.");
+ cy.get(cesc2(`#/_p2`)).should(
"have.text",
"The response one more time: dogs",
);
- cy.get(cesc("#\\/n") + " textarea").type(
+ cy.get(cesc2("#/n") + " textarea").type(
"{end}{backspace}{backspace}3{enter}",
{ force: true },
);
- cy.get(cesc(`#\\/a\\/_p1`)).should("have.text", "Anything else? ");
- cy.get(cesc(`#\\/a\\/_p2`)).should("have.text", "To repeat: .");
- cy.get(cesc(`#\\/_p1`)).should("have.text", "The response: ");
- cy.get(cesc(`#\\/b\\/_p1`)).should("have.text", "Anything else? ");
- cy.get(cesc(`#\\/b\\/_p2`)).should("have.text", "To repeat: .");
- cy.get(cesc(`#\\/_p2`)).should("have.text", "The response one more time: ");
-
- cy.get(cesc(`#\\/a\\/response_input`)).clear().type("Goodbye{enter}");
- cy.get(cesc(`#\\/a\\/_p2`)).should("have.text", "To repeat: Goodbye.");
- cy.get(cesc(`#\\/_p1`)).should("have.text", "The response: Goodbye");
- cy.get(cesc(`#\\/b\\/_p2`)).should("have.text", "To repeat: Goodbye.");
- cy.get(cesc(`#\\/_p2`)).should(
+ cy.get(cesc2(`#/a/_p1`)).should("have.text", "Anything else? ");
+ cy.get(cesc2(`#/a/_p2`)).should("have.text", "To repeat: .");
+ cy.get(cesc2(`#/_p1`)).should("have.text", "The response: ");
+ cy.get(cesc2(`#/b/_p1`)).should("have.text", "Anything else? ");
+ cy.get(cesc2(`#/b/_p2`)).should("have.text", "To repeat: .");
+ cy.get(cesc2(`#/_p2`)).should("have.text", "The response one more time: ");
+
+ cy.get(cesc2(`#/a/response_input`)).clear().type("Goodbye{enter}");
+ cy.get(cesc2(`#/a/_p2`)).should("have.text", "To repeat: Goodbye.");
+ cy.get(cesc2(`#/_p1`)).should("have.text", "The response: Goodbye");
+ cy.get(cesc2(`#/b/_p2`)).should("have.text", "To repeat: Goodbye.");
+ cy.get(cesc2(`#/_p2`)).should(
"have.text",
"The response one more time: Goodbye",
);
@@ -2959,91 +2968,91 @@ describe("Conditional Content Tag Tests", function () {
What is your favorite animal?
- I like
+ I like
What is your name?
- Hello,
+ Hello,
Anything else?
- To repeat:
+ To repeat:
- The response:
+ The response:
- The response one more time:
+ The response one more time:
`,
},
"*",
);
});
- cy.get(cesc("#\\/_text1")).should("have.text", "a"); // to wait until loaded
+ cy.get(cesc2("#/_text1")).should("have.text", "a"); // to wait until loaded
- cy.get(cesc(`#\\/a`)).should("have.text", "What is your name? ");
- cy.get(cesc(`#\\/b`)).should("have.text", "Hello, !");
- cy.get(cesc(`#\\/pResponse`)).should("have.text", "The response: ");
- cy.get(cesc(`#\\/c`)).should("have.text", "What is your name? ");
- cy.get(cesc(`#\\/d`)).should("have.text", "Hello, !");
- cy.get(cesc(`#\\/pResponse2`)).should(
+ cy.get(cesc2(`#/a`)).should("have.text", "What is your name? ");
+ cy.get(cesc2(`#/b`)).should("have.text", "Hello, !");
+ cy.get(cesc2(`#/pResponse`)).should("have.text", "The response: ");
+ cy.get(cesc2(`#/c`)).should("have.text", "What is your name? ");
+ cy.get(cesc2(`#/d`)).should("have.text", "Hello, !");
+ cy.get(cesc2(`#/pResponse2`)).should(
"have.text",
"The response one more time: ",
);
- cy.get(cesc(`#\\/a\\/response_input`)).clear().type("Fred{enter}");
- cy.get(cesc(`#\\/b`)).should("have.text", "Hello, Fred!");
- cy.get(cesc(`#\\/pResponse`)).should("have.text", "The response: Fred");
- cy.get(cesc(`#\\/d`)).should("have.text", "Hello, Fred!");
- cy.get(cesc(`#\\/pResponse2`)).should(
+ cy.get(cesc2(`#/a/response_input`)).clear().type("Fred{enter}");
+ cy.get(cesc2(`#/b`)).should("have.text", "Hello, Fred!");
+ cy.get(cesc2(`#/pResponse`)).should("have.text", "The response: Fred");
+ cy.get(cesc2(`#/d`)).should("have.text", "Hello, Fred!");
+ cy.get(cesc2(`#/pResponse2`)).should(
"have.text",
"The response one more time: Fred",
);
- cy.get(cesc("#\\/n") + " textarea").type("{end}{backspace}-1{enter}", {
+ cy.get(cesc2("#/n") + " textarea").type("{end}{backspace}-1{enter}", {
force: true,
});
- cy.get(cesc(`#\\/a`)).should("have.text", "What is your favorite animal? ");
- cy.get(cesc(`#\\/b`)).should("have.text", "I like , too.");
- cy.get(cesc(`#\\/pResponse`)).should("have.text", "The response: ");
- cy.get(cesc(`#\\/c`)).should("have.text", "What is your favorite animal? ");
- cy.get(cesc(`#\\/d`)).should("have.text", "I like , too.");
- cy.get(cesc(`#\\/pResponse2`)).should(
+ cy.get(cesc2(`#/a`)).should("have.text", "What is your favorite animal? ");
+ cy.get(cesc2(`#/b`)).should("have.text", "I like , too.");
+ cy.get(cesc2(`#/pResponse`)).should("have.text", "The response: ");
+ cy.get(cesc2(`#/c`)).should("have.text", "What is your favorite animal? ");
+ cy.get(cesc2(`#/d`)).should("have.text", "I like , too.");
+ cy.get(cesc2(`#/pResponse2`)).should(
"have.text",
"The response one more time: ",
);
- cy.get(cesc(`#\\/a\\/response_input`)).clear().type("dogs{enter}");
- cy.get(cesc(`#\\/b`)).should("have.text", "I like dogs, too.");
- cy.get(cesc(`#\\/pResponse`)).should("have.text", "The response: dogs");
- cy.get(cesc(`#\\/d`)).should("have.text", "I like dogs, too.");
- cy.get(cesc(`#\\/pResponse2`)).should(
+ cy.get(cesc2(`#/a/response_input`)).clear().type("dogs{enter}");
+ cy.get(cesc2(`#/b`)).should("have.text", "I like dogs, too.");
+ cy.get(cesc2(`#/pResponse`)).should("have.text", "The response: dogs");
+ cy.get(cesc2(`#/d`)).should("have.text", "I like dogs, too.");
+ cy.get(cesc2(`#/pResponse2`)).should(
"have.text",
"The response one more time: dogs",
);
- cy.get(cesc("#\\/n") + " textarea").type(
+ cy.get(cesc2("#/n") + " textarea").type(
"{end}{backspace}{backspace}3{enter}",
{ force: true },
);
- cy.get(cesc(`#\\/a`)).should("have.text", "Anything else? ");
- cy.get(cesc(`#\\/b`)).should("have.text", "To repeat: .");
- cy.get(cesc(`#\\/pResponse`)).should("have.text", "The response: ");
- cy.get(cesc(`#\\/c`)).should("have.text", "Anything else? ");
- cy.get(cesc(`#\\/d`)).should("have.text", "To repeat: .");
- cy.get(cesc(`#\\/pResponse2`)).should(
+ cy.get(cesc2(`#/a`)).should("have.text", "Anything else? ");
+ cy.get(cesc2(`#/b`)).should("have.text", "To repeat: .");
+ cy.get(cesc2(`#/pResponse`)).should("have.text", "The response: ");
+ cy.get(cesc2(`#/c`)).should("have.text", "Anything else? ");
+ cy.get(cesc2(`#/d`)).should("have.text", "To repeat: .");
+ cy.get(cesc2(`#/pResponse2`)).should(
"have.text",
"The response one more time: ",
);
- cy.get(cesc(`#\\/a\\/response_input`)).clear().type("Goodbye{enter}");
- cy.get(cesc(`#\\/b`)).should("have.text", "To repeat: Goodbye.");
- cy.get(cesc(`#\\/pResponse`)).should("have.text", "The response: Goodbye");
- cy.get(cesc(`#\\/d`)).should("have.text", "To repeat: Goodbye.");
- cy.get(cesc(`#\\/pResponse2`)).should(
+ cy.get(cesc2(`#/a/response_input`)).clear().type("Goodbye{enter}");
+ cy.get(cesc2(`#/b`)).should("have.text", "To repeat: Goodbye.");
+ cy.get(cesc2(`#/pResponse`)).should("have.text", "The response: Goodbye");
+ cy.get(cesc2(`#/d`)).should("have.text", "To repeat: Goodbye.");
+ cy.get(cesc2(`#/pResponse2`)).should(
"have.text",
"The response one more time: Goodbye",
);
@@ -3063,15 +3072,15 @@ describe("Conditional Content Tag Tests", function () {
- negative neither
-
+ $_conditionalcontent1
-
+ $_conditionalcontent2
`,
},
@@ -3079,44 +3088,44 @@ describe("Conditional Content Tag Tests", function () {
);
});
- cy.get(cesc("#\\/_text1")).should("have.text", "a"); // to wait until loaded
+ cy.get(cesc2("#/_text1")).should("have.text", "a"); // to wait until loaded
- cy.get(cesc("#\\/_p1")).should("have.text", "non-positive");
- cy.get(cesc("#\\/_p3")).should("have.text", "non-positive");
- cy.get(cesc("#\\/_p2")).should("have.text", "neither");
- cy.get(cesc("#\\/_p4")).should("have.text", "neither");
+ cy.get(cesc2("#/_p1")).should("have.text", "non-positive");
+ cy.get(cesc2("#/_p3")).should("have.text", "non-positive");
+ cy.get(cesc2("#/_p2")).should("have.text", "neither");
+ cy.get(cesc2("#/_p4")).should("have.text", "neither");
cy.log("enter 1");
- cy.get(cesc("#\\/n") + " textarea").type("{end}{backspace}1{enter}", {
+ cy.get(cesc2("#/n") + " textarea").type("{end}{backspace}1{enter}", {
force: true,
});
- cy.get(cesc("#\\/_p1")).should("have.text", "positive");
- cy.get(cesc("#\\/_p3")).should("have.text", "positive");
- cy.get(cesc("#\\/_p2")).should("have.text", "positive");
- cy.get(cesc("#\\/_p4")).should("have.text", "positive");
+ cy.get(cesc2("#/_p1")).should("have.text", "positive");
+ cy.get(cesc2("#/_p3")).should("have.text", "positive");
+ cy.get(cesc2("#/_p2")).should("have.text", "positive");
+ cy.get(cesc2("#/_p4")).should("have.text", "positive");
cy.log("enter -1");
- cy.get(cesc("#\\/n") + " textarea").type(
+ cy.get(cesc2("#/n") + " textarea").type(
"{end}{backspace}{backspace}-1{enter}",
{ force: true },
);
- cy.get(cesc("#\\/_p1")).should("have.text", "non-positive");
- cy.get(cesc("#\\/_p3")).should("have.text", "non-positive");
- cy.get(cesc("#\\/_p2")).should("have.text", "negative");
- cy.get(cesc("#\\/_p4")).should("have.text", "negative");
+ cy.get(cesc2("#/_p1")).should("have.text", "non-positive");
+ cy.get(cesc2("#/_p3")).should("have.text", "non-positive");
+ cy.get(cesc2("#/_p2")).should("have.text", "negative");
+ cy.get(cesc2("#/_p4")).should("have.text", "negative");
cy.log("enter 0");
- cy.get(cesc("#\\/n") + " textarea").type(
+ cy.get(cesc2("#/n") + " textarea").type(
"{ctrl+home}{shift+end}{backspace}0{enter}",
{ force: true },
);
- cy.get(cesc("#\\/_p1")).should("have.text", "non-positive");
- cy.get(cesc("#\\/_p3")).should("have.text", "non-positive");
- cy.get(cesc("#\\/_p2")).should("have.text", "neither");
- cy.get(cesc("#\\/_p4")).should("have.text", "neither");
+ cy.get(cesc2("#/_p1")).should("have.text", "non-positive");
+ cy.get(cesc2("#/_p3")).should("have.text", "non-positive");
+ cy.get(cesc2("#/_p2")).should("have.text", "neither");
+ cy.get(cesc2("#/_p4")).should("have.text", "neither");
});
it("copy else", () => {
@@ -3135,12 +3144,12 @@ describe("Conditional Content Tag Tests", function () {
hello oops
-
+ $_conditionalcontent1
-
+ $_conditionalcontent2
`,
},
@@ -3148,44 +3157,44 @@ describe("Conditional Content Tag Tests", function () {
);
});
- cy.get(cesc("#\\/_text1")).should("have.text", "a"); // to wait until loaded
+ cy.get(cesc2("#/_text1")).should("have.text", "a"); // to wait until loaded
- cy.get(cesc("#\\/_p1")).should("have.text", "bye");
- cy.get(cesc("#\\/_p3")).should("have.text", "bye");
- cy.get(cesc("#\\/_p2")).should("have.text", "bye");
- cy.get(cesc("#\\/_p4")).should("have.text", "bye");
+ cy.get(cesc2("#/_p1")).should("have.text", "bye");
+ cy.get(cesc2("#/_p3")).should("have.text", "bye");
+ cy.get(cesc2("#/_p2")).should("have.text", "bye");
+ cy.get(cesc2("#/_p4")).should("have.text", "bye");
cy.log("enter 1");
- cy.get(cesc("#\\/n") + " textarea").type("{end}{backspace}1{enter}", {
+ cy.get(cesc2("#/n") + " textarea").type("{end}{backspace}1{enter}", {
force: true,
});
- cy.get(cesc("#\\/_p1")).should("have.text", "hello");
- cy.get(cesc("#\\/_p3")).should("have.text", "hello");
- cy.get(cesc("#\\/_p2")).should("have.text", "oops");
- cy.get(cesc("#\\/_p4")).should("have.text", "oops");
+ cy.get(cesc2("#/_p1")).should("have.text", "hello");
+ cy.get(cesc2("#/_p3")).should("have.text", "hello");
+ cy.get(cesc2("#/_p2")).should("have.text", "oops");
+ cy.get(cesc2("#/_p4")).should("have.text", "oops");
cy.log("enter -1");
- cy.get(cesc("#\\/n") + " textarea").type(
+ cy.get(cesc2("#/n") + " textarea").type(
"{end}{backspace}{backspace}-1{enter}",
{ force: true },
);
- cy.get(cesc("#\\/_p1")).should("have.text", "bye");
- cy.get(cesc("#\\/_p3")).should("have.text", "bye");
- cy.get(cesc("#\\/_p2")).should("have.text", "hello");
- cy.get(cesc("#\\/_p4")).should("have.text", "hello");
+ cy.get(cesc2("#/_p1")).should("have.text", "bye");
+ cy.get(cesc2("#/_p3")).should("have.text", "bye");
+ cy.get(cesc2("#/_p2")).should("have.text", "hello");
+ cy.get(cesc2("#/_p4")).should("have.text", "hello");
cy.log("enter 0");
- cy.get(cesc("#\\/n") + " textarea").type(
+ cy.get(cesc2("#/n") + " textarea").type(
"{ctrl+home}{shift+end}{backspace}0{enter}",
{ force: true },
);
- cy.get(cesc("#\\/_p1")).should("have.text", "bye");
- cy.get(cesc("#\\/_p3")).should("have.text", "bye");
- cy.get(cesc("#\\/_p2")).should("have.text", "bye");
- cy.get(cesc("#\\/_p4")).should("have.text", "bye");
+ cy.get(cesc2("#/_p1")).should("have.text", "bye");
+ cy.get(cesc2("#/_p3")).should("have.text", "bye");
+ cy.get(cesc2("#/_p2")).should("have.text", "bye");
+ cy.get(cesc2("#/_p4")).should("have.text", "bye");
});
it("conditionalcontents hide dynamically", () => {
@@ -3212,54 +3221,54 @@ describe("Conditional Content Tag Tests", function () {
cat mouse
- a1:
- b1:
+ a1:
+ b1:
`,
},
"*",
);
});
- cy.get(cesc("#\\/_text1")).should("have.text", "a"); // to wait for page to load
+ cy.get(cesc2("#/_text1")).should("have.text", "a"); // to wait for page to load
- cy.get(cesc("#\\/pa")).should("have.text", "a: mouse");
- cy.get(cesc("#\\/pa1")).should("have.text", "a1: mouse");
- cy.get(cesc("#\\/pb")).should("have.text", "b: ");
- cy.get(cesc("#\\/pb1")).should("have.text", "b1: mouse");
+ cy.get(cesc2("#/pa")).should("have.text", "a: mouse");
+ cy.get(cesc2("#/pa1")).should("have.text", "a1: mouse");
+ cy.get(cesc2("#/pb")).should("have.text", "b: ");
+ cy.get(cesc2("#/pb1")).should("have.text", "b1: mouse");
cy.log("enter 1");
- cy.get(cesc("#\\/n") + " textarea").type("1{enter}", { force: true });
+ cy.get(cesc2("#/n") + " textarea").type("1{enter}", { force: true });
- cy.get(cesc("#\\/pa")).should("have.text", "a: cat");
- cy.get(cesc("#\\/pa1")).should("have.text", "a1: cat");
- cy.get(cesc("#\\/pb")).should("have.text", "b: ");
- cy.get(cesc("#\\/pb1")).should("have.text", "b1: cat");
+ cy.get(cesc2("#/pa")).should("have.text", "a: cat");
+ cy.get(cesc2("#/pa1")).should("have.text", "a1: cat");
+ cy.get(cesc2("#/pb")).should("have.text", "b: ");
+ cy.get(cesc2("#/pb1")).should("have.text", "b1: cat");
- cy.get(cesc("#\\/h1")).click();
- cy.get(cesc("#\\/h2")).click();
+ cy.get(cesc2("#/h1")).click();
+ cy.get(cesc2("#/h2")).click();
- cy.get(cesc("#\\/pa")).should("have.text", "a: ");
- cy.get(cesc("#\\/pa1")).should("have.text", "a1: cat");
- cy.get(cesc("#\\/pb")).should("have.text", "b: cat");
- cy.get(cesc("#\\/pb1")).should("have.text", "b1: cat");
+ cy.get(cesc2("#/pa")).should("have.text", "a: ");
+ cy.get(cesc2("#/pa1")).should("have.text", "a1: cat");
+ cy.get(cesc2("#/pb")).should("have.text", "b: cat");
+ cy.get(cesc2("#/pb1")).should("have.text", "b1: cat");
cy.log("enter -3");
- cy.get(cesc("#\\/n") + " textarea").type("{end}{backspace}-3{enter}", {
+ cy.get(cesc2("#/n") + " textarea").type("{end}{backspace}-3{enter}", {
force: true,
});
- cy.get(cesc("#\\/pa")).should("have.text", "a: ");
- cy.get(cesc("#\\/pa1")).should("have.text", "a1: dog");
- cy.get(cesc("#\\/pb")).should("have.text", "b: dog");
- cy.get(cesc("#\\/pb1")).should("have.text", "b1: dog");
+ cy.get(cesc2("#/pa")).should("have.text", "a: ");
+ cy.get(cesc2("#/pa1")).should("have.text", "a1: dog");
+ cy.get(cesc2("#/pb")).should("have.text", "b: dog");
+ cy.get(cesc2("#/pb1")).should("have.text", "b1: dog");
- cy.get(cesc("#\\/h1")).click();
- cy.get(cesc("#\\/h2")).click();
+ cy.get(cesc2("#/h1")).click();
+ cy.get(cesc2("#/h2")).click();
- cy.get(cesc("#\\/pa")).should("have.text", "a: dog");
- cy.get(cesc("#\\/pa1")).should("have.text", "a1: dog");
- cy.get(cesc("#\\/pb")).should("have.text", "b: ");
- cy.get(cesc("#\\/pb1")).should("have.text", "b1: dog");
+ cy.get(cesc2("#/pa")).should("have.text", "a: dog");
+ cy.get(cesc2("#/pa1")).should("have.text", "a1: dog");
+ cy.get(cesc2("#/pb")).should("have.text", "b: ");
+ cy.get(cesc2("#/pb1")).should("have.text", "b1: dog");
});
it("string and blank strings in case and else", () => {
@@ -3279,12 +3288,14 @@ describe("Conditional Content Tag Tests", function () {
The $animal2 $verb2.
- a1:
+ a1: $a{assignNames="a11 a12 a13 a14"}
- pieces:
+ pieces:
- b1:
- c1:
+ b1: $b{name="b1"}
+ c1: $c{name="c1"}
+ d1: $d{name="d1"}
+ e1: $e{name="e1"}
`,
},
@@ -3292,57 +3303,75 @@ describe("Conditional Content Tag Tests", function () {
);
});
- cy.get(cesc("#\\/_text1")).should("have.text", "a");
+ cy.get(cesc2("#/_text1")).should("have.text", "a");
- cy.get(cesc("#\\/pa")).should("have.text", "a: The elephant trumpets.");
- cy.get(cesc("#\\/pa1")).should("have.text", "a1: The elephant trumpets.");
- cy.get(cesc("#\\/ppieces")).should(
+ cy.get(cesc2("#/pa")).should("have.text", "a: The elephant trumpets.");
+ cy.get(cesc2("#/pa1")).should("have.text", "a1: The elephant trumpets.");
+ cy.get(cesc2("#/ppieces")).should(
"have.text",
"pieces: The elephant trumpets.",
);
- cy.get(cesc("#\\/pb1")).should("have.text", "b1: elephant");
- cy.get(cesc("#\\/pc1")).should("have.text", "c1: trumpets");
+ cy.get(cesc2("#/pb1")).should("have.text", "b1: ");
+ cy.get(cesc2("#/pc1")).should("have.text", "c1: elephant");
+ cy.get(cesc2("#/pd1")).should("have.text", "d1: trumpets");
+ cy.get(cesc2("#/pe1")).should("have.text", "e1: ");
- cy.get(cesc("#\\/a11")).should("have.text", "elephant");
- cy.get(cesc("#\\/a12")).should("have.text", "trumpets");
- cy.get(cesc("#\\/b1")).should("have.text", "elephant");
- cy.get(cesc("#\\/c1")).should("have.text", "trumpets");
+ cy.get(cesc2("#/a11")).should("not.exist");
+ cy.get(cesc2("#/a12")).should("have.text", "elephant");
+ cy.get(cesc2("#/a13")).should("have.text", "trumpets");
+ cy.get(cesc2("#/a14")).should("not.exist");
+ cy.get(cesc2("#/b1")).should("not.exist");
+ cy.get(cesc2("#/c1")).should("have.text", "elephant");
+ cy.get(cesc2("#/d1")).should("have.text", "trumpets");
+ cy.get(cesc2("#/e1")).should("not.exist");
cy.log("enter 1");
- cy.get(cesc("#\\/n") + " textarea").type("1{enter}", { force: true });
-
- cy.get(cesc("#\\/pa")).should("have.text", "a: The fox jumps.");
- cy.get(cesc("#\\/pa1")).should("have.text", "a1: The fox jumps.");
- cy.get(cesc("#\\/ppieces")).should("have.text", "pieces: The fox jumps.");
- cy.get(cesc("#\\/pb1")).should("have.text", "b1: fox");
- cy.get(cesc("#\\/pc1")).should("have.text", "c1: jumps");
-
- cy.get(cesc("#\\/a11")).should("have.text", "fox");
- cy.get(cesc("#\\/a12")).should("have.text", "jumps");
- cy.get(cesc("#\\/b1")).should("have.text", "fox");
- cy.get(cesc("#\\/c1")).should("have.text", "jumps");
+ cy.get(cesc2("#/n") + " textarea").type("1{enter}", { force: true });
+
+ cy.get(cesc2("#/pa")).should("have.text", "a: The fox jumps.");
+ cy.get(cesc2("#/pa1")).should("have.text", "a1: The fox jumps.");
+ cy.get(cesc2("#/ppieces")).should("have.text", "pieces: The fox jumps.");
+ cy.get(cesc2("#/pb1")).should("have.text", "b1: ");
+ cy.get(cesc2("#/pc1")).should("have.text", "c1: fox");
+ cy.get(cesc2("#/pd1")).should("have.text", "d1: jumps");
+ cy.get(cesc2("#/pe1")).should("have.text", "e1: ");
+
+ cy.get(cesc2("#/a11")).should("not.exist");
+ cy.get(cesc2("#/a12")).should("have.text", "fox");
+ cy.get(cesc2("#/a13")).should("have.text", "jumps");
+ cy.get(cesc2("#/a14")).should("not.exist");
+ cy.get(cesc2("#/b1")).should("not.exist");
+ cy.get(cesc2("#/c1")).should("have.text", "fox");
+ cy.get(cesc2("#/d1")).should("have.text", "jumps");
+ cy.get(cesc2("#/e1")).should("not.exist");
cy.log("enter 0");
- cy.get(cesc("#\\/n") + " textarea").type("{end}{backspace}0{enter}", {
+ cy.get(cesc2("#/n") + " textarea").type("{end}{backspace}0{enter}", {
force: true,
});
- cy.get(cesc("#\\/pa")).should("have.text", "a: The elephant trumpets.");
- cy.get(cesc("#\\/pa1")).should("have.text", "a1: The elephant trumpets.");
- cy.get(cesc("#\\/ppieces")).should(
+ cy.get(cesc2("#/pa")).should("have.text", "a: The elephant trumpets.");
+ cy.get(cesc2("#/pa1")).should("have.text", "a1: The elephant trumpets.");
+ cy.get(cesc2("#/ppieces")).should(
"have.text",
"pieces: The elephant trumpets.",
);
- cy.get(cesc("#\\/pb1")).should("have.text", "b1: elephant");
- cy.get(cesc("#\\/pc1")).should("have.text", "c1: trumpets");
-
- cy.get(cesc("#\\/a11")).should("have.text", "elephant");
- cy.get(cesc("#\\/a12")).should("have.text", "trumpets");
- cy.get(cesc("#\\/b1")).should("have.text", "elephant");
- cy.get(cesc("#\\/c1")).should("have.text", "trumpets");
+ cy.get(cesc2("#/pb1")).should("have.text", "b1: ");
+ cy.get(cesc2("#/pc1")).should("have.text", "c1: elephant");
+ cy.get(cesc2("#/pd1")).should("have.text", "d1: trumpets");
+ cy.get(cesc2("#/pe1")).should("have.text", "e1: ");
+
+ cy.get(cesc2("#/a11")).should("not.exist");
+ cy.get(cesc2("#/a12")).should("have.text", "elephant");
+ cy.get(cesc2("#/a13")).should("have.text", "trumpets");
+ cy.get(cesc2("#/a14")).should("not.exist");
+ cy.get(cesc2("#/b1")).should("not.exist");
+ cy.get(cesc2("#/c1")).should("have.text", "elephant");
+ cy.get(cesc2("#/d1")).should("have.text", "trumpets");
+ cy.get(cesc2("#/e1")).should("not.exist");
});
- it("copy with invalid target gets expanded", () => {
+ it("copy with invalid source gets expanded", () => {
cy.window().then(async (win) => {
win.postMessage(
{
@@ -3351,7 +3380,7 @@ describe("Conditional Content Tag Tests", function () {
- nothing:
+ nothing:
after
`,
@@ -3360,13 +3389,13 @@ describe("Conditional Content Tag Tests", function () {
);
});
- cy.get(cesc("#\\/_text1")).should("have.text", "a");
+ cy.get(cesc2("#/_text1")).should("have.text", "a");
- cy.get(cesc("#\\/n") + " textarea")
+ cy.get(cesc2("#/n") + " textarea")
.type("1", { force: true })
.blur();
- cy.get(cesc("#\\/_document1")).should(
+ cy.get(cesc2("#/_document1")).should(
"contain.text",
"a\n 1\n before\n nothing: \n after\n ",
);
@@ -3416,80 +3445,80 @@ describe("Conditional Content Tag Tests", function () {
);
});
- cy.get(cesc("#\\/_text1")).should("have.text", "a");
+ cy.get(cesc2("#/_text1")).should("have.text", "a");
- cy.get(cesc("#\\/winner1")).should("not.exist");
- cy.get(cesc("#\\/_p1")).should("not.exist");
- cy.get(cesc("#\\/winner1b")).should("not.exist");
- cy.get(cesc("#\\/_p2")).should("not.exist");
- cy.get(cesc("#\\/winner2")).should("not.exist");
- cy.get(cesc("#\\/_p3")).should("not.exist");
- cy.get(cesc("#\\/winner3")).should("not.exist");
- cy.get(cesc("#\\/_p4")).should("not.exist");
- cy.get(cesc("#\\/winner0")).should("have.text", "no winner");
- cy.get(cesc("#\\/_p5")).should("have.text", "We have no winner.");
+ cy.get(cesc2("#/winner1")).should("not.exist");
+ cy.get(cesc2("#/_p1")).should("not.exist");
+ cy.get(cesc2("#/winner1b")).should("not.exist");
+ cy.get(cesc2("#/_p2")).should("not.exist");
+ cy.get(cesc2("#/winner2")).should("not.exist");
+ cy.get(cesc2("#/_p3")).should("not.exist");
+ cy.get(cesc2("#/winner3")).should("not.exist");
+ cy.get(cesc2("#/_p4")).should("not.exist");
+ cy.get(cesc2("#/winner0")).should("have.text", "no winner");
+ cy.get(cesc2("#/_p5")).should("have.text", "We have no winner.");
- cy.get(cesc("#\\/n") + " textarea")
+ cy.get(cesc2("#/n") + " textarea")
.type("1", { force: true })
.blur();
- cy.get(cesc("#\\/winner1")).should("have.text", "first winner");
- cy.get(cesc("#\\/_p1")).should("have.text", "We have a first winner!");
- cy.get(cesc("#\\/winner1b")).should("have.text", "first winner");
- cy.get(cesc("#\\/_p2")).should(
+ cy.get(cesc2("#/winner1")).should("have.text", "first winner");
+ cy.get(cesc2("#/_p1")).should("have.text", "We have a first winner!");
+ cy.get(cesc2("#/winner1b")).should("have.text", "first winner");
+ cy.get(cesc2("#/_p2")).should(
"have.text",
"Just emphasizing that we have that first winner!",
);
- cy.get(cesc("#\\/winner2")).should("not.exist");
- cy.get(cesc("#\\/_p3")).should("not.exist");
- cy.get(cesc("#\\/winner3")).should("not.exist");
- cy.get(cesc("#\\/_p4")).should("not.exist");
- cy.get(cesc("#\\/winner0")).should("not.exist");
- cy.get(cesc("#\\/_p5")).should("not.exist");
+ cy.get(cesc2("#/winner2")).should("not.exist");
+ cy.get(cesc2("#/_p3")).should("not.exist");
+ cy.get(cesc2("#/winner3")).should("not.exist");
+ cy.get(cesc2("#/_p4")).should("not.exist");
+ cy.get(cesc2("#/winner0")).should("not.exist");
+ cy.get(cesc2("#/_p5")).should("not.exist");
- cy.get(cesc("#\\/n") + " textarea")
+ cy.get(cesc2("#/n") + " textarea")
.type("{end}{backspace}2", { force: true })
.blur();
- cy.get(cesc("#\\/winner1")).should("have.text", "first winner");
- cy.get(cesc("#\\/_p1")).should("have.text", "We have a first winner!");
- cy.get(cesc("#\\/winner1b")).should("not.exist");
- cy.get(cesc("#\\/_p2")).should("not.exist");
- cy.get(cesc("#\\/winner2")).should("have.text", "second winner");
- cy.get(cesc("#\\/_p3")).should("have.text", "We have a second winner!");
- cy.get(cesc("#\\/winner3")).should("not.exist");
- cy.get(cesc("#\\/_p4")).should("not.exist");
- cy.get(cesc("#\\/winner0")).should("not.exist");
- cy.get(cesc("#\\/_p5")).should("not.exist");
-
- cy.get(cesc("#\\/n") + " textarea")
+ cy.get(cesc2("#/winner1")).should("have.text", "first winner");
+ cy.get(cesc2("#/_p1")).should("have.text", "We have a first winner!");
+ cy.get(cesc2("#/winner1b")).should("not.exist");
+ cy.get(cesc2("#/_p2")).should("not.exist");
+ cy.get(cesc2("#/winner2")).should("have.text", "second winner");
+ cy.get(cesc2("#/_p3")).should("have.text", "We have a second winner!");
+ cy.get(cesc2("#/winner3")).should("not.exist");
+ cy.get(cesc2("#/_p4")).should("not.exist");
+ cy.get(cesc2("#/winner0")).should("not.exist");
+ cy.get(cesc2("#/_p5")).should("not.exist");
+
+ cy.get(cesc2("#/n") + " textarea")
.type("{end}{backspace}3", { force: true })
.blur();
- cy.get(cesc("#\\/winner1")).should("have.text", "first winner");
- cy.get(cesc("#\\/_p1")).should("have.text", "We have a first winner!");
- cy.get(cesc("#\\/winner1b")).should("not.exist");
- cy.get(cesc("#\\/_p2")).should("not.exist");
- cy.get(cesc("#\\/winner2")).should("not.exist");
- cy.get(cesc("#\\/_p3")).should("not.exist");
- cy.get(cesc("#\\/winner3")).should("have.text", "third winner");
- cy.get(cesc("#\\/_p4")).should("have.text", "We have a third winner!");
- cy.get(cesc("#\\/winner0")).should("not.exist");
- cy.get(cesc("#\\/_p5")).should("not.exist");
-
- cy.get(cesc("#\\/n") + " textarea")
+ cy.get(cesc2("#/winner1")).should("have.text", "first winner");
+ cy.get(cesc2("#/_p1")).should("have.text", "We have a first winner!");
+ cy.get(cesc2("#/winner1b")).should("not.exist");
+ cy.get(cesc2("#/_p2")).should("not.exist");
+ cy.get(cesc2("#/winner2")).should("not.exist");
+ cy.get(cesc2("#/_p3")).should("not.exist");
+ cy.get(cesc2("#/winner3")).should("have.text", "third winner");
+ cy.get(cesc2("#/_p4")).should("have.text", "We have a third winner!");
+ cy.get(cesc2("#/winner0")).should("not.exist");
+ cy.get(cesc2("#/_p5")).should("not.exist");
+
+ cy.get(cesc2("#/n") + " textarea")
.type("{end}{backspace}x", { force: true })
.blur();
- cy.get(cesc("#\\/winner1")).should("not.exist");
- cy.get(cesc("#\\/_p1")).should("not.exist");
- cy.get(cesc("#\\/winner1b")).should("not.exist");
- cy.get(cesc("#\\/_p2")).should("not.exist");
- cy.get(cesc("#\\/winner2")).should("not.exist");
- cy.get(cesc("#\\/_p3")).should("not.exist");
- cy.get(cesc("#\\/winner3")).should("not.exist");
- cy.get(cesc("#\\/_p4")).should("not.exist");
- cy.get(cesc("#\\/winner0")).should("have.text", "no winner");
- cy.get(cesc("#\\/_p5")).should("have.text", "We have no winner.");
+ cy.get(cesc2("#/winner1")).should("not.exist");
+ cy.get(cesc2("#/_p1")).should("not.exist");
+ cy.get(cesc2("#/winner1b")).should("not.exist");
+ cy.get(cesc2("#/_p2")).should("not.exist");
+ cy.get(cesc2("#/winner2")).should("not.exist");
+ cy.get(cesc2("#/_p3")).should("not.exist");
+ cy.get(cesc2("#/winner3")).should("not.exist");
+ cy.get(cesc2("#/_p4")).should("not.exist");
+ cy.get(cesc2("#/winner0")).should("have.text", "no winner");
+ cy.get(cesc2("#/_p5")).should("have.text", "We have no winner.");
});
});
diff --git a/cypress/e2e/DoenetML/tagSpecific/copy.cy.js b/cypress/e2e/DoenetML/tagSpecific/copy.cy.js
index 24ec85963b..fff6893eaa 100644
--- a/cypress/e2e/DoenetML/tagSpecific/copy.cy.js
+++ b/cypress/e2e/DoenetML/tagSpecific/copy.cy.js
@@ -21,14 +21,52 @@ describe("Copy Tag Tests", function () {
doenetML: `
a
x
- x
- A (1,2)a
+ x
+ $_math1{name="a"}
+ $a{name="b"}
+ x
+ $_math2{name="c"}
+ $c{name="d"}
+ A (1,2)a
x
- (1,2)
+ a
+ x
+ $_math1{name="r1" }
+ $_math1{name="r2" modifyIndirectly="true" }
+ $r1{name="r3" modifyIndirectly="true" }
+ $r2{name="r4" }
+ $r3{name="r5" }
+ $r2{name="r6" modifyIndirectly="false" }
+ $r3{name="r7" modifyIndirectly="false" }
(1,2)
- a
x
- a
+ x
+ $_math1{name="r1" }
+ $_math1{name="r2" modifyIndirectly="3<4" }
+ $r1{name="r3" modifyIndirectly="3<4" }
+ $r2{name="r4" }
+ $r3{name="r5" }
+ $r2{name="r6" modifyIndirectly="3>4" }
+ $r3{name="r7" modifyIndirectly="3>4" }
`,
@@ -341,13 +461,13 @@ describe("Copy Tag Tests", function () {
(1,2)
(1,2)
a
+ x
+ $(x.modifyIndirectly{assignNames="mr" })
+ $(x.modifyIndirectly{assignNames="mr2" modifyIndirectly="true" })
+
+ $(x.format{assignNames="frmt" })
+ $(x.format{assignNames="frmt2" hide })
+ $frmt{name="frmt3" hide }
+
+ (1,2)
+ $(A.coords{assignNames="cA" })
+ $(cA.latex{assignNames="l" })
+ $(cA.latex{assignNames="lmr" modifyIndirectly="false" })
+ $A{name="A2" }
+ $(A2.coords{assignNames="cA2" })
+ $(cA2.latex{assignNames="l2" })
+ `,
+ },
+ "*",
+ );
+ });
+
+ cy.get(cesc("#\\/_text1")).should("have.text", "a"); // to wait until loaded
+
+ cy.log(`check properties`);
+ cy.window().then(async (win) => {
+ let stateVariables = await win.returnAllStateVariables1();
+ expect(stateVariables["/x"].stateValues.modifyIndirectly).eq(false);
+ expect(stateVariables["/x"].stateValues.hidden).eq(true);
+ // modifyIndirectly attribute is copied (as it has propagateToProps=true)
+ expect(stateVariables["/mr"].stateValues.modifyIndirectly).eq(false);
+ // hide attribute is not copied (default behavior)
+ expect(stateVariables["/mr"].stateValues.hidden).eq(false);
+ expect(stateVariables["/mr"].stateValues.value).eq(false);
+
+ // modifyIndirectly is overwritten
+ expect(stateVariables["/mr2"].stateValues.modifyIndirectly).eq(true);
+ expect(stateVariables["/mr2"].stateValues.hidden).eq(false);
+ expect(stateVariables["/mr2"].stateValues.value).eq(false);
+
+ // modifyIndirectly attribute is copied (as it has propagateToProps=true)
+ expect(stateVariables["/frmt"].stateValues.modifyIndirectly).eq(false);
+ // hide attribute is not copied (default behavior)
+ expect(stateVariables["/frmt"].stateValues.hidden).eq(false);
+ expect(stateVariables["/frmt"].stateValues.value).eq("text");
+
+ expect(stateVariables["/frmt2"].stateValues.modifyIndirectly).eq(false);
+ expect(stateVariables["/frmt2"].stateValues.hidden).eq(true);
+ expect(stateVariables["/frmt2"].stateValues.value).eq("text");
+
+ // all attributes copied when don't use prop
+ expect(stateVariables["/frmt3"].stateValues.modifyIndirectly).eq(false);
+ expect(stateVariables["/frmt3"].stateValues.value).eq("text");
+ expect(stateVariables["/frmt3"].stateValues.hidden).eq(true);
+
+ expect(stateVariables["/A"].stateValues.label).eq("A");
+ expect(stateVariables["/cA"].stateValues.value).eqls(["vector", 1, 2]);
+ expect(stateVariables["/l"].stateValues.value).eq(
+ "\\left( 1, 2 \\right)",
+ );
+ expect(stateVariables["/l"].stateValues.modifyIndirectly).eq(true);
+ expect(stateVariables["/lmr"].stateValues.value).eq(
+ "\\left( 1, 2 \\right)",
+ );
+ expect(stateVariables["/lmr"].stateValues.modifyIndirectly).eq(false);
+ expect(stateVariables["/A2"].stateValues.label).eq("A");
+ expect(stateVariables["/cA2"].stateValues.value).eqls(["vector", 1, 2]);
+ expect(stateVariables["/l2"].stateValues.value).eq(
+ "\\left( 1, 2 \\right)",
+ );
+ });
+ });
+
it("copy props, with copySource", () => {
cy.window().then(async (win) => {
win.postMessage(
@@ -652,15 +850,15 @@ describe("Copy Tag Tests", function () {
-
(
-
-
(
-
-
- (
-
- (
x
- a
-
-
-
- (1,2)
-
+
-
+ (
-
- x
+ a
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
@@ -1981,102 +2279,329 @@ describe("Copy Tag Tests", function () {
});
});
- it("property children account for replacement changes", () => {
+ it("copy of prop copy shadows source, with copySource, dot notation", () => {
cy.window().then(async (win) => {
win.postMessage(
{
doenetML: `
a
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+ a
+
+
+
+
+
+
+
+
-
-
-
-
+ $_aslist1{name="al2"}
+ $_p1{name="p2"}
-
+ $al2
+ $p2{name="p3"}
`,
},
@@ -2345,13 +2868,196 @@ describe("Copy Tag Tests", function () {
});
});
- it("copy macros", () => {
+ it("property children account for replacement changes, with copySource", () => {
cy.window().then(async (win) => {
win.postMessage(
{
doenetML: `
a
- a=
+
+
+
+
+
+
+
+
+
+
+
+
+
+ `,
+ },
+ "*",
+ );
+ });
+
+ // to wait for page to load
+ cy.get(cesc("#\\/_text1")).should("have.text", "a");
+
+ cy.get(cesc("#\\/_p1"))
+ .invoke("text")
+ .then((text) => {
+ expect(text.trim()).equal("");
+ });
+ cy.get(cesc("#\\/_p2"))
+ .invoke("text")
+ .then((text) => {
+ expect(text.trim()).equal("");
+ });
+ cy.get(cesc("#\\/p2"))
+ .invoke("text")
+ .then((text) => {
+ expect(text.trim()).equal("");
+ });
+ cy.get(cesc("#\\/_p3"))
+ .invoke("text")
+ .then((text) => {
+ expect(text.trim()).equal("");
+ });
+ cy.get(cesc("#\\/p3"))
+ .invoke("text")
+ .then((text) => {
+ expect(text.trim()).equal("");
+ });
+
+ cy.get(cesc("#\\/_mathinput1") + " textarea").type("2{enter}", {
+ force: true,
+ });
+
+ cy.get(cesc("#\\/_p1")).should("contain.text", "a, b");
+
+ cy.get(cesc("#\\/_p1"))
+ .invoke("text")
+ .then((text) => {
+ expect(text.trim()).equal("a, b");
+ });
+ cy.get(cesc("#\\/_p2"))
+ .invoke("text")
+ .then((text) => {
+ expect(text.trim()).equal("a, b");
+ });
+ cy.get(cesc("#\\/p2"))
+ .invoke("text")
+ .then((text) => {
+ expect(text.trim()).equal("a, b");
+ });
+ cy.get(cesc("#\\/_p3"))
+ .invoke("text")
+ .then((text) => {
+ expect(text.trim()).equal("a, b");
+ });
+ cy.get(cesc("#\\/p3"))
+ .invoke("text")
+ .then((text) => {
+ expect(text.trim()).equal("a, b");
+ });
+
+ cy.get(cesc("#\\/_mathinput1") + " textarea").type(
+ "{end}{backspace}5{enter}",
+ { force: true },
+ );
+ cy.get(cesc("#\\/_p1")).should("contain.text", "a, b, c, d, e");
+ cy.get(cesc("#\\/_p1"))
+ .invoke("text")
+ .then((text) => {
+ expect(text.trim()).equal("a, b, c, d, e");
+ });
+ cy.get(cesc("#\\/_p2"))
+ .invoke("text")
+ .then((text) => {
+ expect(text.trim()).equal("a, b, c, d, e");
+ });
+ cy.get(cesc("#\\/p2"))
+ .invoke("text")
+ .then((text) => {
+ expect(text.trim()).equal("a, b, c, d, e");
+ });
+ cy.get(cesc("#\\/_p3"))
+ .invoke("text")
+ .then((text) => {
+ expect(text.trim()).equal("a, b, c, d, e");
+ });
+ cy.get(cesc("#\\/p3"))
+ .invoke("text")
+ .then((text) => {
+ expect(text.trim()).equal("a, b, c, d, e");
+ });
+
+ cy.get(cesc("#\\/_mathinput1") + " textarea").type(
+ "{end}{backspace}1{enter}",
+ { force: true },
+ );
+ cy.get(cesc("#\\/_p1")).should("not.contain.text", "a, b, c, d, e");
+ cy.get(cesc("#\\/_p1"))
+ .invoke("text")
+ .then((text) => {
+ expect(text.trim()).equal("a");
+ });
+ cy.get(cesc("#\\/_p2"))
+ .invoke("text")
+ .then((text) => {
+ expect(text.trim()).equal("a");
+ });
+ cy.get(cesc("#\\/p2"))
+ .invoke("text")
+ .then((text) => {
+ expect(text.trim()).equal("a");
+ });
+ cy.get(cesc("#\\/_p3"))
+ .invoke("text")
+ .then((text) => {
+ expect(text.trim()).equal("a");
+ });
+ cy.get(cesc("#\\/p3"))
+ .invoke("text")
+ .then((text) => {
+ expect(text.trim()).equal("a");
+ });
+
+ cy.get(cesc("#\\/_mathinput1") + " textarea").type(
+ "{end}{backspace}6{enter}",
+ { force: true },
+ );
+ cy.get(cesc("#\\/_p1")).should("contain.text", "a, b, c, d, e, f");
+ cy.get(cesc("#\\/_p1"))
+ .invoke("text")
+ .then((text) => {
+ expect(text.trim()).equal("a, b, c, d, e, f");
+ });
+ cy.get(cesc("#\\/_p2"))
+ .invoke("text")
+ .then((text) => {
+ expect(text.trim()).equal("a, b, c, d, e, f");
+ });
+ cy.get(cesc("#\\/p2"))
+ .invoke("text")
+ .then((text) => {
+ expect(text.trim()).equal("a, b, c, d, e, f");
+ });
+ cy.get(cesc("#\\/_p3"))
+ .invoke("text")
+ .then((text) => {
+ expect(text.trim()).equal("a, b, c, d, e, f");
+ });
+ cy.get(cesc("#\\/p3"))
+ .invoke("text")
+ .then((text) => {
+ expect(text.trim()).equal("a, b, c, d, e, f");
+ });
+ });
+
+ it("copy macros", () => {
+ cy.window().then(async (win) => {
+ win.postMessage(
+ {
+ doenetML: `
+ a
+ a=
b=
c=
@@ -2523,6 +3229,32 @@ describe("Copy Tag Tests", function () {
cy.get(cesc("#\\/_p4")).should("have.text", "Force to reveal 2: secret");
});
+ it("copy does not ignore hide by default, macros", () => {
+ cy.window().then(async (win) => {
+ win.postMessage(
+ {
+ doenetML: `
+ a
+ Hidden text: secret
+ Hidden by default: $hidden
+ Force to reveal: $hidden{hide="false"}
+ Force to reveal 2: $hidden{sourceAttributesToIgnore="hide"}
+
+ `,
+ },
+ "*",
+ );
+ });
+
+ // to wait for page to load
+ cy.get(cesc("#\\/_text1")).should("have.text", "a");
+
+ cy.get(cesc("#\\/_p1")).should("have.text", "Hidden text: ");
+ cy.get(cesc("#\\/_p2")).should("have.text", "Hidden by default: ");
+ cy.get(cesc("#\\/_p3")).should("have.text", "Force to reveal: secret");
+ cy.get(cesc("#\\/_p4")).should("have.text", "Force to reveal 2: secret");
+ });
+
it("copy does not ignore hide by default, with copySource", () => {
cy.window().then(async (win) => {
win.postMessage(
@@ -2558,12 +3290,52 @@ describe("Copy Tag Tests", function () {
Hidden text: secret
Hidden: $(theP/hidden)
Revealed: $(theP/hidden{hide="false"})
- Hidden 2: $(theP2/hidden)
+ Revealed 2: $(theP2/hidden{hide="false"})
+ Revealed 3: $(theP3/hidden)
+ Hidden 4: $(theP4/hidden)
+ Revealed 4: $(theP4/hidden{hide="false"})
+
+ `,
+ },
+ "*",
+ );
+ });
+
+ // to wait for page to load
+ cy.get(cesc("#\\/_text1")).should("have.text", "a");
+
+ cy.get(cesc("#\\/theP")).should("have.text", "Hidden text: ");
+ cy.get(cesc("#\\/pHidden")).should("have.text", "Hidden: ");
+ cy.get(cesc("#\\/pReveal")).should("have.text", "Revealed: secret");
+ cy.get(cesc("#\\/theP2")).should("have.text", "Hidden text: ");
+ cy.get(cesc("#\\/pHidden2")).should("have.text", "Hidden 2: ");
+ cy.get(cesc("#\\/pReveal2")).should("have.text", "Revealed 2: secret");
+ cy.get(cesc("#\\/theP3")).should("have.text", "Hidden text: secret");
+ cy.get(cesc("#\\/pReveal3")).should("have.text", "Revealed 3: secret");
+ cy.get(cesc("#\\/theP4")).should("have.text", "Hidden text: ");
+ cy.get(cesc("#\\/pHidden4")).should("have.text", "Hidden 4: ");
+ cy.get(cesc("#\\/pReveal4")).should("have.text", "Revealed 4: secret");
+ });
+
+ it("copy keeps hidden children hidden, all macros", () => {
+ cy.window().then(async (win) => {
+ win.postMessage(
+ {
+ doenetML: `
+ a
+ Hidden text: secret
+ Hidden: $(theP/hidden)
+ Revealed: $(theP/hidden{hide="false"})
+ $theP{name="theP2"}
Hidden 2: $(theP2/hidden)
Revealed 2: $(theP2/hidden{hide="false"})
- Revealed 3: $(theP3/hidden)
- Hidden 4: $(theP4/hidden)
Revealed 4: $(theP4/hidden{hide="false"})
@@ -2670,7 +3442,7 @@ describe("Copy Tag Tests", function () {
cy.get(cesc("#\\/c2")).should("have.text", "copy 2: ");
});
- it("copies hide dynamically, with copySource", () => {
+ it("copies hide dynamically, macros", () => {
cy.window().then(async (win) => {
win.postMessage(
{
@@ -2686,8 +3458,8 @@ describe("Copy Tag Tests", function () {
Hide second copy
- copy 1:
- copy 2:
+ copy 1: $source{hide="$h1"}
+ copy 2: $source{hide="$h2"}
`,
},
"*",
@@ -2712,21 +3484,63 @@ describe("Copy Tag Tests", function () {
cy.get(cesc("#\\/c2")).should("have.text", "copy 2: ");
});
- it("copy uri two problems", () => {
+ it("copies hide dynamically, with copySource", () => {
cy.window().then(async (win) => {
win.postMessage(
{
doenetML: `
- Two problems
+ a
- hello
+
+
+ Hide first copy
+
+
+ Hide second copy
+
+
+ copy 1:
+ copy 2:
+ `,
+ },
+ "*",
+ );
+ });
+
+ cy.get(cesc("#\\/_text1")).should("have.text", "a"); // to wait for page to load
+
+ cy.get(cesc("#\\/c1")).should("have.text", "copy 1: hello");
+ cy.get(cesc("#\\/c2")).should("have.text", "copy 2: ");
+
+ cy.get(cesc("#\\/h1")).click();
+ cy.get(cesc("#\\/h2")).click();
+
+ cy.get(cesc("#\\/c1")).should("have.text", "copy 1: ");
+ cy.get(cesc("#\\/c2")).should("have.text", "copy 2: hello");
+
+ cy.get(cesc("#\\/h1")).click();
+ cy.get(cesc("#\\/h2")).click();
+
+ cy.get(cesc("#\\/c1")).should("have.text", "copy 1: hello");
+ cy.get(cesc("#\\/c2")).should("have.text", "copy 2: ");
+ });
+
+ it("copy uri two problems", () => {
+ cy.window().then(async (win) => {
+ win.postMessage(
+ {
+ doenetML: `
+ Two problems
+
+ Two problems
-
+
Extra animal sounds
New content at bottom
-
+
Derivative with second derivative
What is the second derivative of
Four problems
- Four problems
- Two variants from copied document
- $jump
- a
+
+ jump
+
+
+
+ skip $jump
+
+
+ $verb{name="verb2"}
`,
},
"*",
@@ -3835,6 +4695,14 @@ describe("Copy Tag Tests", function () {
cy.get(cesc("#\\/b")).click();
cy.get(cesc("#\\/forVerb")).should("have.text", "skip");
cy.get(cesc("#\\/verb2")).should("have.text", "skip");
+
+ cy.get(cesc("#\\/b")).click();
+ cy.get(cesc("#\\/forVerb")).should("have.text", "jump");
+ cy.get(cesc("#\\/verb2")).should("have.text", "jump");
+
+ cy.get(cesc("#\\/b")).click();
+ cy.get(cesc("#\\/forVerb")).should("have.text", "skip");
+ cy.get(cesc("#\\/verb2")).should("have.text", "skip");
});
it("copy of component that changes away from a copy, with copySource", () => {
@@ -3870,6 +4738,14 @@ describe("Copy Tag Tests", function () {
cy.get(cesc("#\\/b")).click();
cy.get(cesc("#\\/forVerb")).should("have.text", "skip");
cy.get(cesc("#\\/verb2")).should("have.text", "skip");
+
+ cy.get(cesc("#\\/b")).click();
+ cy.get(cesc("#\\/forVerb")).should("have.text", "jump");
+ cy.get(cesc("#\\/verb2")).should("have.text", "jump");
+
+ cy.get(cesc("#\\/b")).click();
+ cy.get(cesc("#\\/forVerb")).should("have.text", "skip");
+ cy.get(cesc("#\\/verb2")).should("have.text", "skip");
});
it("copy of invalid source gives math in boolean and math", () => {
@@ -3921,9 +4797,9 @@ describe("Copy Tag Tests", function () {
Original: x +x
- Unlinked copy:
+ Unlinked copy:
- Linked copy:
+ Linked copy:
Double value of original:
double original
@@ -3968,8 +4844,10 @@ describe("Copy Tag Tests", function () {
cy.window().then(async (win) => {
let stateVariables = await win.returnAllStateVariables1();
- expect(stateVariables["/_copy1"].stateValues.link).eq(false);
- expect(stateVariables["/_copy2"].stateValues.link).eq(true);
+ let copy1Name = stateVariables["/m2"].replacementOf;
+ let copy2Name = stateVariables["/m3"].replacementOf;
+ expect(stateVariables[copy1Name].stateValues.link).eq(false);
+ expect(stateVariables[copy2Name].stateValues.link).eq(true);
expect(stateVariables["/m"].stateValues.value).eqls(["*", 2, "x"]);
expect(stateVariables["/m2"].stateValues.value).eqls(["+", "x", "x"]);
expect(stateVariables["/m3"].stateValues.value).eqls(["+", "x", "x"]);
@@ -4245,6 +5123,10 @@ describe("Copy Tag Tests", function () {
cy.window().then(async (win) => {
let stateVariables = await win.returnAllStateVariables1();
+ let copy1Name = stateVariables["/m2"].replacementOf;
+ let copy2Name = stateVariables["/m3"].replacementOf;
+ expect(stateVariables[copy1Name].stateValues.link).eq(false);
+ expect(stateVariables[copy2Name].stateValues.link).eq(true);
expect(stateVariables["/m"].stateValues.value).eqls(["*", 2, "x"]);
expect(stateVariables["/m2"].stateValues.value).eqls(["+", "x", "x"]);
expect(stateVariables["/m3"].stateValues.value).eqls(["+", "x", "x"]);
@@ -4476,32 +5358,32 @@ describe("Copy Tag Tests", function () {
-
-
-
-
@@ -4525,13 +5407,18 @@ describe("Copy Tag Tests", function () {
cy.window().then(async (win) => {
let stateVariables = await win.returnAllStateVariables1();
-
- expect(stateVariables["/Anolink"].stateValues.link).eq(false);
- expect(stateVariables["/lnolink"].stateValues.link).eq(false);
- expect(stateVariables["/plnolink"].stateValues.link).eq(false);
- expect(stateVariables["/plsnolink"].stateValues.link).eq(false);
- expect(stateVariables["/gnolink"].stateValues.link).eq(false);
- expect(stateVariables["/pxnolink"].stateValues.link).eq(false);
+ let copyForA2 = stateVariables["/A2"].replacementOf;
+ let copyForl2 = stateVariables["/l2"].replacementOf;
+ let copyForA3 = stateVariables["/A3"].replacementOf;
+ let copyForA4B4 = stateVariables["/A4"].replacementOf;
+ let copyForgnolink = stateVariables["/gnolink"].replacementOf;
+ let copyForAx = stateVariables["/Ax"].replacementOf;
+ expect(stateVariables[copyForA2].stateValues.link).eq(false);
+ expect(stateVariables[copyForl2].stateValues.link).eq(false);
+ expect(stateVariables[copyForA3].stateValues.link).eq(false);
+ expect(stateVariables[copyForA4B4].stateValues.link).eq(false);
+ expect(stateVariables[copyForgnolink].stateValues.link).eq(false);
+ expect(stateVariables[copyForAx].stateValues.link).eq(false);
expect(stateVariables["/A"].stateValues.xs).eqls([1, 2]);
expect(stateVariables["/B"].stateValues.xs).eqls([3, 4]);
expect(stateVariables["/l"].stateValues.point1).eqls([1, 2]);
@@ -4936,32 +5823,32 @@ describe("Copy Tag Tests", function () {
-
-
-
-
@@ -4986,12 +5873,18 @@ describe("Copy Tag Tests", function () {
cy.window().then(async (win) => {
let stateVariables = await win.returnAllStateVariables1();
- expect(stateVariables["/Anolink"].stateValues.link).eq(false);
- expect(stateVariables["/lnolink"].stateValues.link).eq(false);
- expect(stateVariables["/plnolink"].stateValues.link).eq(false);
- expect(stateVariables["/plsnolink"].stateValues.link).eq(false);
- expect(stateVariables["/gnolink"].stateValues.link).eq(false);
- expect(stateVariables["/pxnolink"].stateValues.link).eq(false);
+ let copyForA2 = stateVariables["/A2"].replacementOf;
+ let copyForl2 = stateVariables["/l2"].replacementOf;
+ let copyForA3 = stateVariables["/A3"].replacementOf;
+ let copyForA4B4 = stateVariables["/A4"].replacementOf;
+ let copyForgnolink = stateVariables["/gnolink"].replacementOf;
+ let copyForAx = stateVariables["/Ax"].replacementOf;
+ expect(stateVariables[copyForA2].stateValues.link).eq(false);
+ expect(stateVariables[copyForl2].stateValues.link).eq(false);
+ expect(stateVariables[copyForA3].stateValues.link).eq(false);
+ expect(stateVariables[copyForA4B4].stateValues.link).eq(false);
+ expect(stateVariables[copyForgnolink].stateValues.link).eq(false);
+ expect(stateVariables[copyForAx].stateValues.link).eq(false);
expect(stateVariables["/A"].stateValues.xs).eqls([1, 2]);
expect(stateVariables["/B"].stateValues.xs).eqls([3, 4]);
expect(stateVariables["/l"].stateValues.point1).eqls([1, 2]);
@@ -5382,7 +6275,7 @@ describe("Copy Tag Tests", function () {
});
});
- it("copy points and lines with no link, with copySource", () => {
+ it("copy points and lines with no link, dot notation, macros", () => {
cy.window().then(async (win) => {
win.postMessage(
{
@@ -5396,34 +6289,33 @@ describe("Copy Tag Tests", function () {
-
-
-
-
-
@@ -5447,6 +6339,18 @@ describe("Copy Tag Tests", function () {
cy.window().then(async (win) => {
let stateVariables = await win.returnAllStateVariables1();
+ let copyForA2 = stateVariables["/A2"].replacementOf;
+ let copyForl2 = stateVariables["/l2"].replacementOf;
+ let copyForA3 = stateVariables["/A3"].replacementOf;
+ let copyForA4B4 = stateVariables["/A4"].replacementOf;
+ let copyForgnolink = stateVariables["/gnolink"].replacementOf;
+ let copyForAx = stateVariables["/Ax"].replacementOf;
+ expect(stateVariables[copyForA2].stateValues.link).eq(false);
+ expect(stateVariables[copyForl2].stateValues.link).eq(false);
+ expect(stateVariables[copyForA3].stateValues.link).eq(false);
+ expect(stateVariables[copyForA4B4].stateValues.link).eq(false);
+ expect(stateVariables[copyForgnolink].stateValues.link).eq(false);
+ expect(stateVariables[copyForAx].stateValues.link).eq(false);
expect(stateVariables["/A"].stateValues.xs).eqls([1, 2]);
expect(stateVariables["/B"].stateValues.xs).eqls([3, 4]);
expect(stateVariables["/l"].stateValues.point1).eqls([1, 2]);
@@ -5837,7 +6741,7 @@ describe("Copy Tag Tests", function () {
});
});
- it("copy points and lines with no link, with copySource, dot notation", () => {
+ it("copy points and lines with no link, with copySource", () => {
cy.window().then(async (win) => {
win.postMessage(
{
@@ -5856,29 +6760,29 @@ describe("Copy Tag Tests", function () {
-
-
@@ -6292,57 +7196,51 @@ describe("Copy Tag Tests", function () {
});
});
- it("copy string with no link", () => {
+ it("copy points and lines with no link, with copySource, dot notation", () => {
cy.window().then(async (win) => {
win.postMessage(
{
doenetML: `
a
- Hello
- a
- Hello
-
- `,
- },
- "*",
- );
- });
+
+ (1,2)
+ (3,4)
+
+
+
+
+
+
+
+
+
- // to wait for page to load
- cy.get(cesc("#\\/_text1")).should("have.text", "a");
+
+ a
-
hello
-
+
+
`,
},
"*",
@@ -6352,610 +7250,3259 @@ describe("Copy Tag Tests", function () {
// to wait for page to load
cy.get(cesc("#\\/_text1")).should("have.text", "a");
- cy.get(cesc("#\\/_p1")).should("have.text", "hello hello");
- cy.get(cesc("#\\/_p2")).should("have.text", "hello hello");
- });
+ cy.get(cesc(`#\\/Ax`))
+ .find(".mjx-mrow")
+ .eq(0)
+ .invoke("text")
+ .then((text) => {
+ expect(text.trim().replace(/−/g, "-")).equal("1");
+ });
- // This was causing a duplicate componentName error
- it("copy group with assignNames inside with no link, with copySource", () => {
cy.window().then(async (win) => {
- win.postMessage(
- {
- doenetML: `
- a
- hello
-
- `,
- },
- "*",
- );
+ let stateVariables = await win.returnAllStateVariables1();
+
+ expect(stateVariables["/A"].stateValues.xs).eqls([1, 2]);
+ expect(stateVariables["/B"].stateValues.xs).eqls([3, 4]);
+ expect(stateVariables["/l"].stateValues.point1).eqls([1, 2]);
+ expect(stateVariables["/l"].stateValues.point2).eqls([3, 4]);
+ expect(stateVariables["/A2"].stateValues.xs).eqls([1, 2]);
+ expect(stateVariables["/l2"].stateValues.point1).eqls([1, 2]);
+ expect(stateVariables["/l2"].stateValues.point2).eqls([3, 4]);
+ expect(stateVariables["/A3"].stateValues.xs).eqls([1, 2]);
+ expect(stateVariables["/A4"].stateValues.xs).eqls([1, 2]);
+ expect(stateVariables["/B4"].stateValues.xs).eqls([3, 4]);
+ expect(stateVariables["/gnolink/A"].stateValues.xs).eqls([1, 2]);
+ expect(stateVariables["/gnolink/B"].stateValues.xs).eqls([3, 4]);
+ expect(stateVariables["/gnolink/l"].stateValues.point1).eqls([1, 2]);
+ expect(stateVariables["/gnolink/l"].stateValues.point2).eqls([3, 4]);
+ expect(stateVariables["/Ax"].stateValues.value).eqls(1);
});
- // to wait for page to load
- cy.get(cesc("#\\/_text1")).should("have.text", "a");
+ cy.log("move A");
+ cy.window().then(async (win) => {
+ win.callAction1({
+ actionName: "movePoint",
+ componentName: "/A",
+ args: { x: -9, y: -3 },
+ });
+ });
- cy.get(cesc("#\\/_p1")).should("have.text", "hello hello");
- cy.get(cesc("#\\/_p2")).should("have.text", "hello hello");
- });
+ cy.get(cesc("#\\/Ac")).should(
+ "contain.text",
+ `(${nInDOM(-9)},${nInDOM(-3)})`,
+ );
- it("copy group with copies with no link", () => {
cy.window().then(async (win) => {
- win.postMessage(
- {
- doenetML: `
- a
-
- x+x
-
-
- a
-
- x+x
-
-
- a
+ Hello
+ a
+ Hello
+ $_p1{name="p2" link="false"}
+ `,
+ },
+ "*",
+ );
+ });
+
+ // to wait for page to load
+ cy.get(cesc("#\\/_text1")).should("have.text", "a");
+
+ cy.get(cesc("#\\/_p1")).should("have.text", "Hello");
+ cy.get(cesc("#\\/p2")).should("have.text", "Hello");
+ });
+
+ it("copy string with no link, with copySource", () => {
+ cy.window().then(async (win) => {
+ win.postMessage(
+ {
+ doenetML: `
+ a
+ Hello
+
+ `,
+ },
+ "*",
+ );
+ });
+
+ // to wait for page to load
+ cy.get(cesc("#\\/_text1")).should("have.text", "a");
+
+ cy.get(cesc("#\\/_p1")).should("have.text", "Hello");
+ cy.get(cesc("#\\/p2")).should("have.text", "Hello");
+ });
+
+ // This was causing a duplicate component name error
+ it("copy group with name inside with no link", () => {
+ cy.window().then(async (win) => {
+ win.postMessage(
+ {
+ doenetML: `
+ a
+ hello
+
+ `,
+ },
+ "*",
+ );
+ });
+
+ // to wait for page to load
+ cy.get(cesc("#\\/_text1")).should("have.text", "a");
+
+ cy.get(cesc("#\\/_p1")).should("have.text", "hello hello");
+ cy.get(cesc("#\\/_p2")).should("have.text", "hello hello");
+ });
+
+ // This was causing a duplicate component name error
+ it("copy group with name inside with no link, macros", () => {
+ cy.window().then(async (win) => {
+ win.postMessage(
+ {
+ doenetML: `
+ a
+ hello $m{name="q"}
+ $g{link="false"}
+ `,
+ },
+ "*",
+ );
+ });
+
+ // to wait for page to load
+ cy.get(cesc("#\\/_text1")).should("have.text", "a");
+
+ cy.get(cesc("#\\/_p1")).should("have.text", "hello hello");
+ cy.get(cesc("#\\/_p2")).should("have.text", "hello hello");
+ });
+
+ // This was causing a duplicate component name error
+ it("copy group with assignNames inside with no link, with copySource", () => {
+ cy.window().then(async (win) => {
+ win.postMessage(
+ {
+ doenetML: `
+ a
+ hello $m{name="q"}
+
+ `,
+ },
+ "*",
+ );
+ });
+
+ // to wait for page to load
+ cy.get(cesc("#\\/_text1")).should("have.text", "a");
+
+ cy.get(cesc("#\\/_p1")).should("have.text", "hello hello");
+ cy.get(cesc("#\\/_p2")).should("have.text", "hello hello");
+ });
+
+ it("copy group with copies with no link", () => {
+ cy.window().then(async (win) => {
+ win.postMessage(
+ {
+ doenetML: `
+ a
+
+ x+x
+
+
+
+ a
+
+ x+x
+ $twox{name="twoxa"}
+ $twox{name="twoxb"}
+
+
+
+ $twox{name="twoxc"}
+ $twox{link="false" name="twoxd"}
+
+ $twoxa{name="twoxe"}
+ $twoxa{link="false" name="twoxf"}
+
+ $twoxe{name="twoxg"}
+ $twoxf{link="false" name="twoxh"}
+
+ $twoxb{name="twoxi"}
+ $twoxb{link="false" name="twoxj"}
+
+ $twoxi{name="twoxk"}
+ $twoxj{link="false" name="twoxl"}
+
+ `,
+ },
+ "*",
+ );
+ });
+
+ // to wait for page to load
+ cy.get(cesc("#\\/_text1")).should("have.text", "a");
+
+ cy.get(cesc("#\\/twox"))
+ .find(".mjx-mrow")
+ .eq(0)
+ .invoke("text")
+ .then((text) => {
+ expect(text.trim().replace(/−/g, "-")).equal("x+x");
+ });
+ cy.get(cesc("#\\/twoxa"))
+ .find(".mjx-mrow")
+ .eq(0)
+ .invoke("text")
+ .then((text) => {
+ expect(text.trim().replace(/−/g, "-")).equal("x+x");
+ });
+ cy.get(cesc("#\\/twoxb"))
+ .find(".mjx-mrow")
+ .eq(0)
+ .invoke("text")
+ .then((text) => {
+ expect(text.trim().replace(/−/g, "-")).equal("x+x");
+ });
+ cy.get(cesc("#\\/twoxc"))
+ .find(".mjx-mrow")
+ .eq(0)
+ .invoke("text")
+ .then((text) => {
+ expect(text.trim().replace(/−/g, "-")).equal("x+x");
+ });
+ cy.get(cesc("#\\/twoxd"))
+ .find(".mjx-mrow")
+ .eq(0)
+ .invoke("text")
+ .then((text) => {
+ expect(text.trim().replace(/−/g, "-")).equal("x+x");
+ });
+ cy.get(cesc("#\\/twoxe"))
+ .find(".mjx-mrow")
+ .eq(0)
+ .invoke("text")
+ .then((text) => {
+ expect(text.trim().replace(/−/g, "-")).equal("x+x");
+ });
+ cy.get(cesc("#\\/twoxf"))
+ .find(".mjx-mrow")
+ .eq(0)
+ .invoke("text")
+ .then((text) => {
+ expect(text.trim().replace(/−/g, "-")).equal("x+x");
+ });
+ cy.get(cesc("#\\/twoxg"))
+ .find(".mjx-mrow")
+ .eq(0)
+ .invoke("text")
+ .then((text) => {
+ expect(text.trim().replace(/−/g, "-")).equal("x+x");
+ });
+ cy.get(cesc("#\\/twoxh"))
+ .find(".mjx-mrow")
+ .eq(0)
+ .invoke("text")
+ .then((text) => {
+ expect(text.trim().replace(/−/g, "-")).equal("x+x");
+ });
+ cy.get(cesc("#\\/twoxi"))
+ .find(".mjx-mrow")
+ .eq(0)
+ .invoke("text")
+ .then((text) => {
+ expect(text.trim().replace(/−/g, "-")).equal("x+x");
+ });
+ cy.get(cesc("#\\/twoxj"))
+ .find(".mjx-mrow")
+ .eq(0)
+ .invoke("text")
+ .then((text) => {
+ expect(text.trim().replace(/−/g, "-")).equal("x+x");
+ });
+ cy.get(cesc("#\\/twoxk"))
+ .find(".mjx-mrow")
+ .eq(0)
+ .invoke("text")
+ .then((text) => {
+ expect(text.trim().replace(/−/g, "-")).equal("x+x");
+ });
+ cy.get(cesc("#\\/twoxl"))
+ .find(".mjx-mrow")
+ .eq(0)
+ .invoke("text")
+ .then((text) => {
+ expect(text.trim().replace(/−/g, "-")).equal("x+x");
+ });
+ });
+
+ it("copy group with copies with no link, with copySource", () => {
+ cy.window().then(async (win) => {
+ win.postMessage(
+ {
+ doenetML: `
+ a
+
+ x+x
+
+
+ a
+
+ x+x
+ x+x+x
+
+
+
+ a
+
+ x+x
+ $twox{simplify="$sim" name="twoxa"}
+ x+x+x
+
+
+
+ $g{link="false" name="g2" newNamespace}
+ $g2{link="false" name="g3" newNamespace}
+ `,
+ },
+ "*",
+ );
+ });
+
+ // to wait for page to load
+ cy.get(cesc("#\\/_text1")).should("have.text", "a");
+
+ cy.get(cesc("#\\/twox"))
+ .find(".mjx-mrow")
+ .eq(0)
+ .invoke("text")
+ .then((text) => {
+ expect(text.trim().replace(/−/g, "-")).equal("x+x");
+ });
+ cy.get(cesc("#\\/twoxa"))
+ .find(".mjx-mrow")
+ .eq(0)
+ .invoke("text")
+ .then((text) => {
+ expect(text.trim().replace(/−/g, "-")).equal("2x");
+ });
+ cy.get(cesc("#\\/threex"))
+ .find(".mjx-mrow")
+ .eq(0)
+ .invoke("text")
+ .then((text) => {
+ expect(text.trim().replace(/−/g, "-")).equal("3x");
+ });
+
+ cy.get(cesc("#\\/g2\\/twox"))
+ .find(".mjx-mrow")
+ .eq(0)
+ .invoke("text")
+ .then((text) => {
+ expect(text.trim().replace(/−/g, "-")).equal("x+x");
+ });
+ cy.get(cesc("#\\/g2\\/twoxa"))
+ .find(".mjx-mrow")
+ .eq(0)
+ .invoke("text")
+ .then((text) => {
+ expect(text.trim().replace(/−/g, "-")).equal("2x");
+ });
+ cy.get(cesc("#\\/g2\\/threex"))
+ .find(".mjx-mrow")
+ .eq(0)
+ .invoke("text")
+ .then((text) => {
+ expect(text.trim().replace(/−/g, "-")).equal("3x");
+ });
+
+ cy.get(cesc("#\\/g3\\/twox"))
+ .find(".mjx-mrow")
+ .eq(0)
+ .invoke("text")
+ .then((text) => {
+ expect(text.trim().replace(/−/g, "-")).equal("x+x");
+ });
+ cy.get(cesc("#\\/g3\\/twoxa"))
+ .find(".mjx-mrow")
+ .eq(0)
+ .invoke("text")
+ .then((text) => {
+ expect(text.trim().replace(/−/g, "-")).equal("2x");
+ });
+ cy.get(cesc("#\\/g3\\/threex"))
+ .find(".mjx-mrow")
+ .eq(0)
+ .invoke("text")
+ .then((text) => {
+ expect(text.trim().replace(/−/g, "-")).equal("3x");
+ });
+
+ cy.log("change first simplify");
+ cy.get(cesc("#\\/sim_input")).clear().type("none{enter}");
+
+ cy.get(cesc("#\\/twoxa")).should("contain.text", "x+x");
+ cy.get(cesc("#\\/twox"))
+ .find(".mjx-mrow")
+ .eq(0)
+ .invoke("text")
+ .then((text) => {
+ expect(text.trim().replace(/−/g, "-")).equal("x+x");
+ });
+ cy.get(cesc("#\\/twoxa"))
+ .find(".mjx-mrow")
+ .eq(0)
+ .invoke("text")
+ .then((text) => {
+ expect(text.trim().replace(/−/g, "-")).equal("x+x");
+ });
+ cy.get(cesc("#\\/threex"))
+ .find(".mjx-mrow")
+ .eq(0)
+ .invoke("text")
+ .then((text) => {
+ expect(text.trim().replace(/−/g, "-")).equal("x+x+x");
+ });
+
+ cy.get(cesc("#\\/g2\\/twox"))
+ .find(".mjx-mrow")
+ .eq(0)
+ .invoke("text")
+ .then((text) => {
+ expect(text.trim().replace(/−/g, "-")).equal("x+x");
+ });
+ cy.get(cesc("#\\/g2\\/twoxa"))
+ .find(".mjx-mrow")
+ .eq(0)
+ .invoke("text")
+ .then((text) => {
+ expect(text.trim().replace(/−/g, "-")).equal("2x");
+ });
+ cy.get(cesc("#\\/g2\\/threex"))
+ .find(".mjx-mrow")
+ .eq(0)
+ .invoke("text")
+ .then((text) => {
+ expect(text.trim().replace(/−/g, "-")).equal("3x");
+ });
+
+ cy.get(cesc("#\\/g3\\/twox"))
+ .find(".mjx-mrow")
+ .eq(0)
+ .invoke("text")
+ .then((text) => {
+ expect(text.trim().replace(/−/g, "-")).equal("x+x");
+ });
+ cy.get(cesc("#\\/g3\\/twoxa"))
+ .find(".mjx-mrow")
+ .eq(0)
+ .invoke("text")
+ .then((text) => {
+ expect(text.trim().replace(/−/g, "-")).equal("2x");
+ });
+ cy.get(cesc("#\\/g3\\/threex"))
+ .find(".mjx-mrow")
+ .eq(0)
+ .invoke("text")
+ .then((text) => {
+ expect(text.trim().replace(/−/g, "-")).equal("3x");
+ });
+
+ cy.log("change second simplify");
+ cy.get(cesc("#\\/g2\\/sim_input")).clear().type("none{enter}");
+
+ cy.get(cesc("#\\/g2\\/twoxa")).should("contain.text", "x+x");
+ cy.get(cesc("#\\/twox"))
+ .find(".mjx-mrow")
+ .eq(0)
+ .invoke("text")
+ .then((text) => {
+ expect(text.trim().replace(/−/g, "-")).equal("x+x");
+ });
+ cy.get(cesc("#\\/twoxa"))
+ .find(".mjx-mrow")
+ .eq(0)
+ .invoke("text")
+ .then((text) => {
+ expect(text.trim().replace(/−/g, "-")).equal("x+x");
+ });
+ cy.get(cesc("#\\/threex"))
+ .find(".mjx-mrow")
+ .eq(0)
+ .invoke("text")
+ .then((text) => {
+ expect(text.trim().replace(/−/g, "-")).equal("x+x+x");
+ });
+
+ cy.get(cesc("#\\/g2\\/twox"))
+ .find(".mjx-mrow")
+ .eq(0)
+ .invoke("text")
+ .then((text) => {
+ expect(text.trim().replace(/−/g, "-")).equal("x+x");
+ });
+ cy.get(cesc("#\\/g2\\/twoxa"))
+ .find(".mjx-mrow")
+ .eq(0)
+ .invoke("text")
+ .then((text) => {
+ expect(text.trim().replace(/−/g, "-")).equal("x+x");
+ });
+ cy.get(cesc("#\\/g2\\/threex"))
+ .find(".mjx-mrow")
+ .eq(0)
+ .invoke("text")
+ .then((text) => {
+ expect(text.trim().replace(/−/g, "-")).equal("x+x+x");
+ });
+
+ cy.get(cesc("#\\/g3\\/twox"))
+ .find(".mjx-mrow")
+ .eq(0)
+ .invoke("text")
+ .then((text) => {
+ expect(text.trim().replace(/−/g, "-")).equal("x+x");
+ });
+ cy.get(cesc("#\\/g3\\/twoxa"))
+ .find(".mjx-mrow")
+ .eq(0)
+ .invoke("text")
+ .then((text) => {
+ expect(text.trim().replace(/−/g, "-")).equal("2x");
+ });
+ cy.get(cesc("#\\/g3\\/threex"))
+ .find(".mjx-mrow")
+ .eq(0)
+ .invoke("text")
+ .then((text) => {
+ expect(text.trim().replace(/−/g, "-")).equal("3x");
+ });
+
+ cy.log("change third simplify");
+ cy.get(cesc("#\\/g3\\/sim_input")).clear().type("none{enter}");
+
+ cy.get(cesc("#\\/g3\\/twoxa")).should("contain.text", "x+x");
+ cy.get(cesc("#\\/twox"))
+ .find(".mjx-mrow")
+ .eq(0)
+ .invoke("text")
+ .then((text) => {
+ expect(text.trim().replace(/−/g, "-")).equal("x+x");
+ });
+ cy.get(cesc("#\\/twoxa"))
+ .find(".mjx-mrow")
+ .eq(0)
+ .invoke("text")
+ .then((text) => {
+ expect(text.trim().replace(/−/g, "-")).equal("x+x");
+ });
+ cy.get(cesc("#\\/threex"))
+ .find(".mjx-mrow")
+ .eq(0)
+ .invoke("text")
+ .then((text) => {
+ expect(text.trim().replace(/−/g, "-")).equal("x+x+x");
+ });
+
+ cy.get(cesc("#\\/g2\\/twox"))
+ .find(".mjx-mrow")
+ .eq(0)
+ .invoke("text")
+ .then((text) => {
+ expect(text.trim().replace(/−/g, "-")).equal("x+x");
+ });
+ cy.get(cesc("#\\/g2\\/twoxa"))
+ .find(".mjx-mrow")
+ .eq(0)
+ .invoke("text")
+ .then((text) => {
+ expect(text.trim().replace(/−/g, "-")).equal("x+x");
+ });
+ cy.get(cesc("#\\/g2\\/threex"))
+ .find(".mjx-mrow")
+ .eq(0)
+ .invoke("text")
+ .then((text) => {
+ expect(text.trim().replace(/−/g, "-")).equal("x+x+x");
+ });
+
+ cy.get(cesc("#\\/g3\\/twox"))
+ .find(".mjx-mrow")
+ .eq(0)
+ .invoke("text")
+ .then((text) => {
+ expect(text.trim().replace(/−/g, "-")).equal("x+x");
+ });
+ cy.get(cesc("#\\/g3\\/twoxa"))
+ .find(".mjx-mrow")
+ .eq(0)
+ .invoke("text")
+ .then((text) => {
+ expect(text.trim().replace(/−/g, "-")).equal("x+x");
+ });
+ cy.get(cesc("#\\/g3\\/threex"))
+ .find(".mjx-mrow")
+ .eq(0)
+ .invoke("text")
+ .then((text) => {
+ expect(text.trim().replace(/−/g, "-")).equal("x+x+x");
+ });
+ });
+
+ it("copy group with copy overwriting attribute, no link, with copySource", () => {
+ cy.window().then(async (win) => {
+ win.postMessage(
+ {
+ doenetML: `
+ a
+
+ x+x
+ x+x+x
+
+
+
+ a
+
+ Credit achieved:
+
+
+ a
+
+ Credit achieved: $(p/_answer1.creditAchieved{assignNames="ca"})
+
+
+ $g{link="false" name="g2"}
+ `,
+ },
+ "*",
+ );
+ });
+
+ // to wait for page to load
+ cy.get(cesc("#\\/_text1")).should("have.text", "a");
+
+ cy.window().then(async (win) => {
+ let stateVariables = await win.returnAllStateVariables1();
+ let mathinput1Anchor =
+ cesc2(
+ "#" +
+ stateVariables["/g/p/_answer1"].stateValues.inputChildren[0]
+ .componentName,
+ ) + " textarea";
+ let mathinput2Anchor =
+ cesc2(
+ "#" +
+ stateVariables["/g2/p/_answer1"].stateValues.inputChildren[0]
+ .componentName,
+ ) + " textarea";
+
+ cy.get(cesc2("#/g/ca")).should("have.text", "0");
+ cy.get(cesc2("#/g2/ca")).should("have.text", "0");
+
+ cy.get(mathinput1Anchor).type("2x{enter}", { force: true });
+
+ cy.get(cesc2("#/g/ca")).should("have.text", "1");
+ cy.get(cesc2("#/g2/ca")).should("have.text", "0");
+
+ cy.get(mathinput2Anchor).type("2x{enter}", { force: true });
+
+ cy.get(cesc2("#/g/ca")).should("have.text", "1");
+ cy.get(cesc2("#/g2/ca")).should("have.text", "1");
+ });
+ });
+
+ it("copy group with link through name of external, no link, with copySource", () => {
+ cy.window().then(async (win) => {
+ win.postMessage(
+ {
+ doenetML: `
+ a
+
+ Credit achieved:
+
+
+ a
+
+
+ x
+
+
+
+ a
+
+
+ x
+
+
+
+ $g{link="false"}
+ `,
+ },
+ "*",
+ );
+ });
+
+ // just testing that page loads, i.e., that bug is removed so that don't get error
+ cy.get(cesc("#\\/_text1")).should("have.text", "a");
+ });
+
+ it("copy group, no link, with function adapted to curve, with copySource", () => {
+ cy.window().then(async (win) => {
+ win.postMessage(
+ {
+ doenetML: `
+ a
+
+
+ x
+
+
+
+ a
+
+ $(/external) (a,b)
+
+ a
+
+ $(/external.value{assignNames="w"})
+ $(/external) (a,b)
+
+ $g{name="g2" link="false"}
+ `,
+ },
+ "*",
+ );
+ });
+
+ // to wait for page to load
+ cy.get(cesc("#\\/_text1")).should("have.text", "a");
+
+ cy.get(cesc2("#/g/w")).should("have.text", "bye");
+ cy.get(cesc2("#/g/Plabel")).should("have.text", "bye");
+ cy.get(cesc2("#/g2/w")).should("have.text", "bye");
+ cy.get(cesc2("#/g2/Plabel")).should("have.text", "bye");
+
+ cy.window().then(async (win) => {
+ let stateVariables = await win.returnAllStateVariables1();
+ expect(stateVariables["/g/P"].stateValues.label).eq("bye");
+ expect(stateVariables["/g2/P"].stateValues.label).eq("bye");
+ });
+
+ cy.get(cesc2("#/external_input")).clear().type("hi{enter}");
+
+ cy.get(cesc2("#/g/w")).should("have.text", "hi");
+ cy.get(cesc2("#/g/Plabel")).should("have.text", "hi");
+ cy.get(cesc2("#/g2/w")).should("have.text", "bye");
+ cy.get(cesc2("#/g2/Plabel")).should("have.text", "bye");
+
+ cy.window().then(async (win) => {
+ let stateVariables = await win.returnAllStateVariables1();
+ expect(stateVariables["/g/P"].stateValues.label).eq("hi");
+ expect(stateVariables["/g2/P"].stateValues.label).eq("bye");
+ });
+ });
+
+ it("copy group, no link, copy to external inside attribute, with copySource", () => {
+ cy.window().then(async (win) => {
+ win.postMessage(
+ {
+ doenetML: `
+ a
+
+
+ $(/external)
+ (a,b)
+
+
+
+ a
+
+
+
+
+ $x (a,b)
+
+ $ti
+
+
+
+
+ a
+
+
+
+
+ $x{name="w"}
+ $x (a,b)
+
+ $ti
+
+
+
+
+ $g{name="g2" link="false"}
+ `,
+ },
+ "*",
+ );
+ });
+
+ // to wait for page to load
+ cy.get(cesc("#\\/_text1")).should("have.text", "a");
+
+ cy.get(cesc2("#/g/a/w")).should("have.text", "hello");
+ cy.get(cesc2("#/g/a/Plabel")).should("have.text", "hello");
+ cy.get(cesc2("#/g2/a/w")).should("have.text", "hello");
+ cy.get(cesc2("#/g2/a/Plabel")).should("have.text", "hello");
+
+ cy.window().then(async (win) => {
+ let stateVariables = await win.returnAllStateVariables1();
+ expect(stateVariables["/g/a/P"].stateValues.label).eq("hello");
+ expect(stateVariables["/g2/a/P"].stateValues.label).eq("hello");
+ });
+
+ cy.get(cesc2("#/g/ti_input")).clear().type("one{enter}");
+ cy.get(cesc2("#/g2/ti_input")).clear().type("two{enter}");
+
+ cy.get(cesc2("#/g/a/w")).should("have.text", "one");
+ cy.get(cesc2("#/g/a/Plabel")).should("have.text", "one");
+ cy.get(cesc2("#/g2/a/w")).should("have.text", "two");
+ cy.get(cesc2("#/g2/a/Plabel")).should("have.text", "two");
+
+ cy.window().then(async (win) => {
+ let stateVariables = await win.returnAllStateVariables1();
+ expect(stateVariables["/g/a/P"].stateValues.label).eq("one");
+ expect(stateVariables["/g2/a/P"].stateValues.label).eq("two");
+ });
+ });
+
+ it("copy group, no link, internal copy to source alias is linked, with copySource", () => {
+ cy.window().then(async (win) => {
+ win.postMessage(
+ {
+ doenetML: `
+ a
+
+
+
+
+
+ $x
+ (a,b)
+
+
+
+ $ti
+
+
+
+
+ a
+
+ 2
+ 2$n
+
+
+ m =
+ m =
+
+
+ a
+
+ 2
+ 2$n
+
+
+ m = $(../m{name="m1"})
+ m = $(../m{name="m2" link="false"})
+
+
+ $g{name="g2"}
+ $g{link="false" name="g3"}
+ `,
+ },
+ "*",
+ );
+ });
+
+ // to wait for page to load
+ cy.get(cesc("#\\/_text1")).should("have.text", "a");
+
+ cy.get(cesc2("#/n")).should("have.text", "2");
+ cy.get(cesc2("#/m")).should("have.text", "4");
+ cy.get(cesc2("#/g/m1")).should("have.text", "4");
+ cy.get(cesc2("#/g/m2")).should("have.text", "4");
+ cy.get(cesc2("#/g2/m1")).should("have.text", "4");
+ cy.get(cesc2("#/g2/m2")).should("have.text", "4");
+ cy.get(cesc2("#/g3/m1")).should("have.text", "4");
+ cy.get(cesc2("#/g3/m2")).should("have.text", "4");
+ });
+
+ it("copy no link containing external copies use absolute source, with copySource", () => {
+ cy.window().then(async (win) => {
+ win.postMessage(
+ {
+ doenetML: `
+ a
+
+ 2
+ 2$n
+
+
+ m =
+ m =
+
+
+ a
+
+
+
+ 2
+
+
+
+ Add P
+
+
+ Remove P
+
+
+ i=$i, v=$v
+
+
+
+
+
+
+ a
+
+
+
+ 2
+
+
+
+ Add P
+
+
+ Remove P
+
+
+ i=$i, v=$v
+
+
+
+ $(../section1/_map1{link='false' assignNames='(p1) (p2) (p3) (p4)'})
+
+
+
+ $(section1/_map1{link='false' assignNames='(p1) (p2) (p3) (p4)'})
+
+
+ $section1{link='false' name="section4"}
+
+
+ $(../section1/_map1{assignNames='(p1) (p2) (p3) (p4)'})
+
+
+
+ $(section1/_map1{assignNames='(p1a) (p2a) (p3a) (p4a)'})
+
+
+ $section1{name="section7"}
+
+ `,
+ },
+ "*",
+ );
+ });
+
+ // to wait for page to load
+ cy.get(cesc("#\\/_text1")).should("have.text", "a");
+
+ cy.get(cesc2("#/section1_title")).should("have.text", "Section 1");
+ cy.get(cesc2("#/section1/p1")).should("have.text", "i=1, v=11");
+ cy.get(cesc2("#/section1/p2")).should("have.text", "i=2, v=12");
+ cy.get(cesc2("#/section1/p3")).should("not.exist");
+ cy.get(cesc2("#/section1/p4")).should("not.exist");
+
+ cy.get(cesc2("#/section2_title")).should("have.text", "Section 2");
+ cy.get(cesc2("#/section2/p1")).should("have.text", "i=1, v=11");
+ cy.get(cesc2("#/section2/p2")).should("have.text", "i=2, v=12");
+ cy.get(cesc2("#/section2/p3")).should("not.exist");
+ cy.get(cesc2("#/section2/p4")).should("not.exist");
+
+ cy.get(cesc2("#/section3_title")).should("have.text", "Section 3");
+ cy.get(cesc2("#/p1")).should("have.text", "i=1, v=11");
+ cy.get(cesc2("#/p2")).should("have.text", "i=2, v=12");
+ cy.get(cesc2("#/p3")).should("not.exist");
+ cy.get(cesc2("#/p4")).should("not.exist");
+
+ cy.get(cesc2("#/section4_title")).should("have.text", "Section 4");
+ cy.get(cesc2("#/section4/p1")).should("have.text", "i=1, v=11");
+ cy.get(cesc2("#/section4/p2")).should("have.text", "i=2, v=12");
+ cy.get(cesc2("#/section4/p3")).should("not.exist");
+ cy.get(cesc2("#/section4/p4")).should("not.exist");
+
+ cy.get(cesc2("#/section5_title")).should("have.text", "Section 5");
+ cy.get(cesc2("#/section5/p1")).should("have.text", "i=1, v=11");
+ cy.get(cesc2("#/section5/p2")).should("have.text", "i=2, v=12");
+ cy.get(cesc2("#/section5/p3")).should("not.exist");
+ cy.get(cesc2("#/section5/p4")).should("not.exist");
+
+ cy.get(cesc2("#/section6_title")).should("have.text", "Section 6");
+ cy.get(cesc2("#/p1a")).should("have.text", "i=1, v=11");
+ cy.get(cesc2("#/p2a")).should("have.text", "i=2, v=12");
+ cy.get(cesc2("#/p3a")).should("not.exist");
+ cy.get(cesc2("#/p4a")).should("not.exist");
+
+ cy.get(cesc2("#/section7_title")).should("have.text", "Section 7");
+ cy.get(cesc2("#/section7/p1")).should("have.text", "i=1, v=11");
+ cy.get(cesc2("#/section7/p2")).should("have.text", "i=2, v=12");
+ cy.get(cesc2("#/section7/p3")).should("not.exist");
+ cy.get(cesc2("#/section7/p4")).should("not.exist");
+
+ cy.get(cesc2("#/section1/addP_button")).click();
+
+ cy.get(cesc2("#/section1/p1")).should("have.text", "i=1, v=11");
+ cy.get(cesc2("#/section1/p2")).should("have.text", "i=2, v=12");
+ cy.get(cesc2("#/section1/p3")).should("have.text", "i=3, v=13");
+ cy.get(cesc2("#/section1/p4")).should("not.exist");
+
+ cy.get(cesc2("#/section2/p1")).should("have.text", "i=1, v=11");
+ cy.get(cesc2("#/section2/p2")).should("have.text", "i=2, v=12");
+ cy.get(cesc2("#/section2/p3")).should("not.exist");
+ cy.get(cesc2("#/section2/p4")).should("not.exist");
+
+ cy.get(cesc2("#/p1")).should("have.text", "i=1, v=11");
+ cy.get(cesc2("#/p2")).should("have.text", "i=2, v=12");
+ cy.get(cesc2("#/p3")).should("not.exist");
+ cy.get(cesc2("#/p4")).should("not.exist");
+
+ cy.get(cesc2("#/section4/p1")).should("have.text", "i=1, v=11");
+ cy.get(cesc2("#/section4/p2")).should("have.text", "i=2, v=12");
+ cy.get(cesc2("#/section4/p3")).should("not.exist");
+ cy.get(cesc2("#/section4/p4")).should("not.exist");
+
+ cy.get(cesc2("#/section5/p1")).should("have.text", "i=1, v=11");
+ cy.get(cesc2("#/section5/p2")).should("have.text", "i=2, v=12");
+ cy.get(cesc2("#/section5/p3")).should("have.text", "i=3, v=13");
+ cy.get(cesc2("#/section5/p4")).should("not.exist");
+
+ cy.get(cesc2("#/p1a")).should("have.text", "i=1, v=11");
+ cy.get(cesc2("#/p2a")).should("have.text", "i=2, v=12");
+ cy.get(cesc2("#/p3a")).should("have.text", "i=3, v=13");
+ cy.get(cesc2("#/p4a")).should("not.exist");
+
+ cy.get(cesc2("#/section7/p1")).should("have.text", "i=1, v=11");
+ cy.get(cesc2("#/section7/p2")).should("have.text", "i=2, v=12");
+ cy.get(cesc2("#/section7/p3")).should("have.text", "i=3, v=13");
+ cy.get(cesc2("#/section7/p4")).should("not.exist");
+
+ cy.get(cesc2("#/section7/removeP_button")).click();
+
+ cy.get(cesc2("#/section1/p1")).should("have.text", "i=1, v=11");
+ cy.get(cesc2("#/section1/p2")).should("have.text", "i=2, v=12");
+ cy.get(cesc2("#/section1/p3")).should("not.exist");
+ cy.get(cesc2("#/section1/p4")).should("not.exist");
+
+ cy.get(cesc2("#/section2/p1")).should("have.text", "i=1, v=11");
+ cy.get(cesc2("#/section2/p2")).should("have.text", "i=2, v=12");
+ cy.get(cesc2("#/section2/p3")).should("not.exist");
+ cy.get(cesc2("#/section2/p4")).should("not.exist");
+
+ cy.get(cesc2("#/p1")).should("have.text", "i=1, v=11");
+ cy.get(cesc2("#/p2")).should("have.text", "i=2, v=12");
+ cy.get(cesc2("#/p3")).should("not.exist");
+ cy.get(cesc2("#/p4")).should("not.exist");
+
+ cy.get(cesc2("#/section4/p1")).should("have.text", "i=1, v=11");
+ cy.get(cesc2("#/section4/p2")).should("have.text", "i=2, v=12");
+ cy.get(cesc2("#/section4/p3")).should("not.exist");
+ cy.get(cesc2("#/section4/p4")).should("not.exist");
+
+ cy.get(cesc2("#/section5/p1")).should("have.text", "i=1, v=11");
+ cy.get(cesc2("#/section5/p2")).should("have.text", "i=2, v=12");
+ cy.get(cesc2("#/section5/p3")).should("not.exist");
+ cy.get(cesc2("#/section5/p4")).should("not.exist");
+
+ cy.get(cesc2("#/p1a")).should("have.text", "i=1, v=11");
+ cy.get(cesc2("#/p2a")).should("have.text", "i=2, v=12");
+ cy.get(cesc2("#/p3a")).should("not.exist");
+ cy.get(cesc2("#/p4a")).should("not.exist");
+
+ cy.get(cesc2("#/section7/p1")).should("have.text", "i=1, v=11");
+ cy.get(cesc2("#/section7/p2")).should("have.text", "i=2, v=12");
+ cy.get(cesc2("#/section7/p3")).should("not.exist");
+ cy.get(cesc2("#/section7/p4")).should("not.exist");
+
+ cy.get(cesc2("#/section4/addP_button")).click();
+
+ cy.get(cesc2("#/section1/p1")).should("have.text", "i=1, v=11");
+ cy.get(cesc2("#/section1/p2")).should("have.text", "i=2, v=12");
+ cy.get(cesc2("#/section1/p3")).should("not.exist");
+ cy.get(cesc2("#/section1/p4")).should("not.exist");
+
+ cy.get(cesc2("#/section2/p1")).should("have.text", "i=1, v=11");
+ cy.get(cesc2("#/section2/p2")).should("have.text", "i=2, v=12");
+ cy.get(cesc2("#/section2/p3")).should("not.exist");
+ cy.get(cesc2("#/section2/p4")).should("not.exist");
+
+ cy.get(cesc2("#/p1")).should("have.text", "i=1, v=11");
+ cy.get(cesc2("#/p2")).should("have.text", "i=2, v=12");
+ cy.get(cesc2("#/p3")).should("not.exist");
+ cy.get(cesc2("#/p4")).should("not.exist");
+
+ cy.get(cesc2("#/section4/p1")).should("have.text", "i=1, v=11");
+ cy.get(cesc2("#/section4/p2")).should("have.text", "i=2, v=12");
+ cy.get(cesc2("#/section4/p3")).should("have.text", "i=3, v=13");
+ cy.get(cesc2("#/section4/p4")).should("not.exist");
+
+ cy.get(cesc2("#/section5/p1")).should("have.text", "i=1, v=11");
+ cy.get(cesc2("#/section5/p2")).should("have.text", "i=2, v=12");
+ cy.get(cesc2("#/section5/p3")).should("not.exist");
+ cy.get(cesc2("#/section5/p4")).should("not.exist");
+
+ cy.get(cesc2("#/p1a")).should("have.text", "i=1, v=11");
+ cy.get(cesc2("#/p2a")).should("have.text", "i=2, v=12");
+ cy.get(cesc2("#/p3a")).should("not.exist");
+ cy.get(cesc2("#/p4a")).should("not.exist");
+
+ cy.get(cesc2("#/section7/p1")).should("have.text", "i=1, v=11");
+ cy.get(cesc2("#/section7/p2")).should("have.text", "i=2, v=12");
+ cy.get(cesc2("#/section7/p3")).should("not.exist");
+ cy.get(cesc2("#/section7/p4")).should("not.exist");
+
+ cy.get(cesc2("#/section4/removeP_button")).click();
+
+ cy.get(cesc2("#/section1/p1")).should("have.text", "i=1, v=11");
+ cy.get(cesc2("#/section1/p2")).should("have.text", "i=2, v=12");
+ cy.get(cesc2("#/section1/p3")).should("not.exist");
+ cy.get(cesc2("#/section1/p4")).should("not.exist");
+
+ cy.get(cesc2("#/section2/p1")).should("have.text", "i=1, v=11");
+ cy.get(cesc2("#/section2/p2")).should("have.text", "i=2, v=12");
+ cy.get(cesc2("#/section2/p3")).should("not.exist");
+ cy.get(cesc2("#/section2/p4")).should("not.exist");
+
+ cy.get(cesc2("#/p1")).should("have.text", "i=1, v=11");
+ cy.get(cesc2("#/p2")).should("have.text", "i=2, v=12");
+ cy.get(cesc2("#/p3")).should("not.exist");
+ cy.get(cesc2("#/p4")).should("not.exist");
+
+ cy.get(cesc2("#/section4/p1")).should("have.text", "i=1, v=11");
+ cy.get(cesc2("#/section4/p2")).should("have.text", "i=2, v=12");
+ cy.get(cesc2("#/section4/p3")).should("not.exist");
+ cy.get(cesc2("#/section4/p4")).should("not.exist");
+
+ cy.get(cesc2("#/section5/p1")).should("have.text", "i=1, v=11");
+ cy.get(cesc2("#/section5/p2")).should("have.text", "i=2, v=12");
+ cy.get(cesc2("#/section5/p3")).should("not.exist");
+ cy.get(cesc2("#/section5/p4")).should("not.exist");
+
+ cy.get(cesc2("#/p1a")).should("have.text", "i=1, v=11");
+ cy.get(cesc2("#/p2a")).should("have.text", "i=2, v=12");
+ cy.get(cesc2("#/p3a")).should("not.exist");
+ cy.get(cesc2("#/p4a")).should("not.exist");
+
+ cy.get(cesc2("#/section7/p1")).should("have.text", "i=1, v=11");
+ cy.get(cesc2("#/section7/p2")).should("have.text", "i=2, v=12");
+ cy.get(cesc2("#/section7/p3")).should("not.exist");
+ cy.get(cesc2("#/section7/p4")).should("not.exist");
+ });
+
+ it("copy dynamic map no link, check aliases, with copySource", () => {
+ cy.window().then(async (win) => {
+ win.postMessage(
+ {
+ doenetML: `
+ a
+
+
+
+ 2
+
+
+
+ Add P
+
+
+ Remove P
+
+
+ i=$i, v=$v
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ `,
+ },
+ "*",
+ );
+ });
+
+ // to wait for page to load
+ cy.get(cesc("#\\/_text1")).should("have.text", "a");
+
+ cy.get(cesc2("#/section1_title")).should("have.text", "Section 1");
+ cy.get(cesc2("#/section1/p1")).should("have.text", "i=1, v=11");
+ cy.get(cesc2("#/section1/p2")).should("have.text", "i=2, v=12");
+ cy.get(cesc2("#/section1/p3")).should("not.exist");
+ cy.get(cesc2("#/section1/p4")).should("not.exist");
+
+ cy.get(cesc2("#/section2_title")).should("have.text", "Section 2");
+ cy.get(cesc2("#/section2/p1")).should("have.text", "i=1, v=11");
+ cy.get(cesc2("#/section2/p2")).should("have.text", "i=2, v=12");
+ cy.get(cesc2("#/section2/p3")).should("not.exist");
+ cy.get(cesc2("#/section2/p4")).should("not.exist");
+
+ cy.get(cesc2("#/section3_title")).should("have.text", "Section 3");
+ cy.get(cesc2("#/p1")).should("have.text", "i=1, v=11");
+ cy.get(cesc2("#/p2")).should("have.text", "i=2, v=12");
+ cy.get(cesc2("#/p3")).should("not.exist");
+ cy.get(cesc2("#/p4")).should("not.exist");
+
+ cy.get(cesc2("#/section4_title")).should("have.text", "Section 4");
+ cy.get(cesc2("#/section4/p1")).should("have.text", "i=1, v=11");
+ cy.get(cesc2("#/section4/p2")).should("have.text", "i=2, v=12");
+ cy.get(cesc2("#/section4/p3")).should("not.exist");
+ cy.get(cesc2("#/section4/p4")).should("not.exist");
+
+ cy.get(cesc2("#/section5_title")).should("have.text", "Section 5");
+ cy.get(cesc2("#/section5/p1")).should("have.text", "i=1, v=11");
+ cy.get(cesc2("#/section5/p2")).should("have.text", "i=2, v=12");
+ cy.get(cesc2("#/section5/p3")).should("not.exist");
+ cy.get(cesc2("#/section5/p4")).should("not.exist");
+
+ cy.get(cesc2("#/section6_title")).should("have.text", "Section 6");
+ cy.get(cesc2("#/p1a")).should("have.text", "i=1, v=11");
+ cy.get(cesc2("#/p2a")).should("have.text", "i=2, v=12");
+ cy.get(cesc2("#/p3a")).should("not.exist");
+ cy.get(cesc2("#/p4a")).should("not.exist");
+
+ cy.get(cesc2("#/section7_title")).should("have.text", "Section 7");
+ cy.get(cesc2("#/section7/p1")).should("have.text", "i=1, v=11");
+ cy.get(cesc2("#/section7/p2")).should("have.text", "i=2, v=12");
+ cy.get(cesc2("#/section7/p3")).should("not.exist");
+ cy.get(cesc2("#/section7/p4")).should("not.exist");
+
+ cy.get(cesc2("#/section1/addP_button")).click();
+
+ cy.get(cesc2("#/section1/p1")).should("have.text", "i=1, v=11");
+ cy.get(cesc2("#/section1/p2")).should("have.text", "i=2, v=12");
+ cy.get(cesc2("#/section1/p3")).should("have.text", "i=3, v=13");
+ cy.get(cesc2("#/section1/p4")).should("not.exist");
+
+ cy.get(cesc2("#/section2/p1")).should("have.text", "i=1, v=11");
+ cy.get(cesc2("#/section2/p2")).should("have.text", "i=2, v=12");
+ cy.get(cesc2("#/section2/p3")).should("not.exist");
+ cy.get(cesc2("#/section2/p4")).should("not.exist");
+
+ cy.get(cesc2("#/p1")).should("have.text", "i=1, v=11");
+ cy.get(cesc2("#/p2")).should("have.text", "i=2, v=12");
+ cy.get(cesc2("#/p3")).should("not.exist");
+ cy.get(cesc2("#/p4")).should("not.exist");
+
+ cy.get(cesc2("#/section4/p1")).should("have.text", "i=1, v=11");
+ cy.get(cesc2("#/section4/p2")).should("have.text", "i=2, v=12");
+ cy.get(cesc2("#/section4/p3")).should("not.exist");
+ cy.get(cesc2("#/section4/p4")).should("not.exist");
+
+ cy.get(cesc2("#/section5/p1")).should("have.text", "i=1, v=11");
+ cy.get(cesc2("#/section5/p2")).should("have.text", "i=2, v=12");
+ cy.get(cesc2("#/section5/p3")).should("have.text", "i=3, v=13");
+ cy.get(cesc2("#/section5/p4")).should("not.exist");
+
+ cy.get(cesc2("#/p1a")).should("have.text", "i=1, v=11");
+ cy.get(cesc2("#/p2a")).should("have.text", "i=2, v=12");
+ cy.get(cesc2("#/p3a")).should("have.text", "i=3, v=13");
+ cy.get(cesc2("#/p4a")).should("not.exist");
+
+ cy.get(cesc2("#/section7/p1")).should("have.text", "i=1, v=11");
+ cy.get(cesc2("#/section7/p2")).should("have.text", "i=2, v=12");
+ cy.get(cesc2("#/section7/p3")).should("have.text", "i=3, v=13");
+ cy.get(cesc2("#/section7/p4")).should("not.exist");
+
+ cy.get(cesc2("#/section7/removeP_button")).click();
+
+ cy.get(cesc2("#/section1/p1")).should("have.text", "i=1, v=11");
+ cy.get(cesc2("#/section1/p2")).should("have.text", "i=2, v=12");
+ cy.get(cesc2("#/section1/p3")).should("not.exist");
+ cy.get(cesc2("#/section1/p4")).should("not.exist");
+
+ cy.get(cesc2("#/section2/p1")).should("have.text", "i=1, v=11");
+ cy.get(cesc2("#/section2/p2")).should("have.text", "i=2, v=12");
+ cy.get(cesc2("#/section2/p3")).should("not.exist");
+ cy.get(cesc2("#/section2/p4")).should("not.exist");
+
+ cy.get(cesc2("#/p1")).should("have.text", "i=1, v=11");
+ cy.get(cesc2("#/p2")).should("have.text", "i=2, v=12");
+ cy.get(cesc2("#/p3")).should("not.exist");
+ cy.get(cesc2("#/p4")).should("not.exist");
- it("copy group with copy overwriting attribute, no link", () => {
- cy.window().then(async (win) => {
- win.postMessage(
- {
- doenetML: `
- a
-
- x+x
- x+x+x
-
-
-
- a
-
- x+x
- x+x+x
-
-
+ Number of iterations:
+
+
-
+
+
+
+
+
+ (
+
+ (
+
+
+
+
+
+
+ A:
+ B:
+ C:
+ D:
+ E:
+ F:
+
`,
},
"*",
@@ -6965,346 +10512,194 @@ describe("Copy Tag Tests", function () {
// to wait for page to load
cy.get(cesc("#\\/_text1")).should("have.text", "a");
- cy.get(cesc("#\\/twox"))
- .find(".mjx-mrow")
- .eq(0)
- .invoke("text")
- .then((text) => {
- expect(text.trim().replace(/−/g, "-")).equal("x+x");
- });
- cy.get(cesc("#\\/twoxa"))
- .find(".mjx-mrow")
- .eq(0)
- .invoke("text")
- .then((text) => {
- expect(text.trim().replace(/−/g, "-")).equal("2x");
- });
- cy.get(cesc("#\\/threex"))
- .find(".mjx-mrow")
- .eq(0)
- .invoke("text")
- .then((text) => {
- expect(text.trim().replace(/−/g, "-")).equal("3x");
- });
-
- cy.get(cesc("#\\/g2\\/twox"))
- .find(".mjx-mrow")
- .eq(0)
- .invoke("text")
- .then((text) => {
- expect(text.trim().replace(/−/g, "-")).equal("x+x");
- });
- cy.get(cesc("#\\/g2\\/twoxa"))
- .find(".mjx-mrow")
- .eq(0)
- .invoke("text")
- .then((text) => {
- expect(text.trim().replace(/−/g, "-")).equal("2x");
- });
- cy.get(cesc("#\\/g2\\/threex"))
- .find(".mjx-mrow")
- .eq(0)
- .invoke("text")
- .then((text) => {
- expect(text.trim().replace(/−/g, "-")).equal("3x");
- });
-
- cy.get(cesc("#\\/g3\\/twox"))
- .find(".mjx-mrow")
- .eq(0)
- .invoke("text")
- .then((text) => {
- expect(text.trim().replace(/−/g, "-")).equal("x+x");
- });
- cy.get(cesc("#\\/g3\\/twoxa"))
- .find(".mjx-mrow")
- .eq(0)
- .invoke("text")
- .then((text) => {
- expect(text.trim().replace(/−/g, "-")).equal("2x");
- });
- cy.get(cesc("#\\/g3\\/threex"))
- .find(".mjx-mrow")
- .eq(0)
- .invoke("text")
- .then((text) => {
- expect(text.trim().replace(/−/g, "-")).equal("3x");
- });
-
- cy.log("change first simplify");
- cy.get(cesc("#\\/sim_input")).clear().type("none{enter}");
+ cy.get(cesc2("#/A2")).should("not.exist");
+ cy.get(cesc2("#/B2")).should("not.exist");
+ cy.get(cesc2("#/C2")).should("not.exist");
+ cy.get(cesc2("#/D2")).should("not.exist");
+ cy.get(cesc2("#/E2")).should("not.exist");
+ cy.get(cesc2("#/F2")).should("not.exist");
- cy.get(cesc("#\\/twoxa")).should("contain.text", "x+x");
- cy.get(cesc("#\\/twox"))
- .find(".mjx-mrow")
- .eq(0)
- .invoke("text")
- .then((text) => {
- expect(text.trim().replace(/−/g, "-")).equal("x+x");
- });
- cy.get(cesc("#\\/twoxa"))
- .find(".mjx-mrow")
- .eq(0)
- .invoke("text")
- .then((text) => {
- expect(text.trim().replace(/−/g, "-")).equal("x+x");
- });
- cy.get(cesc("#\\/threex"))
- .find(".mjx-mrow")
- .eq(0)
- .invoke("text")
- .then((text) => {
- expect(text.trim().replace(/−/g, "-")).equal("x+x+x");
- });
+ cy.get(cesc("#\\/n") + " textarea").type("1{enter}", { force: true });
- cy.get(cesc("#\\/g2\\/twox"))
- .find(".mjx-mrow")
+ cy.get(cesc2("#/A2") + " .mjx-mrow").should("contain.text", "(1,2)");
+ cy.get(cesc2("#/A2") + " .mjx-mrow")
.eq(0)
- .invoke("text")
- .then((text) => {
- expect(text.trim().replace(/−/g, "-")).equal("x+x");
- });
- cy.get(cesc("#\\/g2\\/twoxa"))
- .find(".mjx-mrow")
+ .should("have.text", "(1,2)");
+ cy.get(cesc2("#/B2") + " .mjx-mrow")
.eq(0)
- .invoke("text")
- .then((text) => {
- expect(text.trim().replace(/−/g, "-")).equal("2x");
- });
- cy.get(cesc("#\\/g2\\/threex"))
- .find(".mjx-mrow")
+ .should("have.text", "(3,4)");
+ cy.get(cesc2("#/C2") + " .mjx-mrow")
.eq(0)
- .invoke("text")
- .then((text) => {
- expect(text.trim().replace(/−/g, "-")).equal("3x");
- });
+ .should("have.text", "(5,6)");
+ cy.get(cesc2("#/D2")).should("not.exist");
+ cy.get(cesc2("#/E2")).should("not.exist");
+ cy.get(cesc2("#/F2")).should("not.exist");
- cy.get(cesc("#\\/g3\\/twox"))
- .find(".mjx-mrow")
- .eq(0)
- .invoke("text")
- .then((text) => {
- expect(text.trim().replace(/−/g, "-")).equal("x+x");
+ cy.window().then(async (win) => {
+ win.callAction1({
+ actionName: "movePoint",
+ componentName: "/A",
+ args: { x: 9, y: 0 },
});
- cy.get(cesc("#\\/g3\\/twoxa"))
- .find(".mjx-mrow")
- .eq(0)
- .invoke("text")
- .then((text) => {
- expect(text.trim().replace(/−/g, "-")).equal("2x");
+ win.callAction1({
+ actionName: "movePoint",
+ componentName: "/B",
+ args: { x: 1, y: 8 },
});
- cy.get(cesc("#\\/g3\\/threex"))
- .find(".mjx-mrow")
- .eq(0)
- .invoke("text")
- .then((text) => {
- expect(text.trim().replace(/−/g, "-")).equal("3x");
+ win.callAction1({
+ actionName: "movePoint",
+ componentName: "/C",
+ args: { x: 7, y: 2 },
});
+ });
- cy.log("change second simplify");
- cy.get(cesc("#\\/g2\\/sim_input")).clear().type("none{enter}");
-
- cy.get(cesc("#\\/g2\\/twoxa")).should("contain.text", "x+x");
- cy.get(cesc("#\\/twox"))
- .find(".mjx-mrow")
+ cy.get(cesc2("#/C2") + " .mjx-mrow").should("contain.text", "(7,2)");
+ cy.get(cesc2("#/A2") + " .mjx-mrow")
.eq(0)
- .invoke("text")
- .then((text) => {
- expect(text.trim().replace(/−/g, "-")).equal("x+x");
- });
- cy.get(cesc("#\\/twoxa"))
- .find(".mjx-mrow")
+ .should("have.text", "(9,0)");
+ cy.get(cesc2("#/B2") + " .mjx-mrow")
.eq(0)
- .invoke("text")
- .then((text) => {
- expect(text.trim().replace(/−/g, "-")).equal("x+x");
- });
- cy.get(cesc("#\\/threex"))
- .find(".mjx-mrow")
+ .should("have.text", "(1,8)");
+ cy.get(cesc2("#/C2") + " .mjx-mrow")
.eq(0)
- .invoke("text")
- .then((text) => {
- expect(text.trim().replace(/−/g, "-")).equal("x+x+x");
- });
+ .should("have.text", "(7,2)");
+ cy.get(cesc2("#/D2")).should("not.exist");
+ cy.get(cesc2("#/E2")).should("not.exist");
+ cy.get(cesc2("#/F2")).should("not.exist");
- cy.get(cesc("#\\/g2\\/twox"))
- .find(".mjx-mrow")
+ cy.get(cesc("#\\/n") + " textarea").type("{end}{backspace}2{enter}", {
+ force: true,
+ });
+
+ cy.get(cesc2("#/D2") + " .mjx-mrow").should("contain.text", "(2,3)");
+ cy.get(cesc2("#/A2") + " .mjx-mrow")
.eq(0)
- .invoke("text")
- .then((text) => {
- expect(text.trim().replace(/−/g, "-")).equal("x+x");
- });
- cy.get(cesc("#\\/g2\\/twoxa"))
- .find(".mjx-mrow")
+ .should("have.text", "(9,0)");
+ cy.get(cesc2("#/B2") + " .mjx-mrow")
.eq(0)
- .invoke("text")
- .then((text) => {
- expect(text.trim().replace(/−/g, "-")).equal("x+x");
- });
- cy.get(cesc("#\\/g2\\/threex"))
- .find(".mjx-mrow")
+ .should("have.text", "(1,8)");
+ cy.get(cesc2("#/C2") + " .mjx-mrow")
.eq(0)
- .invoke("text")
- .then((text) => {
- expect(text.trim().replace(/−/g, "-")).equal("x+x+x");
- });
-
- cy.get(cesc("#\\/g3\\/twox"))
- .find(".mjx-mrow")
+ .should("have.text", "(7,2)");
+ cy.get(cesc2("#/D2") + " .mjx-mrow")
.eq(0)
- .invoke("text")
- .then((text) => {
- expect(text.trim().replace(/−/g, "-")).equal("x+x");
- });
- cy.get(cesc("#\\/g3\\/twoxa"))
- .find(".mjx-mrow")
+ .should("have.text", "(2,3)");
+ cy.get(cesc2("#/E2") + " .mjx-mrow")
.eq(0)
- .invoke("text")
- .then((text) => {
- expect(text.trim().replace(/−/g, "-")).equal("2x");
- });
- cy.get(cesc("#\\/g3\\/threex"))
- .find(".mjx-mrow")
+ .should("have.text", "(4,5)");
+ cy.get(cesc2("#/F2") + " .mjx-mrow")
.eq(0)
- .invoke("text")
- .then((text) => {
- expect(text.trim().replace(/−/g, "-")).equal("3x");
- });
-
- cy.log("change third simplify");
- cy.get(cesc("#\\/g3\\/sim_input")).clear().type("none{enter}");
+ .should("have.text", "(6,7)");
- cy.get(cesc("#\\/g3\\/twoxa")).should("contain.text", "x+x");
- cy.get(cesc("#\\/twox"))
- .find(".mjx-mrow")
- .eq(0)
- .invoke("text")
- .then((text) => {
- expect(text.trim().replace(/−/g, "-")).equal("x+x");
+ cy.window().then(async (win) => {
+ win.callAction1({
+ actionName: "movePoint",
+ componentName: "/D",
+ args: { x: 0, y: 10 },
});
- cy.get(cesc("#\\/twoxa"))
- .find(".mjx-mrow")
- .eq(0)
- .invoke("text")
- .then((text) => {
- expect(text.trim().replace(/−/g, "-")).equal("x+x");
+ win.callAction1({
+ actionName: "movePoint",
+ componentName: "/E",
+ args: { x: 9, y: 1 },
});
- cy.get(cesc("#\\/threex"))
- .find(".mjx-mrow")
- .eq(0)
- .invoke("text")
- .then((text) => {
- expect(text.trim().replace(/−/g, "-")).equal("x+x+x");
+ win.callAction1({
+ actionName: "movePoint",
+ componentName: "/F",
+ args: { x: 2, y: 8 },
});
+ });
- cy.get(cesc("#\\/g2\\/twox"))
- .find(".mjx-mrow")
+ cy.get(cesc2("#/F2") + " .mjx-mrow").should("contain.text", "(2,8)");
+ cy.get(cesc2("#/A2") + " .mjx-mrow")
.eq(0)
- .invoke("text")
- .then((text) => {
- expect(text.trim().replace(/−/g, "-")).equal("x+x");
- });
- cy.get(cesc("#\\/g2\\/twoxa"))
- .find(".mjx-mrow")
+ .should("have.text", "(9,0)");
+ cy.get(cesc2("#/B2") + " .mjx-mrow")
.eq(0)
- .invoke("text")
- .then((text) => {
- expect(text.trim().replace(/−/g, "-")).equal("x+x");
- });
- cy.get(cesc("#\\/g2\\/threex"))
- .find(".mjx-mrow")
+ .should("have.text", "(1,8)");
+ cy.get(cesc2("#/C2") + " .mjx-mrow")
.eq(0)
- .invoke("text")
- .then((text) => {
- expect(text.trim().replace(/−/g, "-")).equal("x+x+x");
- });
-
- cy.get(cesc("#\\/g3\\/twox"))
- .find(".mjx-mrow")
+ .should("have.text", "(7,2)");
+ cy.get(cesc2("#/D2") + " .mjx-mrow")
.eq(0)
- .invoke("text")
- .then((text) => {
- expect(text.trim().replace(/−/g, "-")).equal("x+x");
- });
- cy.get(cesc("#\\/g3\\/twoxa"))
- .find(".mjx-mrow")
+ .should("have.text", "(0,10)");
+ cy.get(cesc2("#/E2") + " .mjx-mrow")
.eq(0)
- .invoke("text")
- .then((text) => {
- expect(text.trim().replace(/−/g, "-")).equal("x+x");
- });
- cy.get(cesc("#\\/g3\\/threex"))
- .find(".mjx-mrow")
+ .should("have.text", "(9,1)");
+ cy.get(cesc2("#/F2") + " .mjx-mrow")
.eq(0)
- .invoke("text")
- .then((text) => {
- expect(text.trim().replace(/−/g, "-")).equal("x+x+x");
- });
- });
+ .should("have.text", "(2,8)");
- it("copy group with link through assignNames of external, no link", () => {
- cy.window().then(async (win) => {
- win.postMessage(
- {
- doenetML: `
- a
-
- Credit achieved:
-
-
- a
-
- Credit achieved:
-
+ Number of iterations:
+
+
-
+
+
+
+
+
+ (
+
+ ($i{link="false"} + 4, $(i.value{link="false"}) +5)
+
+
+
+
+
+
+
+ A: $A{name="A2"}
+ B: $B{name="B2"}
+ C: $C{name="C2"}
+ D: $D{name="D2"}
+ E: $E{name="E2"}
+ F: $F{name="F2"}
+
`,
},
"*",
@@ -7314,319 +10709,365 @@ describe("Copy Tag Tests", function () {
// to wait for page to load
cy.get(cesc("#\\/_text1")).should("have.text", "a");
- cy.window().then(async (win) => {
- let stateVariables = await win.returnAllStateVariables1();
- let mathinput1Anchor =
- cesc2(
- "#" +
- stateVariables["/g/p/_answer1"].stateValues.inputChildren[0]
- .componentName,
- ) + " textarea";
- let mathinput2Anchor =
- cesc2(
- "#" +
- stateVariables["/g2/p/_answer1"].stateValues.inputChildren[0]
- .componentName,
- ) + " textarea";
-
- cy.get(cesc2("#/g/ca")).should("have.text", "0");
- cy.get(cesc2("#/g2/ca")).should("have.text", "0");
-
- cy.get(mathinput1Anchor).type("2x{enter}", { force: true });
-
- cy.get(cesc2("#/g/ca")).should("have.text", "1");
- cy.get(cesc2("#/g2/ca")).should("have.text", "0");
+ cy.get(cesc2("#/A2")).should("not.exist");
+ cy.get(cesc2("#/B2")).should("not.exist");
+ cy.get(cesc2("#/C2")).should("not.exist");
+ cy.get(cesc2("#/D2")).should("not.exist");
+ cy.get(cesc2("#/E2")).should("not.exist");
+ cy.get(cesc2("#/F2")).should("not.exist");
- cy.get(mathinput2Anchor).type("2x{enter}", { force: true });
+ cy.get(cesc("#\\/n") + " textarea").type("1{enter}", { force: true });
- cy.get(cesc2("#/g/ca")).should("have.text", "1");
- cy.get(cesc2("#/g2/ca")).should("have.text", "1");
- });
- });
+ cy.get(cesc2("#/A2") + " .mjx-mrow").should("contain.text", "(1,2)");
+ cy.get(cesc2("#/A2") + " .mjx-mrow")
+ .eq(0)
+ .should("have.text", "(1,2)");
+ cy.get(cesc2("#/B2") + " .mjx-mrow")
+ .eq(0)
+ .should("have.text", "(3,4)");
+ cy.get(cesc2("#/C2") + " .mjx-mrow")
+ .eq(0)
+ .should("have.text", "(5,6)");
+ cy.get(cesc2("#/D2")).should("not.exist");
+ cy.get(cesc2("#/E2")).should("not.exist");
+ cy.get(cesc2("#/F2")).should("not.exist");
- it("copy group, no link, with function adapted to curve", () => {
cy.window().then(async (win) => {
- win.postMessage(
- {
- doenetML: `
- a
-
-
- x
-
-
-
- a
-
-
- x
-
-
-
- a
-
- $(/external) (a,b)
-
- a
- x
+
-
- $(/external)
- (a,b)
-
-
-
- $xval
+ $xvalnl
+
`,
},
"*",
);
});
- // to wait for page to load
- cy.get(cesc("#\\/_text1")).should("have.text", "a");
-
- cy.get(cesc2("#/g/w")).should("have.text", "bye");
- cy.get(cesc2("#/g/Plabel")).should("have.text", "bye");
- cy.get(cesc2("#/g2/w")).should("have.text", "bye");
- cy.get(cesc2("#/g2/Plabel")).should("have.text", "bye");
+ cy.get(cesc2("#/x") + " .mjx-mrow")
+ .eq(0)
+ .should("have.text", "x");
+ cy.get(cesc2("#/xval") + " .mjx-mrow")
+ .eq(0)
+ .should("have.text", "x");
+ cy.get(cesc2("#/xvalnl") + " .mjx-mrow")
+ .eq(0)
+ .should("have.text", "x");
- cy.window().then(async (win) => {
- let stateVariables = await win.returnAllStateVariables1();
- expect(stateVariables["/g/P"].stateValues.label).eq("bye");
- expect(stateVariables["/g2/P"].stateValues.label).eq("bye");
+ cy.get(cesc2("#/mi1") + " textarea").type("{end}{backspace}y{enter}", {
+ force: true,
});
- cy.get(cesc2("#/external_input")).clear().type("hi{enter}");
-
- cy.get(cesc2("#/g/w")).should("have.text", "hi");
- cy.get(cesc2("#/g/Plabel")).should("have.text", "hi");
- cy.get(cesc2("#/g2/w")).should("have.text", "bye");
- cy.get(cesc2("#/g2/Plabel")).should("have.text", "bye");
+ cy.get(cesc2("#/x") + " .mjx-mrow").should("contain.text", "y");
+ cy.get(cesc2("#/x") + " .mjx-mrow")
+ .eq(0)
+ .should("have.text", "y");
+ cy.get(cesc2("#/xval") + " .mjx-mrow")
+ .eq(0)
+ .should("have.text", "y");
+ cy.get(cesc2("#/xvalnl") + " .mjx-mrow")
+ .eq(0)
+ .should("have.text", "x");
- cy.window().then(async (win) => {
- let stateVariables = await win.returnAllStateVariables1();
- expect(stateVariables["/g/P"].stateValues.label).eq("hi");
- expect(stateVariables["/g2/P"].stateValues.label).eq("bye");
+ cy.get(cesc2("#/mi2") + " textarea").type("{end}{backspace}z{enter}", {
+ force: true,
});
+
+ cy.get(cesc2("#/xvalnl") + " .mjx-mrow").should("contain.text", "z");
+ cy.get(cesc2("#/xvalnl") + " .mjx-mrow")
+ .eq(0)
+ .should("have.text", "z");
+
+ cy.get(cesc2("#/x") + " .mjx-mrow")
+ .eq(0)
+ .should("have.text", "y");
+ cy.get(cesc2("#/xval") + " .mjx-mrow")
+ .eq(0)
+ .should("have.text", "y");
});
- it("copy group, no link, internal copy to source alias is linked", () => {
+ it("copy no-link of a copy prop 2", () => {
cy.window().then(async (win) => {
win.postMessage(
{
doenetML: `
- a
-
-
-
-
- $x (a,b)
+
+
+
+
+
-
- $ti
-
-
-
-
- a
-
-
-
-
-
- $x
- (a,b)
-
-
-
- $ti
-
-
-
-
- a
+ 2
- 2$n
-
-
- m =
- m =
-
+ Don't get this: Bye
- a
+ cy.get(cesc2("#/hi")).should("have.text", "Bye");
- 2
- 2$n
-
-
- m =
- m =
-
-
- a
+
-
- 2
-
-
-
- Add P
-
-
- Remove P
-
-
- i=$i, v=$v
-
-
-
-
-
-
- Don't get this: Bye
-
-
-
-
- a
+
- cy.get(cesc2("#/section4/p1")).should("have.text", "i=1, v=11");
- cy.get(cesc2("#/section4/p2")).should("have.text", "i=2, v=12");
- cy.get(cesc2("#/section4/p3")).should("have.text", "i=3, v=13");
- cy.get(cesc2("#/section4/p4")).should("not.exist");
+ Don't get this: Bye
+
+ `,
+ },
+ "*",
+ );
+ });
- cy.get(cesc2("#/section5/p1")).should("have.text", "i=1, v=11");
- cy.get(cesc2("#/section5/p2")).should("have.text", "i=2, v=12");
- cy.get(cesc2("#/section5/p3")).should("not.exist");
- cy.get(cesc2("#/section5/p4")).should("not.exist");
+ // to wait for page to load
+ cy.get(cesc("#\\/_text1")).should("have.text", "a");
- cy.get(cesc2("#/p1a")).should("have.text", "i=1, v=11");
- cy.get(cesc2("#/p2a")).should("have.text", "i=2, v=12");
- cy.get(cesc2("#/p3a")).should("not.exist");
- cy.get(cesc2("#/p4a")).should("not.exist");
+ cy.get(cesc2("#/hi")).should("have.text", "Bye");
- cy.get(cesc2("#/section7/p1")).should("have.text", "i=1, v=11");
- cy.get(cesc2("#/section7/p2")).should("have.text", "i=2, v=12");
- cy.get(cesc2("#/section7/p3")).should("not.exist");
- cy.get(cesc2("#/section7/p4")).should("not.exist");
+ cy.get(cesc2("#/greetings/hi")).should("have.text", "Hello");
- cy.get(cesc2("#/section4/removeP_button")).click();
+ cy.get(cesc2("#/greetings/c1")).should("have.text", "Hello");
+ cy.get(cesc2("#/greetings/c2")).should("have.text", "Hello");
+ cy.get(cesc2("#/greetings/c3")).should("have.text", "Hello");
+ cy.get(cesc2("#/greetings/c4")).should("have.text", "Hello");
+ cy.get(cesc2("#/greetings/c5")).should("have.text", "Hello");
- cy.get(cesc2("#/section1/p1")).should("have.text", "i=1, v=11");
- cy.get(cesc2("#/section1/p2")).should("have.text", "i=2, v=12");
- cy.get(cesc2("#/section1/p3")).should("not.exist");
- cy.get(cesc2("#/section1/p4")).should("not.exist");
+ cy.get(cesc2("#/greetings/s/hi")).should("have.text", "Hola");
- cy.get(cesc2("#/section2/p1")).should("have.text", "i=1, v=11");
- cy.get(cesc2("#/section2/p2")).should("have.text", "i=2, v=12");
- cy.get(cesc2("#/section2/p3")).should("not.exist");
- cy.get(cesc2("#/section2/p4")).should("not.exist");
+ cy.get(cesc2("#/greetings/s/l1")).should("have.text", "Hola");
+ cy.get(cesc2("#/greetings/s/l2")).should("have.text", "Hola");
+ cy.get(cesc2("#/greetings/s/l3")).should("have.text", "Hola");
+ cy.get(cesc2("#/greetings/s/l4")).should("have.text", "Hola");
+ cy.get(cesc2("#/greetings/s/l5")).should("have.text", "Hola");
- cy.get(cesc2("#/p1")).should("have.text", "i=1, v=11");
- cy.get(cesc2("#/p2")).should("have.text", "i=2, v=12");
- cy.get(cesc2("#/p3")).should("not.exist");
- cy.get(cesc2("#/p4")).should("not.exist");
+ cy.get(cesc2("#/greetings/s/c1")).should("have.text", "Hello");
+ cy.get(cesc2("#/greetings/s/c2")).should("have.text", "Hello");
+ cy.get(cesc2("#/greetings/s/c3")).should("have.text", "Hello");
+ cy.get(cesc2("#/greetings/s/c4")).should("have.text", "Hello");
+ cy.get(cesc2("#/greetings/s/c5")).should("have.text", "Hello");
- cy.get(cesc2("#/section4/p1")).should("have.text", "i=1, v=11");
- cy.get(cesc2("#/section4/p2")).should("have.text", "i=2, v=12");
- cy.get(cesc2("#/section4/p3")).should("not.exist");
- cy.get(cesc2("#/section4/p4")).should("not.exist");
+ cy.get(cesc2("#/greetings/s/s/hi")).should("have.text", "Marhaban");
- cy.get(cesc2("#/section5/p1")).should("have.text", "i=1, v=11");
- cy.get(cesc2("#/section5/p2")).should("have.text", "i=2, v=12");
- cy.get(cesc2("#/section5/p3")).should("not.exist");
- cy.get(cesc2("#/section5/p4")).should("not.exist");
+ cy.get(cesc2("#/greetings/s/s/l1")).should("have.text", "Marhaban");
+ cy.get(cesc2("#/greetings/s/s/l2")).should("have.text", "Marhaban");
+ cy.get(cesc2("#/greetings/s/s/l3")).should("have.text", "Marhaban");
+ cy.get(cesc2("#/greetings/s/s/l4")).should("have.text", "Marhaban");
+ cy.get(cesc2("#/greetings/s/s/l5")).should("have.text", "Marhaban");
- cy.get(cesc2("#/p1a")).should("have.text", "i=1, v=11");
- cy.get(cesc2("#/p2a")).should("have.text", "i=2, v=12");
- cy.get(cesc2("#/p3a")).should("not.exist");
- cy.get(cesc2("#/p4a")).should("not.exist");
+ cy.get(cesc2("#/greetings/s/s/m1")).should("have.text", "Hola");
+ cy.get(cesc2("#/greetings/s/s/m2")).should("have.text", "Hola");
+ cy.get(cesc2("#/greetings/s/s/m3")).should("have.text", "Hola");
+ cy.get(cesc2("#/greetings/s/s/m4")).should("have.text", "Hola");
+ cy.get(cesc2("#/greetings/s/s/m5")).should("have.text", "Hola");
- cy.get(cesc2("#/section7/p1")).should("have.text", "i=1, v=11");
- cy.get(cesc2("#/section7/p2")).should("have.text", "i=2, v=12");
- cy.get(cesc2("#/section7/p3")).should("not.exist");
- cy.get(cesc2("#/section7/p4")).should("not.exist");
+ cy.get(cesc2("#/greetings/s/s/c1")).should("have.text", "Hello");
+ cy.get(cesc2("#/greetings/s/s/c2")).should("have.text", "Hello");
+ cy.get(cesc2("#/greetings/s/s/c3")).should("have.text", "Hello");
+ cy.get(cesc2("#/greetings/s/s/c4")).should("have.text", "Hello");
+ cy.get(cesc2("#/greetings/s/s/c5")).should("have.text", "Hello");
});
- it("copy dynamic map no link, check aliases, with copySource", () => {
+ it("external content cannot reach outside namespace, external has namespace", () => {
cy.window().then(async (win) => {
win.postMessage(
{
doenetML: `
a
+
-
- 2
-
-
-
- Add P
-
-
- Remove P
-
-
- i=$i, v=$v
-
-
-
-
-
-
-
+ Don't get this: Bye
-
-
-
-
-
-
`,
},
"*",
@@ -7979,232 +11251,231 @@ describe("Copy Tag Tests", function () {
// to wait for page to load
cy.get(cesc("#\\/_text1")).should("have.text", "a");
- cy.get(cesc2("#/section1_title")).should("have.text", "Section 1");
- cy.get(cesc2("#/section1/p1")).should("have.text", "i=1, v=11");
- cy.get(cesc2("#/section1/p2")).should("have.text", "i=2, v=12");
- cy.get(cesc2("#/section1/p3")).should("not.exist");
- cy.get(cesc2("#/section1/p4")).should("not.exist");
+ cy.get(cesc2("#/hi")).should("have.text", "Bye");
- cy.get(cesc2("#/section2_title")).should("have.text", "Section 2");
- cy.get(cesc2("#/section2/p1")).should("have.text", "i=1, v=11");
- cy.get(cesc2("#/section2/p2")).should("have.text", "i=2, v=12");
- cy.get(cesc2("#/section2/p3")).should("not.exist");
- cy.get(cesc2("#/section2/p4")).should("not.exist");
+ cy.get(cesc2("#/greetings/hi")).should("have.text", "Hello");
+ cy.get(cesc2("#/greetings/c1")).should("have.text", "Hello");
+ cy.get(cesc2("#/greetings/c2")).should("have.text", "Hello");
+ cy.get(cesc2("#/greetings/c3")).should("have.text", "Hello");
+ cy.get(cesc2("#/greetings/c4")).should("have.text", "Hello");
+ cy.get(cesc2("#/greetings/c5")).should("have.text", "Hello");
- cy.get(cesc2("#/section3_title")).should("have.text", "Section 3");
- cy.get(cesc2("#/p1")).should("have.text", "i=1, v=11");
- cy.get(cesc2("#/p2")).should("have.text", "i=2, v=12");
- cy.get(cesc2("#/p3")).should("not.exist");
- cy.get(cesc2("#/p4")).should("not.exist");
+ cy.get(cesc2("#/greetings/nm1")).should("not.exist");
+ cy.get(cesc2("#/greetings/nm2")).should("not.exist");
+ cy.get(cesc2("#/greetings/nm3")).should("not.exist");
+ cy.get(cesc2("#/greetings/nm4")).should("not.exist");
- cy.get(cesc2("#/section4_title")).should("have.text", "Section 4");
- cy.get(cesc2("#/section4/p1")).should("have.text", "i=1, v=11");
- cy.get(cesc2("#/section4/p2")).should("have.text", "i=2, v=12");
- cy.get(cesc2("#/section4/p3")).should("not.exist");
- cy.get(cesc2("#/section4/p4")).should("not.exist");
+ cy.get(cesc2("#/greetings/pNoMatch")).should(
+ "have.text",
+ "Four no matches:",
+ );
- cy.get(cesc2("#/section5_title")).should("have.text", "Section 5");
- cy.get(cesc2("#/section5/p1")).should("have.text", "i=1, v=11");
- cy.get(cesc2("#/section5/p2")).should("have.text", "i=2, v=12");
- cy.get(cesc2("#/section5/p3")).should("not.exist");
- cy.get(cesc2("#/section5/p4")).should("not.exist");
+ cy.get(cesc2("#/greetings/s/hi")).should("have.text", "Hola");
- cy.get(cesc2("#/section6_title")).should("have.text", "Section 6");
- cy.get(cesc2("#/p1a")).should("have.text", "i=1, v=11");
- cy.get(cesc2("#/p2a")).should("have.text", "i=2, v=12");
- cy.get(cesc2("#/p3a")).should("not.exist");
- cy.get(cesc2("#/p4a")).should("not.exist");
+ cy.get(cesc2("#/greetings/s/l1")).should("have.text", "Hola");
+ cy.get(cesc2("#/greetings/s/l2")).should("have.text", "Hola");
+ cy.get(cesc2("#/greetings/s/l3")).should("have.text", "Hola");
+ cy.get(cesc2("#/greetings/s/l4")).should("have.text", "Hola");
+ cy.get(cesc2("#/greetings/s/l5")).should("have.text", "Hola");
- cy.get(cesc2("#/section7_title")).should("have.text", "Section 7");
- cy.get(cesc2("#/section7/p1")).should("have.text", "i=1, v=11");
- cy.get(cesc2("#/section7/p2")).should("have.text", "i=2, v=12");
- cy.get(cesc2("#/section7/p3")).should("not.exist");
- cy.get(cesc2("#/section7/p4")).should("not.exist");
+ cy.get(cesc2("#/greetings/s/c1")).should("have.text", "Hello");
+ cy.get(cesc2("#/greetings/s/c2")).should("have.text", "Hello");
+ cy.get(cesc2("#/greetings/s/c3")).should("have.text", "Hello");
+ cy.get(cesc2("#/greetings/s/c4")).should("have.text", "Hello");
+ cy.get(cesc2("#/greetings/s/c5")).should("have.text", "Hello");
+
+ cy.get(cesc2("#/greetings/s/nm1")).should("not.exist");
+ cy.get(cesc2("#/greetings/s/nm2")).should("not.exist");
+ cy.get(cesc2("#/greetings/s/nm3")).should("not.exist");
+ cy.get(cesc2("#/greetings/s/nm4")).should("not.exist");
- cy.get(cesc2("#/section1/addP_button")).click();
+ cy.get(cesc2("#/greetings/s/pNoMatch")).should(
+ "have.text",
+ "Four no matches:",
+ );
- cy.get(cesc2("#/section1/p1")).should("have.text", "i=1, v=11");
- cy.get(cesc2("#/section1/p2")).should("have.text", "i=2, v=12");
- cy.get(cesc2("#/section1/p3")).should("have.text", "i=3, v=13");
- cy.get(cesc2("#/section1/p4")).should("not.exist");
+ cy.get(cesc2("#/greetings/s/s/hi")).should("have.text", "Marhaban");
- cy.get(cesc2("#/section2/p1")).should("have.text", "i=1, v=11");
- cy.get(cesc2("#/section2/p2")).should("have.text", "i=2, v=12");
- cy.get(cesc2("#/section2/p3")).should("not.exist");
- cy.get(cesc2("#/section2/p4")).should("not.exist");
+ cy.get(cesc2("#/greetings/s/s/l1")).should("have.text", "Marhaban");
+ cy.get(cesc2("#/greetings/s/s/l2")).should("have.text", "Marhaban");
+ cy.get(cesc2("#/greetings/s/s/l3")).should("have.text", "Marhaban");
+ cy.get(cesc2("#/greetings/s/s/l4")).should("have.text", "Marhaban");
+ cy.get(cesc2("#/greetings/s/s/l5")).should("have.text", "Marhaban");
- cy.get(cesc2("#/p1")).should("have.text", "i=1, v=11");
- cy.get(cesc2("#/p2")).should("have.text", "i=2, v=12");
- cy.get(cesc2("#/p3")).should("not.exist");
- cy.get(cesc2("#/p4")).should("not.exist");
+ cy.get(cesc2("#/greetings/s/s/m1")).should("have.text", "Hola");
+ cy.get(cesc2("#/greetings/s/s/m2")).should("have.text", "Hola");
+ cy.get(cesc2("#/greetings/s/s/m3")).should("have.text", "Hola");
+ cy.get(cesc2("#/greetings/s/s/m4")).should("have.text", "Hola");
+ cy.get(cesc2("#/greetings/s/s/m5")).should("have.text", "Hola");
- cy.get(cesc2("#/section4/p1")).should("have.text", "i=1, v=11");
- cy.get(cesc2("#/section4/p2")).should("have.text", "i=2, v=12");
- cy.get(cesc2("#/section4/p3")).should("not.exist");
- cy.get(cesc2("#/section4/p4")).should("not.exist");
+ cy.get(cesc2("#/greetings/s/s/c1")).should("have.text", "Hello");
+ cy.get(cesc2("#/greetings/s/s/c2")).should("have.text", "Hello");
+ cy.get(cesc2("#/greetings/s/s/c3")).should("have.text", "Hello");
+ cy.get(cesc2("#/greetings/s/s/c4")).should("have.text", "Hello");
+ cy.get(cesc2("#/greetings/s/s/c5")).should("have.text", "Hello");
- cy.get(cesc2("#/section5/p1")).should("have.text", "i=1, v=11");
- cy.get(cesc2("#/section5/p2")).should("have.text", "i=2, v=12");
- cy.get(cesc2("#/section5/p3")).should("have.text", "i=3, v=13");
- cy.get(cesc2("#/section5/p4")).should("not.exist");
+ cy.get(cesc2("#/greetings/s/s/nm1")).should("not.exist");
+ cy.get(cesc2("#/greetings/s/s/nm2")).should("not.exist");
+ cy.get(cesc2("#/greetings/s/s/nm3")).should("not.exist");
+ cy.get(cesc2("#/greetings/s/s/nm4")).should("not.exist");
- cy.get(cesc2("#/p1a")).should("have.text", "i=1, v=11");
- cy.get(cesc2("#/p2a")).should("have.text", "i=2, v=12");
- cy.get(cesc2("#/p3a")).should("have.text", "i=3, v=13");
- cy.get(cesc2("#/p4a")).should("not.exist");
+ cy.get(cesc2("#/greetings/s/s/pNoMatch")).should(
+ "have.text",
+ "Four no matches:",
+ );
+ });
- cy.get(cesc2("#/section7/p1")).should("have.text", "i=1, v=11");
- cy.get(cesc2("#/section7/p2")).should("have.text", "i=2, v=12");
- cy.get(cesc2("#/section7/p3")).should("have.text", "i=3, v=13");
- cy.get(cesc2("#/section7/p4")).should("not.exist");
+ it("external content cannot reach outside namespace, external has namespace, with copyFromURI", () => {
+ cy.window().then(async (win) => {
+ win.postMessage(
+ {
+ doenetML: `
+ a
+
- cy.get(cesc2("#/section7/removeP_button")).click();
+ Don't get this: Bye
+
+ `,
+ },
+ "*",
+ );
+ });
- cy.get(cesc2("#/section1/p1")).should("have.text", "i=1, v=11");
- cy.get(cesc2("#/section1/p2")).should("have.text", "i=2, v=12");
- cy.get(cesc2("#/section1/p3")).should("not.exist");
- cy.get(cesc2("#/section1/p4")).should("not.exist");
+ // to wait for page to load
+ cy.get(cesc("#\\/_text1")).should("have.text", "a");
- cy.get(cesc2("#/section2/p1")).should("have.text", "i=1, v=11");
- cy.get(cesc2("#/section2/p2")).should("have.text", "i=2, v=12");
- cy.get(cesc2("#/section2/p3")).should("not.exist");
- cy.get(cesc2("#/section2/p4")).should("not.exist");
+ cy.get(cesc2("#/hi")).should("have.text", "Bye");
- cy.get(cesc2("#/p1")).should("have.text", "i=1, v=11");
- cy.get(cesc2("#/p2")).should("have.text", "i=2, v=12");
- cy.get(cesc2("#/p3")).should("not.exist");
- cy.get(cesc2("#/p4")).should("not.exist");
+ cy.get(cesc2("#/greetings/hi")).should("have.text", "Hello");
+ cy.get(cesc2("#/greetings/c1")).should("have.text", "Hello");
+ cy.get(cesc2("#/greetings/c2")).should("have.text", "Hello");
+ cy.get(cesc2("#/greetings/c3")).should("have.text", "Hello");
+ cy.get(cesc2("#/greetings/c4")).should("have.text", "Hello");
+ cy.get(cesc2("#/greetings/c5")).should("have.text", "Hello");
- cy.get(cesc2("#/section4/p1")).should("have.text", "i=1, v=11");
- cy.get(cesc2("#/section4/p2")).should("have.text", "i=2, v=12");
- cy.get(cesc2("#/section4/p3")).should("not.exist");
- cy.get(cesc2("#/section4/p4")).should("not.exist");
+ cy.get(cesc2("#/greetings/nm1")).should("not.exist");
+ cy.get(cesc2("#/greetings/nm2")).should("not.exist");
+ cy.get(cesc2("#/greetings/nm3")).should("not.exist");
+ cy.get(cesc2("#/greetings/nm4")).should("not.exist");
- cy.get(cesc2("#/section5/p1")).should("have.text", "i=1, v=11");
- cy.get(cesc2("#/section5/p2")).should("have.text", "i=2, v=12");
- cy.get(cesc2("#/section5/p3")).should("not.exist");
- cy.get(cesc2("#/section5/p4")).should("not.exist");
+ cy.get(cesc2("#/greetings/pNoMatch")).should(
+ "have.text",
+ "Four no matches:",
+ );
- cy.get(cesc2("#/p1a")).should("have.text", "i=1, v=11");
- cy.get(cesc2("#/p2a")).should("have.text", "i=2, v=12");
- cy.get(cesc2("#/p3a")).should("not.exist");
- cy.get(cesc2("#/p4a")).should("not.exist");
+ cy.get(cesc2("#/greetings/s/hi")).should("have.text", "Hola");
- cy.get(cesc2("#/section7/p1")).should("have.text", "i=1, v=11");
- cy.get(cesc2("#/section7/p2")).should("have.text", "i=2, v=12");
- cy.get(cesc2("#/section7/p3")).should("not.exist");
- cy.get(cesc2("#/section7/p4")).should("not.exist");
+ cy.get(cesc2("#/greetings/s/l1")).should("have.text", "Hola");
+ cy.get(cesc2("#/greetings/s/l2")).should("have.text", "Hola");
+ cy.get(cesc2("#/greetings/s/l3")).should("have.text", "Hola");
+ cy.get(cesc2("#/greetings/s/l4")).should("have.text", "Hola");
+ cy.get(cesc2("#/greetings/s/l5")).should("have.text", "Hola");
- cy.get(cesc2("#/section4/addP_button")).click();
+ cy.get(cesc2("#/greetings/s/c1")).should("have.text", "Hello");
+ cy.get(cesc2("#/greetings/s/c2")).should("have.text", "Hello");
+ cy.get(cesc2("#/greetings/s/c3")).should("have.text", "Hello");
+ cy.get(cesc2("#/greetings/s/c4")).should("have.text", "Hello");
+ cy.get(cesc2("#/greetings/s/c5")).should("have.text", "Hello");
- cy.get(cesc2("#/section1/p1")).should("have.text", "i=1, v=11");
- cy.get(cesc2("#/section1/p2")).should("have.text", "i=2, v=12");
- cy.get(cesc2("#/section1/p3")).should("not.exist");
- cy.get(cesc2("#/section1/p4")).should("not.exist");
+ cy.get(cesc2("#/greetings/s/nm1")).should("not.exist");
+ cy.get(cesc2("#/greetings/s/nm2")).should("not.exist");
+ cy.get(cesc2("#/greetings/s/nm3")).should("not.exist");
+ cy.get(cesc2("#/greetings/s/nm4")).should("not.exist");
- cy.get(cesc2("#/section2/p1")).should("have.text", "i=1, v=11");
- cy.get(cesc2("#/section2/p2")).should("have.text", "i=2, v=12");
- cy.get(cesc2("#/section2/p3")).should("not.exist");
- cy.get(cesc2("#/section2/p4")).should("not.exist");
+ cy.get(cesc2("#/greetings/s/pNoMatch")).should(
+ "have.text",
+ "Four no matches:",
+ );
- cy.get(cesc2("#/p1")).should("have.text", "i=1, v=11");
- cy.get(cesc2("#/p2")).should("have.text", "i=2, v=12");
- cy.get(cesc2("#/p3")).should("not.exist");
- cy.get(cesc2("#/p4")).should("not.exist");
+ cy.get(cesc2("#/greetings/s/s/hi")).should("have.text", "Marhaban");
- cy.get(cesc2("#/section4/p1")).should("have.text", "i=1, v=11");
- cy.get(cesc2("#/section4/p2")).should("have.text", "i=2, v=12");
- cy.get(cesc2("#/section4/p3")).should("have.text", "i=3, v=13");
- cy.get(cesc2("#/section4/p4")).should("not.exist");
+ cy.get(cesc2("#/greetings/s/s/l1")).should("have.text", "Marhaban");
+ cy.get(cesc2("#/greetings/s/s/l2")).should("have.text", "Marhaban");
+ cy.get(cesc2("#/greetings/s/s/l3")).should("have.text", "Marhaban");
+ cy.get(cesc2("#/greetings/s/s/l4")).should("have.text", "Marhaban");
+ cy.get(cesc2("#/greetings/s/s/l5")).should("have.text", "Marhaban");
- cy.get(cesc2("#/section5/p1")).should("have.text", "i=1, v=11");
- cy.get(cesc2("#/section5/p2")).should("have.text", "i=2, v=12");
- cy.get(cesc2("#/section5/p3")).should("not.exist");
- cy.get(cesc2("#/section5/p4")).should("not.exist");
+ cy.get(cesc2("#/greetings/s/s/m1")).should("have.text", "Hola");
+ cy.get(cesc2("#/greetings/s/s/m2")).should("have.text", "Hola");
+ cy.get(cesc2("#/greetings/s/s/m3")).should("have.text", "Hola");
+ cy.get(cesc2("#/greetings/s/s/m4")).should("have.text", "Hola");
+ cy.get(cesc2("#/greetings/s/s/m5")).should("have.text", "Hola");
- cy.get(cesc2("#/p1a")).should("have.text", "i=1, v=11");
- cy.get(cesc2("#/p2a")).should("have.text", "i=2, v=12");
- cy.get(cesc2("#/p3a")).should("not.exist");
- cy.get(cesc2("#/p4a")).should("not.exist");
+ cy.get(cesc2("#/greetings/s/s/c1")).should("have.text", "Hello");
+ cy.get(cesc2("#/greetings/s/s/c2")).should("have.text", "Hello");
+ cy.get(cesc2("#/greetings/s/s/c3")).should("have.text", "Hello");
+ cy.get(cesc2("#/greetings/s/s/c4")).should("have.text", "Hello");
+ cy.get(cesc2("#/greetings/s/s/c5")).should("have.text", "Hello");
- cy.get(cesc2("#/section7/p1")).should("have.text", "i=1, v=11");
- cy.get(cesc2("#/section7/p2")).should("have.text", "i=2, v=12");
- cy.get(cesc2("#/section7/p3")).should("not.exist");
- cy.get(cesc2("#/section7/p4")).should("not.exist");
+ cy.get(cesc2("#/greetings/s/s/nm1")).should("not.exist");
+ cy.get(cesc2("#/greetings/s/s/nm2")).should("not.exist");
+ cy.get(cesc2("#/greetings/s/s/nm3")).should("not.exist");
+ cy.get(cesc2("#/greetings/s/s/nm4")).should("not.exist");
- cy.get(cesc2("#/section4/removeP_button")).click();
+ cy.get(cesc2("#/greetings/s/s/pNoMatch")).should(
+ "have.text",
+ "Four no matches:",
+ );
+ });
- cy.get(cesc2("#/section1/p1")).should("have.text", "i=1, v=11");
- cy.get(cesc2("#/section1/p2")).should("have.text", "i=2, v=12");
- cy.get(cesc2("#/section1/p3")).should("not.exist");
- cy.get(cesc2("#/section1/p4")).should("not.exist");
+ it("external content inside external content cannot reach outside namespace", () => {
+ cy.window().then(async (win) => {
+ win.postMessage(
+ {
+ doenetML: `
+ a
+ Don't get this 2: Leave
+
+ `,
+ },
+ "*",
+ );
+ });
- cy.get(cesc2("#/p1")).should("have.text", "i=1, v=11");
- cy.get(cesc2("#/p2")).should("have.text", "i=2, v=12");
- cy.get(cesc2("#/p3")).should("not.exist");
- cy.get(cesc2("#/p4")).should("not.exist");
+ // to wait for page to load
+ cy.get(cesc("#\\/_text1")).should("have.text", "a");
- cy.get(cesc2("#/section4/p1")).should("have.text", "i=1, v=11");
- cy.get(cesc2("#/section4/p2")).should("have.text", "i=2, v=12");
- cy.get(cesc2("#/section4/p3")).should("not.exist");
- cy.get(cesc2("#/section4/p4")).should("not.exist");
+ cy.get(cesc2("#/hi")).should("have.text", "Leave");
- cy.get(cesc2("#/section5/p1")).should("have.text", "i=1, v=11");
- cy.get(cesc2("#/section5/p2")).should("have.text", "i=2, v=12");
- cy.get(cesc2("#/section5/p3")).should("not.exist");
- cy.get(cesc2("#/section5/p4")).should("not.exist");
+ cy.get(cesc2("#/greet/hi")).should("have.text", "Bye");
- cy.get(cesc2("#/p1a")).should("have.text", "i=1, v=11");
- cy.get(cesc2("#/p2a")).should("have.text", "i=2, v=12");
- cy.get(cesc2("#/p3a")).should("not.exist");
- cy.get(cesc2("#/p4a")).should("not.exist");
+ cy.get(cesc2("#/greet/greetings/hi")).should("have.text", "Hello");
+ cy.get(cesc2("#/greet/greetings/c1")).should("have.text", "Hello");
+ cy.get(cesc2("#/greet/greetings/c2")).should("have.text", "Hello");
+ cy.get(cesc2("#/greet/greetings/c3")).should("have.text", "Hello");
+ cy.get(cesc2("#/greet/greetings/c4")).should("have.text", "Hello");
+ cy.get(cesc2("#/greet/greetings/c5")).should("have.text", "Hello");
- cy.get(cesc2("#/section7/p1")).should("have.text", "i=1, v=11");
- cy.get(cesc2("#/section7/p2")).should("have.text", "i=2, v=12");
- cy.get(cesc2("#/section7/p3")).should("not.exist");
- cy.get(cesc2("#/section7/p4")).should("not.exist");
+ cy.get(cesc2("#/greet/greetings/s/hi")).should("have.text", "Hola");
+ cy.get(cesc2("#/greet/greetings/s/l1")).should("have.text", "Hola");
+ cy.get(cesc2("#/greet/greetings/s/c1")).should("have.text", "Hello");
+ cy.get(cesc2("#/greet/greetings/s/c2")).should("have.text", "Hello");
+ cy.get(cesc2("#/greet/greetings/s/c3")).should("have.text", "Hello");
+ cy.get(cesc2("#/greet/greetings/s/c4")).should("have.text", "Hello");
+
+ cy.get(cesc2("#/greet/greetings/s/s/hi")).should("have.text", "Marhaban");
+ cy.get(cesc2("#/greet/greetings/s/s/l1")).should("have.text", "Marhaban");
+ cy.get(cesc2("#/greet/greetings/s/s/m1")).should("have.text", "Hola");
+ cy.get(cesc2("#/greet/greetings/s/s/c1")).should("have.text", "Hello");
+ cy.get(cesc2("#/greet/greetings/s/s/c2")).should("have.text", "Hello");
+ cy.get(cesc2("#/greet/greetings/s/s/c3")).should("have.text", "Hello");
+ cy.get(cesc2("#/greet/greetings/s/s/c4")).should("have.text", "Hello");
+ cy.get(cesc2("#/greet/greetings/s/s/c5")).should("have.text", "Hello");
+ cy.get(cesc2("#/greet/greetings/s/s/c5")).should("have.text", "Hello");
});
- it("copy map source with no link", () => {
+ it("external content inside external content cannot reach outside namespace, external is single section", () => {
cy.window().then(async (win) => {
win.postMessage(
{
doenetML: `
a
- Number of iterations:
+
+ Don't get this 2: Leave
-
-
-
-
-
-
- (
-
- (
-
-
-
-
-
-
- A:
- B:
- C:
- D:
- E:
- F:
-
`,
},
"*",
@@ -8214,364 +11485,338 @@ describe("Copy Tag Tests", function () {
// to wait for page to load
cy.get(cesc("#\\/_text1")).should("have.text", "a");
- cy.get(cesc2("#/A2")).should("not.exist");
- cy.get(cesc2("#/B2")).should("not.exist");
- cy.get(cesc2("#/C2")).should("not.exist");
- cy.get(cesc2("#/D2")).should("not.exist");
- cy.get(cesc2("#/E2")).should("not.exist");
- cy.get(cesc2("#/F2")).should("not.exist");
-
- cy.get(cesc("#\\/n") + " textarea").type("1{enter}", { force: true });
-
- cy.get(cesc2("#/A2") + " .mjx-mrow").should("contain.text", "(1,2)");
- cy.get(cesc2("#/A2") + " .mjx-mrow")
- .eq(0)
- .should("have.text", "(1,2)");
- cy.get(cesc2("#/B2") + " .mjx-mrow")
- .eq(0)
- .should("have.text", "(3,4)");
- cy.get(cesc2("#/C2") + " .mjx-mrow")
- .eq(0)
- .should("have.text", "(5,6)");
- cy.get(cesc2("#/D2")).should("not.exist");
- cy.get(cesc2("#/E2")).should("not.exist");
- cy.get(cesc2("#/F2")).should("not.exist");
-
- cy.window().then(async (win) => {
- win.callAction1({
- actionName: "movePoint",
- componentName: "/A",
- args: { x: 9, y: 0 },
- });
- win.callAction1({
- actionName: "movePoint",
- componentName: "/B",
- args: { x: 1, y: 8 },
- });
- win.callAction1({
- actionName: "movePoint",
- componentName: "/C",
- args: { x: 7, y: 2 },
- });
- });
-
- cy.get(cesc2("#/C2") + " .mjx-mrow").should("contain.text", "(7,2)");
- cy.get(cesc2("#/A2") + " .mjx-mrow")
- .eq(0)
- .should("have.text", "(9,0)");
- cy.get(cesc2("#/B2") + " .mjx-mrow")
- .eq(0)
- .should("have.text", "(1,8)");
- cy.get(cesc2("#/C2") + " .mjx-mrow")
- .eq(0)
- .should("have.text", "(7,2)");
- cy.get(cesc2("#/D2")).should("not.exist");
- cy.get(cesc2("#/E2")).should("not.exist");
- cy.get(cesc2("#/F2")).should("not.exist");
-
- cy.get(cesc("#\\/n") + " textarea").type("{end}{backspace}2{enter}", {
- force: true,
- });
-
- cy.get(cesc2("#/D2") + " .mjx-mrow").should("contain.text", "(2,3)");
- cy.get(cesc2("#/A2") + " .mjx-mrow")
- .eq(0)
- .should("have.text", "(9,0)");
- cy.get(cesc2("#/B2") + " .mjx-mrow")
- .eq(0)
- .should("have.text", "(1,8)");
- cy.get(cesc2("#/C2") + " .mjx-mrow")
- .eq(0)
- .should("have.text", "(7,2)");
- cy.get(cesc2("#/D2") + " .mjx-mrow")
- .eq(0)
- .should("have.text", "(2,3)");
- cy.get(cesc2("#/E2") + " .mjx-mrow")
- .eq(0)
- .should("have.text", "(4,5)");
- cy.get(cesc2("#/F2") + " .mjx-mrow")
- .eq(0)
- .should("have.text", "(6,7)");
+ cy.get(cesc2("#/hi")).should("have.text", "Leave");
- cy.window().then(async (win) => {
- win.callAction1({
- actionName: "movePoint",
- componentName: "/D",
- args: { x: 0, y: 10 },
- });
- win.callAction1({
- actionName: "movePoint",
- componentName: "/E",
- args: { x: 9, y: 1 },
- });
- win.callAction1({
- actionName: "movePoint",
- componentName: "/F",
- args: { x: 2, y: 8 },
- });
- });
+ cy.get(cesc2("#/greet/hi")).should("have.text", "Bye");
- cy.get(cesc2("#/F2") + " .mjx-mrow").should("contain.text", "(2,8)");
- cy.get(cesc2("#/A2") + " .mjx-mrow")
- .eq(0)
- .should("have.text", "(9,0)");
- cy.get(cesc2("#/B2") + " .mjx-mrow")
- .eq(0)
- .should("have.text", "(1,8)");
- cy.get(cesc2("#/C2") + " .mjx-mrow")
- .eq(0)
- .should("have.text", "(7,2)");
- cy.get(cesc2("#/D2") + " .mjx-mrow")
- .eq(0)
- .should("have.text", "(0,10)");
- cy.get(cesc2("#/E2") + " .mjx-mrow")
- .eq(0)
- .should("have.text", "(9,1)");
- cy.get(cesc2("#/F2") + " .mjx-mrow")
- .eq(0)
- .should("have.text", "(2,8)");
+ cy.get(cesc2("#/greet/greetings/hi")).should("have.text", "Hello");
- cy.get(cesc("#\\/n") + " textarea").type("{end}{backspace}0{enter}", {
- force: true,
- });
+ cy.get(cesc2("#/greet/greetings/c1")).should("have.text", "Hello");
+ cy.get(cesc2("#/greet/greetings/c2")).should("have.text", "Hello");
+ cy.get(cesc2("#/greet/greetings/c3")).should("have.text", "Hello");
+ cy.get(cesc2("#/greet/greetings/c4")).should("have.text", "Hello");
+ cy.get(cesc2("#/greet/greetings/c5")).should("have.text", "Hello");
- cy.get(cesc2("#/A2")).should("not.exist");
- cy.get(cesc2("#/B2")).should("not.exist");
- cy.get(cesc2("#/C2")).should("not.exist");
- cy.get(cesc2("#/D2")).should("not.exist");
- cy.get(cesc2("#/E2")).should("not.exist");
- cy.get(cesc2("#/F2")).should("not.exist");
+ cy.get(cesc2("#/greet/greetings/s/hi")).should("have.text", "Hola");
- cy.get(cesc("#\\/n") + " textarea").type("{end}{backspace}2{enter}", {
- force: true,
- });
+ cy.get(cesc2("#/greet/greetings/s/l1")).should("have.text", "Hola");
+ cy.get(cesc2("#/greet/greetings/s/l2")).should("have.text", "Hola");
+ cy.get(cesc2("#/greet/greetings/s/l3")).should("have.text", "Hola");
+ cy.get(cesc2("#/greet/greetings/s/l4")).should("have.text", "Hola");
+ cy.get(cesc2("#/greet/greetings/s/l5")).should("have.text", "Hola");
+ cy.get(cesc2("#/greet/greetings/s/c1")).should("have.text", "Hello");
+ cy.get(cesc2("#/greet/greetings/s/c2")).should("have.text", "Hello");
+ cy.get(cesc2("#/greet/greetings/s/c3")).should("have.text", "Hello");
+ cy.get(cesc2("#/greet/greetings/s/c4")).should("have.text", "Hello");
- cy.get(cesc2("#/F2") + " .mjx-mrow").should("contain.text", "(2,8)");
- cy.get(cesc2("#/A2") + " .mjx-mrow")
- .eq(0)
- .should("have.text", "(9,0)");
- cy.get(cesc2("#/B2") + " .mjx-mrow")
- .eq(0)
- .should("have.text", "(1,8)");
- cy.get(cesc2("#/C2") + " .mjx-mrow")
- .eq(0)
- .should("have.text", "(7,2)");
- cy.get(cesc2("#/D2") + " .mjx-mrow")
- .eq(0)
- .should("have.text", "(0,10)");
- cy.get(cesc2("#/E2") + " .mjx-mrow")
- .eq(0)
- .should("have.text", "(9,1)");
- cy.get(cesc2("#/F2") + " .mjx-mrow")
- .eq(0)
- .should("have.text", "(2,8)");
+ cy.get(cesc2("#/greet/greetings/s/s/hi")).should("have.text", "Marhaban");
+ cy.get(cesc2("#/greet/greetings/s/s/l1")).should("have.text", "Marhaban");
+ cy.get(cesc2("#/greet/greetings/s/s/m1")).should("have.text", "Hola");
+ cy.get(cesc2("#/greet/greetings/s/s/c1")).should("have.text", "Hello");
+ cy.get(cesc2("#/greet/greetings/s/s/c2")).should("have.text", "Hello");
+ cy.get(cesc2("#/greet/greetings/s/s/c3")).should("have.text", "Hello");
+ cy.get(cesc2("#/greet/greetings/s/s/c4")).should("have.text", "Hello");
+ cy.get(cesc2("#/greet/greetings/s/s/c5")).should("have.text", "Hello");
+ cy.get(cesc2("#/greet/greetings/s/s/c5")).should("have.text", "Hello");
});
- it("copy no-link of a copy prop", () => {
+ it("external content inside external content cannot reach outside namespace, with copyFromURI", () => {
cy.window().then(async (win) => {
win.postMessage(
{
doenetML: `
- x
- a
+
- $xval
- $xvalnl
-
+ Don't get this 2: Leave
+
`,
},
"*",
);
});
- cy.get(cesc2("#/x") + " .mjx-mrow")
- .eq(0)
- .should("have.text", "x");
- cy.get(cesc2("#/xval") + " .mjx-mrow")
- .eq(0)
- .should("have.text", "x");
- cy.get(cesc2("#/xvalnl") + " .mjx-mrow")
- .eq(0)
- .should("have.text", "x");
+ // to wait for page to load
+ cy.get(cesc("#\\/_text1")).should("have.text", "a");
- cy.get(cesc2("#/mi1") + " textarea").type("{end}{backspace}y{enter}", {
- force: true,
- });
+ cy.get(cesc2("#/hi")).should("have.text", "Leave");
- cy.get(cesc2("#/x") + " .mjx-mrow").should("contain.text", "y");
- cy.get(cesc2("#/x") + " .mjx-mrow")
- .eq(0)
- .should("have.text", "y");
- cy.get(cesc2("#/xval") + " .mjx-mrow")
- .eq(0)
- .should("have.text", "y");
- cy.get(cesc2("#/xvalnl") + " .mjx-mrow")
- .eq(0)
- .should("have.text", "x");
+ cy.get(cesc2("#/greet/hi")).should("have.text", "Bye");
- cy.get(cesc2("#/mi2") + " textarea").type("{end}{backspace}z{enter}", {
- force: true,
- });
+ cy.get(cesc2("#/greet/greetings/hi")).should("have.text", "Hello");
- cy.get(cesc2("#/xvalnl") + " .mjx-mrow").should("contain.text", "z");
- cy.get(cesc2("#/xvalnl") + " .mjx-mrow")
- .eq(0)
- .should("have.text", "z");
+ cy.get(cesc2("#/greet/greetings/c1")).should("have.text", "Hello");
+ cy.get(cesc2("#/greet/greetings/c2")).should("have.text", "Hello");
+ cy.get(cesc2("#/greet/greetings/c3")).should("have.text", "Hello");
+ cy.get(cesc2("#/greet/greetings/c4")).should("have.text", "Hello");
+ cy.get(cesc2("#/greet/greetings/c5")).should("have.text", "Hello");
+
+ cy.get(cesc2("#/greet/greetings/s/hi")).should("have.text", "Hola");
+
+ cy.get(cesc2("#/greet/greetings/s/l1")).should("have.text", "Hola");
+ cy.get(cesc2("#/greet/greetings/s/l2")).should("have.text", "Hola");
+ cy.get(cesc2("#/greet/greetings/s/l3")).should("have.text", "Hola");
+ cy.get(cesc2("#/greet/greetings/s/l4")).should("have.text", "Hola");
+ cy.get(cesc2("#/greet/greetings/s/l5")).should("have.text", "Hola");
+ cy.get(cesc2("#/greet/greetings/s/c1")).should("have.text", "Hello");
+ cy.get(cesc2("#/greet/greetings/s/c2")).should("have.text", "Hello");
+ cy.get(cesc2("#/greet/greetings/s/c3")).should("have.text", "Hello");
+ cy.get(cesc2("#/greet/greetings/s/c4")).should("have.text", "Hello");
- cy.get(cesc2("#/x") + " .mjx-mrow")
- .eq(0)
- .should("have.text", "y");
- cy.get(cesc2("#/xval") + " .mjx-mrow")
- .eq(0)
- .should("have.text", "y");
+ cy.get(cesc2("#/greet/greetings/s/s/hi")).should("have.text", "Marhaban");
+ cy.get(cesc2("#/greet/greetings/s/s/l1")).should("have.text", "Marhaban");
+ cy.get(cesc2("#/greet/greetings/s/s/m1")).should("have.text", "Hola");
+ cy.get(cesc2("#/greet/greetings/s/s/c1")).should("have.text", "Hello");
+ cy.get(cesc2("#/greet/greetings/s/s/c2")).should("have.text", "Hello");
+ cy.get(cesc2("#/greet/greetings/s/s/c3")).should("have.text", "Hello");
+ cy.get(cesc2("#/greet/greetings/s/s/c4")).should("have.text", "Hello");
+ cy.get(cesc2("#/greet/greetings/s/s/c5")).should("have.text", "Hello");
+ cy.get(cesc2("#/greet/greetings/s/s/c5")).should("have.text", "Hello");
});
- it("copy no-link of a copy prop 2", () => {
+ it("copy of template source maintained when withheld", () => {
cy.window().then(async (win) => {
win.postMessage(
{
doenetML: `
-
- a
+ Number of points:
+
+
+
+
+
+
-
-
-
- A_1 =
+ A_2 =
+
`,
},
"*",
);
});
- cy.get(cesc2("#/v1a") + " .mjx-mrow")
+ // to wait for page to load
+ cy.get(cesc("#\\/_text1")).should("have.text", "a");
+
+ cy.get(cesc("#\\/m1"))
+ .find(".mjx-mrow")
.eq(0)
- .should("have.text", "(0,1)");
- cy.get(cesc2("#/v1nla") + " .mjx-mrow")
+ .invoke("text")
+ .then((text) => {
+ expect(text.trim()).equal("A1=");
+ });
+ cy.get(cesc("#\\/m2"))
+ .find(".mjx-mrow")
.eq(0)
- .should("have.text", "(0,1)");
- cy.get(cesc2("#/v2nla") + " .mjx-mrow")
+ .invoke("text")
+ .then((text) => {
+ expect(text.trim()).equal("A2=");
+ });
+
+ cy.log("Add point");
+
+ cy.get(cesc("#\\/n") + " textarea").type("1{enter}", { force: true });
+ cy.get(cesc("#\\/m1")).should("contain.text", "A1=(1,1)");
+ cy.get(cesc("#\\/m1"))
+ .find(".mjx-mrow")
.eq(0)
- .should("have.text", "(0,1)");
- cy.get(cesc2("#/v3nla") + " .mjx-mrow")
+ .invoke("text")
+ .then((text) => {
+ expect(text.trim()).equal("A1=(1,1)");
+ });
+ cy.get(cesc("#\\/m2"))
+ .find(".mjx-mrow")
.eq(0)
- .should("have.text", "(0,1)");
+ .invoke("text")
+ .then((text) => {
+ expect(text.trim()).equal("A2=");
+ });
- cy.log("Move v1");
+ cy.log("Move point");
cy.window().then(async (win) => {
win.callAction1({
actionName: "movePoint",
- componentName: "/v1",
- args: { x: 2, y: 3 },
+ componentName: "/t1/A",
+ args: { x: -3, y: 7 },
});
});
- cy.get(cesc2("#/v1a") + " .mjx-mrow").should("contain.text", "(2,3)");
- cy.get(cesc2("#/v1a") + " .mjx-mrow")
+ cy.get(cesc("#\\/m1")).should("contain.text", "A1=(−3,7)");
+ cy.get(cesc("#\\/m1"))
+ .find(".mjx-mrow")
.eq(0)
- .should("have.text", "(2,3)");
- cy.get(cesc2("#/v1nla") + " .mjx-mrow")
+ .invoke("text")
+ .then((text) => {
+ expect(text.trim()).equal("A1=(−3,7)");
+ });
+ cy.get(cesc("#\\/m2"))
+ .find(".mjx-mrow")
.eq(0)
- .should("have.text", "(0,1)");
- cy.get(cesc2("#/v2nla") + " .mjx-mrow")
+ .invoke("text")
+ .then((text) => {
+ expect(text.trim()).equal("A2=");
+ });
+
+ cy.log("Remove point");
+ cy.get(cesc("#\\/n") + " textarea").type("{end}{backspace}0{enter}", {
+ force: true,
+ });
+
+ cy.get(cesc("#\\/m1")).should("not.contain.text", "A1=(−3,7)");
+ cy.get(cesc("#\\/m1"))
+ .find(".mjx-mrow")
.eq(0)
- .should("have.text", "(0,1)");
- cy.get(cesc2("#/v3nla") + " .mjx-mrow")
+ .invoke("text")
+ .then((text) => {
+ expect(text.trim()).equal("A1=");
+ });
+ cy.get(cesc("#\\/m2"))
+ .find(".mjx-mrow")
.eq(0)
- .should("have.text", "(0,1)");
-
- cy.log("Move v1nl");
- cy.window().then(async (win) => {
- win.callAction1({
- actionName: "movePoint",
- componentName: "/v1nl",
- args: { x: 3, y: 4 },
+ .invoke("text")
+ .then((text) => {
+ expect(text.trim()).equal("A2=");
});
+
+ cy.log("Remember coordinates when restore point since copy was maintained");
+
+ cy.get(cesc("#\\/n") + " textarea").type("{end}{backspace}1{enter}", {
+ force: true,
});
- cy.get(cesc2("#/v1nla") + " .mjx-mrow").should("contain.text", "(3,4)");
- cy.get(cesc2("#/v1a") + " .mjx-mrow")
+ cy.get(cesc("#\\/m1") + " .mjx-mrow").should("contain.text", "A1=(−3,7)");
+ cy.get(cesc("#\\/m1"))
+ .find(".mjx-mrow")
.eq(0)
- .should("have.text", "(2,3)");
- cy.get(cesc2("#/v1nla") + " .mjx-mrow")
+ .invoke("text")
+ .then((text) => {
+ expect(text.trim()).equal("A1=(−3,7)");
+ });
+ cy.get(cesc("#\\/m2"))
+ .find(".mjx-mrow")
.eq(0)
- .should("have.text", "(3,4)");
- cy.get(cesc2("#/v2nla") + " .mjx-mrow")
+ .invoke("text")
+ .then((text) => {
+ expect(text.trim()).equal("A2=");
+ });
+
+ cy.log("Add second point");
+
+ cy.get(cesc("#\\/n") + " textarea").type("{end}{backspace}2{enter}", {
+ force: true,
+ });
+ cy.get(cesc("#\\/m2") + " .mjx-mrow").should("contain.text", "A2=(2,1)");
+ cy.get(cesc("#\\/m1"))
+ .find(".mjx-mrow")
.eq(0)
- .should("have.text", "(0,1)");
- cy.get(cesc2("#/v3nla") + " .mjx-mrow")
+ .invoke("text")
+ .then((text) => {
+ expect(text.trim()).equal("A1=(−3,7)");
+ });
+ cy.get(cesc("#\\/m2"))
+ .find(".mjx-mrow")
.eq(0)
- .should("have.text", "(0,1)");
+ .invoke("text")
+ .then((text) => {
+ expect(text.trim()).equal("A2=(2,1)");
+ });
- cy.log("Move v2nl");
+ cy.log("Move second point");
cy.window().then(async (win) => {
+ let stateVariables = await win.returnAllStateVariables1();
win.callAction1({
actionName: "movePoint",
- componentName: "/v2nl",
- args: { x: 4, y: 5 },
+ componentName: "/t2/A",
+ args: { x: 5, y: -4 },
});
});
- cy.get(cesc2("#/v2nla") + " .mjx-mrow").should("contain.text", "(4,5)");
- cy.get(cesc2("#/v1a") + " .mjx-mrow")
- .eq(0)
- .should("have.text", "(2,3)");
- cy.get(cesc2("#/v1nla") + " .mjx-mrow")
- .eq(0)
- .should("have.text", "(3,4)");
- cy.get(cesc2("#/v2nla") + " .mjx-mrow")
+ cy.get(cesc("#\\/m2") + " .mjx-mrow").should("contain.text", "A2=(5,−4)");
+ cy.get(cesc("#\\/m1"))
+ .find(".mjx-mrow")
.eq(0)
- .should("have.text", "(4,5)");
- cy.get(cesc2("#/v3nla") + " .mjx-mrow")
+ .invoke("text")
+ .then((text) => {
+ expect(text.trim()).equal("A1=(−3,7)");
+ });
+ cy.get(cesc("#\\/m2"))
+ .find(".mjx-mrow")
.eq(0)
- .should("have.text", "(0,1)");
-
- cy.log("Move v3nl");
- cy.window().then(async (win) => {
- win.callAction1({
- actionName: "movePoint",
- componentName: "/v3nl",
- args: { x: 5, y: 6 },
+ .invoke("text")
+ .then((text) => {
+ expect(text.trim()).equal("A2=(5,−4)");
});
+
+ cy.log("Remove both points");
+ cy.get(cesc("#\\/n") + " textarea").type("{end}{backspace}0{enter}", {
+ force: true,
});
- cy.get(cesc2("#/v3nla") + " .mjx-mrow").should("contain.text", "(5,6)");
- cy.get(cesc2("#/v1a") + " .mjx-mrow")
+ cy.get(cesc("#\\/m1") + " .mjx-mrow").should(
+ "not.contain.text",
+ "A1=(−3,7)",
+ );
+ cy.get(cesc("#\\/m1"))
+ .find(".mjx-mrow")
.eq(0)
- .should("have.text", "(2,3)");
- cy.get(cesc2("#/v1nla") + " .mjx-mrow")
+ .invoke("text")
+ .then((text) => {
+ expect(text.trim()).equal("A1=");
+ });
+ cy.get(cesc("#\\/m2"))
+ .find(".mjx-mrow")
.eq(0)
- .should("have.text", "(3,4)");
- cy.get(cesc2("#/v2nla") + " .mjx-mrow")
+ .invoke("text")
+ .then((text) => {
+ expect(text.trim()).equal("A2=");
+ });
+
+ cy.log("Remember coordinates of both points");
+
+ cy.get(cesc("#\\/n") + " textarea").type("{end}{backspace}2{enter}", {
+ force: true,
+ });
+ cy.get(cesc("#\\/m1") + " .mjx-mrow").should("contain.text", "A1=(−3,7)");
+ cy.get(cesc("#\\/m1"))
+ .find(".mjx-mrow")
.eq(0)
- .should("have.text", "(4,5)");
- cy.get(cesc2("#/v3nla") + " .mjx-mrow")
+ .invoke("text")
+ .then((text) => {
+ expect(text.trim()).equal("A1=(−3,7)");
+ });
+ cy.get(cesc("#\\/m2"))
+ .find(".mjx-mrow")
.eq(0)
- .should("have.text", "(5,6)");
+ .invoke("text")
+ .then((text) => {
+ expect(text.trim()).equal("A2=(5,−4)");
+ });
});
- it("external content cannot reach outside namespace", () => {
+ it("copy of template source maintained when withheld, macros", () => {
cy.window().then(async (win) => {
win.postMessage(
{
doenetML: `
a
- Number of points:
- Don't get this: Bye
+
+
+
+
+
+
+
+ A_1 = $(t1/A{displayDigits="3"})
+ A_2 = $(t2/A{displayDigits="3"})
`,
},
@@ -8582,522 +11827,507 @@ describe("Copy Tag Tests", function () {
// to wait for page to load
cy.get(cesc("#\\/_text1")).should("have.text", "a");
- cy.get(cesc2("#/hi")).should("have.text", "Bye");
-
- cy.get(cesc2("#/greetings/hi")).should("have.text", "Hello");
- cy.get(cesc2("#/greetings/c1")).should("have.text", "Hello");
- cy.get(cesc2("#/greetings/c2")).should("have.text", "Hello");
- cy.get(cesc2("#/greetings/c3")).should("have.text", "Hello");
- cy.get(cesc2("#/greetings/c4")).should("have.text", "Hello");
- cy.get(cesc2("#/greetings/c5")).should("have.text", "Hello");
+ cy.get(cesc("#\\/m1"))
+ .find(".mjx-mrow")
+ .eq(0)
+ .invoke("text")
+ .then((text) => {
+ expect(text.trim()).equal("A1=");
+ });
+ cy.get(cesc("#\\/m2"))
+ .find(".mjx-mrow")
+ .eq(0)
+ .invoke("text")
+ .then((text) => {
+ expect(text.trim()).equal("A2=");
+ });
- cy.get(cesc2("#/greetings/s/hi")).should("have.text", "Hola");
- cy.get(cesc2("#/greetings/s/l1")).should("have.text", "Hola");
- cy.get(cesc2("#/greetings/s/c1")).should("have.text", "Hello");
- cy.get(cesc2("#/greetings/s/c2")).should("have.text", "Hello");
- cy.get(cesc2("#/greetings/s/c3")).should("have.text", "Hello");
- cy.get(cesc2("#/greetings/s/c4")).should("have.text", "Hello");
+ cy.log("Add point");
- cy.get(cesc2("#/greetings/s/s/hi")).should("have.text", "Marhaban");
- cy.get(cesc2("#/greetings/s/s/l1")).should("have.text", "Marhaban");
- cy.get(cesc2("#/greetings/s/s/m1")).should("have.text", "Hola");
- cy.get(cesc2("#/greetings/s/s/c1")).should("have.text", "Hello");
- cy.get(cesc2("#/greetings/s/s/c2")).should("have.text", "Hello");
- cy.get(cesc2("#/greetings/s/s/c3")).should("have.text", "Hello");
- cy.get(cesc2("#/greetings/s/s/c4")).should("have.text", "Hello");
- cy.get(cesc2("#/greetings/s/s/c5")).should("have.text", "Hello");
- cy.get(cesc2("#/greetings/s/s/c5")).should("have.text", "Hello");
- });
+ cy.get(cesc("#\\/n") + " textarea").type("1{enter}", { force: true });
+ cy.get(cesc("#\\/m1")).should("contain.text", "A1=(1,1)");
+ cy.get(cesc("#\\/m1"))
+ .find(".mjx-mrow")
+ .eq(0)
+ .invoke("text")
+ .then((text) => {
+ expect(text.trim()).equal("A1=(1,1)");
+ });
+ cy.get(cesc("#\\/m2"))
+ .find(".mjx-mrow")
+ .eq(0)
+ .invoke("text")
+ .then((text) => {
+ expect(text.trim()).equal("A2=");
+ });
- it("external content cannot reach outside namespace, external is single section", () => {
+ cy.log("Move point");
cy.window().then(async (win) => {
- win.postMessage(
- {
- doenetML: `
- a
- Don't get this: Bye
-
- `,
- },
- "*",
- );
+ cy.get(cesc("#\\/m1")).should("contain.text", "A1=(−3,7)");
+ cy.get(cesc("#\\/m1"))
+ .find(".mjx-mrow")
+ .eq(0)
+ .invoke("text")
+ .then((text) => {
+ expect(text.trim()).equal("A1=(−3,7)");
+ });
+ cy.get(cesc("#\\/m2"))
+ .find(".mjx-mrow")
+ .eq(0)
+ .invoke("text")
+ .then((text) => {
+ expect(text.trim()).equal("A2=");
+ });
+
+ cy.log("Remove point");
+ cy.get(cesc("#\\/n") + " textarea").type("{end}{backspace}0{enter}", {
+ force: true,
});
- // to wait for page to load
- cy.get(cesc("#\\/_text1")).should("have.text", "a");
+ cy.get(cesc("#\\/m1")).should("not.contain.text", "A1=(−3,7)");
+ cy.get(cesc("#\\/m1"))
+ .find(".mjx-mrow")
+ .eq(0)
+ .invoke("text")
+ .then((text) => {
+ expect(text.trim()).equal("A1=");
+ });
+ cy.get(cesc("#\\/m2"))
+ .find(".mjx-mrow")
+ .eq(0)
+ .invoke("text")
+ .then((text) => {
+ expect(text.trim()).equal("A2=");
+ });
- cy.get(cesc2("#/hi")).should("have.text", "Bye");
+ cy.log("Remember coordinates when restore point since copy was maintained");
- cy.get(cesc2("#/greetings/hi")).should("have.text", "Hello");
+ cy.get(cesc("#\\/n") + " textarea").type("{end}{backspace}1{enter}", {
+ force: true,
+ });
- cy.get(cesc2("#/greetings/c1")).should("have.text", "Hello");
- cy.get(cesc2("#/greetings/c2")).should("have.text", "Hello");
- cy.get(cesc2("#/greetings/c3")).should("have.text", "Hello");
- cy.get(cesc2("#/greetings/c4")).should("have.text", "Hello");
- cy.get(cesc2("#/greetings/c5")).should("have.text", "Hello");
+ cy.get(cesc("#\\/m1") + " .mjx-mrow").should("contain.text", "A1=(−3,7)");
+ cy.get(cesc("#\\/m1"))
+ .find(".mjx-mrow")
+ .eq(0)
+ .invoke("text")
+ .then((text) => {
+ expect(text.trim()).equal("A1=(−3,7)");
+ });
+ cy.get(cesc("#\\/m2"))
+ .find(".mjx-mrow")
+ .eq(0)
+ .invoke("text")
+ .then((text) => {
+ expect(text.trim()).equal("A2=");
+ });
- cy.get(cesc2("#/greetings/s/hi")).should("have.text", "Hola");
+ cy.log("Add second point");
- cy.get(cesc2("#/greetings/s/l1")).should("have.text", "Hola");
- cy.get(cesc2("#/greetings/s/l2")).should("have.text", "Hola");
- cy.get(cesc2("#/greetings/s/l3")).should("have.text", "Hola");
- cy.get(cesc2("#/greetings/s/l4")).should("have.text", "Hola");
- cy.get(cesc2("#/greetings/s/l5")).should("have.text", "Hola");
+ cy.get(cesc("#\\/n") + " textarea").type("{end}{backspace}2{enter}", {
+ force: true,
+ });
+ cy.get(cesc("#\\/m2") + " .mjx-mrow").should("contain.text", "A2=(2,1)");
+ cy.get(cesc("#\\/m1"))
+ .find(".mjx-mrow")
+ .eq(0)
+ .invoke("text")
+ .then((text) => {
+ expect(text.trim()).equal("A1=(−3,7)");
+ });
+ cy.get(cesc("#\\/m2"))
+ .find(".mjx-mrow")
+ .eq(0)
+ .invoke("text")
+ .then((text) => {
+ expect(text.trim()).equal("A2=(2,1)");
+ });
- cy.get(cesc2("#/greetings/s/c1")).should("have.text", "Hello");
- cy.get(cesc2("#/greetings/s/c2")).should("have.text", "Hello");
- cy.get(cesc2("#/greetings/s/c3")).should("have.text", "Hello");
- cy.get(cesc2("#/greetings/s/c4")).should("have.text", "Hello");
- cy.get(cesc2("#/greetings/s/c5")).should("have.text", "Hello");
+ cy.log("Move second point");
+ cy.window().then(async (win) => {
+ let stateVariables = await win.returnAllStateVariables1();
+ win.callAction1({
+ actionName: "movePoint",
+ componentName: "/t2/A",
+ args: { x: 5, y: -4 },
+ });
+ });
- cy.get(cesc2("#/greetings/s/s/hi")).should("have.text", "Marhaban");
+ cy.get(cesc("#\\/m2") + " .mjx-mrow").should("contain.text", "A2=(5,−4)");
+ cy.get(cesc("#\\/m1"))
+ .find(".mjx-mrow")
+ .eq(0)
+ .invoke("text")
+ .then((text) => {
+ expect(text.trim()).equal("A1=(−3,7)");
+ });
+ cy.get(cesc("#\\/m2"))
+ .find(".mjx-mrow")
+ .eq(0)
+ .invoke("text")
+ .then((text) => {
+ expect(text.trim()).equal("A2=(5,−4)");
+ });
- cy.get(cesc2("#/greetings/s/s/l1")).should("have.text", "Marhaban");
- cy.get(cesc2("#/greetings/s/s/l2")).should("have.text", "Marhaban");
- cy.get(cesc2("#/greetings/s/s/l3")).should("have.text", "Marhaban");
- cy.get(cesc2("#/greetings/s/s/l4")).should("have.text", "Marhaban");
- cy.get(cesc2("#/greetings/s/s/l5")).should("have.text", "Marhaban");
+ cy.log("Remove both points");
+ cy.get(cesc("#\\/n") + " textarea").type("{end}{backspace}0{enter}", {
+ force: true,
+ });
- cy.get(cesc2("#/greetings/s/s/m1")).should("have.text", "Hola");
- cy.get(cesc2("#/greetings/s/s/m2")).should("have.text", "Hola");
- cy.get(cesc2("#/greetings/s/s/m3")).should("have.text", "Hola");
- cy.get(cesc2("#/greetings/s/s/m4")).should("have.text", "Hola");
- cy.get(cesc2("#/greetings/s/s/m5")).should("have.text", "Hola");
+ cy.get(cesc("#\\/m1") + " .mjx-mrow").should(
+ "not.contain.text",
+ "A1=(−3,7)",
+ );
+ cy.get(cesc("#\\/m1"))
+ .find(".mjx-mrow")
+ .eq(0)
+ .invoke("text")
+ .then((text) => {
+ expect(text.trim()).equal("A1=");
+ });
+ cy.get(cesc("#\\/m2"))
+ .find(".mjx-mrow")
+ .eq(0)
+ .invoke("text")
+ .then((text) => {
+ expect(text.trim()).equal("A2=");
+ });
- cy.get(cesc2("#/greetings/s/s/c1")).should("have.text", "Hello");
- cy.get(cesc2("#/greetings/s/s/c2")).should("have.text", "Hello");
- cy.get(cesc2("#/greetings/s/s/c3")).should("have.text", "Hello");
- cy.get(cesc2("#/greetings/s/s/c4")).should("have.text", "Hello");
- cy.get(cesc2("#/greetings/s/s/c5")).should("have.text", "Hello");
+ cy.log("Remember coordinates of both points");
+
+ cy.get(cesc("#\\/n") + " textarea").type("{end}{backspace}2{enter}", {
+ force: true,
+ });
+ cy.get(cesc("#\\/m1") + " .mjx-mrow").should("contain.text", "A1=(−3,7)");
+ cy.get(cesc("#\\/m1"))
+ .find(".mjx-mrow")
+ .eq(0)
+ .invoke("text")
+ .then((text) => {
+ expect(text.trim()).equal("A1=(−3,7)");
+ });
+ cy.get(cesc("#\\/m2"))
+ .find(".mjx-mrow")
+ .eq(0)
+ .invoke("text")
+ .then((text) => {
+ expect(text.trim()).equal("A2=(5,−4)");
+ });
});
- it("external content cannot reach outside namespace, with copyFromURI", () => {
+ it("trim whitespace off source", () => {
cy.window().then(async (win) => {
win.postMessage(
{
doenetML: `
- a
-
-
- Don't get this: Bye
-
+ Hello
+
`,
},
"*",
);
});
- // to wait for page to load
- cy.get(cesc("#\\/_text1")).should("have.text", "a");
-
- cy.get(cesc2("#/hi")).should("have.text", "Bye");
-
- cy.get(cesc2("#/greetings/hi")).should("have.text", "Hello");
-
- cy.get(cesc2("#/greetings/c1")).should("have.text", "Hello");
- cy.get(cesc2("#/greetings/c2")).should("have.text", "Hello");
- cy.get(cesc2("#/greetings/c3")).should("have.text", "Hello");
- cy.get(cesc2("#/greetings/c4")).should("have.text", "Hello");
- cy.get(cesc2("#/greetings/c5")).should("have.text", "Hello");
-
- cy.get(cesc2("#/greetings/s/hi")).should("have.text", "Hola");
-
- cy.get(cesc2("#/greetings/s/l1")).should("have.text", "Hola");
- cy.get(cesc2("#/greetings/s/l2")).should("have.text", "Hola");
- cy.get(cesc2("#/greetings/s/l3")).should("have.text", "Hola");
- cy.get(cesc2("#/greetings/s/l4")).should("have.text", "Hola");
- cy.get(cesc2("#/greetings/s/l5")).should("have.text", "Hola");
-
- cy.get(cesc2("#/greetings/s/c1")).should("have.text", "Hello");
- cy.get(cesc2("#/greetings/s/c2")).should("have.text", "Hello");
- cy.get(cesc2("#/greetings/s/c3")).should("have.text", "Hello");
- cy.get(cesc2("#/greetings/s/c4")).should("have.text", "Hello");
- cy.get(cesc2("#/greetings/s/c5")).should("have.text", "Hello");
-
- cy.get(cesc2("#/greetings/s/s/hi")).should("have.text", "Marhaban");
-
- cy.get(cesc2("#/greetings/s/s/l1")).should("have.text", "Marhaban");
- cy.get(cesc2("#/greetings/s/s/l2")).should("have.text", "Marhaban");
- cy.get(cesc2("#/greetings/s/s/l3")).should("have.text", "Marhaban");
- cy.get(cesc2("#/greetings/s/s/l4")).should("have.text", "Marhaban");
- cy.get(cesc2("#/greetings/s/s/l5")).should("have.text", "Marhaban");
-
- cy.get(cesc2("#/greetings/s/s/m1")).should("have.text", "Hola");
- cy.get(cesc2("#/greetings/s/s/m2")).should("have.text", "Hola");
- cy.get(cesc2("#/greetings/s/s/m3")).should("have.text", "Hola");
- cy.get(cesc2("#/greetings/s/s/m4")).should("have.text", "Hola");
- cy.get(cesc2("#/greetings/s/s/m5")).should("have.text", "Hola");
-
- cy.get(cesc2("#/greetings/s/s/c1")).should("have.text", "Hello");
- cy.get(cesc2("#/greetings/s/s/c2")).should("have.text", "Hello");
- cy.get(cesc2("#/greetings/s/s/c3")).should("have.text", "Hello");
- cy.get(cesc2("#/greetings/s/s/c4")).should("have.text", "Hello");
- cy.get(cesc2("#/greetings/s/s/c5")).should("have.text", "Hello");
+ cy.get(cesc("#\\/hi")).should("have.text", "Hello");
+ cy.get(cesc("#\\/_p1")).should("have.text", "Hello there");
});
- it("external content cannot reach outside namespace, external has namespace", () => {
+ it("trim whitespace off source, with copySource", () => {
cy.window().then(async (win) => {
win.postMessage(
{
doenetML: `
- a
- Don't get this: Bye
-
+ Hello
+
`,
},
"*",
);
});
- // to wait for page to load
- cy.get(cesc("#\\/_text1")).should("have.text", "a");
-
- cy.get(cesc2("#/hi")).should("have.text", "Bye");
-
- cy.get(cesc2("#/greetings/hi")).should("have.text", "Hello");
- cy.get(cesc2("#/greetings/c1")).should("have.text", "Hello");
- cy.get(cesc2("#/greetings/c2")).should("have.text", "Hello");
- cy.get(cesc2("#/greetings/c3")).should("have.text", "Hello");
- cy.get(cesc2("#/greetings/c4")).should("have.text", "Hello");
- cy.get(cesc2("#/greetings/c5")).should("have.text", "Hello");
-
- cy.get(cesc2("#/greetings/nm1")).should("not.exist");
- cy.get(cesc2("#/greetings/nm2")).should("not.exist");
- cy.get(cesc2("#/greetings/nm3")).should("not.exist");
- cy.get(cesc2("#/greetings/nm4")).should("not.exist");
-
- cy.get(cesc2("#/greetings/pNoMatch")).should(
- "have.text",
- "Four no matches:",
- );
-
- cy.get(cesc2("#/greetings/s/hi")).should("have.text", "Hola");
-
- cy.get(cesc2("#/greetings/s/l1")).should("have.text", "Hola");
- cy.get(cesc2("#/greetings/s/l2")).should("have.text", "Hola");
- cy.get(cesc2("#/greetings/s/l3")).should("have.text", "Hola");
- cy.get(cesc2("#/greetings/s/l4")).should("have.text", "Hola");
- cy.get(cesc2("#/greetings/s/l5")).should("have.text", "Hola");
-
- cy.get(cesc2("#/greetings/s/c1")).should("have.text", "Hello");
- cy.get(cesc2("#/greetings/s/c2")).should("have.text", "Hello");
- cy.get(cesc2("#/greetings/s/c3")).should("have.text", "Hello");
- cy.get(cesc2("#/greetings/s/c4")).should("have.text", "Hello");
- cy.get(cesc2("#/greetings/s/c5")).should("have.text", "Hello");
-
- cy.get(cesc2("#/greetings/s/nm1")).should("not.exist");
- cy.get(cesc2("#/greetings/s/nm2")).should("not.exist");
- cy.get(cesc2("#/greetings/s/nm3")).should("not.exist");
- cy.get(cesc2("#/greetings/s/nm4")).should("not.exist");
-
- cy.get(cesc2("#/greetings/s/pNoMatch")).should(
- "have.text",
- "Four no matches:",
- );
-
- cy.get(cesc2("#/greetings/s/s/hi")).should("have.text", "Marhaban");
-
- cy.get(cesc2("#/greetings/s/s/l1")).should("have.text", "Marhaban");
- cy.get(cesc2("#/greetings/s/s/l2")).should("have.text", "Marhaban");
- cy.get(cesc2("#/greetings/s/s/l3")).should("have.text", "Marhaban");
- cy.get(cesc2("#/greetings/s/s/l4")).should("have.text", "Marhaban");
- cy.get(cesc2("#/greetings/s/s/l5")).should("have.text", "Marhaban");
-
- cy.get(cesc2("#/greetings/s/s/m1")).should("have.text", "Hola");
- cy.get(cesc2("#/greetings/s/s/m2")).should("have.text", "Hola");
- cy.get(cesc2("#/greetings/s/s/m3")).should("have.text", "Hola");
- cy.get(cesc2("#/greetings/s/s/m4")).should("have.text", "Hola");
- cy.get(cesc2("#/greetings/s/s/m5")).should("have.text", "Hola");
-
- cy.get(cesc2("#/greetings/s/s/c1")).should("have.text", "Hello");
- cy.get(cesc2("#/greetings/s/s/c2")).should("have.text", "Hello");
- cy.get(cesc2("#/greetings/s/s/c3")).should("have.text", "Hello");
- cy.get(cesc2("#/greetings/s/s/c4")).should("have.text", "Hello");
- cy.get(cesc2("#/greetings/s/s/c5")).should("have.text", "Hello");
+ cy.get(cesc("#\\/hi")).should("have.text", "Hello");
+ cy.get(cesc("#\\/_p1")).should("have.text", "Hello there");
+ });
- cy.get(cesc2("#/greetings/s/s/nm1")).should("not.exist");
- cy.get(cesc2("#/greetings/s/s/nm2")).should("not.exist");
- cy.get(cesc2("#/greetings/s/s/nm3")).should("not.exist");
- cy.get(cesc2("#/greetings/s/s/nm4")).should("not.exist");
+ it("copy of external content retains desired variant", () => {
+ let doenetML = `
+ a
+ a
-
-
- Don't get this: Bye
-
- `,
+ doenetML,
+ requestedVariantIndex: 1,
},
"*",
);
});
- // to wait for page to load
cy.get(cesc("#\\/_text1")).should("have.text", "a");
- cy.get(cesc2("#/hi")).should("have.text", "Bye");
-
- cy.get(cesc2("#/greetings/hi")).should("have.text", "Hello");
- cy.get(cesc2("#/greetings/c1")).should("have.text", "Hello");
- cy.get(cesc2("#/greetings/c2")).should("have.text", "Hello");
- cy.get(cesc2("#/greetings/c3")).should("have.text", "Hello");
- cy.get(cesc2("#/greetings/c4")).should("have.text", "Hello");
- cy.get(cesc2("#/greetings/c5")).should("have.text", "Hello");
-
- cy.get(cesc2("#/greetings/nm1")).should("not.exist");
- cy.get(cesc2("#/greetings/nm2")).should("not.exist");
- cy.get(cesc2("#/greetings/nm3")).should("not.exist");
- cy.get(cesc2("#/greetings/nm4")).should("not.exist");
-
- cy.get(cesc2("#/greetings/pNoMatch")).should(
- "have.text",
- "Four no matches:",
- );
-
- cy.get(cesc2("#/greetings/s/hi")).should("have.text", "Hola");
-
- cy.get(cesc2("#/greetings/s/l1")).should("have.text", "Hola");
- cy.get(cesc2("#/greetings/s/l2")).should("have.text", "Hola");
- cy.get(cesc2("#/greetings/s/l3")).should("have.text", "Hola");
- cy.get(cesc2("#/greetings/s/l4")).should("have.text", "Hola");
- cy.get(cesc2("#/greetings/s/l5")).should("have.text", "Hola");
-
- cy.get(cesc2("#/greetings/s/c1")).should("have.text", "Hello");
- cy.get(cesc2("#/greetings/s/c2")).should("have.text", "Hello");
- cy.get(cesc2("#/greetings/s/c3")).should("have.text", "Hello");
- cy.get(cesc2("#/greetings/s/c4")).should("have.text", "Hello");
- cy.get(cesc2("#/greetings/s/c5")).should("have.text", "Hello");
-
- cy.get(cesc2("#/greetings/s/nm1")).should("not.exist");
- cy.get(cesc2("#/greetings/s/nm2")).should("not.exist");
- cy.get(cesc2("#/greetings/s/nm3")).should("not.exist");
- cy.get(cesc2("#/greetings/s/nm4")).should("not.exist");
-
- cy.get(cesc2("#/greetings/s/pNoMatch")).should(
- "have.text",
- "Four no matches:",
- );
-
- cy.get(cesc2("#/greetings/s/s/hi")).should("have.text", "Marhaban");
-
- cy.get(cesc2("#/greetings/s/s/l1")).should("have.text", "Marhaban");
- cy.get(cesc2("#/greetings/s/s/l2")).should("have.text", "Marhaban");
- cy.get(cesc2("#/greetings/s/s/l3")).should("have.text", "Marhaban");
- cy.get(cesc2("#/greetings/s/s/l4")).should("have.text", "Marhaban");
- cy.get(cesc2("#/greetings/s/s/l5")).should("have.text", "Marhaban");
-
- cy.get(cesc2("#/greetings/s/s/m1")).should("have.text", "Hola");
- cy.get(cesc2("#/greetings/s/s/m2")).should("have.text", "Hola");
- cy.get(cesc2("#/greetings/s/s/m3")).should("have.text", "Hola");
- cy.get(cesc2("#/greetings/s/s/m4")).should("have.text", "Hola");
- cy.get(cesc2("#/greetings/s/s/m5")).should("have.text", "Hola");
+ let catInd, choiceOrder;
- cy.get(cesc2("#/greetings/s/s/c1")).should("have.text", "Hello");
- cy.get(cesc2("#/greetings/s/s/c2")).should("have.text", "Hello");
- cy.get(cesc2("#/greetings/s/s/c3")).should("have.text", "Hello");
- cy.get(cesc2("#/greetings/s/s/c4")).should("have.text", "Hello");
- cy.get(cesc2("#/greetings/s/s/c5")).should("have.text", "Hello");
+ cy.window().then(async (win) => {
+ let stateVariables = await win.returnAllStateVariables1();
+ expect(
+ stateVariables["/problem1/_select1"].stateValues.currentVariantName,
+ ).eq("cat");
+ let choices =
+ stateVariables["/problem1/_choiceinput1"].stateValues.choiceTexts;
+ catInd = choices.indexOf("meow") + 1;
+ choiceOrder =
+ stateVariables["/problem1/_choiceinput1"].stateValues.choiceOrder;
- cy.get(cesc2("#/greetings/s/s/nm1")).should("not.exist");
- cy.get(cesc2("#/greetings/s/s/nm2")).should("not.exist");
- cy.get(cesc2("#/greetings/s/s/nm3")).should("not.exist");
- cy.get(cesc2("#/greetings/s/s/nm4")).should("not.exist");
+ cy.get(cesc2(`#/problem1/_choiceinput1_choice${catInd}_input`)).click();
+ });
- cy.get(cesc2("#/greetings/s/s/pNoMatch")).should(
- "have.text",
- "Four no matches:",
- );
- });
+ cy.get(cesc2(`#/problem1/_choiceinput1_submit`)).click();
+ cy.get(cesc2(`#/problem1/_choiceinput1_correct`)).should("be.visible");
+
+ cy.wait(2000); // make sure 1 second debounce occurred
+
+ cy.reload();
- it("external content inside external content cannot reach outside namespace", () => {
cy.window().then(async (win) => {
win.postMessage(
{
- doenetML: `
- a
- Don't get this 2: Leave
-
- `,
+ doenetML,
+ requestedVariantIndex: 1,
},
"*",
);
});
- // to wait for page to load
cy.get(cesc("#\\/_text1")).should("have.text", "a");
- cy.get(cesc2("#/hi")).should("have.text", "Leave");
-
- cy.get(cesc2("#/greet/hi")).should("have.text", "Bye");
+ // wait until core is loaded
+ cy.waitUntil(() =>
+ cy.window().then(async (win) => {
+ let stateVariables = await win.returnAllStateVariables1();
+ let foundIt = Boolean(
+ stateVariables["/problem1/_choiceinput1"]?.stateValues?.choiceTexts,
+ );
+ return foundIt;
+ }),
+ );
- cy.get(cesc2("#/greet/greetings/hi")).should("have.text", "Hello");
- cy.get(cesc2("#/greet/greetings/c1")).should("have.text", "Hello");
- cy.get(cesc2("#/greet/greetings/c2")).should("have.text", "Hello");
- cy.get(cesc2("#/greet/greetings/c3")).should("have.text", "Hello");
- cy.get(cesc2("#/greet/greetings/c4")).should("have.text", "Hello");
- cy.get(cesc2("#/greet/greetings/c5")).should("have.text", "Hello");
+ cy.window().then(async (win) => {
+ let stateVariables = await win.returnAllStateVariables1();
+ expect(
+ stateVariables["/problem1/_select1"].stateValues.currentVariantName,
+ ).eq("cat");
+ expect(
+ stateVariables["/problem1/_choiceinput1"].stateValues.choiceOrder,
+ ).eqls(choiceOrder);
+ let choices = [
+ ...stateVariables["/problem1/_choiceinput1"].stateValues.choiceTexts,
+ ];
+ expect(choices.indexOf("meow") + 1).eq(catInd);
+ });
+ });
- cy.get(cesc2("#/greet/greetings/s/hi")).should("have.text", "Hola");
- cy.get(cesc2("#/greet/greetings/s/l1")).should("have.text", "Hola");
- cy.get(cesc2("#/greet/greetings/s/c1")).should("have.text", "Hello");
- cy.get(cesc2("#/greet/greetings/s/c2")).should("have.text", "Hello");
- cy.get(cesc2("#/greet/greetings/s/c3")).should("have.text", "Hello");
- cy.get(cesc2("#/greet/greetings/s/c4")).should("have.text", "Hello");
+ it("copy of external content retains desired variant, with copyfromuri", () => {
+ let doenetML = `
+ a
+ a
- Don't get this 2: Leave
-
- `,
+ doenetML,
+ requestedVariantIndex: 1,
},
"*",
);
});
- // to wait for page to load
cy.get(cesc("#\\/_text1")).should("have.text", "a");
- cy.get(cesc2("#/hi")).should("have.text", "Leave");
-
- cy.get(cesc2("#/greet/hi")).should("have.text", "Bye");
+ let catInd, choiceOrder;
- cy.get(cesc2("#/greet/greetings/hi")).should("have.text", "Hello");
+ cy.window().then(async (win) => {
+ let stateVariables = await win.returnAllStateVariables1();
+ expect(
+ stateVariables["/problem1/_select1"].stateValues.currentVariantName,
+ ).eq("cat");
+ let choices =
+ stateVariables["/problem1/_choiceinput1"].stateValues.choiceTexts;
+ catInd = choices.indexOf("meow") + 1;
+ choiceOrder =
+ stateVariables["/problem1/_choiceinput1"].stateValues.choiceOrder;
- cy.get(cesc2("#/greet/greetings/c1")).should("have.text", "Hello");
- cy.get(cesc2("#/greet/greetings/c2")).should("have.text", "Hello");
- cy.get(cesc2("#/greet/greetings/c3")).should("have.text", "Hello");
- cy.get(cesc2("#/greet/greetings/c4")).should("have.text", "Hello");
- cy.get(cesc2("#/greet/greetings/c5")).should("have.text", "Hello");
+ cy.get(cesc2(`#/problem1/_choiceinput1_choice${catInd}_input`)).click();
+ });
- cy.get(cesc2("#/greet/greetings/s/hi")).should("have.text", "Hola");
+ cy.get(cesc2(`#/problem1/_choiceinput1_submit`)).click();
+ cy.get(cesc2(`#/problem1/_choiceinput1_correct`)).should("be.visible");
- cy.get(cesc2("#/greet/greetings/s/l1")).should("have.text", "Hola");
- cy.get(cesc2("#/greet/greetings/s/l2")).should("have.text", "Hola");
- cy.get(cesc2("#/greet/greetings/s/l3")).should("have.text", "Hola");
- cy.get(cesc2("#/greet/greetings/s/l4")).should("have.text", "Hola");
- cy.get(cesc2("#/greet/greetings/s/l5")).should("have.text", "Hola");
- cy.get(cesc2("#/greet/greetings/s/c1")).should("have.text", "Hello");
- cy.get(cesc2("#/greet/greetings/s/c2")).should("have.text", "Hello");
- cy.get(cesc2("#/greet/greetings/s/c3")).should("have.text", "Hello");
- cy.get(cesc2("#/greet/greetings/s/c4")).should("have.text", "Hello");
+ cy.wait(2000); // make sure 1 second debounce occurred
- cy.get(cesc2("#/greet/greetings/s/s/hi")).should("have.text", "Marhaban");
- cy.get(cesc2("#/greet/greetings/s/s/l1")).should("have.text", "Marhaban");
- cy.get(cesc2("#/greet/greetings/s/s/m1")).should("have.text", "Hola");
- cy.get(cesc2("#/greet/greetings/s/s/c1")).should("have.text", "Hello");
- cy.get(cesc2("#/greet/greetings/s/s/c2")).should("have.text", "Hello");
- cy.get(cesc2("#/greet/greetings/s/s/c3")).should("have.text", "Hello");
- cy.get(cesc2("#/greet/greetings/s/s/c4")).should("have.text", "Hello");
- cy.get(cesc2("#/greet/greetings/s/s/c5")).should("have.text", "Hello");
- cy.get(cesc2("#/greet/greetings/s/s/c5")).should("have.text", "Hello");
- });
+ cy.reload();
- it("external content inside external content cannot reach outside namespace, with copyFromURI", () => {
cy.window().then(async (win) => {
win.postMessage(
{
- doenetML: `
+ doenetML,
+ requestedVariantIndex: 1,
+ },
+ "*",
+ );
+ });
+
+ cy.get(cesc("#\\/_text1")).should("have.text", "a");
+
+ // wait until core is loaded
+ cy.waitUntil(() =>
+ cy.window().then(async (win) => {
+ let stateVariables = await win.returnAllStateVariables1();
+ let foundIt = Boolean(
+ stateVariables["/problem1/_choiceinput1"]?.stateValues?.choiceTexts,
+ );
+ return foundIt;
+ }),
+ );
+
+ cy.window().then(async (win) => {
+ let stateVariables = await win.returnAllStateVariables1();
+ expect(
+ stateVariables["/problem1/_select1"].stateValues.currentVariantName,
+ ).eq("cat");
+ expect(
+ stateVariables["/problem1/_choiceinput1"].stateValues.choiceOrder,
+ ).eqls(choiceOrder);
+ let choices = [
+ ...stateVariables["/problem1/_choiceinput1"].stateValues.choiceTexts,
+ ];
+ expect(choices.indexOf("meow") + 1).eq(catInd);
+ });
+ });
+
+ it("copy of external content retains desired variant, no problem in external content", () => {
+ let doenetML = `
a
-
+ Don't get this 2: Leave
-
- `,
+ cy.get("#testRunner_toggleControls").click();
+ cy.get("#testRunner_allowLocalState").click();
+ cy.wait(100);
+ cy.get("#testRunner_toggleControls").click();
+
+ cy.window().then(async (win) => {
+ win.postMessage(
+ {
+ doenetML,
+ requestedVariantIndex: 1,
},
"*",
);
});
- // to wait for page to load
cy.get(cesc("#\\/_text1")).should("have.text", "a");
- cy.get(cesc2("#/hi")).should("have.text", "Leave");
+ let catInd, choiceOrder;
- cy.get(cesc2("#/greet/hi")).should("have.text", "Bye");
+ cy.window().then(async (win) => {
+ let stateVariables = await win.returnAllStateVariables1();
+ expect(
+ stateVariables["/problem1/_select1"].stateValues.currentVariantName,
+ ).eq("cat");
+ let choices =
+ stateVariables["/problem1/_choiceinput1"].stateValues.choiceTexts;
+ catInd = choices.indexOf("meow") + 1;
+ choiceOrder =
+ stateVariables["/problem1/_choiceinput1"].stateValues.choiceOrder;
- cy.get(cesc2("#/greet/greetings/hi")).should("have.text", "Hello");
+ cy.get(cesc2(`#/problem1/_choiceinput1_choice${catInd}_input`)).click();
+ });
- cy.get(cesc2("#/greet/greetings/c1")).should("have.text", "Hello");
- cy.get(cesc2("#/greet/greetings/c2")).should("have.text", "Hello");
- cy.get(cesc2("#/greet/greetings/c3")).should("have.text", "Hello");
- cy.get(cesc2("#/greet/greetings/c4")).should("have.text", "Hello");
- cy.get(cesc2("#/greet/greetings/c5")).should("have.text", "Hello");
+ cy.get(cesc2(`#/problem1/_choiceinput1_submit`)).click();
+ cy.get(cesc2(`#/problem1/_choiceinput1_correct`)).should("be.visible");
- cy.get(cesc2("#/greet/greetings/s/hi")).should("have.text", "Hola");
+ cy.wait(2000); // make sure 1 second debounce occurred
- cy.get(cesc2("#/greet/greetings/s/l1")).should("have.text", "Hola");
- cy.get(cesc2("#/greet/greetings/s/l2")).should("have.text", "Hola");
- cy.get(cesc2("#/greet/greetings/s/l3")).should("have.text", "Hola");
- cy.get(cesc2("#/greet/greetings/s/l4")).should("have.text", "Hola");
- cy.get(cesc2("#/greet/greetings/s/l5")).should("have.text", "Hola");
- cy.get(cesc2("#/greet/greetings/s/c1")).should("have.text", "Hello");
- cy.get(cesc2("#/greet/greetings/s/c2")).should("have.text", "Hello");
- cy.get(cesc2("#/greet/greetings/s/c3")).should("have.text", "Hello");
- cy.get(cesc2("#/greet/greetings/s/c4")).should("have.text", "Hello");
+ cy.reload();
- cy.get(cesc2("#/greet/greetings/s/s/hi")).should("have.text", "Marhaban");
- cy.get(cesc2("#/greet/greetings/s/s/l1")).should("have.text", "Marhaban");
- cy.get(cesc2("#/greet/greetings/s/s/m1")).should("have.text", "Hola");
- cy.get(cesc2("#/greet/greetings/s/s/c1")).should("have.text", "Hello");
- cy.get(cesc2("#/greet/greetings/s/s/c2")).should("have.text", "Hello");
- cy.get(cesc2("#/greet/greetings/s/s/c3")).should("have.text", "Hello");
- cy.get(cesc2("#/greet/greetings/s/s/c4")).should("have.text", "Hello");
- cy.get(cesc2("#/greet/greetings/s/s/c5")).should("have.text", "Hello");
- cy.get(cesc2("#/greet/greetings/s/s/c5")).should("have.text", "Hello");
+ cy.window().then(async (win) => {
+ win.postMessage(
+ {
+ doenetML,
+ requestedVariantIndex: 1,
+ },
+ "*",
+ );
+ });
+
+ cy.get(cesc("#\\/_text1")).should("have.text", "a");
+
+ // wait until core is loaded
+ cy.waitUntil(() =>
+ cy.window().then(async (win) => {
+ let stateVariables = await win.returnAllStateVariables1();
+ let foundIt = Boolean(
+ stateVariables["/problem1/_choiceinput1"]?.stateValues?.choiceTexts,
+ );
+ return foundIt;
+ }),
+ );
+
+ cy.window().then(async (win) => {
+ let stateVariables = await win.returnAllStateVariables1();
+ expect(
+ stateVariables["/problem1/_select1"].stateValues.currentVariantName,
+ ).eq("cat");
+ expect(
+ stateVariables["/problem1/_choiceinput1"].stateValues.choiceOrder,
+ ).eqls(choiceOrder);
+ let choices = [
+ ...stateVariables["/problem1/_choiceinput1"].stateValues.choiceTexts,
+ ];
+ expect(choices.indexOf("meow") + 1).eq(catInd);
+ });
});
- it("copy of template source maintained when withheld", () => {
+ it("copy with newNamespace and name retains original names, even with group", () => {
cy.window().then(async (win) => {
win.postMessage(
{
doenetML: `
- a
- Number of points:
-
-
-
-
-
-
-
-
- A_1 =
- A_2 =
+ a
+ values: 1 2 3
+
+
+
+ $p1
+ Hello
-
- `,
- },
- "*",
- );
});
-
- cy.get(cesc("#\\/hi")).should("have.text", "Hello");
- cy.get(cesc("#\\/_p1")).should("have.text", "Hello there");
});
- it("trim whitespace off source, with copySource", () => {
+ it("copy with newNamespace and name retains original names, even with group, macros", () => {
cy.window().then(async (win) => {
win.postMessage(
{
doenetML: `
- Hello
-
+ a
+ values: 1 2 3
+
+ $_p1{newNamespace name="p1"}
+
+ $p1
+ $p1{name="p1a"}
+ $p1{newNamespace}
+ $p1{newNamespace name="p1b"}
+ $p1a{newNamespace}
+
+ $_section1
+ $_section1{name="s1a"}
+ $_section1{newNamespace}
+ $_section1{newNamespace name="s1b"}
+
`,
},
"*",
);
});
- cy.get(cesc("#\\/hi")).should("have.text", "Hello");
- cy.get(cesc("#\\/_p1")).should("have.text", "Hello there");
- });
+ cy.get(cesc2("#/_text1")).should("have.text", "a");
+ cy.get(cesc2("#/_number1")).should("have.text", "1");
+ cy.get(cesc2("#/_number2")).should("have.text", "2");
+ cy.get(cesc2("#/_number3")).should("have.text", "3");
- it("copy of external content retains desired variant", () => {
- let doenetML = `
- a
- a
- a
+ values: 1 2 3
+
+
+
+
+
+
+
+
+
+ `,
},
"*",
);
});
- cy.get(cesc("#\\/_text1")).should("have.text", "a");
+ cy.get(cesc2("#/_text1")).should("have.text", "a");
+ cy.get(cesc2("#/_number1")).should("have.text", "1");
+ cy.get(cesc2("#/_number2")).should("have.text", "2");
+ cy.get(cesc2("#/_number3")).should("have.text", "3");
- let catInd, choiceOrder;
+ cy.get(cesc2("#/p1a/_number1")).should("have.text", "1");
+ cy.get(cesc2("#/p1a/_number2")).should("have.text", "2");
+ cy.get(cesc2("#/p1a/_number3")).should("have.text", "3");
+
+ cy.get(cesc2("#/p1b/_number1")).should("have.text", "1");
+ cy.get(cesc2("#/p1b/_number2")).should("have.text", "2");
+ cy.get(cesc2("#/p1b/_number3")).should("have.text", "3");
+
+ cy.get(cesc2("#/p1c/_number1")).should("have.text", "1");
+ cy.get(cesc2("#/p1c/_number2")).should("have.text", "2");
+ cy.get(cesc2("#/p1c/_number3")).should("have.text", "3");
+
+ cy.get(cesc2("#/s1b/p1a/_number1")).should("have.text", "1");
+ cy.get(cesc2("#/s1b/p1a/_number2")).should("have.text", "2");
+ cy.get(cesc2("#/s1b/p1a/_number3")).should("have.text", "3");
+
+ cy.get(cesc2("#/_p1")).should("have.text", "values: 1 2 3");
+ cy.get(cesc2("#/p1a")).should("have.text", "values: 1 2 3");
+ cy.get(cesc2("#/p1b")).should("have.text", "values: 1 2 3");
+ cy.get(cesc2("#/p1c")).should("have.text", "values: 1 2 3");
+ cy.get(cesc2("#/s1b/p1a")).should("have.text", "values: 1 2 3");
+
+ cy.get(cesc2("#/_section1"))
+ .invoke("text")
+ .then((text) => {
+ expect(text.match(/Section 1\s*values: 1 2 3/)).not.be.null;
+ });
+ cy.get(cesc2("#/s1a"))
+ .invoke("text")
+ .then((text) => {
+ expect(text.match(/Section 2\s*values: 1 2 3/)).not.be.null;
+ });
+ cy.get(cesc2("#/s1b"))
+ .invoke("text")
+ .then((text) => {
+ expect(text.match(/Section 3\s*values: 1 2 3/)).not.be.null;
+ });
cy.window().then(async (win) => {
let stateVariables = await win.returnAllStateVariables1();
- expect(
- stateVariables["/problem1/_select1"].stateValues.currentVariantName,
- ).eq("cat");
- let choices =
- stateVariables["/problem1/_choiceinput1"].stateValues.choiceTexts;
- catInd = choices.indexOf("meow") + 1;
- choiceOrder =
- stateVariables["/problem1/_choiceinput1"].stateValues.choiceOrder;
- cy.get(cesc2(`#/problem1/_choiceinput1_choice${catInd}_input`)).click();
- });
+ expect(stateVariables["/p1a/_number1"].stateValues.value).eq(1);
+ expect(stateVariables["/p1a/_number2"].stateValues.value).eq(2);
+ expect(stateVariables["/p1a/_number3"].stateValues.value).eq(3);
- cy.get(cesc2(`#/problem1/_choiceinput1_submit`)).click();
- cy.get(cesc2(`#/problem1/_choiceinput1_correct`)).should("be.visible");
+ expect(stateVariables["/p1b/_number1"].stateValues.value).eq(1);
+ expect(stateVariables["/p1b/_number2"].stateValues.value).eq(2);
+ expect(stateVariables["/p1b/_number3"].stateValues.value).eq(3);
- cy.wait(2000); // make sure 1 second debounce occurred
+ expect(stateVariables["/p1c/_number1"].stateValues.value).eq(1);
+ expect(stateVariables["/p1c/_number2"].stateValues.value).eq(2);
+ expect(stateVariables["/p1c/_number3"].stateValues.value).eq(3);
- cy.reload();
+ // s1a's grandchildren should have gotten unique names (so begin with two underscores)
+ let s1aChildName = stateVariables["/s1a"].activeChildren[0].componentName;
+ let s1aGrandChildNames = stateVariables[s1aChildName].activeChildren
+ .filter((x) => x.componentName)
+ .map((x) => x.componentName);
+ expect(s1aGrandChildNames[0].slice(0, 3)).eq("/__");
+ expect(s1aGrandChildNames[1].slice(0, 3)).eq("/__");
+ expect(s1aGrandChildNames[2].slice(0, 3)).eq("/__");
+ expect(stateVariables[s1aGrandChildNames[0]].stateValues.value).eq(1);
+ expect(stateVariables[s1aGrandChildNames[1]].stateValues.value).eq(2);
+ expect(stateVariables[s1aGrandChildNames[2]].stateValues.value).eq(3);
+ });
+ });
+ it("copy with newNamespace and name retains original names, even with group that assigns names", () => {
cy.window().then(async (win) => {
win.postMessage(
{
- doenetML,
- requestedVariantIndex: 1,
+ doenetML: `
+ a
+ values: 1 2 3
+
+
+
+ $p1
+ a
- a
- values: 1 2 3
+ values: 1 2 3
-
+ $_p1{newNamespace name="p1"}
- a
- values: 1 2 3
+ values: 1 2 3
@@ -9825,25 +13201,25 @@ describe("Copy Tag Tests", function () {
});
cy.get(cesc2("#/_text1")).should("have.text", "a");
- cy.get(cesc2("#/_number1")).should("have.text", "1");
- cy.get(cesc2("#/_number2")).should("have.text", "2");
- cy.get(cesc2("#/_number3")).should("have.text", "3");
+ cy.get(cesc2("#/n1")).should("have.text", "1");
+ cy.get(cesc2("#/n2")).should("have.text", "2");
+ cy.get(cesc2("#/n3")).should("have.text", "3");
- cy.get(cesc2("#/p1a/_number1")).should("have.text", "1");
- cy.get(cesc2("#/p1a/_number2")).should("have.text", "2");
- cy.get(cesc2("#/p1a/_number3")).should("have.text", "3");
+ cy.get(cesc2("#/p1a/n1")).should("have.text", "1");
+ cy.get(cesc2("#/p1a/n2")).should("have.text", "2");
+ cy.get(cesc2("#/p1a/n3")).should("have.text", "3");
- cy.get(cesc2("#/p1b/_number1")).should("have.text", "1");
- cy.get(cesc2("#/p1b/_number2")).should("have.text", "2");
- cy.get(cesc2("#/p1b/_number3")).should("have.text", "3");
+ cy.get(cesc2("#/p1b/n1")).should("have.text", "1");
+ cy.get(cesc2("#/p1b/n2")).should("have.text", "2");
+ cy.get(cesc2("#/p1b/n3")).should("have.text", "3");
- cy.get(cesc2("#/p1c/_number1")).should("have.text", "1");
- cy.get(cesc2("#/p1c/_number2")).should("have.text", "2");
- cy.get(cesc2("#/p1c/_number3")).should("have.text", "3");
+ cy.get(cesc2("#/p1c/n1")).should("have.text", "1");
+ cy.get(cesc2("#/p1c/n2")).should("have.text", "2");
+ cy.get(cesc2("#/p1c/n3")).should("have.text", "3");
- cy.get(cesc2("#/s1b/p1a/_number1")).should("have.text", "1");
- cy.get(cesc2("#/s1b/p1a/_number2")).should("have.text", "2");
- cy.get(cesc2("#/s1b/p1a/_number3")).should("have.text", "3");
+ cy.get(cesc2("#/s1b/p1a/n1")).should("have.text", "1");
+ cy.get(cesc2("#/s1b/p1a/n2")).should("have.text", "2");
+ cy.get(cesc2("#/s1b/p1a/n3")).should("have.text", "3");
cy.get(cesc2("#/_p1")).should("have.text", "values: 1 2 3");
cy.get(cesc2("#/p1a")).should("have.text", "values: 1 2 3");
@@ -9870,17 +13246,17 @@ describe("Copy Tag Tests", function () {
cy.window().then(async (win) => {
let stateVariables = await win.returnAllStateVariables1();
- expect(stateVariables["/p1a/_number1"].stateValues.value).eq(1);
- expect(stateVariables["/p1a/_number2"].stateValues.value).eq(2);
- expect(stateVariables["/p1a/_number3"].stateValues.value).eq(3);
+ expect(stateVariables["/p1a/n1"].stateValues.value).eq(1);
+ expect(stateVariables["/p1a/n2"].stateValues.value).eq(2);
+ expect(stateVariables["/p1a/n3"].stateValues.value).eq(3);
- expect(stateVariables["/p1b/_number1"].stateValues.value).eq(1);
- expect(stateVariables["/p1b/_number2"].stateValues.value).eq(2);
- expect(stateVariables["/p1b/_number3"].stateValues.value).eq(3);
+ expect(stateVariables["/p1b/n1"].stateValues.value).eq(1);
+ expect(stateVariables["/p1b/n2"].stateValues.value).eq(2);
+ expect(stateVariables["/p1b/n3"].stateValues.value).eq(3);
- expect(stateVariables["/p1c/_number1"].stateValues.value).eq(1);
- expect(stateVariables["/p1c/_number2"].stateValues.value).eq(2);
- expect(stateVariables["/p1c/_number3"].stateValues.value).eq(3);
+ expect(stateVariables["/p1c/n1"].stateValues.value).eq(1);
+ expect(stateVariables["/p1c/n2"].stateValues.value).eq(2);
+ expect(stateVariables["/p1c/n3"].stateValues.value).eq(3);
// s1a's grandchildren should have gotten unique names (so begin with two underscores)
let s1aChildName = stateVariables["/s1a"].activeChildren[0].componentName;
@@ -9896,25 +13272,220 @@ describe("Copy Tag Tests", function () {
});
});
- it("copy with newNamespace retains original names, even with group that assigns names", () => {
+ it("copy with newNamespace and name retains original names, even with group that assigns name to just one number, macros", () => {
cy.window().then(async (win) => {
win.postMessage(
{
doenetML: `
a
- values: 1 2 3
+ values: 1 2 3
+
+ $_p1{newNamespace name="p1"}
+
+ $p1
+ $p1{name="p1a"}
+ $p1{newNamespace}
+ $p1{newNamespace name="p1b"}
+ $p1a{newNamespace}
+
+ $_section1
+ $_section1{name="s1a"}
+ $_section1{newNamespace}
+ $_section1{newNamespace name="s1b"}
+
+ `,
+ },
+ "*",
+ );
+ });
+
+ cy.get(cesc2("#/_text1")).should("have.text", "a");
+ cy.get(cesc2("#/n1")).should("have.text", "1");
+ cy.get(cesc2("#/_number2")).should("have.text", "2");
+ cy.get(cesc2("#/_number3")).should("have.text", "3");
+
+ cy.get(cesc2("#/p1/n1")).should("have.text", "1");
+ cy.get(cesc2("#/p1/_number2")).should("have.text", "2");
+ cy.get(cesc2("#/p1/_number3")).should("have.text", "3");
+
+ cy.get(cesc2("#/p1a/n1")).should("have.text", "1");
+ cy.get(cesc2("#/p1a/_number2")).should("have.text", "2");
+ cy.get(cesc2("#/p1a/_number3")).should("have.text", "3");
+
+ cy.get(cesc2("#/p1b/n1")).should("have.text", "1");
+ cy.get(cesc2("#/p1b/_number2")).should("have.text", "2");
+ cy.get(cesc2("#/p1b/_number3")).should("have.text", "3");
+
+ cy.get(cesc2("#/s1b/p1/n1")).should("have.text", "1");
+ cy.get(cesc2("#/s1b/p1/_number2")).should("have.text", "2");
+ cy.get(cesc2("#/s1b/p1/_number3")).should("have.text", "3");
+
+ cy.get(cesc2("#/_p1")).should("have.text", "values: 1 2 3");
+ cy.get(cesc2("#/p1a")).should("have.text", "values: 1 2 3");
+ cy.get(cesc2("#/p1b")).should("have.text", "values: 1 2 3");
+ cy.get(cesc2("#/s1b/p1")).should("have.text", "values: 1 2 3");
+
+ cy.get(cesc2("#/_section1"))
+ .invoke("text")
+ .then((text) => {
+ expect(text.match(/Section 1\s*values: 1 2 3/)).not.be.null;
+ });
+ cy.get(cesc2("#/s1a"))
+ .invoke("text")
+ .then((text) => {
+ expect(text.match(/Section 3\s*values: 1 2 3/)).not.be.null;
+ });
+ cy.get(cesc2("#/s1b"))
+ .invoke("text")
+ .then((text) => {
+ expect(text.match(/Section 5\s*values: 1 2 3/)).not.be.null;
+ });
+
+ cy.window().then(async (win) => {
+ let stateVariables = await win.returnAllStateVariables1();
+ let c2p = stateVariables["/_document1"].activeChildren[7].componentName;
+ let c4p = stateVariables["/_document1"].activeChildren[11].componentName;
+ let c6p = stateVariables["/_document1"].activeChildren[15].componentName;
+ let c7s = stateVariables["/_document1"].activeChildren[17].componentName;
+ let c9s = stateVariables["/_document1"].activeChildren[21].componentName;
+
+ cy.get(cesc2("#" + c2p)).should("have.text", "values: 1 2 3");
+ cy.get(cesc2("#" + c4p)).should("have.text", "values: 1 2 3");
+ cy.get(cesc2("#" + c6p)).should("have.text", "values: 1 2 3");
+
+ cy.get(cesc2("#" + c7s))
+ .invoke("text")
+ .then((text) => {
+ expect(text.match(/Section 2\s*values: 1 2 3/)).not.be.null;
+ });
+ cy.get(cesc2("#" + c9s))
+ .invoke("text")
+ .then((text) => {
+ expect(text.match(/Section 4\s*values: 1 2 3/)).not.be.null;
+ });
+
+ // put in window just so happens after above
+ cy.window().then(async (win) => {
+ expect(stateVariables["/p1/n1"].stateValues.value).eq(1);
+ expect(stateVariables["/p1/_number2"].stateValues.value).eq(2);
+ expect(stateVariables["/p1/_number3"].stateValues.value).eq(3);
+
+ // c2p's children should have gotten unique names (so begin with two underscores)
+ let c2pChildNames = stateVariables[c2p].activeChildren
+ .filter((x) => x.componentName)
+ .map((x) => x.componentName);
+ expect(c2pChildNames[0].slice(0, 3)).eq("/__");
+ expect(c2pChildNames[1].slice(0, 3)).eq("/__");
+ expect(c2pChildNames[2].slice(0, 3)).eq("/__");
+ expect(stateVariables[c2pChildNames[0]].stateValues.value).eq(1);
+ expect(stateVariables[c2pChildNames[1]].stateValues.value).eq(2);
+ expect(stateVariables[c2pChildNames[2]].stateValues.value).eq(3);
+
+ // c4p's children should have gotten unique names (so begin with two underscores)
+ let c4pChildNames = stateVariables[c4p].activeChildren
+ .filter((x) => x.componentName)
+ .map((x) => x.componentName);
+ expect(c4pChildNames[0].slice(0, 3)).eq("/__");
+ expect(c4pChildNames[1].slice(0, 3)).eq("/__");
+ expect(c4pChildNames[2].slice(0, 3)).eq("/__");
+ expect(stateVariables[c4pChildNames[0]].stateValues.value).eq(1);
+ expect(stateVariables[c4pChildNames[1]].stateValues.value).eq(2);
+ expect(stateVariables[c4pChildNames[2]].stateValues.value).eq(3);
+
+ // c6p's children should have gotten unique names (so begin with two underscores)
+ let c6pChildNames = stateVariables[c6p].activeChildren
+ .filter((x) => x.componentName)
+ .map((x) => x.componentName);
+ expect(c6pChildNames[0].slice(0, 3)).eq("/__");
+ expect(c6pChildNames[1].slice(0, 3)).eq("/__");
+ expect(c6pChildNames[2].slice(0, 3)).eq("/__");
+ expect(stateVariables[c6pChildNames[0]].stateValues.value).eq(1);
+ expect(stateVariables[c6pChildNames[1]].stateValues.value).eq(2);
+ expect(stateVariables[c6pChildNames[2]].stateValues.value).eq(3);
+
+ // c7s's grandchildren should have gotten unique names (so begin with two underscores)
+ let c7sChildName = stateVariables[c7s].activeChildren.filter(
+ (x) => x.componentName,
+ )[0].componentName;
+ let c7sGrandChildNames = stateVariables[c7sChildName].activeChildren
+ .filter((x) => x.componentName)
+ .map((x) => x.componentName);
+
+ expect(c7sGrandChildNames[0].slice(0, 3)).eq("/__");
+ expect(c7sGrandChildNames[1].slice(0, 3)).eq("/__");
+ expect(c7sGrandChildNames[2].slice(0, 3)).eq("/__");
+ expect(stateVariables[c7sGrandChildNames[0]].stateValues.value).eq(1);
+ expect(stateVariables[c7sGrandChildNames[1]].stateValues.value).eq(2);
+ expect(stateVariables[c7sGrandChildNames[2]].stateValues.value).eq(3);
+
+ // s1a's grandchildren should have gotten unique names (so begin with two underscores)
+ let s1aChildName = stateVariables["/s1a"].activeChildren.filter(
+ (x) => x.componentName,
+ )[0].componentName;
+ let s1aGrandChildNames = stateVariables[s1aChildName].activeChildren
+ .filter((x) => x.componentName)
+ .map((x) => x.componentName);
+
+ expect(s1aGrandChildNames[0].slice(0, 3)).eq("/__");
+ expect(s1aGrandChildNames[1].slice(0, 3)).eq("/__");
+ expect(s1aGrandChildNames[2].slice(0, 3)).eq("/__");
+ expect(stateVariables[s1aGrandChildNames[0]].stateValues.value).eq(1);
+ expect(stateVariables[s1aGrandChildNames[1]].stateValues.value).eq(2);
+ expect(stateVariables[s1aGrandChildNames[2]].stateValues.value).eq(3);
+
+ // c9s's grandchildren should have gotten unique names (so begin with two underscores)
+ let c9sChildName = stateVariables[c9s].activeChildren.filter(
+ (x) => x.componentName,
+ )[0].componentName;
+ let c9sGrandChildNames = stateVariables[c9sChildName].activeChildren
+ .filter((x) => x.componentName)
+ .map((x) => x.componentName);
+
+ expect(c9sGrandChildNames[0].slice(0, 3)).eq("/__");
+ expect(c9sGrandChildNames[1].slice(0, 3)).eq("/__");
+ expect(c9sGrandChildNames[2].slice(0, 3)).eq("/__");
+ expect(stateVariables[c9sGrandChildNames[0]].stateValues.value).eq(1);
+ expect(stateVariables[c9sGrandChildNames[1]].stateValues.value).eq(2);
+ expect(stateVariables[c9sGrandChildNames[2]].stateValues.value).eq(3);
+
+ // s1b's grandchildren should have retained their original names
+ let s1bChildName = stateVariables["/s1b"].activeChildren.filter(
+ (x) => x.componentName,
+ )[0].componentName;
+ let s1bGrandChildNames = stateVariables[s1bChildName].activeChildren
+ .filter((x) => x.componentName)
+ .map((x) => x.componentName);
+
+ expect(s1bGrandChildNames[0]).eq("/s1b/p1/n1");
+ expect(s1bGrandChildNames[1]).eq("/s1b/p1/_number2");
+ expect(s1bGrandChildNames[2]).eq("/s1b/p1/_number3");
+ expect(stateVariables[s1bGrandChildNames[0]].stateValues.value).eq(1);
+ expect(stateVariables[s1bGrandChildNames[1]].stateValues.value).eq(2);
+ expect(stateVariables[s1bGrandChildNames[2]].stateValues.value).eq(3);
+ });
+ });
+ });
+
+ it("copy with newNamespace and name retains original names, even with group that has new namespace, macros", () => {
+ cy.window().then(async (win) => {
+ win.postMessage(
+ {
+ doenetML: `
+ a
+ values: 1 2 3
-
+ $_p1{newNamespace name="p1"}
- a
- values: 1 2 3
+ values: 1 2 3
@@ -10130,25 +13683,21 @@ describe("Copy Tag Tests", function () {
});
cy.get(cesc2("#/_text1")).should("have.text", "a");
- cy.get(cesc2("#/n1")).should("have.text", "1");
- cy.get(cesc2("#/n2")).should("have.text", "2");
- cy.get(cesc2("#/n3")).should("have.text", "3");
-
- cy.get(cesc2("#/p1a/n1")).should("have.text", "1");
- cy.get(cesc2("#/p1a/n2")).should("have.text", "2");
- cy.get(cesc2("#/p1a/n3")).should("have.text", "3");
+ cy.get(cesc2("#/grp/_number1")).should("have.text", "1");
+ cy.get(cesc2("#/grp/_number2")).should("have.text", "2");
+ cy.get(cesc2("#/_number1")).should("have.text", "3");
- cy.get(cesc2("#/p1b/n1")).should("have.text", "1");
- cy.get(cesc2("#/p1b/n2")).should("have.text", "2");
- cy.get(cesc2("#/p1b/n3")).should("have.text", "3");
+ cy.get(cesc2("#/p1a/grp/_number1")).should("have.text", "1");
+ cy.get(cesc2("#/p1a/grp/_number2")).should("have.text", "2");
+ cy.get(cesc2("#/p1a/_number1")).should("have.text", "3");
- cy.get(cesc2("#/p1c/n1")).should("have.text", "1");
- cy.get(cesc2("#/p1c/n2")).should("have.text", "2");
- cy.get(cesc2("#/p1c/n3")).should("have.text", "3");
+ cy.get(cesc2("#/p1b/grp/_number1")).should("have.text", "1");
+ cy.get(cesc2("#/p1b/grp/_number2")).should("have.text", "2");
+ cy.get(cesc2("#/p1b/_number1")).should("have.text", "3");
- cy.get(cesc2("#/s1b/p1a/n1")).should("have.text", "1");
- cy.get(cesc2("#/s1b/p1a/n2")).should("have.text", "2");
- cy.get(cesc2("#/s1b/p1a/n3")).should("have.text", "3");
+ cy.get(cesc2("#/p1c/grp/_number1")).should("have.text", "1");
+ cy.get(cesc2("#/p1c/grp/_number2")).should("have.text", "2");
+ cy.get(cesc2("#/p1c/_number1")).should("have.text", "3");
cy.get(cesc2("#/_p1")).should("have.text", "values: 1 2 3");
cy.get(cesc2("#/p1a")).should("have.text", "values: 1 2 3");
@@ -10175,17 +13724,17 @@ describe("Copy Tag Tests", function () {
cy.window().then(async (win) => {
let stateVariables = await win.returnAllStateVariables1();
- expect(stateVariables["/p1a/n1"].stateValues.value).eq(1);
- expect(stateVariables["/p1a/n2"].stateValues.value).eq(2);
- expect(stateVariables["/p1a/n3"].stateValues.value).eq(3);
+ expect(stateVariables["/p1a/grp/_number1"].stateValues.value).eq(1);
+ expect(stateVariables["/p1a/grp/_number2"].stateValues.value).eq(2);
+ expect(stateVariables["/p1a/_number1"].stateValues.value).eq(3);
- expect(stateVariables["/p1b/n1"].stateValues.value).eq(1);
- expect(stateVariables["/p1b/n2"].stateValues.value).eq(2);
- expect(stateVariables["/p1b/n3"].stateValues.value).eq(3);
+ expect(stateVariables["/p1b/grp/_number1"].stateValues.value).eq(1);
+ expect(stateVariables["/p1b/grp/_number2"].stateValues.value).eq(2);
+ expect(stateVariables["/p1b/_number1"].stateValues.value).eq(3);
- expect(stateVariables["/p1c/n1"].stateValues.value).eq(1);
- expect(stateVariables["/p1c/n2"].stateValues.value).eq(2);
- expect(stateVariables["/p1c/n3"].stateValues.value).eq(3);
+ expect(stateVariables["/p1c/grp/_number1"].stateValues.value).eq(1);
+ expect(stateVariables["/p1c/grp/_number2"].stateValues.value).eq(2);
+ expect(stateVariables["/p1c/_number1"].stateValues.value).eq(3);
// s1a's grandchildren should have gotten unique names (so begin with two underscores)
let s1aChildName = stateVariables["/s1a"].activeChildren[0].componentName;
@@ -10201,25 +13750,26 @@ describe("Copy Tag Tests", function () {
});
});
- it("copy with newNamespace retains original names, even with group that has new namespace", () => {
+ it("copy with newNamespace and name retains original names, even with group that has new namespace and assigns names, macros", () => {
cy.window().then(async (win) => {
win.postMessage(
{
doenetML: `
a
- values: 1 2 3
+ values: 1 2 3
-
+ $_p1{newNamespace name="p1"}
- a
- values: 1 2 3
+ values: 1 2 3
@@ -10436,21 +13967,21 @@ describe("Copy Tag Tests", function () {
});
cy.get(cesc2("#/_text1")).should("have.text", "a");
- cy.get(cesc2("#/grp/_number1")).should("have.text", "1");
- cy.get(cesc2("#/grp/_number2")).should("have.text", "2");
- cy.get(cesc2("#/_number1")).should("have.text", "3");
+ cy.get(cesc2("#/grp/n1")).should("have.text", "1");
+ cy.get(cesc2("#/grp/n2")).should("have.text", "2");
+ cy.get(cesc2("#/n1")).should("have.text", "3");
- cy.get(cesc2("#/p1a/grp/_number1")).should("have.text", "1");
- cy.get(cesc2("#/p1a/grp/_number2")).should("have.text", "2");
- cy.get(cesc2("#/p1a/_number1")).should("have.text", "3");
+ cy.get(cesc2("#/p1a/grp/n1")).should("have.text", "1");
+ cy.get(cesc2("#/p1a/grp/n2")).should("have.text", "2");
+ cy.get(cesc2("#/p1a/n1")).should("have.text", "3");
- cy.get(cesc2("#/p1b/grp/_number1")).should("have.text", "1");
- cy.get(cesc2("#/p1b/grp/_number2")).should("have.text", "2");
- cy.get(cesc2("#/p1b/_number1")).should("have.text", "3");
+ cy.get(cesc2("#/p1b/grp/n1")).should("have.text", "1");
+ cy.get(cesc2("#/p1b/grp/n2")).should("have.text", "2");
+ cy.get(cesc2("#/p1b/n1")).should("have.text", "3");
- cy.get(cesc2("#/p1c/grp/_number1")).should("have.text", "1");
- cy.get(cesc2("#/p1c/grp/_number2")).should("have.text", "2");
- cy.get(cesc2("#/p1c/_number1")).should("have.text", "3");
+ cy.get(cesc2("#/p1c/grp/n1")).should("have.text", "1");
+ cy.get(cesc2("#/p1c/grp/n2")).should("have.text", "2");
+ cy.get(cesc2("#/p1c/n1")).should("have.text", "3");
cy.get(cesc2("#/_p1")).should("have.text", "values: 1 2 3");
cy.get(cesc2("#/p1a")).should("have.text", "values: 1 2 3");
@@ -10477,17 +14008,17 @@ describe("Copy Tag Tests", function () {
cy.window().then(async (win) => {
let stateVariables = await win.returnAllStateVariables1();
- expect(stateVariables["/p1a/grp/_number1"].stateValues.value).eq(1);
- expect(stateVariables["/p1a/grp/_number2"].stateValues.value).eq(2);
- expect(stateVariables["/p1a/_number1"].stateValues.value).eq(3);
+ expect(stateVariables["/p1a/grp/n1"].stateValues.value).eq(1);
+ expect(stateVariables["/p1a/grp/n2"].stateValues.value).eq(2);
+ expect(stateVariables["/p1a/n1"].stateValues.value).eq(3);
- expect(stateVariables["/p1b/grp/_number1"].stateValues.value).eq(1);
- expect(stateVariables["/p1b/grp/_number2"].stateValues.value).eq(2);
- expect(stateVariables["/p1b/_number1"].stateValues.value).eq(3);
+ expect(stateVariables["/p1b/grp/n1"].stateValues.value).eq(1);
+ expect(stateVariables["/p1b/grp/n2"].stateValues.value).eq(2);
+ expect(stateVariables["/p1b/n1"].stateValues.value).eq(3);
- expect(stateVariables["/p1c/grp/_number1"].stateValues.value).eq(1);
- expect(stateVariables["/p1c/grp/_number2"].stateValues.value).eq(2);
- expect(stateVariables["/p1c/_number1"].stateValues.value).eq(3);
+ expect(stateVariables["/p1c/grp/n1"].stateValues.value).eq(1);
+ expect(stateVariables["/p1c/grp/n2"].stateValues.value).eq(2);
+ expect(stateVariables["/p1c/n1"].stateValues.value).eq(3);
// s1a's grandchildren should have gotten unique names (so begin with two underscores)
let s1aChildName = stateVariables["/s1a"].activeChildren[0].componentName;
@@ -10503,276 +14034,266 @@ describe("Copy Tag Tests", function () {
});
});
- it("copy with newNamespace retains original names, even with group that has new namespace and assigns names", () => {
+ it("copy with newNamespace and name retains original names, even with group, wrapped in nested groups and copied with variable componentIndex", () => {
cy.window().then(async (win) => {
win.postMessage(
{
doenetML: `
- a
- values: 1 2 3
+
+
+ values: 1 2 3
-
+ $_p1{newNamespace name="p1"}
-
+
+ values: 4 5 6
+
+ $_p1{newNamespace name="p1"}
+
+ $p1{name="p1a"}
+ $p1{newNamespace name="p1b"}
+
+ $_section1{newNamespace name="s1b"}
+
+
+
+ $grp[$n]{name="thegrp"}
+
+
`,
},
"*",
);
});
- cy.get(cesc2("#/_text1")).should("have.text", "a");
- cy.get(cesc2("#/grp/n1")).should("have.text", "1");
- cy.get(cesc2("#/grp/n2")).should("have.text", "2");
- cy.get(cesc2("#/n1")).should("have.text", "3");
+ cy.log("check g1");
+ cy.get(cesc2("#/g1/_number1")).should("have.text", "1");
+ cy.get(cesc2("#/g1/_number2")).should("have.text", "2");
+ cy.get(cesc2("#/g1/_number3")).should("have.text", "3");
- cy.get(cesc2("#/c1/grp/n1")).should("have.text", "1");
- cy.get(cesc2("#/c1/grp/n2")).should("have.text", "2");
- cy.get(cesc2("#/c1/n1")).should("have.text", "3");
+ cy.get(cesc2("#/g1/p1/_number1")).should("have.text", "1");
+ cy.get(cesc2("#/g1/p1/_number2")).should("have.text", "2");
+ cy.get(cesc2("#/g1/p1/_number3")).should("have.text", "3");
- cy.get(cesc2("#/c4/grp/n1")).should("have.text", "1");
- cy.get(cesc2("#/c4/grp/n2")).should("have.text", "2");
- cy.get(cesc2("#/c4/n1")).should("have.text", "3");
+ cy.get(cesc2("#/g1/p1a/_number1")).should("have.text", "1");
+ cy.get(cesc2("#/g1/p1a/_number2")).should("have.text", "2");
+ cy.get(cesc2("#/g1/p1a/_number3")).should("have.text", "3");
- cy.get(cesc2("#/c9/c1/grp/n1")).should("have.text", "1");
- cy.get(cesc2("#/c9/c1/grp/n2")).should("have.text", "2");
- cy.get(cesc2("#/c9/c1/n1")).should("have.text", "3");
+ cy.get(cesc2("#/g1/p1b/_number1")).should("have.text", "1");
+ cy.get(cesc2("#/g1/p1b/_number2")).should("have.text", "2");
+ cy.get(cesc2("#/g1/p1b/_number3")).should("have.text", "3");
- cy.get(cesc2("#/_p1")).should("have.text", "values: 1 2 3");
- cy.get(cesc2("#/p1a")).should("have.text", "values: 1 2 3");
- cy.get(cesc2("#/c5/p1b")).should("have.text", "values: 1 2 3");
- cy.get(cesc2("#/c6/grp")).should("have.text", "values: 1 2 3");
+ cy.get(cesc2("#/g1/s1b/p1/_number1")).should("have.text", "1");
+ cy.get(cesc2("#/g1/s1b/p1/_number2")).should("have.text", "2");
+ cy.get(cesc2("#/g1/s1b/p1/_number3")).should("have.text", "3");
- cy.get(cesc2("#/_section1"))
+ cy.get(cesc2("#/g1/_p1")).should("have.text", "values: 1 2 3");
+ cy.get(cesc2("#/g1/p1a")).should("have.text", "values: 1 2 3");
+ cy.get(cesc2("#/g1/p1b")).should("have.text", "values: 1 2 3");
+ cy.get(cesc2("#/g1/s1b/p1")).should("have.text", "values: 1 2 3");
+
+ cy.get(cesc2("#/g1/_section1"))
.invoke("text")
.then((text) => {
expect(text.match(/Section 1\s*values: 1 2 3/)).not.be.null;
});
- cy.get(cesc2("#/s1a"))
+
+ cy.get(cesc2("#/g1/s1b"))
.invoke("text")
.then((text) => {
- expect(text.match(/Section 3\s*values: 1 2 3/)).not.be.null;
+ expect(text.match(/Section 2\s*values: 1 2 3/)).not.be.null;
+ });
+
+ cy.log("check g2");
+
+ cy.get(cesc2("#/g2/n1")).should("have.text", "4");
+ cy.get(cesc2("#/g2/n2")).should("have.text", "5");
+ cy.get(cesc2("#/g2/n3")).should("have.text", "6");
+
+ cy.get(cesc2("#/g2/p1/n1")).should("have.text", "4");
+ cy.get(cesc2("#/g2/p1/n2")).should("have.text", "5");
+ cy.get(cesc2("#/g2/p1/n3")).should("have.text", "6");
+
+ cy.get(cesc2("#/g2/p1a/n1")).should("have.text", "4");
+ cy.get(cesc2("#/g2/p1a/n2")).should("have.text", "5");
+ cy.get(cesc2("#/g2/p1a/n3")).should("have.text", "6");
+
+ cy.get(cesc2("#/g2/p1b/n1")).should("have.text", "4");
+ cy.get(cesc2("#/g2/p1b/n2")).should("have.text", "5");
+ cy.get(cesc2("#/g2/p1b/n3")).should("have.text", "6");
+
+ cy.get(cesc2("#/g2/s1b/p1/n1")).should("have.text", "4");
+ cy.get(cesc2("#/g2/s1b/p1/n2")).should("have.text", "5");
+ cy.get(cesc2("#/g2/s1b/p1/n3")).should("have.text", "6");
+
+ cy.get(cesc2("#/g2/_p1")).should("have.text", "values: 4 5 6");
+ cy.get(cesc2("#/g2/p1a")).should("have.text", "values: 4 5 6");
+ cy.get(cesc2("#/g2/p1b")).should("have.text", "values: 4 5 6");
+ cy.get(cesc2("#/g2/s1b/p1")).should("have.text", "values: 4 5 6");
+
+ cy.get(cesc2("#/g2/_section1"))
+ .invoke("text")
+ .then((text) => {
+ expect(text.match(/Section 3\s*values: 4 5 6/)).not.be.null;
});
- cy.get(cesc2("#/c10/s1b"))
+
+ cy.get(cesc2("#/g2/s1b"))
+ .invoke("text")
+ .then((text) => {
+ expect(text.match(/Section 4\s*values: 4 5 6/)).not.be.null;
+ });
+
+ cy.log("check thegrp");
+
+ cy.get(cesc2("#/thegrp/_number1")).should("have.text", "1");
+ cy.get(cesc2("#/thegrp/_number2")).should("have.text", "2");
+ cy.get(cesc2("#/thegrp/_number3")).should("have.text", "3");
+
+ cy.get(cesc2("#/thegrp/p1/_number1")).should("have.text", "1");
+ cy.get(cesc2("#/thegrp/p1/_number2")).should("have.text", "2");
+ cy.get(cesc2("#/thegrp/p1/_number3")).should("have.text", "3");
+
+ cy.get(cesc2("#/thegrp/p1a/_number1")).should("have.text", "1");
+ cy.get(cesc2("#/thegrp/p1a/_number2")).should("have.text", "2");
+ cy.get(cesc2("#/thegrp/p1a/_number3")).should("have.text", "3");
+
+ cy.get(cesc2("#/thegrp/p1b/_number1")).should("have.text", "1");
+ cy.get(cesc2("#/thegrp/p1b/_number2")).should("have.text", "2");
+ cy.get(cesc2("#/thegrp/p1b/_number3")).should("have.text", "3");
+
+ cy.get(cesc2("#/thegrp/s1b/p1/_number1")).should("have.text", "1");
+ cy.get(cesc2("#/thegrp/s1b/p1/_number2")).should("have.text", "2");
+ cy.get(cesc2("#/thegrp/s1b/p1/_number3")).should("have.text", "3");
+
+ cy.get(cesc2("#/thegrp/_p1")).should("have.text", "values: 1 2 3");
+ cy.get(cesc2("#/thegrp/p1a")).should("have.text", "values: 1 2 3");
+ cy.get(cesc2("#/thegrp/p1b")).should("have.text", "values: 1 2 3");
+ cy.get(cesc2("#/thegrp/s1b/p1")).should("have.text", "values: 1 2 3");
+
+ cy.get(cesc2("#/thegrp/_section1"))
.invoke("text")
.then((text) => {
expect(text.match(/Section 5\s*values: 1 2 3/)).not.be.null;
});
- cy.get(cesc2("#/c11/grp"))
+
+ cy.get(cesc2("#/thegrp/s1b"))
.invoke("text")
.then((text) => {
expect(text.match(/Section 6\s*values: 1 2 3/)).not.be.null;
});
- cy.window().then(async (win) => {
- let stateVariables = await win.returnAllStateVariables1();
- let c2p = stateVariables["/c2"].replacements[0].componentName;
- let c3p = stateVariables["/c3"].replacements[0].componentName;
- let c4p = stateVariables["/c4"].replacements[0].componentName;
- let c5p = stateVariables["/c5"].replacements[0].componentName;
- let c6p = stateVariables["/c6"].replacements[0].componentName;
- let c7s = stateVariables["/c7"].replacements[0].componentName;
- let c8s = stateVariables["/c8"].replacements[0].componentName;
- let c9s = stateVariables["/c9"].replacements[0].componentName;
- let c10s = stateVariables["/c10"].replacements[0].componentName;
- let c11s = stateVariables["/c11"].replacements[0].componentName;
+ cy.log("Change index for thegrp");
+ cy.get(cesc2("#/n") + " textarea").type("{end}{backspace}2{enter}", {
+ force: true,
+ });
- cy.get(cesc2("#" + c2p)).should("have.text", "values: 1 2 3");
- cy.get(cesc2("#" + c3p)).should("have.text", "values: 1 2 3");
- cy.get(cesc2("#" + c4p)).should("have.text", "values: 1 2 3");
- cy.get(cesc2("#" + c5p)).should("have.text", "values: 1 2 3");
- cy.get(cesc2("#" + c6p)).should("have.text", "values: 1 2 3");
- cy.get(cesc2("#" + c7s))
- .invoke("text")
- .then((text) => {
- expect(text.match(/Section 2\s*values: 1 2 3/)).not.be.null;
- });
- cy.get(cesc2("#" + c8s))
- .invoke("text")
- .then((text) => {
- expect(text.match(/Section 3\s*values: 1 2 3/)).not.be.null;
- });
- cy.get(cesc2("#" + c9s))
- .invoke("text")
- .then((text) => {
- expect(text.match(/Section 4\s*values: 1 2 3/)).not.be.null;
- });
- cy.get(cesc2("#" + c10s))
- .invoke("text")
- .then((text) => {
- expect(text.match(/Section 5\s*values: 1 2 3/)).not.be.null;
- });
- cy.get(cesc2("#" + c11s))
- .invoke("text")
- .then((text) => {
- expect(text.match(/Section 6\s*values: 1 2 3/)).not.be.null;
- });
+ cy.get(cesc2("#/thegrp/n1")).should("have.text", "4");
+ cy.get(cesc2("#/thegrp/n2")).should("have.text", "5");
+ cy.get(cesc2("#/thegrp/n3")).should("have.text", "6");
- // put in window just so happens after above
- cy.window().then(async (win) => {
- expect(stateVariables["/c1/grp/n1"].stateValues.value).eq(1);
- expect(stateVariables["/c1/grp/n2"].stateValues.value).eq(2);
- expect(stateVariables["/c1/n1"].stateValues.value).eq(3);
+ cy.get(cesc2("#/thegrp/p1/n1")).should("have.text", "4");
+ cy.get(cesc2("#/thegrp/p1/n2")).should("have.text", "5");
+ cy.get(cesc2("#/thegrp/p1/n3")).should("have.text", "6");
- // c2p's children should have gotten unique names (so begin with two underscores)
- let c2pChildNames = stateVariables[c2p].activeChildren
- .filter((x) => x.componentName)
- .map((x) => x.componentName);
- expect(c2pChildNames[0].slice(0, 3)).eq("/__");
- expect(c2pChildNames[1].slice(0, 3)).eq("/__");
- expect(c2pChildNames[2].slice(0, 3)).eq("/__");
- expect(stateVariables[c2pChildNames[0]].stateValues.value).eq(1);
- expect(stateVariables[c2pChildNames[1]].stateValues.value).eq(2);
- expect(stateVariables[c2pChildNames[2]].stateValues.value).eq(3);
+ cy.get(cesc2("#/thegrp/p1a/n1")).should("have.text", "4");
+ cy.get(cesc2("#/thegrp/p1a/n2")).should("have.text", "5");
+ cy.get(cesc2("#/thegrp/p1a/n3")).should("have.text", "6");
- // c3p's children should have gotten unique names (so begin with two underscores)
- let c3pChildNames = stateVariables[c3p].activeChildren
- .filter((x) => x.componentName)
- .map((x) => x.componentName);
- expect(c3pChildNames[0].slice(0, 3)).eq("/__");
- expect(c3pChildNames[1].slice(0, 3)).eq("/__");
- expect(c3pChildNames[2].slice(0, 3)).eq("/__");
- expect(stateVariables[c3pChildNames[0]].stateValues.value).eq(1);
- expect(stateVariables[c3pChildNames[1]].stateValues.value).eq(2);
- expect(stateVariables[c3pChildNames[2]].stateValues.value).eq(3);
-
- // c4p's children should have retained their original names
- let c4pChildNames = stateVariables[c4p].activeChildren
- .filter((x) => x.componentName)
- .map((x) => x.componentName);
- expect(c4pChildNames[0]).eq("/c4/grp/n1");
- expect(c4pChildNames[1]).eq("/c4/grp/n2");
- expect(c4pChildNames[2]).eq("/c4/n1");
- expect(stateVariables[c4pChildNames[0]].stateValues.value).eq(1);
- expect(stateVariables[c4pChildNames[1]].stateValues.value).eq(2);
- expect(stateVariables[c4pChildNames[2]].stateValues.value).eq(3);
+ cy.get(cesc2("#/thegrp/p1b/n1")).should("have.text", "4");
+ cy.get(cesc2("#/thegrp/p1b/n2")).should("have.text", "5");
+ cy.get(cesc2("#/thegrp/p1b/n3")).should("have.text", "6");
+
+ cy.get(cesc2("#/thegrp/s1b/p1/n1")).should("have.text", "4");
+ cy.get(cesc2("#/thegrp/s1b/p1/n2")).should("have.text", "5");
+ cy.get(cesc2("#/thegrp/s1b/p1/n3")).should("have.text", "6");
+
+ cy.get(cesc2("#/thegrp/_p1")).should("have.text", "values: 4 5 6");
+ cy.get(cesc2("#/thegrp/p1a")).should("have.text", "values: 4 5 6");
+ cy.get(cesc2("#/thegrp/p1b")).should("have.text", "values: 4 5 6");
+ cy.get(cesc2("#/thegrp/s1b/p1")).should("have.text", "values: 4 5 6");
+
+ cy.get(cesc2("#/thegrp/_section1"))
+ .invoke("text")
+ .then((text) => {
+ expect(text.match(/Section 5\s*values: 4 5 6/)).not.be.null;
+ });
- // c5p's children should have gotten unique names (so begin with two underscores after namespace)
- let c5pChildNames = stateVariables[c5p].activeChildren
- .filter((x) => x.componentName)
- .map((x) => x.componentName);
- expect(c5pChildNames[0].slice(0, 6)).eq("/c5/__");
- expect(c5pChildNames[1].slice(0, 6)).eq("/c5/__");
- expect(c5pChildNames[2].slice(0, 6)).eq("/c5/__");
- expect(stateVariables[c5pChildNames[0]].stateValues.value).eq(1);
- expect(stateVariables[c5pChildNames[1]].stateValues.value).eq(2);
- expect(stateVariables[c5pChildNames[2]].stateValues.value).eq(3);
-
- // c6p's children should have gotten unique names (so begin with two underscores after namespace)
- let c6pChildNames = stateVariables[c6p].activeChildren
- .filter((x) => x.componentName)
- .map((x) => x.componentName);
- expect(c6pChildNames[0].slice(0, 6)).eq("/c6/__");
- expect(c6pChildNames[1].slice(0, 6)).eq("/c6/__");
- expect(c6pChildNames[2].slice(0, 6)).eq("/c6/__");
- expect(stateVariables[c6pChildNames[0]].stateValues.value).eq(1);
- expect(stateVariables[c6pChildNames[1]].stateValues.value).eq(2);
- expect(stateVariables[c6pChildNames[2]].stateValues.value).eq(3);
+ cy.get(cesc2("#/thegrp/s1b"))
+ .invoke("text")
+ .then((text) => {
+ expect(text.match(/Section 6\s*values: 4 5 6/)).not.be.null;
+ });
- // c7s's grandchildren should have gotten unique names (so begin with two underscores)
- let c7sChildName = stateVariables[c7s].activeChildren.filter(
- (x) => x.componentName,
- )[0].componentName;
- let c7sGrandChildNames = stateVariables[c7sChildName].activeChildren
- .filter((x) => x.componentName)
- .map((x) => x.componentName);
+ cy.log("Change to invalid index for thegrp");
+ cy.get(cesc2("#/n") + " textarea").type("{end}{backspace}3{enter}", {
+ force: true,
+ });
+ cy.get(cesc2("#/thegrp")).should("not.exist");
- expect(c7sGrandChildNames[0].slice(0, 3)).eq("/__");
- expect(c7sGrandChildNames[1].slice(0, 3)).eq("/__");
- expect(c7sGrandChildNames[2].slice(0, 3)).eq("/__");
- expect(stateVariables[c7sGrandChildNames[0]].stateValues.value).eq(1);
- expect(stateVariables[c7sGrandChildNames[1]].stateValues.value).eq(2);
- expect(stateVariables[c7sGrandChildNames[2]].stateValues.value).eq(3);
+ cy.log("Change back to index 1 for thegrp");
+ cy.get(cesc2("#/n") + " textarea").type("{end}{backspace}1{enter}", {
+ force: true,
+ });
- // c8s's grandchildren should have gotten unique names (so begin with two underscores)
- let c8sChildName = stateVariables[c8s].activeChildren.filter(
- (x) => x.componentName,
- )[0].componentName;
- let c8sGrandChildNames = stateVariables[c8sChildName].activeChildren
- .filter((x) => x.componentName)
- .map((x) => x.componentName);
+ cy.get(cesc2("#/thegrp/_number1")).should("have.text", "1");
+ cy.get(cesc2("#/thegrp/_number2")).should("have.text", "2");
+ cy.get(cesc2("#/thegrp/_number3")).should("have.text", "3");
- expect(c8sGrandChildNames[0].slice(0, 3)).eq("/__");
- expect(c8sGrandChildNames[1].slice(0, 3)).eq("/__");
- expect(c8sGrandChildNames[2].slice(0, 3)).eq("/__");
- expect(stateVariables[c8sGrandChildNames[0]].stateValues.value).eq(1);
- expect(stateVariables[c8sGrandChildNames[1]].stateValues.value).eq(2);
- expect(stateVariables[c8sGrandChildNames[2]].stateValues.value).eq(3);
+ cy.get(cesc2("#/thegrp/p1/_number1")).should("have.text", "1");
+ cy.get(cesc2("#/thegrp/p1/_number2")).should("have.text", "2");
+ cy.get(cesc2("#/thegrp/p1/_number3")).should("have.text", "3");
- // c9s's grandchildren should have retained their original names
- let c9sChildName = stateVariables[c9s].activeChildren.filter(
- (x) => x.componentName,
- )[0].componentName;
- let c9sGrandChildNames = stateVariables[c9sChildName].activeChildren
- .filter((x) => x.componentName)
- .map((x) => x.componentName);
+ cy.get(cesc2("#/thegrp/p1a/_number1")).should("have.text", "1");
+ cy.get(cesc2("#/thegrp/p1a/_number2")).should("have.text", "2");
+ cy.get(cesc2("#/thegrp/p1a/_number3")).should("have.text", "3");
- expect(c9sGrandChildNames[0]).eq("/c9/c1/grp/n1");
- expect(c9sGrandChildNames[1]).eq("/c9/c1/grp/n2");
- expect(c9sGrandChildNames[2]).eq("/c9/c1/n1");
- expect(stateVariables[c9sGrandChildNames[0]].stateValues.value).eq(1);
- expect(stateVariables[c9sGrandChildNames[1]].stateValues.value).eq(2);
- expect(stateVariables[c9sGrandChildNames[2]].stateValues.value).eq(3);
+ cy.get(cesc2("#/thegrp/p1b/_number1")).should("have.text", "1");
+ cy.get(cesc2("#/thegrp/p1b/_number2")).should("have.text", "2");
+ cy.get(cesc2("#/thegrp/p1b/_number3")).should("have.text", "3");
- // c10s's grandchildren should have gotten unique names (so begin with two underscores after namespace)
- let c10sChildName = stateVariables[c10s].activeChildren.filter(
- (x) => x.componentName,
- )[0].componentName;
- let c10sGrandChildNames = stateVariables[c10sChildName].activeChildren
- .filter((x) => x.componentName)
- .map((x) => x.componentName);
+ cy.get(cesc2("#/thegrp/s1b/p1/_number1")).should("have.text", "1");
+ cy.get(cesc2("#/thegrp/s1b/p1/_number2")).should("have.text", "2");
+ cy.get(cesc2("#/thegrp/s1b/p1/_number3")).should("have.text", "3");
- expect(c10sGrandChildNames[0].slice(0, 7)).eq("/c10/__");
- expect(c10sGrandChildNames[1].slice(0, 7)).eq("/c10/__");
- expect(c10sGrandChildNames[2].slice(0, 7)).eq("/c10/__");
- expect(stateVariables[c10sGrandChildNames[0]].stateValues.value).eq(1);
- expect(stateVariables[c10sGrandChildNames[1]].stateValues.value).eq(2);
- expect(stateVariables[c10sGrandChildNames[2]].stateValues.value).eq(3);
+ cy.get(cesc2("#/thegrp/_p1")).should("have.text", "values: 1 2 3");
+ cy.get(cesc2("#/thegrp/p1a")).should("have.text", "values: 1 2 3");
+ cy.get(cesc2("#/thegrp/p1b")).should("have.text", "values: 1 2 3");
+ cy.get(cesc2("#/thegrp/s1b/p1")).should("have.text", "values: 1 2 3");
- // c11s's grandchildren should have gotten unique names (so begin with two underscores after namespace)
- let c11sChildName = stateVariables[c11s].activeChildren.filter(
- (x) => x.componentName,
- )[0].componentName;
- let c11sGrandChildNames = stateVariables[c11sChildName].activeChildren
- .filter((x) => x.componentName)
- .map((x) => x.componentName);
+ cy.get(cesc2("#/thegrp/_section1"))
+ .invoke("text")
+ .then((text) => {
+ expect(text.match(/Section 5\s*values: 1 2 3/)).not.be.null;
+ });
- expect(c11sGrandChildNames[0].slice(0, 7)).eq("/c11/__");
- expect(c11sGrandChildNames[1].slice(0, 7)).eq("/c11/__");
- expect(c11sGrandChildNames[2].slice(0, 7)).eq("/c11/__");
- expect(stateVariables[c11sGrandChildNames[0]].stateValues.value).eq(1);
- expect(stateVariables[c11sGrandChildNames[1]].stateValues.value).eq(2);
- expect(stateVariables[c11sGrandChildNames[2]].stateValues.value).eq(3);
+ cy.get(cesc2("#/thegrp/s1b"))
+ .invoke("text")
+ .then((text) => {
+ expect(text.match(/Section 6\s*values: 1 2 3/)).not.be.null;
});
- });
});
- it("copy with newNamespace retains original names, even with group that has new namespace and assigns names, with copySource", () => {
+ it("copy group of groups retains name", () => {
cy.window().then(async (win) => {
win.postMessage(
{
doenetML: `
a
- values: 1 2 3
-
-
-
-
-
+ 1 2 3 4 5 6 1 2 $grp{assignNames="num2"}
+
- expect(stateVariables["/p1b/grp/n1"].stateValues.value).eq(1);
- expect(stateVariables["/p1b/grp/n2"].stateValues.value).eq(2);
- expect(stateVariables["/p1b/n1"].stateValues.value).eq(3);
+ `,
+ },
+ "*",
+ );
+ });
- expect(stateVariables["/p1c/grp/n1"].stateValues.value).eq(1);
- expect(stateVariables["/p1c/grp/n2"].stateValues.value).eq(2);
- expect(stateVariables["/p1c/n1"].stateValues.value).eq(3);
+ cy.document().should("contain.text", "Duplicate component name: num2");
+ });
- // s1a's grandchildren should have gotten unique names (so begin with two underscores)
- let s1aChildName = stateVariables["/s1a"].activeChildren[0].componentName;
- let s1aGrandChildNames = stateVariables[s1aChildName].activeChildren
- .filter((x) => x.componentName)
- .map((x) => x.componentName);
- expect(s1aGrandChildNames[0].slice(0, 3)).eq("/__");
- expect(s1aGrandChildNames[1].slice(0, 3)).eq("/__");
- expect(s1aGrandChildNames[2].slice(0, 3)).eq("/__");
- expect(stateVariables[s1aGrandChildNames[0]].stateValues.value).eq(1);
- expect(stateVariables[s1aGrandChildNames[1]].stateValues.value).eq(2);
- expect(stateVariables[s1aGrandChildNames[2]].stateValues.value).eq(3);
+ it("copy p with newNamespace, does not avoid name collision when assignnames", () => {
+ cy.window().then(async (win) => {
+ win.postMessage(
+ {
+ doenetML: `
+ Hello
+ $p{newNamespace name="hello"}
+
+ `,
+ },
+ "*",
+ );
});
+
+ cy.document().should("contain.text", "Duplicate component name: hello");
});
- it("copy group of groups retains name", () => {
+ it("copy point with math attribute, duplicate component name message uses point name", () => {
cy.window().then(async (win) => {
win.postMessage(
{
doenetML: `
- a
- 1 2 3 4 5 6 a
+
+ n:
+
+
+ (1,2)
+ (3,4)
+
+
+
+
+
+
+
+
+ a
- 1 2
-
+ (x2 = 0), (y2 = 8);
+ await win.callAction1({
+ actionName: "movePoint",
+ componentName: "/g3/A2",
+ args: { x: x2, y: y2 },
+ });
- `,
- },
- "*",
+ cy.get(cesc("#\\/Ax") + " .mjx-mrow").should("contain.text", nInDOM(x2));
+ cy.get(cesc("#\\/al2\\/Ax") + " .mjx-mrow").should(
+ "contain.text",
+ nInDOM(x2),
);
- });
-
- cy.get(cesc2("#/_text1")).should("have.text", "a");
- cy.get(cesc2("#/_p1")).should("have.text", "1 2");
+ cy.window().then(async (win) => {
+ let stateVariables = await win.returnAllStateVariables1();
+ expect(stateVariables["/A"].stateValues.xs).eqls([x1, y1]);
+ expect(stateVariables["/A2"].stateValues.xs).eqls([x2, y2]);
+ expect(stateVariables["/g3/A2"].stateValues.xs).eqls([x2, y2]);
+ expect(stateVariables["/B"].stateValues.xs).eqls([x2, y2]);
+ expect(stateVariables["/Ax"].stateValues.value).eq(x2);
+ expect(stateVariables["/al2/Ax"].stateValues.value).eq(x2);
+ });
+ });
});
- it("copy componentIndex", () => {
+ it("copy componentIndex, array notation", () => {
cy.window().then(async (win) => {
win.postMessage(
{
@@ -10943,12 +14556,12 @@ describe("Copy Tag Tests", function () {
-
-
- $(col[$n].x{assignNames="Ax"})
-
-
+
+ a
+
+ n:
+
+
+ (1,2)
+ (3,4)
+
+
+
+
+
+
+
a
- n:
+ m:
+ n:
(1,2)
(3,4)
-
+
-
-
-
-
-
+
+
`,
},
@@ -11461,57 +15144,60 @@ describe("Copy Tag Tests", function () {
x2 = 3,
y2 = 4;
- cy.get(cesc("#\\/Ax") + " .mjx-mrow").should("contain.text", nInDOM(x1));
- cy.get(cesc("#\\/al2\\/Ax") + " .mjx-mrow").should(
- "contain.text",
- nInDOM(x1),
- );
+ cy.get(cesc("#\\/n1") + " .mjx-mrow").should("not.exist");
+ cy.get(cesc("#\\/al2\\/n1") + " .mjx-mrow").should("not.exist");
cy.window().then(async (win) => {
let stateVariables = await win.returnAllStateVariables1();
expect(stateVariables["/A"].stateValues.xs).eqls([x1, y1]);
- expect(stateVariables["/A2"].stateValues.xs).eqls([x1, y1]);
- expect(stateVariables["/g3/A2"].stateValues.xs).eqls([x1, y1]);
expect(stateVariables["/B"].stateValues.xs).eqls([x2, y2]);
- expect(stateVariables["/Ax"].stateValues.value).eq(x1);
- expect(stateVariables["/al2/Ax"].stateValues.value).eq(x1);
+ expect(stateVariables["/n1"]).eq(undefined);
+ expect(stateVariables["/al2/n1"]).eq(undefined);
});
- cy.log("move copied point");
+ cy.log("set propIndex to 1");
+
+ cy.get(cesc("#\\/n") + " textarea").type("1{enter}", { force: true });
+
+ cy.get(cesc("#\\/n1") + " .mjx-mrow").should("not.exist");
+ cy.get(cesc("#\\/al2\\/n1") + " .mjx-mrow").should("not.exist");
+
+ cy.window().then(async (win) => {
+ let stateVariables = await win.returnAllStateVariables1();
+ expect(stateVariables["/A"].stateValues.xs).eqls([x1, y1]);
+ expect(stateVariables["/B"].stateValues.xs).eqls([x2, y2]);
+ expect(stateVariables["/n1"]).eq(undefined);
+ expect(stateVariables["/al2/n1"]).eq(undefined);
+ });
+
+ cy.log("move point 1");
cy.window().then(async (win) => {
(x1 = 9), (y1 = -5);
await win.callAction1({
actionName: "movePoint",
- componentName: "/A2",
+ componentName: "/A",
args: { x: x1, y: y1 },
});
- cy.get(cesc("#\\/Ax") + " .mjx-mrow").should("contain.text", nInDOM(x1));
- cy.get(cesc("#\\/al2\\/Ax") + " .mjx-mrow").should(
- "contain.text",
- nInDOM(x1),
- );
+ cy.get(cesc("#\\/n1") + " .mjx-mrow").should("not.exist");
+ cy.get(cesc("#\\/al2\\/n1") + " .mjx-mrow").should("not.exist");
cy.window().then(async (win) => {
let stateVariables = await win.returnAllStateVariables1();
expect(stateVariables["/A"].stateValues.xs).eqls([x1, y1]);
- expect(stateVariables["/A2"].stateValues.xs).eqls([x1, y1]);
- expect(stateVariables["/g3/A2"].stateValues.xs).eqls([x1, y1]);
expect(stateVariables["/B"].stateValues.xs).eqls([x2, y2]);
- expect(stateVariables["/Ax"].stateValues.value).eq(x1);
- expect(stateVariables["/al2/Ax"].stateValues.value).eq(x1);
+ expect(stateVariables["/n1"]).eq(undefined);
+ expect(stateVariables["/al2/n1"]).eq(undefined);
});
});
- cy.log("restrict collection to second component");
+ cy.log("set componentIndex to 2");
- cy.get(cesc("#\\/n") + " textarea").type("{end}{backspace}2{enter}", {
- force: true,
- });
+ cy.get(cesc("#\\/m") + " textarea").type("2{enter}", { force: true });
cy.window().then(async (win) => {
- cy.get(cesc("#\\/Ax") + " .mjx-mrow").should("contain.text", nInDOM(x2));
- cy.get(cesc("#\\/al2\\/Ax") + " .mjx-mrow").should(
+ cy.get(cesc("#\\/n1") + " .mjx-mrow").should("contain.text", nInDOM(x2));
+ cy.get(cesc("#\\/al2\\/n1") + " .mjx-mrow").should(
"contain.text",
nInDOM(x2),
);
@@ -11519,25 +15205,23 @@ describe("Copy Tag Tests", function () {
cy.window().then(async (win) => {
let stateVariables = await win.returnAllStateVariables1();
expect(stateVariables["/A"].stateValues.xs).eqls([x1, y1]);
- expect(stateVariables["/A2"].stateValues.xs).eqls([x2, y2]);
- expect(stateVariables["/g3/A2"].stateValues.xs).eqls([x2, y2]);
expect(stateVariables["/B"].stateValues.xs).eqls([x2, y2]);
- expect(stateVariables["/Ax"].stateValues.value).eq(x2);
- expect(stateVariables["/al2/Ax"].stateValues.value).eq(x2);
+ expect(stateVariables["/n1"].stateValues.value).eq(x2);
+ expect(stateVariables["/al2/n1"].stateValues.value).eq(x2);
});
});
- cy.log("move double copied point");
+ cy.log("move point2");
cy.window().then(async (win) => {
(x2 = 0), (y2 = 8);
await win.callAction1({
actionName: "movePoint",
- componentName: "/g3/A2",
+ componentName: "/B",
args: { x: x2, y: y2 },
});
- cy.get(cesc("#\\/Ax") + " .mjx-mrow").should("contain.text", nInDOM(x2));
- cy.get(cesc("#\\/al2\\/Ax") + " .mjx-mrow").should(
+ cy.get(cesc("#\\/n1") + " .mjx-mrow").should("contain.text", nInDOM(x2));
+ cy.get(cesc("#\\/al2\\/n1") + " .mjx-mrow").should(
"contain.text",
nInDOM(x2),
);
@@ -11545,16 +15229,150 @@ describe("Copy Tag Tests", function () {
cy.window().then(async (win) => {
let stateVariables = await win.returnAllStateVariables1();
expect(stateVariables["/A"].stateValues.xs).eqls([x1, y1]);
- expect(stateVariables["/A2"].stateValues.xs).eqls([x2, y2]);
- expect(stateVariables["/g3/A2"].stateValues.xs).eqls([x2, y2]);
expect(stateVariables["/B"].stateValues.xs).eqls([x2, y2]);
- expect(stateVariables["/Ax"].stateValues.value).eq(x2);
- expect(stateVariables["/al2/Ax"].stateValues.value).eq(x2);
+ expect(stateVariables["/n1"].stateValues.value).eq(x2);
+ expect(stateVariables["/al2/n1"].stateValues.value).eq(x2);
+ });
+ });
+
+ cy.log("set propIndex to 2");
+ cy.get(cesc("#\\/n") + " textarea").type("{end}{backspace}2{enter}", {
+ force: true,
+ });
+
+ cy.window().then(async (win) => {
+ cy.get(cesc("#\\/n1") + " .mjx-mrow").should("contain.text", nInDOM(y2));
+ cy.get(cesc("#\\/al2\\/n1") + " .mjx-mrow").should(
+ "contain.text",
+ nInDOM(y2),
+ );
+
+ cy.window().then(async (win) => {
+ let stateVariables = await win.returnAllStateVariables1();
+ expect(stateVariables["/A"].stateValues.xs).eqls([x1, y1]);
+ expect(stateVariables["/B"].stateValues.xs).eqls([x2, y2]);
+ expect(stateVariables["/n1"].stateValues.value).eq(y2);
+ expect(stateVariables["/al2/n1"].stateValues.value).eq(y2);
+ });
+ });
+
+ cy.log("set componentIndex to 1");
+ cy.get(cesc("#\\/m") + " textarea").type("{end}{backspace}1{enter}", {
+ force: true,
+ });
+
+ cy.window().then(async (win) => {
+ cy.get(cesc("#\\/n1") + " .mjx-mrow").should("contain.text", nInDOM(y1));
+ cy.get(cesc("#\\/al2\\/n1") + " .mjx-mrow").should(
+ "contain.text",
+ nInDOM(y1),
+ );
+
+ cy.window().then(async (win) => {
+ let stateVariables = await win.returnAllStateVariables1();
+ expect(stateVariables["/A"].stateValues.xs).eqls([x1, y1]);
+ expect(stateVariables["/B"].stateValues.xs).eqls([x2, y2]);
+ expect(stateVariables["/n1"].stateValues.value).eq(y1);
+ expect(stateVariables["/al2/n1"].stateValues.value).eq(y1);
+ });
+ });
+
+ cy.log("set propIndex to 3");
+ cy.get(cesc("#\\/n") + " textarea").type("{end}{backspace}3{enter}", {
+ force: true,
+ });
+
+ cy.window().then(async (win) => {
+ cy.get(cesc("#\\/n1") + " .mjx-mrow").should("not.exist");
+ cy.get(cesc("#\\/al2\\/n1") + " .mjx-mrow").should("not.exist");
+
+ cy.window().then(async (win) => {
+ let stateVariables = await win.returnAllStateVariables1();
+ expect(stateVariables["/A"].stateValues.xs).eqls([x1, y1]);
+ expect(stateVariables["/B"].stateValues.xs).eqls([x2, y2]);
+ expect(stateVariables["/n1"]).eq(undefined);
+ expect(stateVariables["/al2/n1"]).eq(undefined);
+ });
+ });
+
+ cy.log("set propIndex to 1");
+ cy.get(cesc("#\\/n") + " textarea").type("{end}{backspace}1{enter}", {
+ force: true,
+ });
+
+ cy.window().then(async (win) => {
+ cy.get(cesc("#\\/n1") + " .mjx-mrow").should("contain.text", nInDOM(x1));
+ cy.get(cesc("#\\/al2\\/n1") + " .mjx-mrow").should(
+ "contain.text",
+ nInDOM(x1),
+ );
+
+ cy.window().then(async (win) => {
+ let stateVariables = await win.returnAllStateVariables1();
+ expect(stateVariables["/A"].stateValues.xs).eqls([x1, y1]);
+ expect(stateVariables["/B"].stateValues.xs).eqls([x2, y2]);
+ expect(stateVariables["/n1"].stateValues.value).eq(x1);
+ expect(stateVariables["/al2/n1"].stateValues.value).eq(x1);
+ });
+ });
+
+ cy.log("set componentIndex to 3");
+ cy.get(cesc("#\\/m") + " textarea").type("{end}{backspace}3{enter}", {
+ force: true,
+ });
+
+ cy.window().then(async (win) => {
+ cy.get(cesc("#\\/n1") + " .mjx-mrow").should("not.exist");
+ cy.get(cesc("#\\/al2\\/n1") + " .mjx-mrow").should("not.exist");
+
+ cy.window().then(async (win) => {
+ let stateVariables = await win.returnAllStateVariables1();
+ expect(stateVariables["/A"].stateValues.xs).eqls([x1, y1]);
+ expect(stateVariables["/B"].stateValues.xs).eqls([x2, y2]);
+ expect(stateVariables["/n1"]).eq(undefined);
+ expect(stateVariables["/al2/n1"]).eq(undefined);
+ });
+ });
+
+ cy.log("set componentIndex to 2");
+ cy.get(cesc("#\\/m") + " textarea").type("{end}{backspace}2{enter}", {
+ force: true,
+ });
+
+ cy.window().then(async (win) => {
+ cy.get(cesc("#\\/n1") + " .mjx-mrow").should("contain.text", nInDOM(x2));
+ cy.get(cesc("#\\/al2\\/n1") + " .mjx-mrow").should(
+ "contain.text",
+ nInDOM(x2),
+ );
+
+ cy.window().then(async (win) => {
+ let stateVariables = await win.returnAllStateVariables1();
+ expect(stateVariables["/A"].stateValues.xs).eqls([x1, y1]);
+ expect(stateVariables["/B"].stateValues.xs).eqls([x2, y2]);
+ expect(stateVariables["/n1"].stateValues.value).eq(x2);
+ expect(stateVariables["/al2/n1"].stateValues.value).eq(x2);
});
});
+
+ cy.log("clear propIndex");
+ cy.get(cesc("#\\/n") + " textarea").type("{end}{backspace}{enter}", {
+ force: true,
+ });
+
+ cy.get(cesc("#\\/n1") + " .mjx-mrow").should("not.exist");
+ cy.get(cesc("#\\/al2\\/n1") + " .mjx-mrow").should("not.exist");
+
+ cy.window().then(async (win) => {
+ let stateVariables = await win.returnAllStateVariables1();
+ expect(stateVariables["/A"].stateValues.xs).eqls([x1, y1]);
+ expect(stateVariables["/B"].stateValues.xs).eqls([x2, y2]);
+ expect(stateVariables["/n1"]).eq(undefined);
+ expect(stateVariables["/al2/n1"]).eq(undefined);
+ });
});
- it("copy propIndex and componentIndex", () => {
+ it("copy propIndex and componentIndex, array notation", () => {
cy.window().then(async (win) => {
win.postMessage(
{
@@ -11574,7 +15392,7 @@ describe("Copy Tag Tests", function () {
-
+
@@ -11592,26 +15410,14 @@ describe("Copy Tag Tests", function () {
y2 = 4;
cy.get(cesc("#\\/n1") + " .mjx-mrow").should("not.exist");
- cy.get(cesc("#\\/n2") + " .mjx-mrow").should("not.exist");
- cy.get(cesc("#\\/n3") + " .mjx-mrow").should("not.exist");
- cy.get(cesc("#\\/n4") + " .mjx-mrow").should("not.exist");
cy.get(cesc("#\\/al2\\/n1") + " .mjx-mrow").should("not.exist");
- cy.get(cesc("#\\/al2\\/n2") + " .mjx-mrow").should("not.exist");
- cy.get(cesc("#\\/al2\\/n3") + " .mjx-mrow").should("not.exist");
- cy.get(cesc("#\\/al2\\/n4") + " .mjx-mrow").should("not.exist");
cy.window().then(async (win) => {
let stateVariables = await win.returnAllStateVariables1();
expect(stateVariables["/A"].stateValues.xs).eqls([x1, y1]);
expect(stateVariables["/B"].stateValues.xs).eqls([x2, y2]);
expect(stateVariables["/n1"]).eq(undefined);
- expect(stateVariables["/n2"]).eq(undefined);
- expect(stateVariables["/n3"]).eq(undefined);
- expect(stateVariables["/n4"]).eq(undefined);
expect(stateVariables["/al2/n1"]).eq(undefined);
- expect(stateVariables["/al2/n2"]).eq(undefined);
- expect(stateVariables["/al2/n3"]).eq(undefined);
- expect(stateVariables["/al2/n4"]).eq(undefined);
});
cy.log("set propIndex to 1");
@@ -11619,26 +15425,14 @@ describe("Copy Tag Tests", function () {
cy.get(cesc("#\\/n") + " textarea").type("1{enter}", { force: true });
cy.get(cesc("#\\/n1") + " .mjx-mrow").should("not.exist");
- cy.get(cesc("#\\/n2") + " .mjx-mrow").should("not.exist");
- cy.get(cesc("#\\/n3") + " .mjx-mrow").should("not.exist");
- cy.get(cesc("#\\/n4") + " .mjx-mrow").should("not.exist");
cy.get(cesc("#\\/al2\\/n1") + " .mjx-mrow").should("not.exist");
- cy.get(cesc("#\\/al2\\/n2") + " .mjx-mrow").should("not.exist");
- cy.get(cesc("#\\/al2\\/n3") + " .mjx-mrow").should("not.exist");
- cy.get(cesc("#\\/al2\\/n4") + " .mjx-mrow").should("not.exist");
cy.window().then(async (win) => {
let stateVariables = await win.returnAllStateVariables1();
expect(stateVariables["/A"].stateValues.xs).eqls([x1, y1]);
expect(stateVariables["/B"].stateValues.xs).eqls([x2, y2]);
expect(stateVariables["/n1"]).eq(undefined);
- expect(stateVariables["/n2"]).eq(undefined);
- expect(stateVariables["/n3"]).eq(undefined);
- expect(stateVariables["/n4"]).eq(undefined);
expect(stateVariables["/al2/n1"]).eq(undefined);
- expect(stateVariables["/al2/n2"]).eq(undefined);
- expect(stateVariables["/al2/n3"]).eq(undefined);
- expect(stateVariables["/al2/n4"]).eq(undefined);
});
cy.log("move point 1");
@@ -11651,26 +15445,14 @@ describe("Copy Tag Tests", function () {
});
cy.get(cesc("#\\/n1") + " .mjx-mrow").should("not.exist");
- cy.get(cesc("#\\/n2") + " .mjx-mrow").should("not.exist");
- cy.get(cesc("#\\/n3") + " .mjx-mrow").should("not.exist");
- cy.get(cesc("#\\/n4") + " .mjx-mrow").should("not.exist");
cy.get(cesc("#\\/al2\\/n1") + " .mjx-mrow").should("not.exist");
- cy.get(cesc("#\\/al2\\/n2") + " .mjx-mrow").should("not.exist");
- cy.get(cesc("#\\/al2\\/n3") + " .mjx-mrow").should("not.exist");
- cy.get(cesc("#\\/al2\\/n4") + " .mjx-mrow").should("not.exist");
cy.window().then(async (win) => {
let stateVariables = await win.returnAllStateVariables1();
expect(stateVariables["/A"].stateValues.xs).eqls([x1, y1]);
expect(stateVariables["/B"].stateValues.xs).eqls([x2, y2]);
expect(stateVariables["/n1"]).eq(undefined);
- expect(stateVariables["/n2"]).eq(undefined);
- expect(stateVariables["/n3"]).eq(undefined);
- expect(stateVariables["/n4"]).eq(undefined);
expect(stateVariables["/al2/n1"]).eq(undefined);
- expect(stateVariables["/al2/n2"]).eq(undefined);
- expect(stateVariables["/al2/n3"]).eq(undefined);
- expect(stateVariables["/al2/n4"]).eq(undefined);
});
});
@@ -11680,29 +15462,17 @@ describe("Copy Tag Tests", function () {
cy.window().then(async (win) => {
cy.get(cesc("#\\/n1") + " .mjx-mrow").should("contain.text", nInDOM(x2));
- cy.get(cesc("#\\/n2") + " .mjx-mrow").should("not.exist");
- cy.get(cesc("#\\/n3") + " .mjx-mrow").should("not.exist");
- cy.get(cesc("#\\/n4") + " .mjx-mrow").should("not.exist");
cy.get(cesc("#\\/al2\\/n1") + " .mjx-mrow").should(
"contain.text",
nInDOM(x2),
);
- cy.get(cesc("#\\/al2\\/n2") + " .mjx-mrow").should("not.exist");
- cy.get(cesc("#\\/al2\\/n3") + " .mjx-mrow").should("not.exist");
- cy.get(cesc("#\\/al2\\/n4") + " .mjx-mrow").should("not.exist");
cy.window().then(async (win) => {
let stateVariables = await win.returnAllStateVariables1();
expect(stateVariables["/A"].stateValues.xs).eqls([x1, y1]);
expect(stateVariables["/B"].stateValues.xs).eqls([x2, y2]);
expect(stateVariables["/n1"].stateValues.value).eq(x2);
- expect(stateVariables["/n2"]).eq(undefined);
- expect(stateVariables["/n3"]).eq(undefined);
- expect(stateVariables["/n4"]).eq(undefined);
expect(stateVariables["/al2/n1"].stateValues.value).eq(x2);
- expect(stateVariables["/al2/n2"]).eq(undefined);
- expect(stateVariables["/al2/n3"]).eq(undefined);
- expect(stateVariables["/al2/n4"]).eq(undefined);
});
});
@@ -11716,29 +15486,17 @@ describe("Copy Tag Tests", function () {
});
cy.get(cesc("#\\/n1") + " .mjx-mrow").should("contain.text", nInDOM(x2));
- cy.get(cesc("#\\/n2") + " .mjx-mrow").should("not.exist");
- cy.get(cesc("#\\/n3") + " .mjx-mrow").should("not.exist");
- cy.get(cesc("#\\/n4") + " .mjx-mrow").should("not.exist");
cy.get(cesc("#\\/al2\\/n1") + " .mjx-mrow").should(
"contain.text",
nInDOM(x2),
);
- cy.get(cesc("#\\/al2\\/n2") + " .mjx-mrow").should("not.exist");
- cy.get(cesc("#\\/al2\\/n3") + " .mjx-mrow").should("not.exist");
- cy.get(cesc("#\\/al2\\/n4") + " .mjx-mrow").should("not.exist");
cy.window().then(async (win) => {
let stateVariables = await win.returnAllStateVariables1();
expect(stateVariables["/A"].stateValues.xs).eqls([x1, y1]);
expect(stateVariables["/B"].stateValues.xs).eqls([x2, y2]);
expect(stateVariables["/n1"].stateValues.value).eq(x2);
- expect(stateVariables["/n2"]).eq(undefined);
- expect(stateVariables["/n3"]).eq(undefined);
- expect(stateVariables["/n4"]).eq(undefined);
expect(stateVariables["/al2/n1"].stateValues.value).eq(x2);
- expect(stateVariables["/al2/n2"]).eq(undefined);
- expect(stateVariables["/al2/n3"]).eq(undefined);
- expect(stateVariables["/al2/n4"]).eq(undefined);
});
});
@@ -11749,29 +15507,17 @@ describe("Copy Tag Tests", function () {
cy.window().then(async (win) => {
cy.get(cesc("#\\/n1") + " .mjx-mrow").should("contain.text", nInDOM(y2));
- cy.get(cesc("#\\/n2") + " .mjx-mrow").should("not.exist");
- cy.get(cesc("#\\/n3") + " .mjx-mrow").should("not.exist");
- cy.get(cesc("#\\/n4") + " .mjx-mrow").should("not.exist");
cy.get(cesc("#\\/al2\\/n1") + " .mjx-mrow").should(
"contain.text",
nInDOM(y2),
);
- cy.get(cesc("#\\/al2\\/n2") + " .mjx-mrow").should("not.exist");
- cy.get(cesc("#\\/al2\\/n3") + " .mjx-mrow").should("not.exist");
- cy.get(cesc("#\\/al2\\/n4") + " .mjx-mrow").should("not.exist");
cy.window().then(async (win) => {
let stateVariables = await win.returnAllStateVariables1();
expect(stateVariables["/A"].stateValues.xs).eqls([x1, y1]);
expect(stateVariables["/B"].stateValues.xs).eqls([x2, y2]);
expect(stateVariables["/n1"].stateValues.value).eq(y2);
- expect(stateVariables["/n2"]).eq(undefined);
- expect(stateVariables["/n3"]).eq(undefined);
- expect(stateVariables["/n4"]).eq(undefined);
expect(stateVariables["/al2/n1"].stateValues.value).eq(y2);
- expect(stateVariables["/al2/n2"]).eq(undefined);
- expect(stateVariables["/al2/n3"]).eq(undefined);
- expect(stateVariables["/al2/n4"]).eq(undefined);
});
});
@@ -11782,29 +15528,17 @@ describe("Copy Tag Tests", function () {
cy.window().then(async (win) => {
cy.get(cesc("#\\/n1") + " .mjx-mrow").should("contain.text", nInDOM(y1));
- cy.get(cesc("#\\/n2") + " .mjx-mrow").should("not.exist");
- cy.get(cesc("#\\/n3") + " .mjx-mrow").should("not.exist");
- cy.get(cesc("#\\/n4") + " .mjx-mrow").should("not.exist");
cy.get(cesc("#\\/al2\\/n1") + " .mjx-mrow").should(
"contain.text",
nInDOM(y1),
);
- cy.get(cesc("#\\/al2\\/n2") + " .mjx-mrow").should("not.exist");
- cy.get(cesc("#\\/al2\\/n3") + " .mjx-mrow").should("not.exist");
- cy.get(cesc("#\\/al2\\/n4") + " .mjx-mrow").should("not.exist");
cy.window().then(async (win) => {
let stateVariables = await win.returnAllStateVariables1();
expect(stateVariables["/A"].stateValues.xs).eqls([x1, y1]);
expect(stateVariables["/B"].stateValues.xs).eqls([x2, y2]);
expect(stateVariables["/n1"].stateValues.value).eq(y1);
- expect(stateVariables["/n2"]).eq(undefined);
- expect(stateVariables["/n3"]).eq(undefined);
- expect(stateVariables["/n4"]).eq(undefined);
expect(stateVariables["/al2/n1"].stateValues.value).eq(y1);
- expect(stateVariables["/al2/n2"]).eq(undefined);
- expect(stateVariables["/al2/n3"]).eq(undefined);
- expect(stateVariables["/al2/n4"]).eq(undefined);
});
});
@@ -11815,26 +15549,14 @@ describe("Copy Tag Tests", function () {
cy.window().then(async (win) => {
cy.get(cesc("#\\/n1") + " .mjx-mrow").should("not.exist");
- cy.get(cesc("#\\/n2") + " .mjx-mrow").should("not.exist");
- cy.get(cesc("#\\/n3") + " .mjx-mrow").should("not.exist");
- cy.get(cesc("#\\/n4") + " .mjx-mrow").should("not.exist");
cy.get(cesc("#\\/al2\\/n1") + " .mjx-mrow").should("not.exist");
- cy.get(cesc("#\\/al2\\/n2") + " .mjx-mrow").should("not.exist");
- cy.get(cesc("#\\/al2\\/n3") + " .mjx-mrow").should("not.exist");
- cy.get(cesc("#\\/al2\\/n4") + " .mjx-mrow").should("not.exist");
cy.window().then(async (win) => {
let stateVariables = await win.returnAllStateVariables1();
expect(stateVariables["/A"].stateValues.xs).eqls([x1, y1]);
expect(stateVariables["/B"].stateValues.xs).eqls([x2, y2]);
expect(stateVariables["/n1"]).eq(undefined);
- expect(stateVariables["/n2"]).eq(undefined);
- expect(stateVariables["/n3"]).eq(undefined);
- expect(stateVariables["/n4"]).eq(undefined);
expect(stateVariables["/al2/n1"]).eq(undefined);
- expect(stateVariables["/al2/n2"]).eq(undefined);
- expect(stateVariables["/al2/n3"]).eq(undefined);
- expect(stateVariables["/al2/n4"]).eq(undefined);
});
});
@@ -11845,29 +15567,17 @@ describe("Copy Tag Tests", function () {
cy.window().then(async (win) => {
cy.get(cesc("#\\/n1") + " .mjx-mrow").should("contain.text", nInDOM(x1));
- cy.get(cesc("#\\/n2") + " .mjx-mrow").should("not.exist");
- cy.get(cesc("#\\/n3") + " .mjx-mrow").should("not.exist");
- cy.get(cesc("#\\/n4") + " .mjx-mrow").should("not.exist");
cy.get(cesc("#\\/al2\\/n1") + " .mjx-mrow").should(
"contain.text",
nInDOM(x1),
);
- cy.get(cesc("#\\/al2\\/n2") + " .mjx-mrow").should("not.exist");
- cy.get(cesc("#\\/al2\\/n3") + " .mjx-mrow").should("not.exist");
- cy.get(cesc("#\\/al2\\/n4") + " .mjx-mrow").should("not.exist");
cy.window().then(async (win) => {
let stateVariables = await win.returnAllStateVariables1();
expect(stateVariables["/A"].stateValues.xs).eqls([x1, y1]);
expect(stateVariables["/B"].stateValues.xs).eqls([x2, y2]);
expect(stateVariables["/n1"].stateValues.value).eq(x1);
- expect(stateVariables["/n2"]).eq(undefined);
- expect(stateVariables["/n3"]).eq(undefined);
- expect(stateVariables["/n4"]).eq(undefined);
expect(stateVariables["/al2/n1"].stateValues.value).eq(x1);
- expect(stateVariables["/al2/n2"]).eq(undefined);
- expect(stateVariables["/al2/n3"]).eq(undefined);
- expect(stateVariables["/al2/n4"]).eq(undefined);
});
});
@@ -11878,26 +15588,14 @@ describe("Copy Tag Tests", function () {
cy.window().then(async (win) => {
cy.get(cesc("#\\/n1") + " .mjx-mrow").should("not.exist");
- cy.get(cesc("#\\/n2") + " .mjx-mrow").should("not.exist");
- cy.get(cesc("#\\/n3") + " .mjx-mrow").should("not.exist");
- cy.get(cesc("#\\/n4") + " .mjx-mrow").should("not.exist");
cy.get(cesc("#\\/al2\\/n1") + " .mjx-mrow").should("not.exist");
- cy.get(cesc("#\\/al2\\/n2") + " .mjx-mrow").should("not.exist");
- cy.get(cesc("#\\/al2\\/n3") + " .mjx-mrow").should("not.exist");
- cy.get(cesc("#\\/al2\\/n4") + " .mjx-mrow").should("not.exist");
cy.window().then(async (win) => {
let stateVariables = await win.returnAllStateVariables1();
expect(stateVariables["/A"].stateValues.xs).eqls([x1, y1]);
expect(stateVariables["/B"].stateValues.xs).eqls([x2, y2]);
expect(stateVariables["/n1"]).eq(undefined);
- expect(stateVariables["/n2"]).eq(undefined);
- expect(stateVariables["/n3"]).eq(undefined);
- expect(stateVariables["/n4"]).eq(undefined);
expect(stateVariables["/al2/n1"]).eq(undefined);
- expect(stateVariables["/al2/n2"]).eq(undefined);
- expect(stateVariables["/al2/n3"]).eq(undefined);
- expect(stateVariables["/al2/n4"]).eq(undefined);
});
});
@@ -11908,29 +15606,17 @@ describe("Copy Tag Tests", function () {
cy.window().then(async (win) => {
cy.get(cesc("#\\/n1") + " .mjx-mrow").should("contain.text", nInDOM(x2));
- cy.get(cesc("#\\/n2") + " .mjx-mrow").should("not.exist");
- cy.get(cesc("#\\/n3") + " .mjx-mrow").should("not.exist");
- cy.get(cesc("#\\/n4") + " .mjx-mrow").should("not.exist");
cy.get(cesc("#\\/al2\\/n1") + " .mjx-mrow").should(
"contain.text",
nInDOM(x2),
);
- cy.get(cesc("#\\/al2\\/n2") + " .mjx-mrow").should("not.exist");
- cy.get(cesc("#\\/al2\\/n3") + " .mjx-mrow").should("not.exist");
- cy.get(cesc("#\\/al2\\/n4") + " .mjx-mrow").should("not.exist");
cy.window().then(async (win) => {
let stateVariables = await win.returnAllStateVariables1();
expect(stateVariables["/A"].stateValues.xs).eqls([x1, y1]);
expect(stateVariables["/B"].stateValues.xs).eqls([x2, y2]);
expect(stateVariables["/n1"].stateValues.value).eq(x2);
- expect(stateVariables["/n2"]).eq(undefined);
- expect(stateVariables["/n3"]).eq(undefined);
- expect(stateVariables["/n4"]).eq(undefined);
expect(stateVariables["/al2/n1"].stateValues.value).eq(x2);
- expect(stateVariables["/al2/n2"]).eq(undefined);
- expect(stateVariables["/al2/n3"]).eq(undefined);
- expect(stateVariables["/al2/n4"]).eq(undefined);
});
});
@@ -11940,30 +15626,18 @@ describe("Copy Tag Tests", function () {
});
cy.get(cesc("#\\/n1") + " .mjx-mrow").should("not.exist");
- cy.get(cesc("#\\/n2") + " .mjx-mrow").should("not.exist");
- cy.get(cesc("#\\/n3") + " .mjx-mrow").should("not.exist");
- cy.get(cesc("#\\/n4") + " .mjx-mrow").should("not.exist");
cy.get(cesc("#\\/al2\\/n1") + " .mjx-mrow").should("not.exist");
- cy.get(cesc("#\\/al2\\/n2") + " .mjx-mrow").should("not.exist");
- cy.get(cesc("#\\/al2\\/n3") + " .mjx-mrow").should("not.exist");
- cy.get(cesc("#\\/al2\\/n4") + " .mjx-mrow").should("not.exist");
cy.window().then(async (win) => {
let stateVariables = await win.returnAllStateVariables1();
expect(stateVariables["/A"].stateValues.xs).eqls([x1, y1]);
expect(stateVariables["/B"].stateValues.xs).eqls([x2, y2]);
expect(stateVariables["/n1"]).eq(undefined);
- expect(stateVariables["/n2"]).eq(undefined);
- expect(stateVariables["/n3"]).eq(undefined);
- expect(stateVariables["/n4"]).eq(undefined);
expect(stateVariables["/al2/n1"]).eq(undefined);
- expect(stateVariables["/al2/n2"]).eq(undefined);
- expect(stateVariables["/al2/n3"]).eq(undefined);
- expect(stateVariables["/al2/n4"]).eq(undefined);
});
});
- it("copy propIndex and componentIndex, array notation", () => {
+ it("copy propIndex and componentIndex, array notation, macros", () => {
cy.window().then(async (win) => {
win.postMessage(
{
@@ -11983,9 +15657,9 @@ describe("Copy Tag Tests", function () {
-
+ $(col[$m].xs[$n]{assignNames="n1"})
-
+ $al{name="al2" newNamespace}
`,
},
@@ -12001,26 +15675,14 @@ describe("Copy Tag Tests", function () {
y2 = 4;
cy.get(cesc("#\\/n1") + " .mjx-mrow").should("not.exist");
- cy.get(cesc("#\\/n2") + " .mjx-mrow").should("not.exist");
- cy.get(cesc("#\\/n3") + " .mjx-mrow").should("not.exist");
- cy.get(cesc("#\\/n4") + " .mjx-mrow").should("not.exist");
cy.get(cesc("#\\/al2\\/n1") + " .mjx-mrow").should("not.exist");
- cy.get(cesc("#\\/al2\\/n2") + " .mjx-mrow").should("not.exist");
- cy.get(cesc("#\\/al2\\/n3") + " .mjx-mrow").should("not.exist");
- cy.get(cesc("#\\/al2\\/n4") + " .mjx-mrow").should("not.exist");
cy.window().then(async (win) => {
let stateVariables = await win.returnAllStateVariables1();
expect(stateVariables["/A"].stateValues.xs).eqls([x1, y1]);
expect(stateVariables["/B"].stateValues.xs).eqls([x2, y2]);
expect(stateVariables["/n1"]).eq(undefined);
- expect(stateVariables["/n2"]).eq(undefined);
- expect(stateVariables["/n3"]).eq(undefined);
- expect(stateVariables["/n4"]).eq(undefined);
expect(stateVariables["/al2/n1"]).eq(undefined);
- expect(stateVariables["/al2/n2"]).eq(undefined);
- expect(stateVariables["/al2/n3"]).eq(undefined);
- expect(stateVariables["/al2/n4"]).eq(undefined);
});
cy.log("set propIndex to 1");
@@ -12028,26 +15690,14 @@ describe("Copy Tag Tests", function () {
cy.get(cesc("#\\/n") + " textarea").type("1{enter}", { force: true });
cy.get(cesc("#\\/n1") + " .mjx-mrow").should("not.exist");
- cy.get(cesc("#\\/n2") + " .mjx-mrow").should("not.exist");
- cy.get(cesc("#\\/n3") + " .mjx-mrow").should("not.exist");
- cy.get(cesc("#\\/n4") + " .mjx-mrow").should("not.exist");
cy.get(cesc("#\\/al2\\/n1") + " .mjx-mrow").should("not.exist");
- cy.get(cesc("#\\/al2\\/n2") + " .mjx-mrow").should("not.exist");
- cy.get(cesc("#\\/al2\\/n3") + " .mjx-mrow").should("not.exist");
- cy.get(cesc("#\\/al2\\/n4") + " .mjx-mrow").should("not.exist");
cy.window().then(async (win) => {
let stateVariables = await win.returnAllStateVariables1();
expect(stateVariables["/A"].stateValues.xs).eqls([x1, y1]);
expect(stateVariables["/B"].stateValues.xs).eqls([x2, y2]);
expect(stateVariables["/n1"]).eq(undefined);
- expect(stateVariables["/n2"]).eq(undefined);
- expect(stateVariables["/n3"]).eq(undefined);
- expect(stateVariables["/n4"]).eq(undefined);
expect(stateVariables["/al2/n1"]).eq(undefined);
- expect(stateVariables["/al2/n2"]).eq(undefined);
- expect(stateVariables["/al2/n3"]).eq(undefined);
- expect(stateVariables["/al2/n4"]).eq(undefined);
});
cy.log("move point 1");
@@ -12060,26 +15710,14 @@ describe("Copy Tag Tests", function () {
});
cy.get(cesc("#\\/n1") + " .mjx-mrow").should("not.exist");
- cy.get(cesc("#\\/n2") + " .mjx-mrow").should("not.exist");
- cy.get(cesc("#\\/n3") + " .mjx-mrow").should("not.exist");
- cy.get(cesc("#\\/n4") + " .mjx-mrow").should("not.exist");
cy.get(cesc("#\\/al2\\/n1") + " .mjx-mrow").should("not.exist");
- cy.get(cesc("#\\/al2\\/n2") + " .mjx-mrow").should("not.exist");
- cy.get(cesc("#\\/al2\\/n3") + " .mjx-mrow").should("not.exist");
- cy.get(cesc("#\\/al2\\/n4") + " .mjx-mrow").should("not.exist");
cy.window().then(async (win) => {
let stateVariables = await win.returnAllStateVariables1();
expect(stateVariables["/A"].stateValues.xs).eqls([x1, y1]);
expect(stateVariables["/B"].stateValues.xs).eqls([x2, y2]);
expect(stateVariables["/n1"]).eq(undefined);
- expect(stateVariables["/n2"]).eq(undefined);
- expect(stateVariables["/n3"]).eq(undefined);
- expect(stateVariables["/n4"]).eq(undefined);
expect(stateVariables["/al2/n1"]).eq(undefined);
- expect(stateVariables["/al2/n2"]).eq(undefined);
- expect(stateVariables["/al2/n3"]).eq(undefined);
- expect(stateVariables["/al2/n4"]).eq(undefined);
});
});
@@ -12089,29 +15727,17 @@ describe("Copy Tag Tests", function () {
cy.window().then(async (win) => {
cy.get(cesc("#\\/n1") + " .mjx-mrow").should("contain.text", nInDOM(x2));
- cy.get(cesc("#\\/n2") + " .mjx-mrow").should("not.exist");
- cy.get(cesc("#\\/n3") + " .mjx-mrow").should("not.exist");
- cy.get(cesc("#\\/n4") + " .mjx-mrow").should("not.exist");
cy.get(cesc("#\\/al2\\/n1") + " .mjx-mrow").should(
"contain.text",
nInDOM(x2),
);
- cy.get(cesc("#\\/al2\\/n2") + " .mjx-mrow").should("not.exist");
- cy.get(cesc("#\\/al2\\/n3") + " .mjx-mrow").should("not.exist");
- cy.get(cesc("#\\/al2\\/n4") + " .mjx-mrow").should("not.exist");
cy.window().then(async (win) => {
let stateVariables = await win.returnAllStateVariables1();
expect(stateVariables["/A"].stateValues.xs).eqls([x1, y1]);
expect(stateVariables["/B"].stateValues.xs).eqls([x2, y2]);
expect(stateVariables["/n1"].stateValues.value).eq(x2);
- expect(stateVariables["/n2"]).eq(undefined);
- expect(stateVariables["/n3"]).eq(undefined);
- expect(stateVariables["/n4"]).eq(undefined);
expect(stateVariables["/al2/n1"].stateValues.value).eq(x2);
- expect(stateVariables["/al2/n2"]).eq(undefined);
- expect(stateVariables["/al2/n3"]).eq(undefined);
- expect(stateVariables["/al2/n4"]).eq(undefined);
});
});
@@ -12125,29 +15751,17 @@ describe("Copy Tag Tests", function () {
});
cy.get(cesc("#\\/n1") + " .mjx-mrow").should("contain.text", nInDOM(x2));
- cy.get(cesc("#\\/n2") + " .mjx-mrow").should("not.exist");
- cy.get(cesc("#\\/n3") + " .mjx-mrow").should("not.exist");
- cy.get(cesc("#\\/n4") + " .mjx-mrow").should("not.exist");
cy.get(cesc("#\\/al2\\/n1") + " .mjx-mrow").should(
"contain.text",
nInDOM(x2),
);
- cy.get(cesc("#\\/al2\\/n2") + " .mjx-mrow").should("not.exist");
- cy.get(cesc("#\\/al2\\/n3") + " .mjx-mrow").should("not.exist");
- cy.get(cesc("#\\/al2\\/n4") + " .mjx-mrow").should("not.exist");
cy.window().then(async (win) => {
let stateVariables = await win.returnAllStateVariables1();
expect(stateVariables["/A"].stateValues.xs).eqls([x1, y1]);
expect(stateVariables["/B"].stateValues.xs).eqls([x2, y2]);
expect(stateVariables["/n1"].stateValues.value).eq(x2);
- expect(stateVariables["/n2"]).eq(undefined);
- expect(stateVariables["/n3"]).eq(undefined);
- expect(stateVariables["/n4"]).eq(undefined);
expect(stateVariables["/al2/n1"].stateValues.value).eq(x2);
- expect(stateVariables["/al2/n2"]).eq(undefined);
- expect(stateVariables["/al2/n3"]).eq(undefined);
- expect(stateVariables["/al2/n4"]).eq(undefined);
});
});
@@ -12158,29 +15772,17 @@ describe("Copy Tag Tests", function () {
cy.window().then(async (win) => {
cy.get(cesc("#\\/n1") + " .mjx-mrow").should("contain.text", nInDOM(y2));
- cy.get(cesc("#\\/n2") + " .mjx-mrow").should("not.exist");
- cy.get(cesc("#\\/n3") + " .mjx-mrow").should("not.exist");
- cy.get(cesc("#\\/n4") + " .mjx-mrow").should("not.exist");
cy.get(cesc("#\\/al2\\/n1") + " .mjx-mrow").should(
"contain.text",
nInDOM(y2),
);
- cy.get(cesc("#\\/al2\\/n2") + " .mjx-mrow").should("not.exist");
- cy.get(cesc("#\\/al2\\/n3") + " .mjx-mrow").should("not.exist");
- cy.get(cesc("#\\/al2\\/n4") + " .mjx-mrow").should("not.exist");
cy.window().then(async (win) => {
let stateVariables = await win.returnAllStateVariables1();
expect(stateVariables["/A"].stateValues.xs).eqls([x1, y1]);
expect(stateVariables["/B"].stateValues.xs).eqls([x2, y2]);
expect(stateVariables["/n1"].stateValues.value).eq(y2);
- expect(stateVariables["/n2"]).eq(undefined);
- expect(stateVariables["/n3"]).eq(undefined);
- expect(stateVariables["/n4"]).eq(undefined);
expect(stateVariables["/al2/n1"].stateValues.value).eq(y2);
- expect(stateVariables["/al2/n2"]).eq(undefined);
- expect(stateVariables["/al2/n3"]).eq(undefined);
- expect(stateVariables["/al2/n4"]).eq(undefined);
});
});
@@ -12191,29 +15793,17 @@ describe("Copy Tag Tests", function () {
cy.window().then(async (win) => {
cy.get(cesc("#\\/n1") + " .mjx-mrow").should("contain.text", nInDOM(y1));
- cy.get(cesc("#\\/n2") + " .mjx-mrow").should("not.exist");
- cy.get(cesc("#\\/n3") + " .mjx-mrow").should("not.exist");
- cy.get(cesc("#\\/n4") + " .mjx-mrow").should("not.exist");
cy.get(cesc("#\\/al2\\/n1") + " .mjx-mrow").should(
"contain.text",
nInDOM(y1),
);
- cy.get(cesc("#\\/al2\\/n2") + " .mjx-mrow").should("not.exist");
- cy.get(cesc("#\\/al2\\/n3") + " .mjx-mrow").should("not.exist");
- cy.get(cesc("#\\/al2\\/n4") + " .mjx-mrow").should("not.exist");
cy.window().then(async (win) => {
let stateVariables = await win.returnAllStateVariables1();
expect(stateVariables["/A"].stateValues.xs).eqls([x1, y1]);
expect(stateVariables["/B"].stateValues.xs).eqls([x2, y2]);
expect(stateVariables["/n1"].stateValues.value).eq(y1);
- expect(stateVariables["/n2"]).eq(undefined);
- expect(stateVariables["/n3"]).eq(undefined);
- expect(stateVariables["/n4"]).eq(undefined);
expect(stateVariables["/al2/n1"].stateValues.value).eq(y1);
- expect(stateVariables["/al2/n2"]).eq(undefined);
- expect(stateVariables["/al2/n3"]).eq(undefined);
- expect(stateVariables["/al2/n4"]).eq(undefined);
});
});
@@ -12224,26 +15814,14 @@ describe("Copy Tag Tests", function () {
cy.window().then(async (win) => {
cy.get(cesc("#\\/n1") + " .mjx-mrow").should("not.exist");
- cy.get(cesc("#\\/n2") + " .mjx-mrow").should("not.exist");
- cy.get(cesc("#\\/n3") + " .mjx-mrow").should("not.exist");
- cy.get(cesc("#\\/n4") + " .mjx-mrow").should("not.exist");
cy.get(cesc("#\\/al2\\/n1") + " .mjx-mrow").should("not.exist");
- cy.get(cesc("#\\/al2\\/n2") + " .mjx-mrow").should("not.exist");
- cy.get(cesc("#\\/al2\\/n3") + " .mjx-mrow").should("not.exist");
- cy.get(cesc("#\\/al2\\/n4") + " .mjx-mrow").should("not.exist");
cy.window().then(async (win) => {
let stateVariables = await win.returnAllStateVariables1();
expect(stateVariables["/A"].stateValues.xs).eqls([x1, y1]);
expect(stateVariables["/B"].stateValues.xs).eqls([x2, y2]);
expect(stateVariables["/n1"]).eq(undefined);
- expect(stateVariables["/n2"]).eq(undefined);
- expect(stateVariables["/n3"]).eq(undefined);
- expect(stateVariables["/n4"]).eq(undefined);
expect(stateVariables["/al2/n1"]).eq(undefined);
- expect(stateVariables["/al2/n2"]).eq(undefined);
- expect(stateVariables["/al2/n3"]).eq(undefined);
- expect(stateVariables["/al2/n4"]).eq(undefined);
});
});
@@ -12254,29 +15832,17 @@ describe("Copy Tag Tests", function () {
cy.window().then(async (win) => {
cy.get(cesc("#\\/n1") + " .mjx-mrow").should("contain.text", nInDOM(x1));
- cy.get(cesc("#\\/n2") + " .mjx-mrow").should("not.exist");
- cy.get(cesc("#\\/n3") + " .mjx-mrow").should("not.exist");
- cy.get(cesc("#\\/n4") + " .mjx-mrow").should("not.exist");
cy.get(cesc("#\\/al2\\/n1") + " .mjx-mrow").should(
"contain.text",
nInDOM(x1),
);
- cy.get(cesc("#\\/al2\\/n2") + " .mjx-mrow").should("not.exist");
- cy.get(cesc("#\\/al2\\/n3") + " .mjx-mrow").should("not.exist");
- cy.get(cesc("#\\/al2\\/n4") + " .mjx-mrow").should("not.exist");
cy.window().then(async (win) => {
let stateVariables = await win.returnAllStateVariables1();
expect(stateVariables["/A"].stateValues.xs).eqls([x1, y1]);
expect(stateVariables["/B"].stateValues.xs).eqls([x2, y2]);
expect(stateVariables["/n1"].stateValues.value).eq(x1);
- expect(stateVariables["/n2"]).eq(undefined);
- expect(stateVariables["/n3"]).eq(undefined);
- expect(stateVariables["/n4"]).eq(undefined);
expect(stateVariables["/al2/n1"].stateValues.value).eq(x1);
- expect(stateVariables["/al2/n2"]).eq(undefined);
- expect(stateVariables["/al2/n3"]).eq(undefined);
- expect(stateVariables["/al2/n4"]).eq(undefined);
});
});
@@ -12287,26 +15853,14 @@ describe("Copy Tag Tests", function () {
cy.window().then(async (win) => {
cy.get(cesc("#\\/n1") + " .mjx-mrow").should("not.exist");
- cy.get(cesc("#\\/n2") + " .mjx-mrow").should("not.exist");
- cy.get(cesc("#\\/n3") + " .mjx-mrow").should("not.exist");
- cy.get(cesc("#\\/n4") + " .mjx-mrow").should("not.exist");
cy.get(cesc("#\\/al2\\/n1") + " .mjx-mrow").should("not.exist");
- cy.get(cesc("#\\/al2\\/n2") + " .mjx-mrow").should("not.exist");
- cy.get(cesc("#\\/al2\\/n3") + " .mjx-mrow").should("not.exist");
- cy.get(cesc("#\\/al2\\/n4") + " .mjx-mrow").should("not.exist");
cy.window().then(async (win) => {
let stateVariables = await win.returnAllStateVariables1();
expect(stateVariables["/A"].stateValues.xs).eqls([x1, y1]);
expect(stateVariables["/B"].stateValues.xs).eqls([x2, y2]);
expect(stateVariables["/n1"]).eq(undefined);
- expect(stateVariables["/n2"]).eq(undefined);
- expect(stateVariables["/n3"]).eq(undefined);
- expect(stateVariables["/n4"]).eq(undefined);
expect(stateVariables["/al2/n1"]).eq(undefined);
- expect(stateVariables["/al2/n2"]).eq(undefined);
- expect(stateVariables["/al2/n3"]).eq(undefined);
- expect(stateVariables["/al2/n4"]).eq(undefined);
});
});
@@ -12317,29 +15871,17 @@ describe("Copy Tag Tests", function () {
cy.window().then(async (win) => {
cy.get(cesc("#\\/n1") + " .mjx-mrow").should("contain.text", nInDOM(x2));
- cy.get(cesc("#\\/n2") + " .mjx-mrow").should("not.exist");
- cy.get(cesc("#\\/n3") + " .mjx-mrow").should("not.exist");
- cy.get(cesc("#\\/n4") + " .mjx-mrow").should("not.exist");
cy.get(cesc("#\\/al2\\/n1") + " .mjx-mrow").should(
"contain.text",
nInDOM(x2),
);
- cy.get(cesc("#\\/al2\\/n2") + " .mjx-mrow").should("not.exist");
- cy.get(cesc("#\\/al2\\/n3") + " .mjx-mrow").should("not.exist");
- cy.get(cesc("#\\/al2\\/n4") + " .mjx-mrow").should("not.exist");
cy.window().then(async (win) => {
let stateVariables = await win.returnAllStateVariables1();
expect(stateVariables["/A"].stateValues.xs).eqls([x1, y1]);
expect(stateVariables["/B"].stateValues.xs).eqls([x2, y2]);
expect(stateVariables["/n1"].stateValues.value).eq(x2);
- expect(stateVariables["/n2"]).eq(undefined);
- expect(stateVariables["/n3"]).eq(undefined);
- expect(stateVariables["/n4"]).eq(undefined);
expect(stateVariables["/al2/n1"].stateValues.value).eq(x2);
- expect(stateVariables["/al2/n2"]).eq(undefined);
- expect(stateVariables["/al2/n3"]).eq(undefined);
- expect(stateVariables["/al2/n4"]).eq(undefined);
});
});
@@ -12349,26 +15891,14 @@ describe("Copy Tag Tests", function () {
});
cy.get(cesc("#\\/n1") + " .mjx-mrow").should("not.exist");
- cy.get(cesc("#\\/n2") + " .mjx-mrow").should("not.exist");
- cy.get(cesc("#\\/n3") + " .mjx-mrow").should("not.exist");
- cy.get(cesc("#\\/n4") + " .mjx-mrow").should("not.exist");
cy.get(cesc("#\\/al2\\/n1") + " .mjx-mrow").should("not.exist");
- cy.get(cesc("#\\/al2\\/n2") + " .mjx-mrow").should("not.exist");
- cy.get(cesc("#\\/al2\\/n3") + " .mjx-mrow").should("not.exist");
- cy.get(cesc("#\\/al2\\/n4") + " .mjx-mrow").should("not.exist");
cy.window().then(async (win) => {
let stateVariables = await win.returnAllStateVariables1();
expect(stateVariables["/A"].stateValues.xs).eqls([x1, y1]);
expect(stateVariables["/B"].stateValues.xs).eqls([x2, y2]);
expect(stateVariables["/n1"]).eq(undefined);
- expect(stateVariables["/n2"]).eq(undefined);
- expect(stateVariables["/n3"]).eq(undefined);
- expect(stateVariables["/n4"]).eq(undefined);
expect(stateVariables["/al2/n1"]).eq(undefined);
- expect(stateVariables["/al2/n2"]).eq(undefined);
- expect(stateVariables["/al2/n3"]).eq(undefined);
- expect(stateVariables["/al2/n4"]).eq(undefined);
});
});
diff --git a/cypress/e2e/DoenetML/tagSpecific/copy2.cy.js b/cypress/e2e/DoenetML/tagSpecific/copy2.cy.js
index 7906587982..bae3648892 100644
--- a/cypress/e2e/DoenetML/tagSpecific/copy2.cy.js
+++ b/cypress/e2e/DoenetML/tagSpecific/copy2.cy.js
@@ -24,14 +24,12 @@ describe("Copy Tag Tests", function () {
The text: secret
Text stays hidden by default:
- Because source attributes to ignore are:
- Check attributes:
+ $p1{name="p2"}
+ Check attributes: $p2.hidden $p2.fixed $p2.isResponse $(p2/hidden.hidden) $(p2/hidden.fixed) $(p2/hidden.isResponse)
Now all is revealed:
- Because source attributes to ignore are:
- Check attributes:
+ Check attributes: $p5.hidden $p5.fixed $p5.isResponse $(p5/hidden.hidden) $(p5/hidden.fixed) $(p5/hidden.isResponse)
`,
},
@@ -45,20 +43,12 @@ describe("Copy Tag Tests", function () {
cy.get(cesc("#\\/p1")).should("have.text", "The text: ");
cy.get(cesc("#\\/p2")).should("have.text", "The text: ");
- cy.get(cesc("#\\/p3")).should(
- "have.text",
- "Because source attributes to ignore are: isResponse",
- );
cy.get(cesc("#\\/p4")).should(
"have.text",
"Check attributes: false true false true true false",
);
cy.get(cesc("#\\/p5")).should("have.text", "The text: secret");
- cy.get(cesc("#\\/p6")).should(
- "have.text",
- "Because source attributes to ignore are: hide, fixed",
- );
cy.get(cesc("#\\/p7")).should(
"have.text",
"Check attributes: false false true false false true",
@@ -369,7 +359,7 @@ describe("Copy Tag Tests", function () {
});
});
- it("copySource and copies with assignNewNamespaces", () => {
+ it("copySource and copies with newNamespace", () => {
cy.window().then(async (win) => {
win.postMessage(
{
@@ -378,11 +368,11 @@ describe("Copy Tag Tests", function () {
(1,2)
-
(3,4)
-
@@ -394,10 +384,10 @@ describe("Copy Tag Tests", function () {
y
- Credit achieved:
- Value of mathinput:
- Other answer credit achieved:
+ Credit achieved: $p1.creditAchieved{assignNames="ca"}
+ Value of mathinput: $mi.value{assignNames="m"}
+ Other answer credit achieved: $(p2/_answer1.creditAchieved{assignNames="cao"})
z
- Credit achieved:
- Value of mathinput:
- Other answer credit achieved:
+ Credit achieved: $(../p2.creditAchieved{assignNames="ca"})
+ Value of mathinput: $(../mi.value{assignNames="m"})
+ Other answer credit achieved: $(../_answer2.creditAchieved{assignNames="cao"})
- Value:
- Value 2:
+ Value:
+ Value 2:
Hello
a
+
+ Value: $n.value{assignNames="n2"}
+ Value 2: $n2{name="n3"}
+
+
+ Hello $v{name="n1"}!
+
+ $map1{name="map2" assignNames="(p1a) (p2a) (p3a)"}
+
+ $map2{name="map3" assignNames="(p1b) (p2b) (p3b)"}
+
+
+ `,
+ },
+ "*",
+ );
+ });
+
+ // to wait for page to load
+ cy.get(cesc("#\\/_text1")).should("have.text", "a");
+
+ cy.get(cesc2("#/n2")).contains("2");
+ cy.get(cesc2("#/n3")).contains("2");
+
+ cy.get(cesc2("#/p1")).contains("Hello 1!");
+ cy.get(cesc2("#/p1/n1")).contains("1");
+ cy.get(cesc2("#/p1/m1")).contains("＿");
+ cy.get(cesc2("#/p2")).contains("Hello 2!");
+ cy.get(cesc2("#/p2/n1")).contains("2");
+ cy.get(cesc2("#/p2/m1")).contains("＿");
+ cy.get(cesc2("#/p3")).should("not.exist");
+ cy.get(cesc2("#/p3/n1")).should("not.exist");
+ cy.get(cesc2("#/p3/m1")).should("not.exist");
+
+ cy.get(cesc2("#/p1a")).contains("Hello 1!");
+ cy.get(cesc2("#/p1a/n1")).contains("1");
+ cy.get(cesc2("#/p1a/m1")).contains("＿");
+ cy.get(cesc2("#/p2a")).contains("Hello 2!");
+ cy.get(cesc2("#/p2a/n1")).contains("2");
+ cy.get(cesc2("#/p2a/m1")).contains("＿");
+ cy.get(cesc2("#/p3a")).should("not.exist");
+ cy.get(cesc2("#/p3a/n1")).should("not.exist");
+ cy.get(cesc2("#/p3a/m1")).should("not.exist");
+
+ cy.get(cesc2("#/p1b")).contains("Hello 1!");
+ cy.get(cesc2("#/p1b/n1")).contains("1");
+ cy.get(cesc2("#/p1b/m1")).contains("＿");
+ cy.get(cesc2("#/p2b")).contains("Hello 2!");
+ cy.get(cesc2("#/p2b/n1")).contains("2");
+ cy.get(cesc2("#/p2b/m1")).contains("＿");
+ cy.get(cesc2("#/p3b")).should("not.exist");
+ cy.get(cesc2("#/p3b/n1")).should("not.exist");
+ cy.get(cesc2("#/p3b/m1")).should("not.exist");
+
+ cy.window().then(async (win) => {
+ let stateVariables = await win.returnAllStateVariables1();
+ expect(stateVariables["/n2"].stateValues.value).eq(2);
+ expect(stateVariables["/n3"].stateValues.value).eq(2);
+
+ expect(stateVariables["/p1/n1"].stateValues.value).eq(1);
+ expect(stateVariables["/p2/n1"].stateValues.value).eq(2);
+ expect(stateVariables["/p3/n1"]).eq(undefined);
+ expect(stateVariables["/p1a/n1"].stateValues.value).eq(1);
+ expect(stateVariables["/p2a/n1"].stateValues.value).eq(2);
+ expect(stateVariables["/p3a/n1"]).eq(undefined);
+ expect(stateVariables["/p1b/n1"].stateValues.value).eq(1);
+ expect(stateVariables["/p2b/n1"].stateValues.value).eq(2);
+ expect(stateVariables["/p3b/n1"]).eq(undefined);
+
+ expect(stateVariables["/p1/m1"].stateValues.value).eq("＿");
+ expect(stateVariables["/p2/m1"].stateValues.value).eq("＿");
+ expect(stateVariables["/p3/m1"]).eq(undefined);
+ expect(stateVariables["/p1a/m1"].stateValues.value).eq("＿");
+ expect(stateVariables["/p2a/m1"].stateValues.value).eq("＿");
+ expect(stateVariables["/p3a/m1"]).eq(undefined);
+ expect(stateVariables["/p1b/m1"].stateValues.value).eq("＿");
+ expect(stateVariables["/p2b/m1"].stateValues.value).eq("＿");
+ expect(stateVariables["/p3b/m1"]).eq(undefined);
+ });
+
+ cy.log("type x in first mathinput");
+ cy.get(cesc2("#/p1/x") + " textarea").type("x{enter}", { force: true });
+
+ cy.get(cesc2("#/p1")).contains("Hello 1!");
+ cy.get(cesc2("#/p1/n1")).contains("1");
+ cy.get(cesc2("#/p1/m1")).contains("x");
+ cy.get(cesc2("#/p2")).contains("Hello 2!");
+ cy.get(cesc2("#/p2/n1")).contains("2");
+ cy.get(cesc2("#/p2/m1")).contains("＿");
+ cy.get(cesc2("#/p3")).should("not.exist");
+ cy.get(cesc2("#/p3/n1")).should("not.exist");
+ cy.get(cesc2("#/p3/m1")).should("not.exist");
+
+ cy.get(cesc2("#/p1a")).contains("Hello 1!");
+ cy.get(cesc2("#/p1a/n1")).contains("1");
+ cy.get(cesc2("#/p1a/m1")).contains("x");
+ cy.get(cesc2("#/p2a")).contains("Hello 2!");
+ cy.get(cesc2("#/p2a/n1")).contains("2");
+ cy.get(cesc2("#/p2a/m1")).contains("＿");
+ cy.get(cesc2("#/p3a")).should("not.exist");
+ cy.get(cesc2("#/p3a/n1")).should("not.exist");
+ cy.get(cesc2("#/p3a/m1")).should("not.exist");
+
+ cy.get(cesc2("#/p1b")).contains("Hello 1!");
+ cy.get(cesc2("#/p1b/n1")).contains("1");
+ cy.get(cesc2("#/p1b/m1")).contains("x");
+ cy.get(cesc2("#/p2b")).contains("Hello 2!");
+ cy.get(cesc2("#/p2b/n1")).contains("2");
+ cy.get(cesc2("#/p2b/m1")).contains("＿");
+ cy.get(cesc2("#/p3b")).should("not.exist");
+ cy.get(cesc2("#/p3b/n1")).should("not.exist");
+ cy.get(cesc2("#/p3b/m1")).should("not.exist");
+
+ cy.window().then(async (win) => {
+ let stateVariables = await win.returnAllStateVariables1();
+ expect(stateVariables["/n2"].stateValues.value).eq(2);
+ expect(stateVariables["/n3"].stateValues.value).eq(2);
+
+ expect(stateVariables["/p1/n1"].stateValues.value).eq(1);
+ expect(stateVariables["/p2/n1"].stateValues.value).eq(2);
+ expect(stateVariables["/p3/n1"]).eq(undefined);
+ expect(stateVariables["/p1a/n1"].stateValues.value).eq(1);
+ expect(stateVariables["/p2a/n1"].stateValues.value).eq(2);
+ expect(stateVariables["/p3a/n1"]).eq(undefined);
+ expect(stateVariables["/p1b/n1"].stateValues.value).eq(1);
+ expect(stateVariables["/p2b/n1"].stateValues.value).eq(2);
+ expect(stateVariables["/p3b/n1"]).eq(undefined);
+
+ expect(stateVariables["/p1/m1"].stateValues.value).eq("x");
+ expect(stateVariables["/p2/m1"].stateValues.value).eq("＿");
+ expect(stateVariables["/p3/m1"]).eq(undefined);
+ expect(stateVariables["/p1a/m1"].stateValues.value).eq("x");
+ expect(stateVariables["/p2a/m1"].stateValues.value).eq("＿");
+ expect(stateVariables["/p3a/m1"]).eq(undefined);
+ expect(stateVariables["/p1b/m1"].stateValues.value).eq("x");
+ expect(stateVariables["/p2b/m1"].stateValues.value).eq("＿");
+ expect(stateVariables["/p3b/m1"]).eq(undefined);
+ });
+
+ cy.log("type y in second mathinput");
+ cy.get(cesc2("#/p2b/x") + " textarea").type("y{enter}", { force: true });
+
+ cy.get(cesc2("#/p1")).contains("Hello 1!");
+ cy.get(cesc2("#/p1/n1")).contains("1");
+ cy.get(cesc2("#/p1/m1")).contains("x");
+ cy.get(cesc2("#/p2")).contains("Hello 2!");
+ cy.get(cesc2("#/p2/n1")).contains("2");
+ cy.get(cesc2("#/p2/m1")).contains("y");
+ cy.get(cesc2("#/p3")).should("not.exist");
+ cy.get(cesc2("#/p3/n1")).should("not.exist");
+ cy.get(cesc2("#/p3/m1")).should("not.exist");
+
+ cy.get(cesc2("#/p1a")).contains("Hello 1!");
+ cy.get(cesc2("#/p1a/n1")).contains("1");
+ cy.get(cesc2("#/p1a/m1")).contains("x");
+ cy.get(cesc2("#/p2a")).contains("Hello 2!");
+ cy.get(cesc2("#/p2a/n1")).contains("2");
+ cy.get(cesc2("#/p2a/m1")).contains("y");
+ cy.get(cesc2("#/p3a")).should("not.exist");
+ cy.get(cesc2("#/p3a/n1")).should("not.exist");
+ cy.get(cesc2("#/p3a/m1")).should("not.exist");
+
+ cy.get(cesc2("#/p1b")).contains("Hello 1!");
+ cy.get(cesc2("#/p1b/n1")).contains("1");
+ cy.get(cesc2("#/p1b/m1")).contains("x");
+ cy.get(cesc2("#/p2b")).contains("Hello 2!");
+ cy.get(cesc2("#/p2b/n1")).contains("2");
+ cy.get(cesc2("#/p2b/m1")).contains("y");
+ cy.get(cesc2("#/p3b")).should("not.exist");
+ cy.get(cesc2("#/p3b/n1")).should("not.exist");
+ cy.get(cesc2("#/p3b/m1")).should("not.exist");
+
+ cy.window().then(async (win) => {
+ let stateVariables = await win.returnAllStateVariables1();
+ expect(stateVariables["/n2"].stateValues.value).eq(2);
+ expect(stateVariables["/n3"].stateValues.value).eq(2);
+
+ expect(stateVariables["/p1/n1"].stateValues.value).eq(1);
+ expect(stateVariables["/p2/n1"].stateValues.value).eq(2);
+ expect(stateVariables["/p3/n1"]).eq(undefined);
+ expect(stateVariables["/p1a/n1"].stateValues.value).eq(1);
+ expect(stateVariables["/p2a/n1"].stateValues.value).eq(2);
+ expect(stateVariables["/p3a/n1"]).eq(undefined);
+ expect(stateVariables["/p1b/n1"].stateValues.value).eq(1);
+ expect(stateVariables["/p2b/n1"].stateValues.value).eq(2);
+ expect(stateVariables["/p3b/n1"]).eq(undefined);
+
+ expect(stateVariables["/p1/m1"].stateValues.value).eq("x");
+ expect(stateVariables["/p2/m1"].stateValues.value).eq("y");
+ expect(stateVariables["/p3/m1"]).eq(undefined);
+ expect(stateVariables["/p1a/m1"].stateValues.value).eq("x");
+ expect(stateVariables["/p2a/m1"].stateValues.value).eq("y");
+ expect(stateVariables["/p3a/m1"]).eq(undefined);
+ expect(stateVariables["/p1b/m1"].stateValues.value).eq("x");
+ expect(stateVariables["/p2b/m1"].stateValues.value).eq("y");
+ expect(stateVariables["/p3b/m1"]).eq(undefined);
+ });
+
+ cy.log("increase n");
+ cy.get(cesc2("#/n") + " textarea").type("{end}{backspace}3{enter}", {
+ force: true,
+ });
+
+ cy.get(cesc2("#/n2")).contains("3");
+ cy.get(cesc2("#/n3")).contains("3");
+
+ cy.get(cesc2("#/p1")).contains("Hello 1!");
+ cy.get(cesc2("#/p1/n1")).contains("1");
+ cy.get(cesc2("#/p1/m1")).contains("x");
+ cy.get(cesc2("#/p2")).contains("Hello 2!");
+ cy.get(cesc2("#/p2/n1")).contains("2");
+ cy.get(cesc2("#/p2/m1")).contains("y");
+ cy.get(cesc2("#/p3")).contains("Hello 3!");
+ cy.get(cesc2("#/p3/n1")).contains("3");
+ cy.get(cesc2("#/p3/m1")).contains("＿");
+
+ cy.get(cesc2("#/p1a")).contains("Hello 1!");
+ cy.get(cesc2("#/p1a/n1")).contains("1");
+ cy.get(cesc2("#/p1a/m1")).contains("x");
+ cy.get(cesc2("#/p2a")).contains("Hello 2!");
+ cy.get(cesc2("#/p2a/n1")).contains("2");
+ cy.get(cesc2("#/p2a/m1")).contains("y");
+ cy.get(cesc2("#/p3a")).contains("Hello 3!");
+ cy.get(cesc2("#/p3a/n1")).contains("3");
+ cy.get(cesc2("#/p3a/m1")).contains("＿");
+
+ cy.get(cesc2("#/p1b")).contains("Hello 1!");
+ cy.get(cesc2("#/p1b/n1")).contains("1");
+ cy.get(cesc2("#/p1b/m1")).contains("x");
+ cy.get(cesc2("#/p2b")).contains("Hello 2!");
+ cy.get(cesc2("#/p2b/n1")).contains("2");
+ cy.get(cesc2("#/p2b/m1")).contains("y");
+ cy.get(cesc2("#/p3b")).contains("Hello 3!");
+ cy.get(cesc2("#/p3b/n1")).contains("3");
+ cy.get(cesc2("#/p3b/m1")).contains("＿");
+
+ cy.window().then(async (win) => {
+ let stateVariables = await win.returnAllStateVariables1();
+ expect(stateVariables["/n2"].stateValues.value).eq(3);
+ expect(stateVariables["/n3"].stateValues.value).eq(3);
+
+ expect(stateVariables["/p1/n1"].stateValues.value).eq(1);
+ expect(stateVariables["/p2/n1"].stateValues.value).eq(2);
+ expect(stateVariables["/p3/n1"].stateValues.value).eq(3);
+ expect(stateVariables["/p1a/n1"].stateValues.value).eq(1);
+ expect(stateVariables["/p2a/n1"].stateValues.value).eq(2);
+ expect(stateVariables["/p3a/n1"].stateValues.value).eq(3);
+ expect(stateVariables["/p1b/n1"].stateValues.value).eq(1);
+ expect(stateVariables["/p2b/n1"].stateValues.value).eq(2);
+ expect(stateVariables["/p3b/n1"].stateValues.value).eq(3);
+
+ expect(stateVariables["/p1/m1"].stateValues.value).eq("x");
+ expect(stateVariables["/p2/m1"].stateValues.value).eq("y");
+ expect(stateVariables["/p3/m1"].stateValues.value).eq("＿");
+ expect(stateVariables["/p1a/m1"].stateValues.value).eq("x");
+ expect(stateVariables["/p2a/m1"].stateValues.value).eq("y");
+ expect(stateVariables["/p3a/m1"].stateValues.value).eq("＿");
+ expect(stateVariables["/p1b/m1"].stateValues.value).eq("x");
+ expect(stateVariables["/p2b/m1"].stateValues.value).eq("y");
+ expect(stateVariables["/p3b/m1"].stateValues.value).eq("＿");
+ });
+
+ cy.log("type z in third mathinput");
+ cy.get(cesc2("#/p3a/x") + " textarea").type("z{enter}", { force: true });
+
+ cy.get(cesc2("#/p1")).contains("Hello 1!");
+ cy.get(cesc2("#/p1/n1")).contains("1");
+ cy.get(cesc2("#/p1/m1")).contains("x");
+ cy.get(cesc2("#/p2")).contains("Hello 2!");
+ cy.get(cesc2("#/p2/n1")).contains("2");
+ cy.get(cesc2("#/p2/m1")).contains("y");
+ cy.get(cesc2("#/p3")).contains("Hello 3!");
+ cy.get(cesc2("#/p3/n1")).contains("3");
+ cy.get(cesc2("#/p3/m1")).contains("z");
+
+ cy.get(cesc2("#/p1a")).contains("Hello 1!");
+ cy.get(cesc2("#/p1a/n1")).contains("1");
+ cy.get(cesc2("#/p1a/m1")).contains("x");
+ cy.get(cesc2("#/p2a")).contains("Hello 2!");
+ cy.get(cesc2("#/p2a/n1")).contains("2");
+ cy.get(cesc2("#/p2a/m1")).contains("y");
+ cy.get(cesc2("#/p3a")).contains("Hello 3!");
+ cy.get(cesc2("#/p3a/n1")).contains("3");
+ cy.get(cesc2("#/p3a/m1")).contains("z");
+
+ cy.get(cesc2("#/p1b")).contains("Hello 1!");
+ cy.get(cesc2("#/p1b/n1")).contains("1");
+ cy.get(cesc2("#/p1b/m1")).contains("x");
+ cy.get(cesc2("#/p2b")).contains("Hello 2!");
+ cy.get(cesc2("#/p2b/n1")).contains("2");
+ cy.get(cesc2("#/p2b/m1")).contains("y");
+ cy.get(cesc2("#/p3b")).contains("Hello 3!");
+ cy.get(cesc2("#/p3b/n1")).contains("3");
+ cy.get(cesc2("#/p3b/m1")).contains("z");
+
+ cy.window().then(async (win) => {
+ let stateVariables = await win.returnAllStateVariables1();
+ expect(stateVariables["/n2"].stateValues.value).eq(3);
+ expect(stateVariables["/n3"].stateValues.value).eq(3);
+
+ expect(stateVariables["/p1/n1"].stateValues.value).eq(1);
+ expect(stateVariables["/p2/n1"].stateValues.value).eq(2);
+ expect(stateVariables["/p3/n1"].stateValues.value).eq(3);
+ expect(stateVariables["/p1a/n1"].stateValues.value).eq(1);
+ expect(stateVariables["/p2a/n1"].stateValues.value).eq(2);
+ expect(stateVariables["/p3a/n1"].stateValues.value).eq(3);
+ expect(stateVariables["/p1b/n1"].stateValues.value).eq(1);
+ expect(stateVariables["/p2b/n1"].stateValues.value).eq(2);
+ expect(stateVariables["/p3b/n1"].stateValues.value).eq(3);
+
+ expect(stateVariables["/p1/m1"].stateValues.value).eq("x");
+ expect(stateVariables["/p2/m1"].stateValues.value).eq("y");
+ expect(stateVariables["/p3/m1"].stateValues.value).eq("z");
+ expect(stateVariables["/p1a/m1"].stateValues.value).eq("x");
+ expect(stateVariables["/p2a/m1"].stateValues.value).eq("y");
+ expect(stateVariables["/p3a/m1"].stateValues.value).eq("z");
+ expect(stateVariables["/p1b/m1"].stateValues.value).eq("x");
+ expect(stateVariables["/p2b/m1"].stateValues.value).eq("y");
+ expect(stateVariables["/p3b/m1"].stateValues.value).eq("z");
+ });
+ });
+
it("copySource and createComponentOfType wrap to match specified type", () => {
cy.window().then(async (win) => {
win.postMessage(
@@ -1833,22 +2155,22 @@ describe("Copy Tag Tests", function () {
(x,y)
+
@@ -3536,23 +3858,25 @@ describe("Copy Tag Tests", function () {
});
});
- it("add children to copySource with prop and propIndex", () => {
+ it("assign names with copySource of group and map", () => {
cy.window().then(async (win) => {
win.postMessage(
{
doenetML: `
-
-
- V_$ind
-
-
- P:
- label of P:
-
+
+ hi $v 1 2
+
+
+ apple
+ banana
+
+
+
+ hi $v 1 2
+
+ $map1{name="map2" assignNames="(c) (d)"}
+
+
+
+ apple
+ banana
+
+
+ $grp1{name="grp2" assignNames="g h"}
- cy.log("invalid vertex");
- cy.get(cesc2("#/ind") + " textarea").type("{end}{backspace}{enter}", {
- force: true,
+ `,
+ },
+ "*",
+ );
});
- cy.get(cesc2("#/Pa") + " .mjx-mrow").should("contain.text", "(0,0)");
- cy.get(cesc2("#/Pa") + " .mjx-mrow")
- .eq(0)
- .should("have.text", "(0,0)");
- cy.get(cesc2("#/l")).should("have.text", "");
+
+ cy.get(cesc2("#/a")).should("have.text", "hi 1");
+ cy.get(cesc2("#/b")).should("have.text", "hi 2");
+ cy.get(cesc2("#/c")).should("have.text", "hi 1");
+ cy.get(cesc2("#/d")).should("have.text", "hi 2");
+ cy.get(cesc2("#/e")).should("have.text", "apple");
+ cy.get(cesc2("#/f")).should("have.text", "banana");
+ cy.get(cesc2("#/g")).should("have.text", "apple");
+ cy.get(cesc2("#/h")).should("have.text", "banana");
cy.window().then(async (win) => {
let stateVariables = await win.returnAllStateVariables1();
- expect(stateVariables["/P"].stateValues.xs).eqls([0, 0]);
- expect(stateVariables["/P"].stateValues.label).eq("");
+ expect(stateVariables["/a"].stateValues.value).eq("hi 1");
+ expect(stateVariables["/b"].stateValues.value).eq("hi 2");
+ expect(stateVariables["/c"].stateValues.value).eq("hi 1");
+ expect(stateVariables["/d"].stateValues.value).eq("hi 2");
+ expect(stateVariables["/e"].stateValues.value).eq("apple");
+ expect(stateVariables["/f"].stateValues.value).eq("banana");
+ expect(stateVariables["/g"].stateValues.value).eq("apple");
+ expect(stateVariables["/h"].stateValues.value).eq("banana");
});
+ });
- cy.log("change to vertex 3");
- cy.get(cesc2("#/ind") + " textarea").type("3{enter}", {
- force: true,
+ it("assign names with copySource of group and map, newNamespace", () => {
+ cy.window().then(async (win) => {
+ win.postMessage(
+ {
+ doenetML: `
+
+ hi $v 1 2
+
+
+ apple
+ banana
+
+
+ a
-
- (2,3)
-
+
+ hi $v 1 2
- P: $P
- P: $P[1]
- nothing: $P[2]
- P.: $P.
- P.1: $P.1
- x of P: $P.x
+ $map1{name="map2" assignNames="c d"}
+
+
+
+ apple
+ banana
+
+
+ $grp1{name="grp2" assignNames="c d"}
+
+ `,
+ },
+ "*",
+ );
+ });
+
+ cy.get(cesc2("#/map1/a/t")).should("have.text", "hi 1");
+ cy.get(cesc2("#/map1/b/t")).should("have.text", "hi 2");
+ cy.get(cesc2("#/map2/c/t")).should("have.text", "hi 1");
+ cy.get(cesc2("#/map2/d/t")).should("have.text", "hi 2");
+ cy.get(cesc2("#/grp1/a")).should("have.text", "apple");
+ cy.get(cesc2("#/grp1/b")).should("have.text", "banana");
+ cy.get(cesc2("#/grp2/c")).should("have.text", "apple");
+ cy.get(cesc2("#/grp2/d")).should("have.text", "banana");
+
+ cy.window().then(async (win) => {
+ let stateVariables = await win.returnAllStateVariables1();
+ expect(stateVariables["/map1/a/t"].stateValues.value).eq("hi 1");
+ expect(stateVariables["/map1/b/t"].stateValues.value).eq("hi 2");
+ expect(stateVariables["/map2/c/t"].stateValues.value).eq("hi 1");
+ expect(stateVariables["/map2/d/t"].stateValues.value).eq("hi 2");
+ expect(stateVariables["/grp1/a"].stateValues.value).eq("apple");
+ expect(stateVariables["/grp1/b"].stateValues.value).eq("banana");
+ expect(stateVariables["/grp2/c"].stateValues.value).eq("apple");
+ expect(stateVariables["/grp2/d"].stateValues.value).eq("banana");
+ });
+ });
+
+ it("copySource composite replacement implicitly skips assignNames", () => {
+ cy.window().then(async (win) => {
+ win.postMessage(
+ {
+ doenetML: `
+ hi
+ bye
+
+
+
+
+
+
+
+
+
+ `,
+ },
+ "*",
+ );
+ });
+
+ cy.get(cesc2("#/a")).should("have.text", "hi");
+ cy.get(cesc2("#/b")).should("have.text", "bye");
+ cy.get(cesc2("#/c")).should("have.text", "hi");
+ cy.get(cesc2("#/d")).should("have.text", "bye");
+ cy.get(cesc2("#/_p2/c")).should("have.text", "hi");
+ cy.get(cesc2("#/_p2/d")).should("have.text", "bye");
+
+ cy.window().then(async (win) => {
+ let stateVariables = await win.returnAllStateVariables1();
+ expect(stateVariables["/a"].stateValues.value).eq("hi");
+ expect(stateVariables["/b"].stateValues.value).eq("bye");
+ expect(stateVariables["/c"].stateValues.value).eq("hi");
+ expect(stateVariables["/d"].stateValues.value).eq("bye");
+ expect(stateVariables["/_p2/c"].stateValues.value).eq("hi");
+ expect(stateVariables["/_p2/d"].stateValues.value).eq("bye");
+ });
+ });
+
+ it("macro copy composite replacement implicitly skips assignNames", () => {
+ cy.window().then(async (win) => {
+ win.postMessage(
+ {
+ doenetML: `
+ hi
+ bye
+
+
+ $t1
+ $t2
+
+
+
+ $_group1{assignNames="c d"}
+
+
+ $_p1{name="p2" newNamespace}
+
+ `,
+ },
+ "*",
+ );
+ });
+
+ cy.get(cesc2("#/a")).should("have.text", "hi");
+ cy.get(cesc2("#/b")).should("have.text", "bye");
+ cy.get(cesc2("#/c")).should("have.text", "hi");
+ cy.get(cesc2("#/d")).should("have.text", "bye");
+ cy.get(cesc2("#/p2/c")).should("have.text", "hi");
+ cy.get(cesc2("#/p2/d")).should("have.text", "bye");
+
+ cy.window().then(async (win) => {
+ let stateVariables = await win.returnAllStateVariables1();
+ expect(stateVariables["/a"].stateValues.value).eq("hi");
+ expect(stateVariables["/b"].stateValues.value).eq("bye");
+ expect(stateVariables["/c"].stateValues.value).eq("hi");
+ expect(stateVariables["/d"].stateValues.value).eq("bye");
+ expect(stateVariables["/p2/c"].stateValues.value).eq("hi");
+ expect(stateVariables["/p2/d"].stateValues.value).eq("bye");
+ });
+ });
+
+ it("copy and macro's prescribed name is used to assign name to replacement", () => {
+ cy.window().then(async (win) => {
+ win.postMessage(
+ {
+ doenetML: `
+ hi
+
+ apple
+ banana
+
+ (3,4)
+ hi $t1
+
+ `,
+ },
+ "*",
+ );
+ });
+
+ cy.get(cesc2("#/t1")).should("have.text", "hi");
+ cy.get(cesc2("#/_document1")).should("contain.text", "hi hi");
+
+ cy.window().then(async (win) => {
+ let stateVariables = await win.returnAllStateVariables1();
+ expect(stateVariables["/t1"].stateValues.value).eq("hi");
+ expect(stateVariables["/_copy1"]).eq(undefined);
+
+ let secondTextComponentName =
+ stateVariables["/_document1"].activeChildren[3].componentName;
+ expect(stateVariables[secondTextComponentName].stateValues.value).eq(
+ "hi",
+ );
+
+ cy.get(cesc2("#" + secondTextComponentName)).should("have.text", "hi");
+ });
+ });
+
+ it("copy and macro's ssignNames is used to assign name to prop replacement", () => {
+ cy.window().then(async (win) => {
+ win.postMessage(
+ {
+ doenetML: `
+ (3,4)
+
+
+ V_$ind
+
+
+ P:
+ label of P:
+
+
+ `,
+ },
+ "*",
+ );
+ });
+
+ cy.get(cesc2("#/Pa") + " .mjx-mrow")
+ .eq(0)
+ .should("have.text", "(1,2)");
+ cy.get(cesc2("#/l") + " .mjx-mrow")
+ .eq(0)
+ .should("have.text", "V1");
+
+ cy.window().then(async (win) => {
+ let stateVariables = await win.returnAllStateVariables1();
+ expect(stateVariables["/P"].stateValues.xs).eqls([1, 2]);
+ expect(stateVariables["/P"].stateValues.label).eq("\\(V_1\\)");
+ });
+
+ cy.log("change to vertex 2");
+ cy.get(cesc2("#/ind") + " textarea").type("{end}{backspace}2{enter}", {
+ force: true,
+ });
+ cy.get(cesc2("#/Pa") + " .mjx-mrow").should("contain.text", "(5,2)");
+ cy.get(cesc2("#/Pa") + " .mjx-mrow")
+ .eq(0)
+ .should("have.text", "(5,2)");
+ cy.get(cesc2("#/l") + " .mjx-mrow")
+ .eq(0)
+ .should("have.text", "V2");
+
+ cy.window().then(async (win) => {
+ let stateVariables = await win.returnAllStateVariables1();
+ expect(stateVariables["/P"].stateValues.xs).eqls([5, 2]);
+ expect(stateVariables["/P"].stateValues.label).eq("\\(V_2\\)");
+ });
+
+ cy.log("invalid vertex");
+ cy.get(cesc2("#/ind") + " textarea").type("{end}{backspace}{enter}", {
+ force: true,
+ });
+ cy.get(cesc2("#/Pa") + " .mjx-mrow").should("contain.text", "(0,0)");
+ cy.get(cesc2("#/Pa") + " .mjx-mrow")
+ .eq(0)
+ .should("have.text", "(0,0)");
+ cy.get(cesc2("#/l")).should("have.text", "");
+
+ cy.window().then(async (win) => {
+ let stateVariables = await win.returnAllStateVariables1();
+ expect(stateVariables["/P"].stateValues.xs).eqls([0, 0]);
+ expect(stateVariables["/P"].stateValues.label).eq("");
+ });
+
+ cy.log("change to vertex 3");
+ cy.get(cesc2("#/ind") + " textarea").type("3{enter}", {
+ force: true,
+ });
+ cy.get(cesc2("#/Pa") + " .mjx-mrow").should("contain.text", "(5,8)");
+ cy.get(cesc2("#/Pa") + " .mjx-mrow")
+ .eq(0)
+ .should("have.text", "(5,8)");
+ cy.get(cesc2("#/l") + " .mjx-mrow")
+ .eq(0)
+ .should("have.text", "V3");
+
+ cy.window().then(async (win) => {
+ let stateVariables = await win.returnAllStateVariables1();
+ expect(stateVariables["/P"].stateValues.xs).eqls([5, 8]);
+ expect(stateVariables["/P"].stateValues.label).eq("\\(V_3\\)");
+ });
+ });
+
+ it("dot and array notation", () => {
+ cy.window().then(async (win) => {
+ win.postMessage(
+ {
+ doenetML: `
+ a
+
+ (2,3)
+
+
+ P: $P
+ P: $P[1]
+ nothing: $P[2]
+ P.: $P.
+ P.1: $P.1
+ x of P: $P.x
y of P: $P.y
nothing: $P._x
x of P: $P.xs[1]
@@ -3659,7 +4427,7 @@ describe("Copy Tag Tests", function () {
y of P: $(P.xs[2])
- P:
+ P: $P
P:
nothing:
nothing:
@@ -3941,13 +4709,13 @@ describe("Copy Tag Tests", function () {
cy.get(cesc2("#/p29")).should(
"have.text",
- "\\left( \\frac{2}{3}, 3 \\right)\\left( 5, 6 \\right)",
+ "\\left( \\frac{2}{3}, 3 \\right), \\left( 5, 6 \\right)",
);
- cy.get(cesc2("#/p30")).should("have.text", "\\frac{2}{3}5");
- cy.get(cesc2("#/p31")).should("have.text", "36");
+ cy.get(cesc2("#/p30")).should("have.text", "\\frac{2}{3}, 5");
+ cy.get(cesc2("#/p31")).should("have.text", "3, 6");
cy.get(cesc2("#/p32")).should("have.text", "");
- cy.get(cesc2("#/p33")).should("have.text", "\\frac{2}{3}5");
- cy.get(cesc2("#/p34")).should("have.text", "36");
+ cy.get(cesc2("#/p33")).should("have.text", "\\frac{2}{3}, 5");
+ cy.get(cesc2("#/p34")).should("have.text", "3, 6");
cy.get(cesc2("#/p35")).should("have.text", "");
cy.get(cesc2("#/p36")).should(
@@ -3993,7 +4761,7 @@ describe("Copy Tag Tests", function () {
cy.get(cesc2("#/p29")).should(
"have.text",
- "\\left( 7, 8 \\right)\\left( 9, 0 \\right)",
+ "\\left( 7, 8 \\right), \\left( 9, 0 \\right)",
);
cy.get(cesc2("#/p1") + " .mjx-mrow")
@@ -4105,13 +4873,13 @@ describe("Copy Tag Tests", function () {
cy.get(cesc2("#/p29")).should(
"have.text",
- "\\left( 7, 8 \\right)\\left( 9, 0 \\right)",
+ "\\left( 7, 8 \\right), \\left( 9, 0 \\right)",
);
- cy.get(cesc2("#/p30")).should("have.text", "79");
- cy.get(cesc2("#/p31")).should("have.text", "80");
+ cy.get(cesc2("#/p30")).should("have.text", "7, 9");
+ cy.get(cesc2("#/p31")).should("have.text", "8, 0");
cy.get(cesc2("#/p32")).should("have.text", "");
- cy.get(cesc2("#/p33")).should("have.text", "79");
- cy.get(cesc2("#/p34")).should("have.text", "80");
+ cy.get(cesc2("#/p33")).should("have.text", "7, 9");
+ cy.get(cesc2("#/p34")).should("have.text", "8, 0");
cy.get(cesc2("#/p35")).should("have.text", "");
cy.get(cesc2("#/p36")).should("have.text", "\\left( 7, 8 \\right)");
@@ -4324,13 +5092,13 @@ describe("Copy Tag Tests", function () {
cy.get(cesc2("#/p29")).should(
"have.text",
- "\\left( \\frac{2}{3}, 3 \\right)\\left( 5, 6 \\right)",
+ "\\left( \\frac{2}{3}, 3 \\right), \\left( 5, 6 \\right)",
);
- cy.get(cesc2("#/p30")).should("have.text", "\\frac{2}{3}5");
- cy.get(cesc2("#/p31")).should("have.text", "36");
+ cy.get(cesc2("#/p30")).should("have.text", "\\frac{2}{3}, 5");
+ cy.get(cesc2("#/p31")).should("have.text", "3, 6");
cy.get(cesc2("#/p32")).should("have.text", "");
- cy.get(cesc2("#/p33")).should("have.text", "\\frac{2}{3}5");
- cy.get(cesc2("#/p34")).should("have.text", "36");
+ cy.get(cesc2("#/p33")).should("have.text", "\\frac{2}{3}, 5");
+ cy.get(cesc2("#/p34")).should("have.text", "3, 6");
cy.get(cesc2("#/p35")).should("have.text", "");
cy.get(cesc2("#/p36")).should(
@@ -4376,7 +5144,7 @@ describe("Copy Tag Tests", function () {
cy.get(cesc2("#/p29")).should(
"have.text",
- "\\left( 7, 8 \\right)\\left( 9, 0 \\right)",
+ "\\left( 7, 8 \\right), \\left( 9, 0 \\right)",
);
cy.get(cesc2("#/p1") + " .mjx-mrow")
@@ -4488,13 +5256,13 @@ describe("Copy Tag Tests", function () {
cy.get(cesc2("#/p29")).should(
"have.text",
- "\\left( 7, 8 \\right)\\left( 9, 0 \\right)",
+ "\\left( 7, 8 \\right), \\left( 9, 0 \\right)",
);
- cy.get(cesc2("#/p30")).should("have.text", "79");
- cy.get(cesc2("#/p31")).should("have.text", "80");
+ cy.get(cesc2("#/p30")).should("have.text", "7, 9");
+ cy.get(cesc2("#/p31")).should("have.text", "8, 0");
cy.get(cesc2("#/p32")).should("have.text", "");
- cy.get(cesc2("#/p33")).should("have.text", "79");
- cy.get(cesc2("#/p34")).should("have.text", "80");
+ cy.get(cesc2("#/p33")).should("have.text", "7, 9");
+ cy.get(cesc2("#/p34")).should("have.text", "8, 0");
cy.get(cesc2("#/p35")).should("have.text", "");
cy.get(cesc2("#/p36")).should("have.text", "\\left( 7, 8 \\right)");
@@ -5451,24 +6219,28 @@ describe("Copy Tag Tests", function () {
a
x
- skip me
- hello
- skip me too
+ copied will be blank
+ hello
+ copied will also be blank
(4,5)
A y and a word .
the math: $grp[1]
- the text: $grp[2]
- the point: $grp[3]
- the point x: $grp[3].x
- the line: $grp[4]
- the line, point 1: $grp[4].points[1]
- the line, point 2, y: $grp[4].points[2].y
- math from p: $(grp[5]/m)
- text from p: $(grp[5]/t)
- nothing: $grp[6]
+ a blank: $grp[2]
+ the text: $grp[3]
+ another blank: $grp[4]
+ the point: $grp[5]
+ the point x: $grp[5].x
+ the line: $grp[6]
+ the line, point 1: $grp[6].points[1]
+ the line, point 2, y: $grp[6].points[2].y
+ math from p: $(grp[7]/m)
+ text from p: $(grp[7]/t)
+ nothing: $grp[8]
+ Prop fixed from group: $grp.fixed
+ Prop x from group: $grp.x
`,
},
"*",
@@ -5481,30 +6253,44 @@ describe("Copy Tag Tests", function () {
cy.get(cesc2("#/p1") + " .mjx-mrow")
.eq(0)
.should("have.text", "x");
- cy.get(cesc2("#/p2")).should("have.text", "the text: hello");
- cy.get(cesc2("#/p3") + " .mjx-mrow")
+ cy.get(cesc2("#/p2")).should("have.text", "a blank: ");
+ cy.get(cesc2("#/p3")).should("have.text", "the text: hello");
+ cy.get(cesc2("#/p4")).should("have.text", "another blank: ");
+ cy.get(cesc2("#/p5") + " .mjx-mrow")
.eq(0)
.should("have.text", "(4,5)");
- cy.get(cesc2("#/p4") + " .mjx-mrow")
+ cy.get(cesc2("#/p6") + " .mjx-mrow")
.eq(0)
.should("have.text", "4");
- cy.get(cesc2("#/p5") + " .mjx-mrow")
+ cy.get(cesc2("#/p7") + " .mjx-mrow")
.eq(0)
.should("have.text", "0=x−y−1");
- cy.get(cesc2("#/p6") + " .mjx-mrow")
+ cy.get(cesc2("#/p8") + " .mjx-mrow")
.eq(0)
.should("have.text", "(10,9)");
- cy.get(cesc2("#/p7") + " .mjx-mrow")
+ cy.get(cesc2("#/p9") + " .mjx-mrow")
.eq(0)
.should("have.text", "8");
- cy.get(cesc2("#/p8") + " .mjx-mrow")
+ cy.get(cesc2("#/p10") + " .mjx-mrow")
.eq(0)
.should("have.text", "y");
- cy.get(cesc2("#/p9")).should("have.text", "text from p: word");
- cy.get(cesc2("#/p10")).should("have.text", "nothing: ");
+ cy.get(cesc2("#/p11")).should("have.text", "text from p: word");
+ cy.get(cesc2("#/p12")).should("have.text", "nothing: ");
+ cy.get(cesc2("#/p13")).should(
+ "have.text",
+ "Prop fixed from group: false, true, false, false, false",
+ );
+ cy.get(cesc2("#/p14")).should("contain.text", "Prop x from group: x");
+ cy.get(cesc2("#/p14")).should("contain.text", "x, 4");
+ cy.get(cesc2("#/p14") + " .mjx-mrow")
+ .eq(0)
+ .should("have.text", "x");
+ cy.get(cesc2("#/p14") + " .mjx-mrow")
+ .eq(1)
+ .should("have.text", "4");
});
- it("isPlainMacro and isPlainCopy", () => {
+ it("implicitProp from an input", () => {
cy.window().then(async (win) => {
win.postMessage(
{
@@ -5512,12 +6298,225 @@ describe("Copy Tag Tests", function () {
a
$mi
- $mi{simplify}
-
-
-
-
+ $mi
+ $mi{simplify}
+ $mi
+
+
+
+
+ `,
+ },
+ "*",
+ );
+ });
+
+ // to wait for page to load
+ cy.get(cesc("#\\/_text1")).should("have.text", "a");
+
+ cy.get(cesc2("#/pmacro1") + " .mjx-mrow")
+ .eq(0)
+ .should("have.text", "x+x");
+ cy.get(cesc2("#/pmacro2") + " .mjx-mrow")
+ .eq(0)
+ .should("have.text", "2x");
+
+ cy.get(cesc2("#/pcopy1") + " .mjx-mrow")
+ .eq(0)
+ .should("have.text", "x+x");
+ cy.get(cesc2("#/pcopy2") + " .mjx-mrow")
+ .eq(0)
+ .should("have.text", "2x");
+ cy.get(cesc2("#/pcopy3") + " .mjx-mrow")
+ .eq(0)
+ .should("have.text", "2x");
+ cy.get(cesc2("#/pcopy4") + " .mq-editable-field")
+ .eq(0)
+ .should("have.text", "x+x");
+
+ cy.window().then(async (win) => {
+ let stateVariables = await win.returnAllStateVariables1();
+ let macrom1Name =
+ stateVariables["/pmacro1"].activeChildren[0].componentName;
+ let macrom2Name =
+ stateVariables["/pmacro2"].activeChildren[0].componentName;
+ let copym1Name =
+ stateVariables["/pcopy1"].activeChildren[0].componentName;
+ let copym2Name =
+ stateVariables["/pcopy2"].activeChildren[0].componentName;
+ let copym3Name =
+ stateVariables["/pcopy3"].activeChildren[0].componentName;
+ let copymi4Name =
+ stateVariables["/pcopy4"].activeChildren[0].componentName;
+
+ expect(stateVariables[macrom1Name].componentType).eq("math");
+ expect(stateVariables[macrom2Name].componentType).eq("math");
+ expect(stateVariables[copym1Name].componentType).eq("math");
+ expect(stateVariables[copym2Name].componentType).eq("math");
+ expect(stateVariables[copym3Name].componentType).eq("math");
+ expect(stateVariables[copymi4Name].componentType).eq("mathInput");
+ expect(stateVariables[macrom1Name].stateValues.value).eqls([
+ "+",
+ "x",
+ "x",
+ ]);
+ expect(stateVariables[macrom2Name].stateValues.value).eqls(["*", 2, "x"]);
+ expect(stateVariables[copym1Name].stateValues.value).eqls([
+ "+",
+ "x",
+ "x",
+ ]);
+ expect(stateVariables[copym2Name].stateValues.value).eqls(["*", 2, "x"]);
+ expect(stateVariables[copym3Name].stateValues.value).eqls(["*", 2, "x"]);
+ expect(stateVariables[copymi4Name].stateValues.value).eqls([
+ "+",
+ "x",
+ "x",
+ ]);
+ });
+ });
+
+ it("implicitProp with same componentType depend on attributes", () => {
+ cy.window().then(async (win) => {
+ win.postMessage(
+ {
+ doenetML: `
+ x +xy +z
+ x +x1
+
+ $(map[1]/m{name="mimplicit1"})
+ $(map[1]/m{name="mimplicit2" createComponentOfType="math"})
+
+ y +z1
+
+ $(map2[1]/n{name="nnotimplicit1"})
+ $col
-
+ $col
$g
-
+ $g
`,
},
@@ -5686,7 +6692,7 @@ describe("Copy Tag Tests", function () {
});
});
- it("copies of composites with subnames do not ignore isPlainMacro and isPlainCopy", () => {
+ it("copies of composites with subnames do not ignore implicitProp", () => {
cy.window().then(async (win) => {
win.postMessage(
{
@@ -5698,7 +6704,7 @@ describe("Copy Tag Tests", function () {
$map
-
+ $map
$map[1]$map[2]
@@ -5807,55 +6813,7 @@ describe("Copy Tag Tests", function () {
});
});
- it("isPlainCopy does not mean isPlainMacro", () => {
- // a plain copy copies children, unlike a macro
- cy.window().then(async (win) => {
- win.postMessage(
- {
- doenetML: `
- a
- x+y
-
-
-
- x2/y: $(x2/y)
-
- $x
-
- `,
- },
- "*",
- );
- });
-
- // to wait for page to load
- cy.get(cesc("#\\/_text1")).should("have.text", "a");
-
- cy.get(cesc2("#/p1") + " .mjx-mrow")
- .eq(0)
- .should("have.text", "x+y");
- cy.get(cesc2("#/p2") + " .mjx-mrow")
- .eq(0)
- .should("have.text", "x+y");
- cy.get(cesc2("#/p3") + " .mjx-mrow")
- .eq(0)
- .should("have.text", "y");
- cy.get(cesc2("#/p4") + " .mjx-mrow")
- .eq(0)
- .should("have.text", "x+y");
-
- cy.window().then(async (win) => {
- let stateVariables = await win.returnAllStateVariables1();
- expect(stateVariables["/x2"].activeChildren.length).eq(2);
-
- expect(stateVariables["/x2/y"].stateValues.value).eq("y");
-
- let macroName = stateVariables["/p4"].activeChildren[0].componentName;
- expect(stateVariables[macroName].activeChildren.length).eq(0);
- });
- });
-
- it("plain copies and macros with createComponentOfType", () => {
+ it("implicitProp with createComponentOfType", () => {
cy.window().then(async (win) => {
win.postMessage(
{
@@ -5958,6 +6916,251 @@ describe("Copy Tag Tests", function () {
});
});
+ it("asList when copy array prop", () => {
+ cy.window().then(async (win) => {
+ win.postMessage(
+ {
+ doenetML: `
+
+ yes
+ no
+ maybe
+
+
+ Default: $ci.choiceTexts
+ No commas: $ci.choiceTexts{asList="false"}
+ With commas: $ci.choiceTexts{asList="true"}
+
+
+
+ `,
+ },
+ "*",
+ );
+ });
+
+ cy.get(cesc2("#/default")).should("have.text", "Default: yes, no, maybe");
+ cy.get(cesc2("#/nocommas")).should("have.text", "No commas: yesnomaybe");
+ cy.get(cesc2("#/withcommas")).should(
+ "have.text",
+ "With commas: yes, no, maybe",
+ );
+ cy.get(cesc2("#/default2")).should("have.text", "Default: yes, no, maybe");
+ cy.get(cesc2("#/nocommas2")).should("have.text", "No commas: yesnomaybe");
+ cy.get(cesc2("#/withcommas2")).should(
+ "have.text",
+ "With commas: yes, no, maybe",
+ );
+
+ cy.window().then(async (win) => {
+ let stateVariables = await win.returnAllStateVariables1();
+ expect(stateVariables["/default"].stateValues.text).eq(
+ "Default: yes, no, maybe",
+ );
+ expect(stateVariables["/nocommas"].stateValues.text).eq(
+ "No commas: yesnomaybe",
+ );
+ expect(stateVariables["/withcommas"].stateValues.text).eq(
+ "With commas: yes, no, maybe",
+ );
+ expect(stateVariables["/default2"].stateValues.text).eq(
+ "Default: yes, no, maybe",
+ );
+ expect(stateVariables["/nocommas2"].stateValues.text).eq(
+ "No commas: yesnomaybe",
+ );
+ expect(stateVariables["/withcommas2"].stateValues.text).eq(
+ "With commas: yes, no, maybe",
+ );
+ });
+ });
+
+ it("asList when copy array prop, multiple stacked props", () => {
+ cy.window().then(async (win) => {
+ win.postMessage(
+ {
+ doenetML: `
+ Default: $l.points.x
+ No commas: $l.points.x{asList="false"}
+ With commas: $l.points.x{asList="true"}
+
+
+
+ `,
+ },
+ "*",
+ );
+ });
+
+ cy.get(cesc2("#/default")).should("contain.text", "1, 3");
+ cy.get(cesc2("#/nocommas")).should("contain.text", "13");
+ cy.get(cesc2("#/withcommas")).should("contain.text", "1, 3");
+ cy.get(cesc2("#/default2")).should("contain.text", "1, 3");
+ cy.get(cesc2("#/nocommas2")).should("contain.text", "13");
+ cy.get(cesc2("#/withcommas2")).should("contain.text", "1, 3");
+
+ cy.window().then(async (win) => {
+ let stateVariables = await win.returnAllStateVariables1();
+ expect(stateVariables["/default"].stateValues.text).eq("Default: 1, 3");
+ expect(stateVariables["/nocommas"].stateValues.text).eq("No commas: 13");
+ expect(stateVariables["/withcommas"].stateValues.text).eq(
+ "With commas: 1, 3",
+ );
+ expect(stateVariables["/default2"].stateValues.text).eq("Default: 1, 3");
+ expect(stateVariables["/nocommas2"].stateValues.text).eq("No commas: 13");
+ expect(stateVariables["/withcommas2"].stateValues.text).eq(
+ "With commas: 1, 3",
+ );
+ });
+ });
+
+ it("asList when copy array prop, aslist overrides", () => {
+ cy.window().then(async (win) => {
+ win.postMessage(
+ {
+ doenetML: `
+
+ yes
+ no
+ maybe
+
+
+
+ Override no commas: $ci.choiceTexts{asList="false"}
+ Copy:
+ yes
+ no
+ maybe
+
+
+ In document: $ci.choiceTexts
+ $ci.choiceTexts
+ $ci.choiceTexts
+ $ci.choiceTexts
+ $ci.choiceTexts
+ $ci.choiceTexts |
+ $ci.choiceTexts
+ $ci.choiceTexts
+ $ci.choiceTexts
+ $ci.choiceTexts
+ $ci.choiceTexts
+ A title $ci.choiceTexts$ci.choiceTexts
+ $ci.choiceTexts
+
+ $ci.choiceTexts
+
+
+ $ci.choiceTexts
+ $ci.choiceTexts
+ $ci.choiceTexts
+ Title: $ci.choiceTexts Text: $ci.choiceTexts$ci.choiceTexts
+ $ci.choiceTexts
+ $ci.choiceTexts
+
+ `,
+ },
+ "*",
+ );
+ });
+
+ cy.get(cesc2("#/_document1")).should(
+ "contain.text",
+ "In document: yes, no, maybe",
+ );
+ cy.get(cesc2("#/in_alert")).should("have.text", "yes, no, maybe");
+ cy.get(cesc2("#/in_blockquote")).should("have.text", "yes, no, maybe");
+ cy.get(cesc2("#/in_c")).should("have.text", "yes, no, maybe");
+ cy.get(cesc2("#/in_caption")).should("have.text", "yes, no, maybe");
+ cy.get(cesc2("#/in_cell")).should("have.text", "yes, no, maybe");
+ cy.get(cesc2("#/in_choice")).should("have.text", "yes, no, maybe");
+ cy.get(cesc2("#/in_span")).should("have.text", "yes, no, maybe");
+ cy.get(cesc2("#/in_em")).should("have.text", "yes, no, maybe");
+ cy.get(cesc2("#/in_feedback")).should("have.text", "yes, no, maybe");
+ cy.get(cesc2("#/in_footnote")).click();
+ cy.get(cesc2("#/in_footnote")).should("contain.text", "yes, no, maybe");
+ cy.get(cesc2("#/in_hint_w_title")).click();
+ cy.get(cesc2("#/in_hint_w_title")).should("contain.text", "yes, no, maybe");
+ cy.get(cesc2("#/in_hint_wo_title")).click();
+ cy.get(cesc2("#/in_hint_wo_title")).should(
+ "contain.text",
+ "yes, no, maybe",
+ );
+ cy.get(cesc2("#/in_label")).should("have.text", "yes, no, maybe");
+ cy.get(cesc2("#/in_li")).should("have.text", "yes, no, maybe");
+ cy.get(cesc2("#/in_li2")).should("have.text", "yes, no, maybe");
+ cy.get(cesc2("#/in_p")).should("have.text", "yes, no, maybe");
+ cy.get(cesc2("#/in_pre")).should("have.text", "yes, no, maybe");
+ cy.get(cesc2("#/in_q")).should("have.text", "“yes, no, maybe”");
+ cy.get(cesc2("#/in_section_w_title")).should(
+ "contain.text",
+ "Title: yes, no, maybe",
+ );
+ cy.get(cesc2("#/in_section_w_title")).should(
+ "contain.text",
+ "Text: yes, no, maybe",
+ );
+ cy.get(cesc2("#/in_section_wo_title")).should(
+ "contain.text",
+ "yes, no, maybe",
+ );
+ cy.get(cesc2("#/in_solution")).click();
+ cy.get(cesc2("#/in_solution")).should("contain.text", "yes, no, maybe");
+ cy.get(cesc2("#/in_sq")).should("have.text", "‘yes, no, maybe’");
+ cy.get(cesc2("#/in_text")).should("have.text", "yes, no, maybe");
+
+ cy.window().then(async (win) => {
+ let stateVariables = await win.returnAllStateVariables1();
+ expect(stateVariables["/in_alert"].stateValues.text).eq("yes, no, maybe");
+ expect(stateVariables["/in_c"].stateValues.text).eq("yes, no, maybe");
+ expect(stateVariables["/in_caption"].stateValues.text).eq(
+ "yes, no, maybe",
+ );
+ expect(stateVariables["/in_cell"].stateValues.text).eq("yes, no, maybe");
+ expect(stateVariables["/in_choice"].stateValues.text).eq(
+ "yes, no, maybe",
+ );
+ expect(stateVariables["/in_em"].stateValues.text).eq("yes, no, maybe");
+ expect(stateVariables["/in_footnote"].stateValues.text).eq(
+ "yes, no, maybe",
+ );
+ expect(stateVariables["/in_label"].stateValues.text).eq("yes, no, maybe");
+ expect(stateVariables["/in_p"].stateValues.text).eq("yes, no, maybe");
+ expect(stateVariables["/in_text"].stateValues.text).eq("yes, no, maybe");
+ expect(stateVariables["/sec_title"].stateValues.text).eq(
+ "Title: yes, no, maybe",
+ );
+ });
+ });
+
it("copy number from external content multiple ways, change attributes", () => {
cy.window().then(async (win) => {
win.postMessage(
@@ -5966,7 +7169,7 @@ describe("Copy Tag Tests", function () {
-
+
@@ -5974,7 +7177,7 @@ describe("Copy Tag Tests", function () {
-
+
@@ -5991,7 +7194,7 @@ describe("Copy Tag Tests", function () {
cy.get(cesc("#\\/_number1")).should("have.text", "8.85");
cy.get(cesc("#\\/n4")).should("have.text", "8.853729375");
cy.get(cesc("#\\/_p5")).should("have.text", "8.85");
- cy.get(cesc("#\\/_copy4\\/n6")).should("have.text", "8.853729375");
+ cy.get(cesc("#\\/n6")).should("have.text", "8.853729375");
cy.get(cesc("#\\/_number3")).should("have.text", "8.85");
cy.get(cesc("#\\/n8")).should("have.text", "8.853729375");
});
@@ -6017,4 +7220,112 @@ describe("Copy Tag Tests", function () {
cy.get(cesc("#\\/ans") + " textarea").type("7{enter}", { force: true });
cy.get(cesc("#\\/num")).should("have.text", "47");
});
+
+ it("copy of copy with new namespace", () => {
+ cy.window().then(async (win) => {
+ win.postMessage(
+ {
+ doenetML: `
+ hello copy with new namespace:
+ copy of copy:
+
+ copy of copy of copy:
+ copy of copy of copy nn:
+
+ piece of copy:
+ piece of copy of copy:
+
+ piece of copy of copy of copy:
+ piece of copy of copy of copy nn:
+ `,
+ },
+ "*",
+ );
+ });
+
+ cy.get(cesc2("#/t")).should("have.text", "hello");
+ cy.get(cesc2("#/cN/t")).should("have.text", "hello");
+ cy.get(cesc2("#/cNc/t")).should("have.text", "hello");
+ cy.get(cesc2("#/cNcc/t")).should("have.text", "hello");
+ cy.get(cesc2("#/cNccN/t")).should("have.text", "hello");
+
+ cy.get(cesc2("#/cNt")).should("have.text", "hello");
+ cy.get(cesc2("#/cNct")).should("have.text", "hello");
+ cy.get(cesc2("#/cNcct")).should("have.text", "hello");
+ cy.get(cesc2("#/cNccNt")).should("have.text", "hello");
+
+ cy.window().then(async (win) => {
+ let stateVariables = await win.returnAllStateVariables1();
+ expect(stateVariables["/orig"].componentType).eq("group");
+ expect(stateVariables["/t"].stateValues.value).eq("hello");
+
+ expect(stateVariables["/cN"].componentType).eq("group");
+ expect(stateVariables["/cN/t"].stateValues.value).eq("hello");
+
+ expect(stateVariables["/cNc"].componentType).eq("group");
+ expect(stateVariables["/cNc/t"].stateValues.value).eq("hello");
+
+ expect(stateVariables["/cNcc"].componentType).eq("group");
+ expect(stateVariables["/cNcc/t"].stateValues.value).eq("hello");
+
+ expect(stateVariables["/cNccN"].componentType).eq("group");
+ expect(stateVariables["/cNccN/t"].stateValues.value).eq("hello");
+ });
+ });
+
+ it("copy of copy with new namespace, macros", () => {
+ cy.window().then(async (win) => {
+ win.postMessage(
+ {
+ doenetML: `
+ hello copy with new namespace: $orig{name="cN" newnamespace}
+ copy of copy: $cN{name="cNc"}
+
+ copy of copy of copy: $cNc{name="cNcc"}
+ copy of copy of copy nn: $cNc{name="cNccN" newNamespace}
+
+ piece of copy: $(cN/t{name="cNt"})
+ piece of copy of copy: $(cNc/t{name="cNct"})
+
+ piece of copy of copy of copy: $(cNcc/t{name="cNcct"})
+ piece of copy of copy of copy nn: $(cNccN/t{name="cNccNt"})
+ `,
+ },
+ "*",
+ );
+ });
+
+ cy.get(cesc2("#/t")).should("have.text", "hello");
+ cy.get(cesc2("#/cN/t")).should("have.text", "hello");
+ cy.get(cesc2("#/cNc/t")).should("have.text", "hello");
+ cy.get(cesc2("#/cNcc/t")).should("have.text", "hello");
+ cy.get(cesc2("#/cNccN/t")).should("have.text", "hello");
+
+ cy.get(cesc2("#/cNt")).should("have.text", "hello");
+ cy.get(cesc2("#/cNct")).should("have.text", "hello");
+ cy.get(cesc2("#/cNcct")).should("have.text", "hello");
+ cy.get(cesc2("#/cNccNt")).should("have.text", "hello");
+
+ cy.window().then(async (win) => {
+ let stateVariables = await win.returnAllStateVariables1();
+ expect(stateVariables["/orig"].componentType).eq("group");
+ expect(stateVariables["/t"].stateValues.value).eq("hello");
+
+ expect(stateVariables["/cN"].componentType).eq("group");
+ expect(stateVariables["/cN/t"].stateValues.value).eq("hello");
+
+ expect(stateVariables["/cNc"].componentType).eq("group");
+ expect(stateVariables["/cNc/t"].stateValues.value).eq("hello");
+
+ expect(stateVariables["/cNcc"].componentType).eq("group");
+ expect(stateVariables["/cNcc/t"].stateValues.value).eq("hello");
+
+ expect(stateVariables["/cNccN"].componentType).eq("group");
+ expect(stateVariables["/cNccN/t"].stateValues.value).eq("hello");
+ });
+ });
});
diff --git a/cypress/e2e/DoenetML/tagSpecific/curve.bezier.cy.js b/cypress/e2e/DoenetML/tagSpecific/curve.bezier.cy.js
index 86022018fa..59fd0749e2 100644
--- a/cypress/e2e/DoenetML/tagSpecific/curve.bezier.cy.js
+++ b/cypress/e2e/DoenetML/tagSpecific/curve.bezier.cy.js
@@ -80,10 +80,10 @@ describe("Curve Tag Bezier Tests", function () {
-
- Temp way to change controls 1:
@@ -96,43 +96,43 @@ describe("Curve Tag Bezier Tests", function () {
-
-
-
Temp way to change controls 2:
-
-
-
-
Temp way to change controls 3:
-
-
-
-
`,
@@ -320,10 +320,10 @@ describe("Curve Tag Bezier Tests", function () {
-
- Temp way to change controls 1:
@@ -336,43 +336,43 @@ describe("Curve Tag Bezier Tests", function () {
-
-
-
Temp way to change controls 2:
-
-
-
-
Temp way to change controls 3:
-
-
-
-
`,
@@ -740,10 +740,10 @@ describe("Curve Tag Bezier Tests", function () {
-
- Temp way to change controls 1:
@@ -756,43 +756,43 @@ describe("Curve Tag Bezier Tests", function () {
-
-
-
Temp way to change controls 2:
-
-
-
-
Temp way to change controls 3:
-
-
-
-
`,
@@ -1230,10 +1230,10 @@ describe("Curve Tag Bezier Tests", function () {
-
- Temp way to change controls 1:
@@ -1246,43 +1246,43 @@ describe("Curve Tag Bezier Tests", function () {
-
-
-
Temp way to change controls 2:
-
-
-
-
Temp way to change controls 3:
-
-
-
-
`,
@@ -1713,7 +1713,7 @@ describe("Curve Tag Bezier Tests", function () {
doenetML: `
a
(-1,5)
-
@@ -1764,7 +1764,7 @@ describe("Curve Tag Bezier Tests", function () {
doenetML: `
b
(-1,5)
-
@@ -1829,10 +1829,10 @@ describe("Curve Tag Bezier Tests", function () {
-
- Temp way to change controls 1:
@@ -1845,43 +1845,43 @@ describe("Curve Tag Bezier Tests", function () {
-
-
-
Temp way to change controls 2:
-
-
-
-
Temp way to change controls 3:
-
-
-
-
`,
@@ -2324,10 +2324,10 @@ describe("Curve Tag Bezier Tests", function () {
-
- Temp way to change controls 1:
@@ -2340,43 +2340,43 @@ describe("Curve Tag Bezier Tests", function () {
-
-
-
Temp way to change controls 2:
-
-
-
-
Temp way to change controls 3:
-
-
-
-
`,
@@ -2818,10 +2818,10 @@ describe("Curve Tag Bezier Tests", function () {
-
- Temp way to change controls 1:
@@ -2834,43 +2834,43 @@ describe("Curve Tag Bezier Tests", function () {
-
-
-
Temp way to change controls 2:
-
-
-
-
Temp way to change controls 3:
-
-
-
-
`,
@@ -3317,10 +3317,10 @@ describe("Curve Tag Bezier Tests", function () {
-
- Temp way to change controls 1:
@@ -3333,43 +3333,43 @@ describe("Curve Tag Bezier Tests", function () {
-
-
-
Temp way to change controls 2:
-
-
-
-
Temp way to change controls 3:
-
-
-
-
`,
@@ -3813,10 +3813,10 @@ describe("Curve Tag Bezier Tests", function () {
-
- Temp way to change controls 1:
@@ -3829,43 +3829,43 @@ describe("Curve Tag Bezier Tests", function () {
-
-
-
Temp way to change controls 2:
-
-
-
-
Temp way to change controls 3:
-
-
-
-
`,
@@ -4309,10 +4309,10 @@ describe("Curve Tag Bezier Tests", function () {
-
- Temp way to change controls 1:
@@ -4325,43 +4325,43 @@ describe("Curve Tag Bezier Tests", function () {
-
-
-
Temp way to change controls 2:
-
-
-
-
Temp way to change controls 3:
-
-
-
-
`,
@@ -5030,10 +5030,10 @@ describe("Curve Tag Bezier Tests", function () {
-
-
-
-
`,
@@ -6300,10 +6300,10 @@ describe("Curve Tag Bezier Tests", function () {
-
-
`,
@@ -6788,10 +6788,10 @@ describe("Curve Tag Bezier Tests", function () {
-
- Temp way to change controls 1:
@@ -6804,43 +6804,43 @@ describe("Curve Tag Bezier Tests", function () {
-
-
-
Temp way to change controls 2:
-
-
-
-
Temp way to change controls 3:
-
-
-
-
`,
@@ -7317,10 +7317,10 @@ describe("Curve Tag Bezier Tests", function () {
-
- Temp way to change controls 1:
@@ -7333,43 +7333,43 @@ describe("Curve Tag Bezier Tests", function () {
-
-
-
Temp way to change controls 2:
-
-
-
-
Temp way to change controls 3:
-
-
-
-
`,
@@ -7846,10 +7846,10 @@ describe("Curve Tag Bezier Tests", function () {
-
- Temp way to change controls 1:
@@ -7862,52 +7862,52 @@ describe("Curve Tag Bezier Tests", function () {
-
-
-
-
Temp way to change controls 2:
-
-
-
-
-
Temp way to change controls 3:
-
-
-
-
-
`,
@@ -8522,10 +8522,10 @@ describe("Curve Tag Bezier Tests", function () {
-
-
-
-
-
-
-
- Temp way to change controls 1:
@@ -10223,13 +10223,13 @@ describe("Curve Tag Bezier Tests", function () {
Temp way to change controls 2:
-
Temp way to change controls 3:
-
`,
@@ -10655,10 +10655,10 @@ describe("Curve Tag Bezier Tests", function () {
-
-
- Hi (-1,2), (2, $_mathinput1), (2($_mathinput1), -4), (5,6)
-
(-1,2)
- (2,
- (2
+ (2, $_mathinput1.value)
+ (2$_mathinput1.value, -4)
(5,6)
-
(-1,2)
- (2,
- (2
+ (2, $_mathinput1.value)
+ (2$_mathinput1.value, -4)
(5,6)
-
- $_curve1
-
- $_curve1
- $_curve1
@@ -578,8 +578,8 @@ describe("Curve Tag Tests", function () {
-
- $_curve1
- $_curve1
- ebm:
- efm:
+ ebm: $_curve1.extrapolateBackwardMode{assignNames="ebm"}
+ efm: $_curve1.extrapolateForwardMode{assignNames="efm"}
`,
},
@@ -1165,8 +1165,8 @@ describe("Curve Tag Tests", function () {
-
x^3-x$a
-
+ $a.value{assignNames="a2"}
`,
},
"*",
@@ -428,7 +428,7 @@ describe("Function curve Tag Tests", function () {
- $_curve1
@@ -579,7 +579,7 @@ describe("Function curve Tag Tests", function () {
- $_curve1
@@ -784,7 +784,7 @@ describe("Function curve Tag Tests", function () {
- $_curve1
@@ -1024,7 +1024,7 @@ describe("Function curve Tag Tests", function () {
- $_curve1
@@ -1101,7 +1101,7 @@ describe("Function curve Tag Tests", function () {
- $_curve1
diff --git a/cypress/e2e/DoenetML/tagSpecific/curve.parametrized.cy.js b/cypress/e2e/DoenetML/tagSpecific/curve.parametrized.cy.js
index 90a143aada..3c405dee6b 100644
--- a/cypress/e2e/DoenetML/tagSpecific/curve.parametrized.cy.js
+++ b/cypress/e2e/DoenetML/tagSpecific/curve.parametrized.cy.js
@@ -676,7 +676,7 @@ describe("Parameterized Curve Tag Tests", function () {
-
`,
},
@@ -778,7 +778,7 @@ describe("Parameterized Curve Tag Tests", function () {
t^3-$_mathinput1
-
- $_curve1
-
- $_curve1
-
- $_function1
@@ -1107,12 +1107,12 @@ describe("Parameterized Curve Tag Tests", function () {
-
- $c
diff --git a/cypress/e2e/DoenetML/tagSpecific/document.cy.js b/cypress/e2e/DoenetML/tagSpecific/document.cy.js
index 39cd55bae1..ac3e431488 100644
--- a/cypress/e2e/DoenetML/tagSpecific/document.cy.js
+++ b/cypress/e2e/DoenetML/tagSpecific/document.cy.js
@@ -12,7 +12,7 @@ describe("Document Tag Tests", function () {
{
doenetML: `
a
- a
- x
Problem with nothing
@@ -63,7 +63,7 @@ describe("Document Tag Tests", function () {
{
doenetML: `
a
-
x
@@ -99,7 +99,7 @@ describe("Document Tag Tests", function () {
{
doenetML: `
a
- x: x
a: a
diff --git a/cypress/e2e/DoenetML/tagSpecific/endpoint.cy.js b/cypress/e2e/DoenetML/tagSpecific/endpoint.cy.js
index f190bdb228..1819d9278f 100644
--- a/cypress/e2e/DoenetML/tagSpecific/endpoint.cy.js
+++ b/cypress/e2e/DoenetML/tagSpecific/endpoint.cy.js
@@ -24,10 +24,10 @@ describe("Endpoint Tag Tests", function () {
Evaluate symbolic using macro: $$f_symbolic($input)
- Evaluated symbolic result again:
+ Evaluated symbolic result again: $result_symbolic{name="result_symbolic3"}
Evaluate numeric:
@@ -38,7 +38,7 @@ describe("Evaluate Tag Tests", function () {
Evaluate numeric using macro: $$f_numeric($input)
- Evaluated numeric result again:
+ Evaluated numeric result again: $result_numeric{name="result_numeric3"}
Force evaluate symbolic:
@@ -699,10 +699,10 @@ describe("Evaluate Tag Tests", function () {
@@ -710,10 +710,10 @@ describe("Evaluate Tag Tests", function () {
@@ -721,10 +721,10 @@ describe("Evaluate Tag Tests", function () {
@@ -732,10 +732,10 @@ describe("Evaluate Tag Tests", function () {
@@ -743,10 +743,10 @@ describe("Evaluate Tag Tests", function () {
$$f2($input)
$$f3($input)
$$f4($input)
-
`,
},
@@ -1378,26 +1378,26 @@ describe("Evaluate Tag Tests", function () {
@@ -1405,14 +1405,14 @@ describe("Evaluate Tag Tests", function () {
@@ -1420,14 +1420,14 @@ describe("Evaluate Tag Tests", function () {
@@ -1435,10 +1435,10 @@ describe("Evaluate Tag Tests", function () {
@@ -2313,10 +2313,10 @@ describe("Evaluate Tag Tests", function () {
{
doenetML: `
a
- 100sin(x)
- Input:
@@ -2325,10 +2325,10 @@ describe("Evaluate Tag Tests", function () {
@@ -2336,10 +2336,10 @@ describe("Evaluate Tag Tests", function () {
@@ -2347,10 +2347,10 @@ describe("Evaluate Tag Tests", function () {
@@ -2358,10 +2358,10 @@ describe("Evaluate Tag Tests", function () {
@@ -2369,10 +2369,10 @@ describe("Evaluate Tag Tests", function () {
$$f2($input)
$$f3($input)
$$f4($input)
-
`,
},
@@ -3008,7 +3008,7 @@ describe("Evaluate Tag Tests", function () {
Evaluate symbolic using macro: $$f_symbolic($input1, $input2)
- Evaluated symbolic result again:
+ Evaluated symbolic result again: $result_symbolic{name="result_symbolic3"}
Evaluate numeric:
@@ -3017,7 +3017,7 @@ describe("Evaluate Tag Tests", function () {
Evaluate numeric using macro: $$f_numeric($input1, $input2)
- Evaluated numeric result again:
+ Evaluated numeric result again: $result_numeric{name="result_numeric3"}
Force evaluate symbolic numeric function:
Evaluate 2: $$f($input)
- Evaluate 3:
+ Evaluate 3: $result1{name="result3"}
`,
},
"*",
@@ -4233,7 +4233,7 @@ describe("Evaluate Tag Tests", function () {
Evaluate symbolic using macro: $$f_symbolic($input1, $input2)
- Evaluated symbolic result again:
+ Evaluated symbolic result again: $result_symbolic{name="result_symbolic3"}
Evaluate numeric:
@@ -4242,7 +4242,7 @@ describe("Evaluate Tag Tests", function () {
Evaluate numeric using macro: $$f_numeric($input1, $input2)
- Evaluated numeric result again:
+ Evaluated numeric result again: $result_numeric{name="result_numeric3"}
Force evaluate symbolic numeric function:
Evaluate 2: $$f($input)
- Evaluate 3:
+ Evaluate 3: $result1{name="result3"}
`,
},
"*",
diff --git a/cypress/e2e/DoenetML/tagSpecific/extract.cy.js b/cypress/e2e/DoenetML/tagSpecific/extract.cy.js
index e36ac3f738..7870e934a0 100644
--- a/cypress/e2e/DoenetML/tagSpecific/extract.cy.js
+++ b/cypress/e2e/DoenetML/tagSpecific/extract.cy.js
@@ -123,10 +123,10 @@ describe("Extract Tag Tests", function () {
doenetML: `
a
-
- ($copy{name="copy2"} )
@@ -211,17 +211,17 @@ describe("Extract Tag Tests", function () {
(1,2)
(5,6)
-
-
+ $_extract1
-
+ $_aslist2
`,
},
"*",
@@ -516,12 +516,12 @@ describe("Extract Tag Tests", function () {
-
+ $_extract1
-
+ $_aslist2
-
+ $n.value{assignNames="n2"}
+ $m.value{assignNames="m2"}
`,
},
"*",
diff --git a/cypress/e2e/DoenetML/tagSpecific/feedback.cy.js b/cypress/e2e/DoenetML/tagSpecific/feedback.cy.js
index 75a45fbfc9..b1298cbea3 100644
--- a/cypress/e2e/DoenetML/tagSpecific/feedback.cy.js
+++ b/cypress/e2e/DoenetML/tagSpecific/feedback.cy.js
@@ -314,13 +314,13 @@ describe("Feedback Tag Tests", function () {
a
$_mathinput1.immediateValue > 1 $_mathinput1.immediateValue > 10 $_mathinput1.immediateValue > 2 $_mathinput1.immediateValue > 0.9 $_mathinput1.immediateValue < 0
- Credit achieved:
+ Credit achieved: $_answer1.creditAchieved{assignNames="ca"}
Larger than 1
@@ -633,7 +633,7 @@ describe("Feedback Tag Tests", function () {
banana
- Credit achieved:
+ Credit achieved: $_answer1.creditAchieved{assignNames="ca"}
Meow
@@ -753,7 +753,7 @@ describe("Feedback Tag Tests", function () {
banana
- Credit achieved:
+ Credit achieved: $_answer1.creditAchieved{assignNames="ca"}
Meow
@@ -872,7 +872,7 @@ describe("Feedback Tag Tests", function () {
- Credit achieved 1:
+ Credit achieved 1: $_answer1.creditAchieved{assignNames="ca1"}
Meow
@@ -894,7 +894,7 @@ describe("Feedback Tag Tests", function () {
- Credit achieved 2:
+ Credit achieved 2: $_answer2.creditAchieved{assignNames="ca2"}
Ruff
@@ -992,7 +992,7 @@ describe("Feedback Tag Tests", function () {
hello there
- Your response
+ Your response $_answer1.submittedresponse is incorrect.
`,
@@ -1064,16 +1064,16 @@ describe("Feedback Tag Tests", function () {
Award 1 feedback:
- Award 2 feedback:
- Award 3 feedback:
- Answer feedbacks:
- Award 1 feedback:
- Award 2 feedback:
- Award 3 feedback:
- Answer feedbacks:
- Award 1 feedback:
- Award 2 feedback:
- Award 3 feedback:
- Answer feedbacks:
-
`,
},
@@ -1892,16 +1892,16 @@ describe("Feedback Tag Tests", function () {
Award 1 feedback:
- Award 2 feedback:
- Award 3 feedback:
- Answer feedbacks:
- Answer feedbacks:
- Answer feedbacks:
-
`,
},
@@ -2442,7 +2442,7 @@ describe("Feedback Tag Tests", function () {
$m1 $m2
- Submitted responses:
+ Submitted responses: $ans.submittedResponses{assignNames="r1 r2"}
Desired feedback behavior
diff --git a/cypress/e2e/DoenetML/tagSpecific/function.cy.js b/cypress/e2e/DoenetML/tagSpecific/function.cy.js
index 669bc34af0..c77769b31a 100644
--- a/cypress/e2e/DoenetML/tagSpecific/function.cy.js
+++ b/cypress/e2e/DoenetML/tagSpecific/function.cy.js
@@ -926,8 +926,8 @@ describe("Function Tag Tests", function () {
doenetML: `
a
a
`,
},
@@ -1131,7 +1131,7 @@ describe("Function Tag Tests", function () {
-
+ $_mathinput1.value{assignNames="m1"}
`,
},
"*",
@@ -1212,7 +1212,7 @@ describe("Function Tag Tests", function () {
-
+ $_mathinput1.value{assignNames="m1"}
`,
},
"*",
@@ -1608,8 +1608,8 @@ describe("Function Tag Tests", function () {
a
`,
},
@@ -1724,7 +1724,7 @@ describe("Function Tag Tests", function () {
- $_function1
@@ -1850,7 +1850,7 @@ describe("Function Tag Tests", function () {
- $_function1
@@ -1935,7 +1935,7 @@ describe("Function Tag Tests", function () {
- $_function1
@@ -2161,7 +2161,7 @@ describe("Function Tag Tests", function () {
3/(1+e^(-x/2))
- Hello
+ Hello $_function1.formula
`,
@@ -2280,7 +2280,7 @@ describe("Function Tag Tests", function () {
a
-
3
@@ -2360,7 +2360,7 @@ describe("Function Tag Tests", function () {
a
- Hello
+ Hello $_function1.formula
3/(1+e^(-x/2))
@@ -2398,7 +2398,7 @@ describe("Function Tag Tests", function () {
a
- $a/(1+e^(-x/$b))
3
@@ -2813,7 +2813,7 @@ describe("Function Tag Tests", function () {
$_function1
- $_function2.formula
`,
@@ -2854,7 +2854,7 @@ describe("Function Tag Tests", function () {
- $_function1
@@ -2922,7 +2922,7 @@ describe("Function Tag Tests", function () {
- $_function1
@@ -3011,7 +3011,7 @@ describe("Function Tag Tests", function () {
- $_function1
@@ -3099,16 +3099,16 @@ describe("Function Tag Tests", function () {
(5,6)
(-5,6)
Number of maxima:
- Maxima:
+ Maxima: $_function1.maxima
Number of minima:
- Minima:
+ Minima: $_function1.minima
Number of extrema:
- Extrema:
+ Extrema: $_function1.extrema
Global maximum:
Global minimum:
Global supremum:
@@ -3128,7 +3128,7 @@ describe("Function Tag Tests", function () {
.eq(0)
.invoke("text")
.then((text) => {
- expect(text.trim()).equal("((−2.15,7),(5,6))");
+ expect(text.trim()).equal("(−2.15,7),(5,6)");
});
cy.get(cesc("#\\/numMinima")).should("have.text", "2");
cy.get(cesc("#\\/_math2"))
@@ -3136,7 +3136,7 @@ describe("Function Tag Tests", function () {
.eq(0)
.invoke("text")
.then((text) => {
- expect(text.trim()).equal("((−5,6),(3,4))");
+ expect(text.trim()).equal("(−5,6),(3,4)");
});
cy.get(cesc("#\\/numExtrema")).should("have.text", "4");
@@ -3145,7 +3145,7 @@ describe("Function Tag Tests", function () {
.eq(0)
.invoke("text")
.then((text) => {
- expect(text.trim()).equal("((−5,6),(−2.15,7),(3,4),(5,6))");
+ expect(text.trim()).equal("(−5,6),(−2.15,7),(3,4),(5,6)");
});
cy.get(cesc2("#/globalmax")).should("have.text", "NaN");
cy.get(cesc2("#/globalsup")).should("have.text", "∞");
@@ -3165,7 +3165,7 @@ describe("Function Tag Tests", function () {
.eq(0)
.invoke("text")
.then((text) => {
- expect(text.trim()).equal("((−1.5,7),(5,6))");
+ expect(text.trim()).equal("(−1.5,7),(5,6)");
});
cy.get(cesc("#\\/numMinima")).should("have.text", "2");
cy.get(cesc("#\\/_math2"))
@@ -3173,7 +3173,7 @@ describe("Function Tag Tests", function () {
.eq(0)
.invoke("text")
.then((text) => {
- expect(text.trim()).equal("((−5,6),(2,2))");
+ expect(text.trim()).equal("(−5,6),(2,2)");
});
cy.get(cesc("#\\/numExtrema")).should("have.text", "4");
cy.get(cesc("#\\/_math3"))
@@ -3181,7 +3181,7 @@ describe("Function Tag Tests", function () {
.eq(0)
.invoke("text")
.then((text) => {
- expect(text.trim()).equal("((−5,6),(−1.5,7),(2,2),(5,6))");
+ expect(text.trim()).equal("(−5,6),(−1.5,7),(2,2),(5,6)");
});
cy.get(cesc2("#/globalmax")).should("have.text", "NaN");
cy.get(cesc2("#/globalsup")).should("have.text", "∞");
@@ -3202,7 +3202,7 @@ describe("Function Tag Tests", function () {
.eq(0)
.invoke("text")
.then((text) => {
- expect(text.trim()).equal("((−1,7),(3.6,5.1),(5,6))");
+ expect(text.trim()).equal("(−1,7),(3.6,5.1),(5,6)");
});
cy.get(cesc("#\\/numMinima")).should("have.text", "3");
cy.get(cesc("#\\/_math2"))
@@ -3210,7 +3210,7 @@ describe("Function Tag Tests", function () {
.eq(0)
.invoke("text")
.then((text) => {
- expect(text.trim()).equal("((−5,6),(3,4),(4.3,5))");
+ expect(text.trim()).equal("(−5,6),(3,4),(4.3,5)");
});
cy.get(cesc("#\\/numExtrema")).should("have.text", "6");
cy.get(cesc("#\\/_math3"))
@@ -3219,7 +3219,7 @@ describe("Function Tag Tests", function () {
.invoke("text")
.then((text) => {
expect(text.trim()).equal(
- "((−5,6),(−1,7),(3,4),(3.6,5.1),(4.3,5),(5,6))",
+ "(−5,6),(−1,7),(3,4),(3.6,5.1),(4.3,5),(5,6)",
);
});
cy.get(cesc2("#/globalmax")).should("have.text", "NaN");
@@ -3241,7 +3241,7 @@ describe("Function Tag Tests", function () {
.eq(0)
.invoke("text")
.then((text) => {
- expect(text.trim()).equal("((−1,7),(5,6))");
+ expect(text.trim()).equal("(−1,7),(5,6)");
});
cy.get(cesc("#\\/numMinima")).should("have.text", "3");
cy.get(cesc("#\\/_math2"))
@@ -3249,7 +3249,7 @@ describe("Function Tag Tests", function () {
.eq(0)
.invoke("text")
.then((text) => {
- expect(text.trim()).equal("((−5,6),(3,4),(6.5,5))");
+ expect(text.trim()).equal("(−5,6),(3,4),(6.5,5)");
});
cy.get(cesc("#\\/numExtrema")).should("have.text", "5");
cy.get(cesc("#\\/_math3"))
@@ -3257,7 +3257,7 @@ describe("Function Tag Tests", function () {
.eq(0)
.invoke("text")
.then((text) => {
- expect(text.trim()).equal("((−5,6),(−1,7),(3,4),(5,6),(6.5,5))");
+ expect(text.trim()).equal("(−5,6),(−1,7),(3,4),(5,6),(6.5,5)");
});
cy.get(cesc2("#/globalmax")).should("have.text", "NaN");
cy.get(cesc2("#/globalsup")).should("have.text", "∞");
@@ -3315,7 +3315,7 @@ describe("Function Tag Tests", function () {
.eq(0)
.invoke("text")
.then((text) => {
- expect(text.trim()).equal("((−7,7),(−1,7),(5,6))");
+ expect(text.trim()).equal("(−7,7),(−1,7),(5,6)");
});
cy.get(cesc("#\\/numMinima")).should("have.text", "2");
cy.get(cesc("#\\/_math2"))
@@ -3323,7 +3323,7 @@ describe("Function Tag Tests", function () {
.eq(0)
.invoke("text")
.then((text) => {
- expect(text.trim()).equal("((−5,6),(3,4))");
+ expect(text.trim()).equal("(−5,6),(3,4)");
});
cy.get(cesc("#\\/numExtrema")).should("have.text", "5");
cy.get(cesc("#\\/_math3"))
@@ -3331,7 +3331,7 @@ describe("Function Tag Tests", function () {
.eq(0)
.invoke("text")
.then((text) => {
- expect(text.trim()).equal("((−7,7),(−5,6),(−1,7),(3,4),(5,6))");
+ expect(text.trim()).equal("(−7,7),(−5,6),(−1,7),(3,4),(5,6)");
});
cy.get(cesc2("#/globalmax")).should("have.text", "7");
cy.get(cesc2("#/globalsup")).should("have.text", "7");
@@ -3368,7 +3368,7 @@ describe("Function Tag Tests", function () {
.eq(0)
.invoke("text")
.then((text) => {
- expect(text.trim()).equal("((5,6),(8,3))");
+ expect(text.trim()).equal("(5,6),(8,3)");
});
cy.get(cesc2("#/globalmax")).should("have.text", "NaN");
cy.get(cesc2("#/globalsup")).should("have.text", "∞");
@@ -3389,7 +3389,7 @@ describe("Function Tag Tests", function () {
.eq(0)
.invoke("text")
.then((text) => {
- expect(text.trim()).equal("((5,6),(7,7))");
+ expect(text.trim()).equal("(5,6),(7,7)");
});
cy.get(cesc("#\\/numMinima")).should("have.text", "2");
cy.get(cesc("#\\/_math2"))
@@ -3397,7 +3397,7 @@ describe("Function Tag Tests", function () {
.eq(0)
.invoke("text")
.then((text) => {
- expect(text.trim()).equal("((6,5),(8,6))");
+ expect(text.trim()).equal("(6,5),(8,6)");
});
cy.get(cesc("#\\/numExtrema")).should("have.text", "4");
cy.get(cesc("#\\/_math3"))
@@ -3405,7 +3405,7 @@ describe("Function Tag Tests", function () {
.eq(0)
.invoke("text")
.then((text) => {
- expect(text.trim()).equal("((5,6),(6,5),(7,7),(8,6))");
+ expect(text.trim()).equal("(5,6),(6,5),(7,7),(8,6)");
});
cy.get(cesc2("#/globalmax")).should("have.text", "NaN");
cy.get(cesc2("#/globalsup")).should("have.text", "∞");
@@ -3428,16 +3428,16 @@ describe("Function Tag Tests", function () {
(5,6)
(-5,6)
Number of maxima:
- Maxima:
+ Maxima: $_function1.maxima
Number of minima:
- Minima:
+ Minima: $_function1.minima
Number of extrema:
- Extrema:
+ Extrema: $_function1.extrema
Global maximum:
Global minimum:
Global supremum:
@@ -3457,7 +3457,7 @@ describe("Function Tag Tests", function () {
.eq(0)
.invoke("text")
.then((text) => {
- expect(text.trim()).equal("((−2.15,7),(5,6))");
+ expect(text.trim()).equal("(−2.15,7),(5,6)");
});
cy.get(cesc("#\\/numMinima")).should("have.text", "1");
cy.get(cesc("#\\/_math2"))
@@ -3474,7 +3474,7 @@ describe("Function Tag Tests", function () {
.eq(0)
.invoke("text")
.then((text) => {
- expect(text.trim()).equal("((−2.15,7),(3,4),(5,6))");
+ expect(text.trim()).equal("(−2.15,7),(3,4),(5,6)");
});
cy.get(cesc2("#/globalmax")).should("have.text", "7");
cy.get(cesc2("#/globalsup")).should("have.text", "7");
@@ -3547,7 +3547,7 @@ describe("Function Tag Tests", function () {
.eq(0)
.invoke("text")
.then((text) => {
- expect(text.trim()).equal("((−1.5,7),(2,2))");
+ expect(text.trim()).equal("(−1.5,7),(2,2)");
});
cy.get(cesc2("#/globalmax")).should("have.text", "7");
cy.get(cesc2("#/globalsup")).should("have.text", "7");
@@ -3567,7 +3567,7 @@ describe("Function Tag Tests", function () {
.eq(0)
.invoke("text")
.then((text) => {
- expect(text.trim()).equal("((−1.5,7),(5,6))");
+ expect(text.trim()).equal("(−1.5,7),(5,6)");
});
cy.get(cesc("#\\/numMinima")).should("have.text", "2");
cy.get(cesc("#\\/_math2"))
@@ -3575,7 +3575,7 @@ describe("Function Tag Tests", function () {
.eq(0)
.invoke("text")
.then((text) => {
- expect(text.trim()).equal("((−5,6),(2,2))");
+ expect(text.trim()).equal("(−5,6),(2,2)");
});
cy.get(cesc("#\\/numExtrema")).should("have.text", "4");
cy.get(cesc("#\\/_math3"))
@@ -3583,7 +3583,7 @@ describe("Function Tag Tests", function () {
.eq(0)
.invoke("text")
.then((text) => {
- expect(text.trim()).equal("((−5,6),(−1.5,7),(2,2),(5,6))");
+ expect(text.trim()).equal("(−5,6),(−1.5,7),(2,2),(5,6)");
});
cy.get(cesc2("#/globalmax")).should("have.text", "7");
cy.get(cesc2("#/globalsup")).should("have.text", "7");
@@ -3604,7 +3604,7 @@ describe("Function Tag Tests", function () {
.eq(0)
.invoke("text")
.then((text) => {
- expect(text.trim()).equal("((−1,7),(3.6,5.1),(5,6))");
+ expect(text.trim()).equal("(−1,7),(3.6,5.1),(5,6)");
});
cy.get(cesc("#\\/numMinima")).should("have.text", "3");
cy.get(cesc("#\\/_math2"))
@@ -3612,7 +3612,7 @@ describe("Function Tag Tests", function () {
.eq(0)
.invoke("text")
.then((text) => {
- expect(text.trim()).equal("((−5,6),(3,4),(4.3,5))");
+ expect(text.trim()).equal("(−5,6),(3,4),(4.3,5)");
});
cy.get(cesc("#\\/numExtrema")).should("have.text", "6");
cy.get(cesc("#\\/_math3"))
@@ -3621,7 +3621,7 @@ describe("Function Tag Tests", function () {
.invoke("text")
.then((text) => {
expect(text.trim()).equal(
- "((−5,6),(−1,7),(3,4),(3.6,5.1),(4.3,5),(5,6))",
+ "(−5,6),(−1,7),(3,4),(3.6,5.1),(4.3,5),(5,6)",
);
});
cy.get(cesc2("#/globalmax")).should("have.text", "7");
@@ -3642,7 +3642,7 @@ describe("Function Tag Tests", function () {
.eq(0)
.invoke("text")
.then((text) => {
- expect(text.trim()).equal("((−1,7),(3.6,5.1))");
+ expect(text.trim()).equal("(−1,7),(3.6,5.1)");
});
cy.get(cesc("#\\/numMinima")).should("have.text", "1");
cy.get(cesc("#\\/_math2"))
@@ -3658,7 +3658,7 @@ describe("Function Tag Tests", function () {
.eq(0)
.invoke("text")
.then((text) => {
- expect(text.trim()).equal("((−1,7),(3,4),(3.6,5.1))");
+ expect(text.trim()).equal("(−1,7),(3,4),(3.6,5.1)");
});
cy.get(cesc2("#/globalmax")).should("have.text", "7");
cy.get(cesc2("#/globalsup")).should("have.text", "7");
@@ -3681,16 +3681,16 @@ describe("Function Tag Tests", function () {
(5,6)
(-5,6)
Number of maxima:
- Maxima:
+ Maxima: $_function1.maxima
Number of minima:
- Minima:
+ Minima: $_function1.minima
Number of extrema:
- Extrema:
+ Extrema: $_function1.extrema
Global maximum:
Global minimum:
Global supremum:
@@ -3710,7 +3710,7 @@ describe("Function Tag Tests", function () {
.eq(0)
.invoke("text")
.then((text) => {
- expect(text.trim()).equal("((−2.15,7),(5,6))");
+ expect(text.trim()).equal("(−2.15,7),(5,6)");
});
cy.get(cesc("#\\/numMinima")).should("have.text", "1");
cy.get(cesc("#\\/_math2"))
@@ -3727,7 +3727,7 @@ describe("Function Tag Tests", function () {
.eq(0)
.invoke("text")
.then((text) => {
- expect(text.trim()).equal("((−2.15,7),(3,4),(5,6))");
+ expect(text.trim()).equal("(−2.15,7),(3,4),(5,6)");
});
cy.get(cesc2("#/globalmax")).should("have.text", "7");
cy.get(cesc2("#/globalsup")).should("have.text", "7");
@@ -3800,7 +3800,7 @@ describe("Function Tag Tests", function () {
.eq(0)
.invoke("text")
.then((text) => {
- expect(text.trim()).equal("((−1.5,7),(2,2))");
+ expect(text.trim()).equal("(−1.5,7),(2,2)");
});
cy.get(cesc2("#/globalmax")).should("have.text", "7");
cy.get(cesc2("#/globalsup")).should("have.text", "7");
@@ -3820,7 +3820,7 @@ describe("Function Tag Tests", function () {
.eq(0)
.invoke("text")
.then((text) => {
- expect(text.trim()).equal("((−1.5,7),(5,6))");
+ expect(text.trim()).equal("(−1.5,7),(5,6)");
});
cy.get(cesc("#\\/numMinima")).should("have.text", "2");
cy.get(cesc("#\\/_math2"))
@@ -3828,7 +3828,7 @@ describe("Function Tag Tests", function () {
.eq(0)
.invoke("text")
.then((text) => {
- expect(text.trim()).equal("((−5,6),(2,2))");
+ expect(text.trim()).equal("(−5,6),(2,2)");
});
cy.get(cesc("#\\/numExtrema")).should("have.text", "4");
cy.get(cesc("#\\/_math3"))
@@ -3836,7 +3836,7 @@ describe("Function Tag Tests", function () {
.eq(0)
.invoke("text")
.then((text) => {
- expect(text.trim()).equal("((−5,6),(−1.5,7),(2,2),(5,6))");
+ expect(text.trim()).equal("(−5,6),(−1.5,7),(2,2),(5,6)");
});
cy.get(cesc2("#/globalmax")).should("have.text", "7");
cy.get(cesc2("#/globalsup")).should("have.text", "7");
@@ -3857,7 +3857,7 @@ describe("Function Tag Tests", function () {
.eq(0)
.invoke("text")
.then((text) => {
- expect(text.trim()).equal("((−1,7),(3.6,5.1),(5,6))");
+ expect(text.trim()).equal("(−1,7),(3.6,5.1),(5,6)");
});
cy.get(cesc("#\\/numMinima")).should("have.text", "3");
cy.get(cesc("#\\/_math2"))
@@ -3865,7 +3865,7 @@ describe("Function Tag Tests", function () {
.eq(0)
.invoke("text")
.then((text) => {
- expect(text.trim()).equal("((−5,6),(3,4),(4.3,5))");
+ expect(text.trim()).equal("(−5,6),(3,4),(4.3,5)");
});
cy.get(cesc("#\\/numExtrema")).should("have.text", "6");
cy.get(cesc("#\\/_math3"))
@@ -3874,7 +3874,7 @@ describe("Function Tag Tests", function () {
.invoke("text")
.then((text) => {
expect(text.trim()).equal(
- "((−5,6),(−1,7),(3,4),(3.6,5.1),(4.3,5),(5,6))",
+ "(−5,6),(−1,7),(3,4),(3.6,5.1),(4.3,5),(5,6)",
);
});
cy.get(cesc2("#/globalmax")).should("have.text", "7");
@@ -3911,7 +3911,7 @@ describe("Function Tag Tests", function () {
.eq(0)
.invoke("text")
.then((text) => {
- expect(text.trim()).equal("((3,4),(3.6,5.1))");
+ expect(text.trim()).equal("(3,4),(3.6,5.1)");
});
cy.get(cesc2("#/globalmax")).should("have.text", "NaN");
cy.get(cesc2("#/globalsup")).should("have.text", "7");
@@ -3933,16 +3933,16 @@ describe("Function Tag Tests", function () {
(7,0)
(8,1)
Number of maxima:
- Maxima:
+ Maxima: $_function1.maxima
Number of minima:
- Minima:
+ Minima: $_function1.minima
Number of extrema:
- Extrema:
+ Extrema: $_function1.extrema
Global maximum:
Global minimum:
Global supremum:
@@ -4131,7 +4131,7 @@ describe("Function Tag Tests", function () {
(0,1)
(3,1)
$_point1.y exp(-(x-$_point1.x)^2)+$_point2.y exp(-(x-$_point2.x)^2)
- Number of maxima:
@@ -4380,15 +4380,15 @@ describe("Function Tag Tests", function () {
Period:
sin(2*pi*x/$_mathinput1)
-
-
-
-
-
-
-
-
+ $_function1.maximumLocations
+ $_function1.maximumValues
+ $_function1.minimumLocations
+ $_function1.minimumValues
+ $_function1.extremumLocations
+ $_function1.extremumValues
+ $_mathinput1.value{assignNames="m1"}
`,
},
"*",
@@ -4546,16 +4546,16 @@ describe("Function Tag Tests", function () {
xmax =
sin(2*pi*x/$_mathinput1)
-
-
-
-
-
-
-
-
-
+ $_function1.maximumLocations
+ $_function1.maximumValues
+ $_function1.minimumLocations
+ $_function1.minimumValues
+ $_function1.extremumLocations
+ $_function1.extremumValues
+ $_mathinput1.value{assignNames="m1"}
+ $xmax.value{assignNames="xmax2"}
`,
},
@@ -4841,8 +4841,8 @@ describe("Function Tag Tests", function () {
1/(1+exp(-10*x))
-
(x+8)(x-8)/((x-2)(x+4)(x-5)^2)
-
-
-
-
-
-
+ $_function1.maximumLocations
+ $_function1.maximumValues
+ $_function1.minimumLocations
+ $_function1.minimumValues
+ $_function1.extremumLocations
+ $_function1.extremumValues
$_function1.globalMaximum, $_function1.globalSupremum, $_function1.globalMinimum, $_function1.globalInfimum
`,
@@ -4947,17 +4947,17 @@ describe("Function Tag Tests", function () {
a
`,
@@ -5035,15 +5035,15 @@ describe("Function Tag Tests", function () {
log(x^2-1)*sqrt((x-5)^2-1)
-
-
-
-
-
-
+ $_function1.maximumLocations
+ $_function1.maximumValues
+ $_function1.minimumLocations
+ $_function1.minimumValues
+ $_function1.extremumLocations
+ $_function1.extremumValues
`,
},
@@ -5088,9 +5088,9 @@ describe("Function Tag Tests", function () {
3+(x+pi)^20
-8+3/(1+exp(-100sin(3x)))
- 3+(x+pi)^200
-8+3/(1+exp(-1000sin(3x)))
- sin(x)+2
sin(x)+3
-
-
-
-
+ $f1.extrema{assignNames="f1e1 f1e2 f1e3"}
+ $f2.extrema{assignNames="f2e1 f2e2 f2e3 f2e4 f2e5"}
+ $f3.extrema{assignNames="f3e1 f3e2 f3e3 f3e4"}
+ $f4.extrema{assignNames="f4e1 f4e2 f4e3 f4e4"}
cos(x)
sin(x)+2
sin(x)+3
-
-
-
+ $f1a.extrema{assignNames="f1ae1 f1ae2 f1ae3"}
+ $f3a.extrema{assignNames="f3ae1 f3ae2 f3ae3 f3ae4"}
+ $f4a.extrema{assignNames="f4ae1 f4ae2 f4ae3 f4ae4"}
cos(x)
@@ -5263,10 +5263,10 @@ describe("Function Tag Tests", function () {
cos(x-pi)+5
-
-
-
-
+ $f5.extrema{assignNames="f5e1 f5e2 f5e3"}
+ $f6.extrema{assignNames="f6e1 f6e2 f6e3 f6e4 f6e5"}
+ $f7.extrema{assignNames="f7e1 f7e2 f7e3 f7e4"}
+ $f8.extrema{assignNames="f8e1 f8e2 f8e3 f8e4"}
cos(x)
@@ -5275,10 +5275,10 @@ describe("Function Tag Tests", function () {
cos(x-pi)+5
-
-
-
-
+ $f9.extrema{assignNames="f9e1 f9e2 f9e3"}
+ $f10.extrema{assignNames="f10e1 f10e2 f10e3 f10e4 f10e5"}
+ $f11.extrema{assignNames="f11e1 f11e2 f11e3 f11e4"}
+ $f12.extrema{assignNames="f12e1 f12e2 f12e3 f12e4"}
`,
@@ -6621,27 +6621,27 @@ describe("Function Tag Tests", function () {
-
-
+ $f1.extrema{assignNames="f1e1 f1e2 f1e3"}
+ $f2.extrema{assignNames="f2e1 f2e2 f2e3 f2e4 f2e5"}
+ $f3.extrema{assignNames="f3e1 f3e2 f3e3"}
-
-
-
+ $f4.extrema{assignNames="f4e1 f4e2 f4e3"}
+ $f5.extrema{assignNames="f5e1 f5e2 f5e3 f5e4 f5e5"}
+ $f6.extrema{assignNames="f6e1 f6e2 f6e3"}
-
-
-
+ $f7.extrema{assignNames="f7e1 f7e2 f7e3"}
+ $f8.extrema{assignNames="f8e1 f8e2 f8e3 f8e4 f8e5"}
+ $f9.extrema{assignNames="f9e1 f9e2 f9e3"}
`,
},
@@ -7081,12 +7081,12 @@ describe("Function Tag Tests", function () {
Number of maxima:
Number of minima:
-
-
-
-
-
-
+ $_function1.maximumLocations
+ $_function1.maximumValues
+ $_function1.minimumLocations
+ $_function1.minimumValues
+ $_function1.extremumLocations
+ $_function1.extremumValues
`,
},
@@ -7189,10 +7189,10 @@ describe("Function Tag Tests", function () {
$_mathinput2 x^3+1
-
-
-
+ $f1a.xscale
+ $_function1.xscale
`,
},
@@ -7265,23 +7265,23 @@ describe("Function Tag Tests", function () {
$_mathinput1 x^4 + $_mathinput2 x^3 +$_mathinput3 x^2 +1
-
-
- st^3
- $f
+ $f.formula
- $$f(u)
$$f2(u)
@@ -7505,10 +7505,7 @@ describe("Function Tag Tests", function () {
expect(stateVariables["/f3"].stateValues.variables[0]).eq("s");
expect(stateVariables["/f4"].stateValues.variables[0]).eq("t");
expect(stateVariables["/f5"].stateValues.variables[0]).eq("t");
- expect(
- stateVariables[stateVariables["/f6"].replacements[0].componentName]
- .stateValues.variables[0],
- ).eq("s");
+ expect(stateVariables["/f6"].stateValues.variables[0]).eq("s");
expect(stateVariables["/f"].stateValues.formula).eqls([
"*",
@@ -7535,10 +7532,11 @@ describe("Function Tag Tests", function () {
"s",
["^", "t", 3],
]);
- expect(
- stateVariables[stateVariables["/f6"].replacements[0].componentName]
- .stateValues.formula,
- ).eqls(["*", "s", ["^", "t", 3]]);
+ expect(stateVariables["/f6"].stateValues.formula).eqls([
+ "*",
+ "s",
+ ["^", "t", 3],
+ ]);
expect(
stateVariables[stateVariables["/fOfu"].activeChildren[0].componentName]
@@ -7575,19 +7573,19 @@ describe("Function Tag Tests", function () {
a
$f
+ $f
- $$f(0)
$$f2(0)
@@ -7798,10 +7796,10 @@ describe("Function Tag Tests", function () {
a
sin(x)
- $f
$g
`,
},
@@ -8796,11 +8794,11 @@ describe("Function Tag Tests", function () {
doenetML: `
a
x^2
- x^2
- a
xyz
- $$f1(a)
$$f2(a,b)
@@ -9045,11 +9043,11 @@ describe("Function Tag Tests", function () {
doenetML: `
a
xyz
- $$f1(a)
$$f2(a,b)
@@ -9465,17 +9463,17 @@ describe("Function Tag Tests", function () {
255.029847 sin(0.52952342x) + 3
255.029847 sin(0.52952342x) + 3
- $f1
$f2
@@ -9483,11 +9481,11 @@ describe("Function Tag Tests", function () {
$f4
$f5
- $f1.formula
+ $f2.formula
+ $f3.formula
+ $f4.formula
+ $f5.formula
$f1a
$f2a
@@ -9740,69 +9738,69 @@ describe("Function Tag Tests", function () {
255.029847 sin(0.52952342x) + 3
255.029847 sin(0.52952342x) + 3
- $f1
+ $f2
+ $f3
+ $f4
+ $f5
+ $f1
+ $f2
+ $f3
+ $f4
+ $f5
+ $f1
+ $f2
+ $f3
+ $f4
+ $f5
+ $f1
+ $f2
+ $f3
+ $f4
+ $f5
diff --git a/cypress/e2e/DoenetML/tagSpecific/functioniterates.cy.js b/cypress/e2e/DoenetML/tagSpecific/functioniterates.cy.js
index 4b4702f560..3aa447a898 100644
--- a/cypress/e2e/DoenetML/tagSpecific/functioniterates.cy.js
+++ b/cypress/e2e/DoenetML/tagSpecific/functioniterates.cy.js
@@ -29,12 +29,12 @@ describe("FunctionIterates Tag Tests", function () {
Then
- f^{$i}(u) = f^{$i}(u) = $(../iterates[$i]{name="iter"})
- $fformula
+ $fformula
`,
@@ -306,12 +306,12 @@ describe("FunctionIterates Tag Tests", function () {
Then
- f^{$i}(u) = f^{$i}(u) = $(../iterates[$i]{name="iter" displayDigits="10"})
- $fformula
+ $fformula
`,
@@ -518,8 +518,8 @@ describe("FunctionIterates Tag Tests", function () {
u = n= Iterates:
- Iterates: $fis.iterates{name="iterates"}
+ $n.value{assignNames="n2"}
`,
},
@@ -614,8 +614,8 @@ describe("FunctionIterates Tag Tests", function () {
u = n= Iterates:
- Iterates: $fis.iterates{name="iterates"}
+ $n.value{assignNames="n2"}
`,
},
@@ -743,14 +743,14 @@ describe("FunctionIterates Tag Tests", function () {
f($vars) = u = Iterates:
+ Iterates: $fis.iterates{name="iterates"}
$vars $fformula
- f($vars) = u = Iterates:
+ Iterates: $fis.iterates{name="iterates"}
$vars $fformula
- a
x^3
- $original
+ $original
@@ -45,10 +45,10 @@ describe("Function Operator Tag Tests", function () {
-
-
`,
},
@@ -204,8 +204,8 @@ describe("Function Operator Tag Tests", function () {
doenetML: `
a
x^3
- $original
+ $original
@@ -226,10 +226,10 @@ describe("Function Operator Tag Tests", function () {
-
-
`,
},
@@ -385,8 +385,8 @@ describe("Function Operator Tag Tests", function () {
doenetML: `
a
x^3orig
- clamp 1 clamp 2 $originalclamp 1
+ $originalclamp 2
@@ -525,8 +525,8 @@ describe("Function Operator Tag Tests", function () {
doenetML: `
a
x^3
- $original
+ $original
@@ -547,10 +547,10 @@ describe("Function Operator Tag Tests", function () {
-
-
`,
},
@@ -709,8 +709,8 @@ describe("Function Operator Tag Tests", function () {
doenetML: `
a
x^3
- $original
+ $original
@@ -731,10 +731,10 @@ describe("Function Operator Tag Tests", function () {
-
-
`,
},
@@ -1120,25 +1120,25 @@ describe("Function Operator Tag Tests", function () {
x^2 x^2 $x2
- $x2
x^2sin(z) x^2sin(z)
z 2
x^$a sin($var)
- $f1
$f1
- $f2
$f2
- $f3
$f3
- $f4
$f4
- $f1
+ $f2
+ $f3
+ $f4
+ $f3
+ $f4
`,
},
"*",
@@ -1323,25 +1323,25 @@ describe("Function Operator Tag Tests", function () {
x^2 d1 d2 x^2 $x2d2b
- d2c d2c $x2x^2sin(z) d3 d4 x^2sin(z)z 2
x^$a sin($var)d4b
- d5 d5 $f1$f1d5b
- d6 $f2d6
d6b $f2d7 $f3d7
d7b $f3d8 d8 $f4$f4d8b
- d9 d10 d11 d12 d13 d14 d9 $f1$f2d10
+ d11 $f3$f4d12
+ d13 $f3$f4d14
`,
},
"*",
@@ -2772,25 +2772,25 @@ describe("Function Operator Tag Tests", function () {
(x^2, x^3) (x^2, x^3) $x2
- $x2
(x^2sin(z), z^2sin(x)) (x^2sin(z),z^2sin(x))
z 2
(x^$a sin($var), $var^$a sin(x))
- $f1
$f1
- $f2
$f2
- $f3
$f3
- $f4
$f4
- $f1
+ $f2
+ $f3
+ $f4
+ $f3
+ $f4
`,
},
"*",
@@ -3054,7 +3054,7 @@ describe("Function Operator Tag Tests", function () {
doenetML: `
a
Let f(x) = sin(x) .
- Then f'(x) = .
+ Then f'(x) = $f .
`,
},
"*",
@@ -3088,12 +3088,12 @@ describe("Function Operator Tag Tests", function () {
a
$_function1
+ $_derivative1
+ $_derivative2
+ $_derivative3
+ $_derivative4
+ $_derivative5
`,
},
@@ -3148,10 +3148,10 @@ describe("Function Operator Tag Tests", function () {
a
$_function1
+ $_derivative1
+ $_derivative2
+ $_derivative3
`,
},
@@ -3887,32 +3887,32 @@ describe("Function Operator Tag Tests", function () {
$f
- again, f'($x) = again, f'($x) = $fp{name="fp2"}
Number of minima of f':
- Minima of f':
+ Minima of f': $fp.minima
Number of maxima of f':
- Maxima of f':
+ Maxima of f': $fp.maxima
To repeat:
Number of minima of f':
- Minima of f':
+ Minima of f': $fp2.minima
Number of maxima of f':
- Maxima of f':
+ Maxima of f': $fp2.maxima
-
`,
},
@@ -4191,23 +4191,23 @@ describe("Function Operator Tag Tests", function () {
a
$f
- Number of minima of f':
- Minima of f':
+ Minima of f': $fp.minima
Number of maxima of f':
- Maxima of f':
+ Maxima of f': $fp.maxima
To repeat:
Number of minima of f':
- Minima of f':
+ Minima of f': $fp2.minima
Number of maxima of f':
- Maxima of f':
+ Maxima of f': $fp2.maxima
`,
},
diff --git a/cypress/e2e/DoenetML/tagSpecific/graph.cy.js b/cypress/e2e/DoenetML/tagSpecific/graph.cy.js
index 63243edef1..d5a22caa0a 100644
--- a/cypress/e2e/DoenetML/tagSpecific/graph.cy.js
+++ b/cypress/e2e/DoenetML/tagSpecific/graph.cy.js
@@ -141,10 +141,10 @@ describe("Graph Tag Tests", function () {
(0,0)
xmin:
- xmax:
- ymin:
- ymax:
+ xmin: $_graph1.xmin{assignNames="xmin"}
+ xmax: $_graph1.xmax{assignNames="xmax"}
+ ymin: $_graph1.ymin{assignNames="ymin"}
+ ymax: $_graph1.ymax{assignNames="ymax"}
Change xmin:
Change xmax:
@@ -437,10 +437,10 @@ describe("Graph Tag Tests", function () {
xmin:
- xmax:
- ymin:
- ymax:
+ xmin: $g.xmin{assignNames="xmin"}
+ xmax: $g.xmax{assignNames="xmax"}
+ ymin: $g.ymin{assignNames="ymin"}
+ ymax: $g.ymax{assignNames="ymax"}
`,
},
@@ -532,10 +532,10 @@ describe("Graph Tag Tests", function () {
xmin:
- xmax:
- ymin:
- ymax:
+ xmin: $g.xmin{assignNames="xmin"}
+ xmax: $g.xmax{assignNames="xmax"}
+ ymin: $g.ymin{assignNames="ymin"}
+ ymax: $g.ymax{assignNames="ymax"}
`,
},
@@ -614,10 +614,10 @@ describe("Graph Tag Tests", function () {
xmin:
- xmax:
- ymin:
- ymax:
+ xmin: $g.xmin{assignNames="xmin"}
+ xmax: $g.xmax{assignNames="xmax"}
+ ymin: $g.ymin{assignNames="ymin"}
+ ymax: $g.ymax{assignNames="ymax"}
`,
},
@@ -696,10 +696,10 @@ describe("Graph Tag Tests", function () {
xmin:
- xmax:
- ymin:
- ymax:
+ xmin: $g.xmin{assignNames="xmin"}
+ xmax: $g.xmax{assignNames="xmax"}
+ ymin: $g.ymin{assignNames="ymin"}
+ ymax: $g.ymax{assignNames="ymax"}
`,
},
@@ -776,10 +776,10 @@ describe("Graph Tag Tests", function () {
xmin:
- xmax:
- ymin:
- ymax:
+ xmin: $g.xmin{assignNames="xmin"}
+ xmax: $g.xmax{assignNames="xmax"}
+ ymin: $g.ymin{assignNames="ymin"}
+ ymax: $g.ymax{assignNames="ymax"}
`,
},
@@ -856,10 +856,10 @@ describe("Graph Tag Tests", function () {
xmin:
- xmax:
- ymin:
- ymax:
+ xmin: $g.xmin{assignNames="xmin"}
+ xmax: $g.xmax{assignNames="xmax"}
+ ymin: $g.ymin{assignNames="ymin"}
+ ymax: $g.ymax{assignNames="ymax"}
`,
},
@@ -938,10 +938,10 @@ describe("Graph Tag Tests", function () {
xmin:
- xmax:
- ymin:
- ymax:
+ xmin: $g.xmin{assignNames="xmin"}
+ xmax: $g.xmax{assignNames="xmax"}
+ ymin: $g.ymin{assignNames="ymin"}
+ ymax: $g.ymax{assignNames="ymax"}
`,
},
@@ -1020,10 +1020,10 @@ describe("Graph Tag Tests", function () {
xmin:
- xmax:
- ymin:
- ymax:
+ xmin: $g.xmin{assignNames="xmin"}
+ xmax: $g.xmax{assignNames="xmax"}
+ ymin: $g.ymin{assignNames="ymin"}
+ ymax: $g.ymax{assignNames="ymax"}
`,
},
@@ -1102,10 +1102,10 @@ describe("Graph Tag Tests", function () {
xmin:
- xmax:
- ymin:
- ymax:
+ xmin: $g.xmin{assignNames="xmin"}
+ xmax: $g.xmax{assignNames="xmax"}
+ ymin: $g.ymin{assignNames="ymin"}
+ ymax: $g.ymax{assignNames="ymax"}
`,
},
@@ -1182,10 +1182,10 @@ describe("Graph Tag Tests", function () {
xmin:
- xmax:
- ymin:
- ymax:
+ xmin: $g.xmin{assignNames="xmin"}
+ xmax: $g.xmax{assignNames="xmax"}
+ ymin: $g.ymin{assignNames="ymin"}
+ ymax: $g.ymax{assignNames="ymax"}
`,
},
@@ -1262,10 +1262,10 @@ describe("Graph Tag Tests", function () {
xmin:
- xmax:
- ymin:
- ymax:
+ xmin: $g.xmin{assignNames="xmin"}
+ xmax: $g.xmax{assignNames="xmax"}
+ ymin: $g.ymin{assignNames="ymin"}
+ ymax: $g.ymax{assignNames="ymax"}
`,
},
@@ -1342,10 +1342,10 @@ describe("Graph Tag Tests", function () {
xmin:
- xmax:
- ymin:
- ymax:
+ xmin: $g.xmin{assignNames="xmin"}
+ xmax: $g.xmax{assignNames="xmax"}
+ ymin: $g.ymin{assignNames="ymin"}
+ ymax: $g.ymax{assignNames="ymax"}
`,
},
@@ -1420,10 +1420,10 @@ describe("Graph Tag Tests", function () {
xmin:
- xmax:
- ymin:
- ymax:
+ xmin: $g.xmin{assignNames="xmin"}
+ xmax: $g.xmax{assignNames="xmax"}
+ ymin: $g.ymin{assignNames="ymin"}
+ ymax: $g.ymax{assignNames="ymax"}
Change xmin:
Change xmax:
@@ -1516,35 +1516,35 @@ describe("Graph Tag Tests", function () {
- Graph 1 has grid:
+ Graph 1 has grid: $g1.grid{assignNames="sg1"}
- Graph 2 has grid:
+ Graph 2 has grid: $g2.grid{assignNames="sg2"}
- Graph 3 has grid:
+ Graph 3 has grid: $g3.grid{assignNames="sg3"}
- Graph 4 has grid:
+ Graph 4 has grid: $g4.grid{assignNames="sg4"}
- Graph 5 has grid:
+ Graph 5 has grid: $g5.grid{assignNames="sg5"}
Show grid:
- Graph 6 has grid:
+ Graph 6 has grid: $g6.grid{assignNames="sg6"}
Show grid:
- Graph 7 has grid:
+ Graph 7 has grid: $g7.grid{assignNames="sg7"}
`,
},
@@ -1594,31 +1594,31 @@ describe("Graph Tag Tests", function () {
- Graph 1 has grid:
+ Graph 1 has grid: $g1.grid{assignNames="sg1"}
grid x:
grid y:
- Graph 2 has grid:
+ Graph 2 has grid: $g2.grid{assignNames="sg2"}
grid x: $g3x
grid y: $g3y
- Graph 3 has grid:
+ Graph 3 has grid: $g3.grid{assignNames="sg3"}
grid x:
grid y:
- Graph 4 has grid:
+ Graph 4 has grid: $g4.grid{assignNames="sg4"}
grid x: $g5x
grid y: $g5y
- Graph 5 has grid:
+ Graph 5 has grid: $g5.grid{assignNames="sg5"}
`,
},
@@ -1700,7 +1700,7 @@ describe("Graph Tag Tests", function () {
x
-
Plant:
- The animal is a
+ The animal is a $animal.value.
- The plant is a
- The plant is a $plant.value.
+
-
-
-
-
- The animal
+ The animal $animalphrase.
- The plant
- The plant $plantphrase.
+
-
-
-
- $verb $animal1
+ $article $animal.value
+ $verb2{name="verb1"}
is
- $article1
+ $article2{name="article1"}
a
- $verb $plant1
+ $article $plant.value
Animal:
Plant:
@@ -184,28 +184,26 @@ describe("Group Tag Tests", function () {
{
doenetML: `
a
-
-
+
$x^2
-
-
+
-
+
+
-
+
+
- a
- $var1.value + $y$var2.value + $x
-
+ $_group1$_group2
+ $_aslist1
-
+
+
-
+
+
-
-
-
-
`,
@@ -551,14 +549,14 @@ describe("Group Tag Tests", function () {
a
- a
- 1.2+1.1
`,
},
@@ -21,24 +20,15 @@ describe("Integer Tag Tests", function () {
);
});
- cy.get(cesc("#\\/_text1")).should("have.text", "a"); // to wait until loaded
+ cy.log("Test value displayed in browser");
+ cy.get(cesc2("#/int")).should("have.text", "2");
+ cy.get(cesc2("#/_integer1")).should("have.text", "2");
+ cy.log("Test internal values are set to the correct values");
cy.window().then(async (win) => {
let stateVariables = await win.returnAllStateVariables1();
- let integer0Name =
- stateVariables["/_copy1"].replacements[0].componentName;
- let integer0Anchor = cesc2("#" + integer0Name);
-
- cy.log("Test value displayed in browser");
- cy.get(integer0Anchor).should("have.text", "2");
- cy.get(cesc("#\\/_integer1")).should("have.text", "2");
-
- cy.log("Test internal values are set to the correct values");
- cy.window().then(async (win) => {
- let stateVariables = await win.returnAllStateVariables1();
- expect(stateVariables[integer0Name].stateValues.value).eq(2);
- expect(stateVariables["/_integer1"].stateValues.value).eq(2);
- });
+ expect(stateVariables["/int"].stateValues.value).eq(2);
+ expect(stateVariables["/_integer1"].stateValues.value).eq(2);
});
});
@@ -47,8 +37,7 @@ describe("Integer Tag Tests", function () {
win.postMessage(
{
doenetML: `
- a
- x+1
`,
},
@@ -56,24 +45,15 @@ describe("Integer Tag Tests", function () {
);
});
- cy.get(cesc("#\\/_text1")).should("have.text", "a"); // to wait until loaded
+ cy.log("Test value displayed in browser");
+ cy.get(cesc2("#/int")).should("have.text", "NaN");
+ cy.get(cesc2("#/_integer1")).should("have.text", "NaN");
+ cy.log("Test internal values are set to the correct values");
cy.window().then(async (win) => {
let stateVariables = await win.returnAllStateVariables1();
- let integer0Name =
- stateVariables["/_copy1"].replacements[0].componentName;
- let integer0Anchor = cesc2("#" + integer0Name);
-
- cy.log("Test value displayed in browser");
- cy.get(integer0Anchor).should("have.text", "NaN");
- cy.get(cesc("#\\/_integer1")).should("have.text", "NaN");
-
- cy.log("Test internal values are set to the correct values");
- cy.window().then(async (win) => {
- let stateVariables = await win.returnAllStateVariables1();
- assert.isNaN(stateVariables[integer0Name].stateValues.value);
- assert.isNaN(stateVariables["/_integer1"].stateValues.value);
- });
+ assert.isNaN(stateVariables["/int"].stateValues.value);
+ assert.isNaN(stateVariables["/_integer1"].stateValues.value);
});
});
@@ -82,7 +62,6 @@ describe("Integer Tag Tests", function () {
win.postMessage(
{
doenetML: `
- a
$_mathinput1
a
5
$_line1$_line2
Hide second intersection
- Intersection 1:
- Intersection 2:
+ Intersection 1: $_line1$_line2
+ Intersection 2: $_line1$_line2
-
-
`,
},
@@ -592,12 +592,12 @@ describe("Integer Tag Tests", function () {
-
`,
},
@@ -1276,12 +1276,12 @@ describe("Integer Tag Tests", function () {
-
`,
},
@@ -1793,8 +1793,8 @@ describe("Integer Tag Tests", function () {
+ $p$c
+
+
+
+
+ `,
+ },
+ "*",
+ );
+ });
+
+ cy.get(cesc2("#/pdefault") + " .mjx-mrow")
+ .eq(0)
+ .should("have.text", "(0,1)");
+ cy.get(cesc2("#/pdefault") + " .mjx-mrow")
+ .eq(2)
+ .should("have.text", "(1,0)");
+
+ cy.get(cesc2("#/pdefault")).should("contain.text", "), (");
+
+ cy.get(cesc2("#/pnolist") + " .mjx-mrow")
+ .eq(0)
+ .should("have.text", "(0,1)");
+ cy.get(cesc2("#/pnolist") + " .mjx-mrow")
+ .eq(2)
+ .should("have.text", "(1,0)");
+ cy.get(cesc2("#/pnolist")).should("not.contain.text", "), (");
+ });
});
diff --git a/cypress/e2e/DoenetML/tagSpecific/legend.cy.js b/cypress/e2e/DoenetML/tagSpecific/legend.cy.js
index 9d2b5abaa0..d01ff144f1 100644
--- a/cypress/e2e/DoenetML/tagSpecific/legend.cy.js
+++ b/cypress/e2e/DoenetML/tagSpecific/legend.cy.js
@@ -214,8 +214,8 @@ describe("Legend Tag Tests", function () {
- Q (-4,-1)
l
-
-
l
-
5x-2y=3
- slope =
+ slope = $_line1.slope
- a
- slope =
+ slope = $_line1.slope
$a x + $b y=$c
@@ -734,8 +734,8 @@ describe("Line Tag Tests", function () {
- 1
- slope =
+ slope = $_line1.slope
- Variables are
- Variables are $_line1.var1{assignNames="var1"} and $_line1.var2{assignNames="var2"}.
+ $_line1.point1{assignNames="p1"}
+ $_line1.point2{assignNames="p2"}
`,
},
"*",
@@ -1148,15 +1148,15 @@ describe("Line Tag Tests", function () {
- (
(5,3)
- $_point2.x+1
+ $_line1.point1{assignNames="p1"}
+ $_line1.point2{assignNames="p2"}
`,
},
"*",
@@ -1410,10 +1410,10 @@ describe("Line Tag Tests", function () {
-
-
-
-
-
-
-
- Variables are
- x -intercept is:
- y -intercept is:
- Slope is:
- Equation is:
+ Variables are $_line1.var1{assignNames="var1"} and $_line1.var2{assignNames="var2"}.
+ x -intercept is: $_line1.xintercept{assignNames="xintercept"}.
+ y -intercept is: $_line1.yintercept{assignNames="yintercept"}.
+ Slope is: $_line1.slope{assignNames="slope"}.
+ Equation is: $_line1.equation{assignNames="equation"}.
`,
},
"*",
@@ -2295,8 +2295,8 @@ describe("Line Tag Tests", function () {
-
- ($_line1.point2 ,
4 )
(4 ,
- $_line1.point2 )
- a
-
- a
-
- a
-
- a
-
- a
-
-
-
-
-
-
-
-
(-5,9)
-
-
-
-
-
-
-
-
-
-
-
-
-
- slope:
-
-
-
-
-
-
-
-
-
- slope:
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- $l
- (3,4)
-
+ $A.coords{assignNames="Ac"}, $B.coords{assignNames="Bc"}
+ $l.equation{assignNames="le"}
`;
cy.get("#testRunner_toggleControls").click();
@@ -12082,8 +12082,8 @@ describe("Line Tag Tests", function () {
(-4,-1)
-
-
-
-
-
-
-
-
-
-
-
-
-
- a
(2,1)
(-2,-5)
-
-
-
-
- a
-
-
-
-
-
-
-
-
- $_linesegment1
-
- $_linesegment1
-
- $l
-
-
-
-
-
- ($_linesegment1.endpoint1 ,
3 )
- ($_linesegment1.endpoint2 ,
4 )
(3 ,
- $_linesegment1.endpoint1 )
(4 ,
- $_linesegment1.endpoint2 )
- (7,-2)
(7,-2)
a
(-4,-1)
-
`,
},
diff --git a/cypress/e2e/DoenetML/tagSpecific/map.cy.js b/cypress/e2e/DoenetML/tagSpecific/map.cy.js
index ffce745758..a8d1ae3d38 100644
--- a/cypress/e2e/DoenetML/tagSpecific/map.cy.js
+++ b/cypress/e2e/DoenetML/tagSpecific/map.cy.js
@@ -831,7 +831,7 @@ describe("Map Tag Tests", function () {
a
- z + z + $q + $b +$i
x
x
- 1
- z + z + $q + $b +$i
x
x
-
double
@@ -1527,16 +1527,16 @@ describe("Map Tag Tests", function () {
doenetML: `
a
- sin( sin($i$x) x y
- q p
- x y a
-
@@ -1732,11 +1732,11 @@ describe("Map Tag Tests", function () {
doenetML: `
a
- ( ($n, $(../e/n2))
- sin( sin($n{name="n2"})
`,
@@ -1868,7 +1868,7 @@ describe("Map Tag Tests", function () {
- $n^2 , $n^2
@@ -1879,15 +1879,15 @@ describe("Map Tag Tests", function () {
-
+ $_map1{name="copymap2"}
+ $copymap2{name="copymap3"}
- a
-
-
-
- (
- ( a
+
+
+
+ ($(../q)$n^2,
+ $_point2.x)
+
+ ($(../r)$n,
+ $_point1.x)
+
@@ -2887,7 +2853,7 @@ describe("Map Tag Tests", function () {
- (-$n, $n
- ($n, $n
-
-
-
-
+ $sequenceCount.value{assignNames="sequenceCount2"}
+ $sequenceTo.value{assignNames="sequenceTo2"}
`,
},
"*",
@@ -2946,9 +2912,9 @@ describe("Map Tag Tests", function () {
expect(
stateVariables["/_graph3"].stateValues.graphicalDescendants.length,
).eq(0);
- expect(
- stateVariables["/g4/_graph1"].stateValues.graphicalDescendants.length,
- ).eq(0);
+ expect(stateVariables["/g4"].stateValues.graphicalDescendants.length).eq(
+ 0,
+ );
});
cy.log("make sequence length 1");
@@ -2968,7 +2934,7 @@ describe("Map Tag Tests", function () {
);
cy.get(cesc2("#/_p1"))
- .children(coords1Anchor)
+ .find(coords1Anchor)
.find(".mjx-mrow")
.eq(0)
.invoke("text")
@@ -2976,7 +2942,7 @@ describe("Map Tag Tests", function () {
expect(text.trim()).equal("(−1,1)");
});
cy.get(cesc2("#/_p1"))
- .children(coords2Anchor)
+ .find(coords2Anchor)
.find(".mjx-mrow")
.eq(0)
.invoke("text")
@@ -2996,7 +2962,7 @@ describe("Map Tag Tests", function () {
stateVariables["/_graph3"].stateValues.graphicalDescendants.length,
).eq(2);
expect(
- stateVariables["/g4/_graph1"].stateValues.graphicalDescendants.length,
+ stateVariables["/g4"].stateValues.graphicalDescendants.length,
).eq(2);
expect(stateVariables["/a/_point1"].stateValues.coords).eqls([
"vector",
@@ -3065,9 +3031,9 @@ describe("Map Tag Tests", function () {
expect(
stateVariables["/_graph3"].stateValues.graphicalDescendants.length,
).eq(0);
- expect(
- stateVariables["/g4/_graph1"].stateValues.graphicalDescendants.length,
- ).eq(0);
+ expect(stateVariables["/g4"].stateValues.graphicalDescendants.length).eq(
+ 0,
+ );
});
cy.log("make sequence length 2");
@@ -3093,7 +3059,7 @@ describe("Map Tag Tests", function () {
);
cy.get(cesc2("#/_p1"))
- .children(coords1Anchor)
+ .find(coords1Anchor)
.find(".mjx-mrow")
.eq(0)
.invoke("text")
@@ -3101,7 +3067,7 @@ describe("Map Tag Tests", function () {
expect(text.trim()).equal("(−1,1)");
});
cy.get(cesc2("#/_p1"))
- .children(coords2Anchor)
+ .find(coords2Anchor)
.find(".mjx-mrow")
.eq(0)
.invoke("text")
@@ -3109,7 +3075,7 @@ describe("Map Tag Tests", function () {
expect(text.trim()).equal("(−2,2)");
});
cy.get(cesc2("#/_p1"))
- .children(coords3Anchor)
+ .find(coords3Anchor)
.find(".mjx-mrow")
.eq(0)
.invoke("text")
@@ -3117,7 +3083,7 @@ describe("Map Tag Tests", function () {
expect(text.trim()).equal("(1,−1)");
});
cy.get(cesc2("#/_p1"))
- .children(coords4Anchor)
+ .find(coords4Anchor)
.find(".mjx-mrow")
.eq(0)
.invoke("text")
@@ -3137,7 +3103,7 @@ describe("Map Tag Tests", function () {
stateVariables["/_graph3"].stateValues.graphicalDescendants.length,
).eq(4);
expect(
- stateVariables["/g4/_graph1"].stateValues.graphicalDescendants.length,
+ stateVariables["/g4"].stateValues.graphicalDescendants.length,
).eq(4);
expect(stateVariables["/a/_point1"].stateValues.coords).eqls([
"vector",
@@ -3249,7 +3215,7 @@ describe("Map Tag Tests", function () {
);
cy.get(cesc2("#/_p1"))
- .children(coords1Anchor)
+ .find(coords1Anchor)
.find(".mjx-mrow")
.eq(0)
.invoke("text")
@@ -3257,7 +3223,7 @@ describe("Map Tag Tests", function () {
expect(text.trim()).equal("(−3,9)");
});
cy.get(cesc2("#/_p1"))
- .children(coords2Anchor)
+ .find(coords2Anchor)
.find(".mjx-mrow")
.eq(0)
.invoke("text")
@@ -3265,7 +3231,7 @@ describe("Map Tag Tests", function () {
expect(text.trim()).equal("(−5,15)");
});
cy.get(cesc2("#/_p1"))
- .children(coords3Anchor)
+ .find(coords3Anchor)
.find(".mjx-mrow")
.eq(0)
.invoke("text")
@@ -3273,7 +3239,7 @@ describe("Map Tag Tests", function () {
expect(text.trim()).equal("(3,−9)");
});
cy.get(cesc2("#/_p1"))
- .children(coords4Anchor)
+ .find(coords4Anchor)
.find(".mjx-mrow")
.eq(0)
.invoke("text")
@@ -3293,7 +3259,7 @@ describe("Map Tag Tests", function () {
stateVariables["/_graph3"].stateValues.graphicalDescendants.length,
).eq(4);
expect(
- stateVariables["/g4/_graph1"].stateValues.graphicalDescendants.length,
+ stateVariables["/g4"].stateValues.graphicalDescendants.length,
).eq(4);
expect(stateVariables["/a/_point1"].stateValues.coords).eqls([
"vector",
@@ -3402,9 +3368,9 @@ describe("Map Tag Tests", function () {
expect(
stateVariables["/_graph3"].stateValues.graphicalDescendants.length,
).eq(0);
- expect(
- stateVariables["/g4/_graph1"].stateValues.graphicalDescendants.length,
- ).eq(0);
+ expect(stateVariables["/g4"].stateValues.graphicalDescendants.length).eq(
+ 0,
+ );
});
cy.log("make sequence length 3");
@@ -3436,7 +3402,7 @@ describe("Map Tag Tests", function () {
);
cy.get(cesc2("#/_p1"))
- .children(coords1Anchor)
+ .find(coords1Anchor)
.find(".mjx-mrow")
.eq(0)
.invoke("text")
@@ -3444,7 +3410,7 @@ describe("Map Tag Tests", function () {
expect(text.trim()).equal("(−3,9)");
});
cy.get(cesc2("#/_p1"))
- .children(coords2Anchor)
+ .find(coords2Anchor)
.find(".mjx-mrow")
.eq(0)
.invoke("text")
@@ -3452,7 +3418,7 @@ describe("Map Tag Tests", function () {
expect(text.trim()).equal("(−4,12)");
});
cy.get(cesc2("#/_p1"))
- .children(coords3Anchor)
+ .find(coords3Anchor)
.find(".mjx-mrow")
.eq(0)
.invoke("text")
@@ -3460,7 +3426,7 @@ describe("Map Tag Tests", function () {
expect(text.trim()).equal("(−5,15)");
});
cy.get(cesc2("#/_p1"))
- .children(coords4Anchor)
+ .find(coords4Anchor)
.find(".mjx-mrow")
.eq(0)
.invoke("text")
@@ -3468,7 +3434,7 @@ describe("Map Tag Tests", function () {
expect(text.trim()).equal("(3,−9)");
});
cy.get(cesc2("#/_p1"))
- .children(coords5Anchor)
+ .find(coords5Anchor)
.find(".mjx-mrow")
.eq(0)
.invoke("text")
@@ -3476,7 +3442,7 @@ describe("Map Tag Tests", function () {
expect(text.trim()).equal("(4,−12)");
});
cy.get(cesc2("#/_p1"))
- .children(coords6Anchor)
+ .find(coords6Anchor)
.find(".mjx-mrow")
.eq(0)
.invoke("text")
@@ -3496,7 +3462,7 @@ describe("Map Tag Tests", function () {
stateVariables["/_graph3"].stateValues.graphicalDescendants.length,
).eq(6);
expect(
- stateVariables["/g4/_graph1"].stateValues.graphicalDescendants.length,
+ stateVariables["/g4"].stateValues.graphicalDescendants.length,
).eq(6);
expect(stateVariables["/a/_point1"].stateValues.coords).eqls([
"vector",
@@ -3639,8 +3605,8 @@ describe("Map Tag Tests", function () {
-
- (
+ ($p.x^2, $p.y^2)
-
- p1a:
+ $number.value{assignNames="number2"}
`,
},
@@ -4257,14 +4223,14 @@ describe("Map Tag Tests", function () {
a
-
red yellow
-
red yellow
-
`,
},
@@ -4386,7 +4352,7 @@ describe("Map Tag Tests", function () {
cy.get(cesc("#\\/_text1")).should("have.text", "a"); // to wait for page to load
- cy.get(cesc("#\\/m1")).should("have.text", "map 1: hi1 hi2 hi3 hi4 ");
+ cy.get(cesc("#\\/m1")).should("have.text", "map 1: hi1, hi2, hi3, hi4 ");
cy.get(cesc("#\\/m2")).should("have.text", "map 2: ");
cy.get(cesc("#\\/n1") + " textarea").type("{end}{backspace}6{enter}", {
@@ -4400,7 +4366,7 @@ describe("Map Tag Tests", function () {
cy.get(cesc("#\\/m1")).should(
"have.text",
- "map 1: hi1 hi2 hi3 hi4 hi5 hi6 ",
+ "map 1: hi1, hi2, hi3, hi4, hi5, hi6 ",
);
cy.get(cesc("#\\/m2")).should("have.text", "map 2: ");
@@ -4412,7 +4378,7 @@ describe("Map Tag Tests", function () {
cy.get(cesc("#\\/m1")).should("have.text", "map 1: ");
cy.get(cesc("#\\/m2")).should(
"have.text",
- "map 2: hi1 hi2 hi3 hi4 hi5 hi6 ",
+ "map 2: hi1, hi2, hi3, hi4, hi5, hi6 ",
);
cy.get(cesc("#\\/n1") + " textarea").type("{end}{backspace}8{enter}", {
@@ -4427,7 +4393,7 @@ describe("Map Tag Tests", function () {
cy.get(cesc("#\\/m1")).should("have.text", "map 1: ");
cy.get(cesc("#\\/m2")).should(
"have.text",
- "map 2: hi1 hi2 hi3 hi4 hi5 hi6 hi7 hi8 ",
+ "map 2: hi1, hi2, hi3, hi4, hi5, hi6, hi7, hi8 ",
);
cy.get(cesc("#\\/h1")).click();
@@ -4437,7 +4403,7 @@ describe("Map Tag Tests", function () {
cy.get(cesc("#\\/m1")).should(
"have.text",
- "map 1: hi1 hi2 hi3 hi4 hi5 hi6 hi7 hi8 ",
+ "map 1: hi1, hi2, hi3, hi4, hi5, hi6, hi7, hi8 ",
);
cy.get(cesc("#\\/m2")).should("have.text", "map 2: ");
@@ -4450,7 +4416,7 @@ describe("Map Tag Tests", function () {
cy.get(cesc("#\\/n2a")).should("contain.text", "3");
cy.get(cesc("#\\/n1a")).should("contain.text", "3");
- cy.get(cesc("#\\/m1")).should("have.text", "map 1: hi1 hi2 hi3 ");
+ cy.get(cesc("#\\/m1")).should("have.text", "map 1: hi1, hi2, hi3 ");
cy.get(cesc("#\\/m2")).should("have.text", "map 2: ");
cy.get(cesc("#\\/h1")).click();
@@ -4459,7 +4425,7 @@ describe("Map Tag Tests", function () {
cy.get(cesc("#\\/h1a")).should("contain.text", "true");
cy.get(cesc("#\\/m1")).should("have.text", "map 1: ");
- cy.get(cesc("#\\/m2")).should("have.text", "map 2: hi1 hi2 hi3 ");
+ cy.get(cesc("#\\/m2")).should("have.text", "map 2: hi1, hi2, hi3 ");
cy.get(cesc("#\\/n1") + " textarea").type("{end}{backspace}4{enter}", {
force: true,
@@ -4471,7 +4437,969 @@ describe("Map Tag Tests", function () {
cy.get(cesc("#\\/n1a")).should("contain.text", "4");
cy.get(cesc("#\\/m1")).should("have.text", "map 1: ");
- cy.get(cesc("#\\/m2")).should("have.text", "map 2: hi1 hi2 hi3 hi4 ");
+ cy.get(cesc("#\\/m2")).should("have.text", "map 2: hi1, hi2, hi3, hi4 ");
+ });
+
+ it("map displays as list by default, single number in template", () => {
+ cy.window().then(async (win) => {
+ win.postMessage(
+ {
+ doenetML: `
+ a
+
+
+
+ $v^2
+
+
+
+
+
+
+ $v^2
+
+
+
+
+
+
+ $v^2
+
+
+
+ $default
+ $nocommas
+ $withcommas
+ $default{asList="false"}
+ $withcommas{asList="false"}
+ $nocommas{asList="true"}
+
+
+
+
+
+
+
+
+
+
+ `,
+ },
+ "*",
+ );
+ });
+
+ cy.get(cesc2("#/_text1")).should("have.text", "a");
+
+ cy.get(cesc2("#/default"))
+ .invoke("text")
+ .then((text) =>
+ expect(text.replace(/, \s*/g, ", ").trim()).eq(
+ "1, 4, 9, 16, 25, 36, 49, 64, 81, 100",
+ ),
+ );
+ cy.get(cesc2("#/pdefault2"))
+ .invoke("text")
+ .then((text) =>
+ expect(text.replace(/, \s*/g, ", ").trim()).eq(
+ "1, 4, 9, 16, 25, 36, 49, 64, 81, 100",
+ ),
+ );
+ cy.get(cesc2("#/pdefault4"))
+ .invoke("text")
+ .then((text) =>
+ expect(text.replace(/, \s*/g, ", ").trim()).eq(
+ "1, 4, 9, 16, 25, 36, 49, 64, 81, 100",
+ ),
+ );
+ cy.get(cesc2("#/pdefault5"))
+ .invoke("text")
+ .then((text) =>
+ expect(text.replace(/, \s*/g, ", ").trim()).eq(
+ "1, 4, 9, 16, 25, 36, 49, 64, 81, 100",
+ ),
+ );
+ cy.get(cesc2("#/nocommas"))
+ .invoke("text")
+ .then((text) =>
+ expect(text.replace(/\s+/g, " ").trim()).eq(
+ "1 4 9 16 25 36 49 64 81 100",
+ ),
+ );
+ cy.get(cesc2("#/pnocommas2"))
+ .invoke("text")
+ .then((text) =>
+ expect(text.replace(/\s+/g, " ").trim()).eq(
+ "1 4 9 16 25 36 49 64 81 100",
+ ),
+ );
+ cy.get(cesc2("#/pnocommas3"))
+ .invoke("text")
+ .then((text) =>
+ expect(text.replace(/\s+/g, " ").trim()).eq(
+ "1 4 9 16 25 36 49 64 81 100",
+ ),
+ );
+ cy.get(cesc2("#/pnocommas3a"))
+ .invoke("text")
+ .then((text) =>
+ expect(text.replace(/\s+/g, " ").trim()).eq(
+ "1 4 9 16 25 36 49 64 81 100",
+ ),
+ );
+ cy.get(cesc2("#/pnocommas4"))
+ .invoke("text")
+ .then((text) =>
+ expect(text.replace(/\s+/g, " ").trim()).eq(
+ "1 4 9 16 25 36 49 64 81 100",
+ ),
+ );
+ cy.get(cesc2("#/pnocommas5"))
+ .invoke("text")
+ .then((text) =>
+ expect(text.replace(/\s+/g, " ").trim()).eq(
+ "1 4 9 16 25 36 49 64 81 100",
+ ),
+ );
+ cy.get(cesc2("#/pnocommas6"))
+ .invoke("text")
+ .then((text) =>
+ expect(text.replace(/\s+/g, " ").trim()).eq(
+ "1 4 9 16 25 36 49 64 81 100",
+ ),
+ );
+ cy.get(cesc2("#/pnocommas6a"))
+ .invoke("text")
+ .then((text) =>
+ expect(text.replace(/\s+/g, " ").trim()).eq(
+ "1 4 9 16 25 36 49 64 81 100",
+ ),
+ );
+
+ cy.get(cesc2("#/withcommas"))
+ .invoke("text")
+ .then((text) =>
+ expect(text.replace(/, \s*/g, ", ").trim()).eq(
+ "1, 4, 9, 16, 25, 36, 49, 64, 81, 100",
+ ),
+ );
+ cy.get(cesc2("#/pwithcommas2"))
+ .invoke("text")
+ .then((text) =>
+ expect(text.replace(/, \s*/g, ", ").trim()).eq(
+ "1, 4, 9, 16, 25, 36, 49, 64, 81, 100",
+ ),
+ );
+ cy.get(cesc2("#/pwithcommas3"))
+ .invoke("text")
+ .then((text) =>
+ expect(text.replace(/, \s*/g, ", ").trim()).eq(
+ "1, 4, 9, 16, 25, 36, 49, 64, 81, 100",
+ ),
+ );
+ cy.get(cesc2("#/pwithcommas4"))
+ .invoke("text")
+ .then((text) =>
+ expect(text.replace(/, \s*/g, ", ").trim()).eq(
+ "1, 4, 9, 16, 25, 36, 49, 64, 81, 100",
+ ),
+ );
+ cy.get(cesc2("#/pwithcommas5"))
+ .invoke("text")
+ .then((text) =>
+ expect(text.replace(/, \s*/g, ", ").trim()).eq(
+ "1, 4, 9, 16, 25, 36, 49, 64, 81, 100",
+ ),
+ );
+ cy.get(cesc2("#/pwithcommas6"))
+ .invoke("text")
+ .then((text) =>
+ expect(text.replace(/, \s*/g, ", ").trim()).eq(
+ "1, 4, 9, 16, 25, 36, 49, 64, 81, 100",
+ ),
+ );
+
+ cy.window().then(async (win) => {
+ let stateVariables = await win.returnAllStateVariables1();
+ expect(
+ stateVariables["/pdefault"].stateValues.text
+ .replace(/, \s*/g, ", ")
+ .trim(),
+ ).eq("1, 4, 9, 16, 25, 36, 49, 64, 81, 100");
+ expect(
+ stateVariables["/pdefault2"].stateValues.text
+ .replace(/, \s*/g, ", ")
+ .trim(),
+ ).eq("1, 4, 9, 16, 25, 36, 49, 64, 81, 100");
+ expect(
+ stateVariables["/pdefault4"].stateValues.text
+ .replace(/, \s*/g, ", ")
+ .trim(),
+ ).eq("1, 4, 9, 16, 25, 36, 49, 64, 81, 100");
+ expect(
+ stateVariables["/pdefault5"].stateValues.text
+ .replace(/, \s*/g, ", ")
+ .trim(),
+ ).eq("1, 4, 9, 16, 25, 36, 49, 64, 81, 100");
+ expect(
+ stateVariables["/pnocommas"].stateValues.text
+ .replace(/\s+/g, " ")
+ .trim(),
+ ).eq("1 4 9 16 25 36 49 64 81 100");
+ expect(
+ stateVariables["/pnocommas2"].stateValues.text
+ .replace(/\s+/g, " ")
+ .trim(),
+ ).eq("1 4 9 16 25 36 49 64 81 100");
+ expect(
+ stateVariables["/pnocommas3"].stateValues.text
+ .replace(/\s+/g, " ")
+ .trim(),
+ ).eq("1 4 9 16 25 36 49 64 81 100");
+ expect(
+ stateVariables["/pnocommas3a"].stateValues.text
+ .replace(/\s+/g, " ")
+ .trim(),
+ ).eq("1 4 9 16 25 36 49 64 81 100");
+ expect(
+ stateVariables["/pnocommas4"].stateValues.text
+ .replace(/\s+/g, " ")
+ .trim(),
+ ).eq("1 4 9 16 25 36 49 64 81 100");
+ expect(
+ stateVariables["/pnocommas5"].stateValues.text
+ .replace(/\s+/g, " ")
+ .trim(),
+ ).eq("1 4 9 16 25 36 49 64 81 100");
+ expect(
+ stateVariables["/pnocommas6"].stateValues.text
+ .replace(/\s+/g, " ")
+ .trim(),
+ ).eq("1 4 9 16 25 36 49 64 81 100");
+ expect(
+ stateVariables["/pnocommas6a"].stateValues.text
+ .replace(/\s+/g, " ")
+ .trim(),
+ ).eq("1 4 9 16 25 36 49 64 81 100");
+ expect(
+ stateVariables["/pwithcommas"].stateValues.text
+ .replace(/, \s*/g, ", ")
+ .trim(),
+ ).eq("1, 4, 9, 16, 25, 36, 49, 64, 81, 100");
+ expect(
+ stateVariables["/pwithcommas2"].stateValues.text
+ .replace(/, \s*/g, ", ")
+ .trim(),
+ ).eq("1, 4, 9, 16, 25, 36, 49, 64, 81, 100");
+ expect(
+ stateVariables["/pwithcommas3"].stateValues.text
+ .replace(/, \s*/g, ", ")
+ .trim(),
+ ).eq("1, 4, 9, 16, 25, 36, 49, 64, 81, 100");
+ expect(
+ stateVariables["/pwithcommas4"].stateValues.text
+ .replace(/, \s*/g, ", ")
+ .trim(),
+ ).eq("1, 4, 9, 16, 25, 36, 49, 64, 81, 100");
+ expect(
+ stateVariables["/pwithcommas5"].stateValues.text
+ .replace(/, \s*/g, ", ")
+ .trim(),
+ ).eq("1, 4, 9, 16, 25, 36, 49, 64, 81, 100");
+ expect(
+ stateVariables["/pwithcommas6"].stateValues.text
+ .replace(/, \s*/g, ", ")
+ .trim(),
+ ).eq("1, 4, 9, 16, 25, 36, 49, 64, 81, 100");
+ });
+ });
+
+ it("map displays as list by default, number and string in template", () => {
+ cy.window().then(async (win) => {
+ win.postMessage(
+ {
+ doenetML: `
+ a
+
+
+
+ $v^2
+ x
+
+
+
+
+
+
+ $v^2
+ x
+
+
+
+
+
+
+ $v^2
+ x
+
+
+
+ $default
+ $nocommas
+ $withcommas
+ $default{asList="false"}
+ $withcommas{asList="false"}
+ $nocommas{asList="true"}
+
+
+
+
+
+
+
+
+
+
+ `,
+ },
+ "*",
+ );
+ });
+
+ cy.get(cesc2("#/_text1")).should("have.text", "a");
+
+ // Note: we do not remove whitespace that has a following commas,
+ // as we want to test that the whitespace before a comma is removed.
+ cy.get(cesc2("#/default"))
+ .invoke("text")
+ .then((text) =>
+ expect(text.replace(/\s+(?!,)/g, " ").trim()).eq(
+ "1 x, 4 x, 9 x, 16 x, 25 x, 36 x, 49 x, 64 x, 81 x, 100 x",
+ ),
+ );
+ cy.get(cesc2("#/pdefault2"))
+ .invoke("text")
+ .then((text) =>
+ expect(text.replace(/\s+(?!,)/g, " ").trim()).eq(
+ "1 x, 4 x, 9 x, 16 x, 25 x, 36 x, 49 x, 64 x, 81 x, 100 x",
+ ),
+ );
+ cy.get(cesc2("#/pdefault4"))
+ .invoke("text")
+ .then((text) =>
+ expect(text.replace(/\s+(?!,)/g, " ").trim()).eq(
+ "1 x, 4 x, 9 x, 16 x, 25 x, 36 x, 49 x, 64 x, 81 x, 100 x",
+ ),
+ );
+ cy.get(cesc2("#/pdefault5"))
+ .invoke("text")
+ .then((text) =>
+ expect(text.replace(/\s+(?!,)/g, " ").trim()).eq(
+ "1 x, 4 x, 9 x, 16 x, 25 x, 36 x, 49 x, 64 x, 81 x, 100 x",
+ ),
+ );
+ cy.get(cesc2("#/nocommas"))
+ .invoke("text")
+ .then((text) =>
+ expect(text.replace(/\s+/g, " ").trim()).eq(
+ "1 x 4 x 9 x 16 x 25 x 36 x 49 x 64 x 81 x 100 x",
+ ),
+ );
+ cy.get(cesc2("#/pnocommas2"))
+ .invoke("text")
+ .then((text) =>
+ expect(text.replace(/\s+/g, " ").trim()).eq(
+ "1 x 4 x 9 x 16 x 25 x 36 x 49 x 64 x 81 x 100 x",
+ ),
+ );
+ cy.get(cesc2("#/pnocommas3"))
+ .invoke("text")
+ .then((text) =>
+ expect(text.replace(/\s+/g, " ").trim()).eq(
+ "1 x 4 x 9 x 16 x 25 x 36 x 49 x 64 x 81 x 100 x",
+ ),
+ );
+ cy.get(cesc2("#/pnocommas3a"))
+ .invoke("text")
+ .then((text) =>
+ expect(text.replace(/\s+/g, " ").trim()).eq(
+ "1 x 4 x 9 x 16 x 25 x 36 x 49 x 64 x 81 x 100 x",
+ ),
+ );
+ cy.get(cesc2("#/pnocommas4"))
+ .invoke("text")
+ .then((text) =>
+ expect(text.replace(/\s+/g, " ").trim()).eq(
+ "1 x 4 x 9 x 16 x 25 x 36 x 49 x 64 x 81 x 100 x",
+ ),
+ );
+ cy.get(cesc2("#/pnocommas5"))
+ .invoke("text")
+ .then((text) =>
+ expect(text.replace(/\s+/g, " ").trim()).eq(
+ "1 x 4 x 9 x 16 x 25 x 36 x 49 x 64 x 81 x 100 x",
+ ),
+ );
+ cy.get(cesc2("#/pnocommas6"))
+ .invoke("text")
+ .then((text) =>
+ expect(text.replace(/\s+/g, " ").trim()).eq(
+ "1 x 4 x 9 x 16 x 25 x 36 x 49 x 64 x 81 x 100 x",
+ ),
+ );
+ cy.get(cesc2("#/pnocommas6a"))
+ .invoke("text")
+ .then((text) =>
+ expect(text.replace(/\s+/g, " ").trim()).eq(
+ "1 x 4 x 9 x 16 x 25 x 36 x 49 x 64 x 81 x 100 x",
+ ),
+ );
+
+ cy.get(cesc2("#/withcommas"))
+ .invoke("text")
+ .then((text) =>
+ expect(text.replace(/\s+(?!,)/g, " ").trim()).eq(
+ "1 x, 4 x, 9 x, 16 x, 25 x, 36 x, 49 x, 64 x, 81 x, 100 x",
+ ),
+ );
+ cy.get(cesc2("#/pwithcommas2"))
+ .invoke("text")
+ .then((text) =>
+ expect(text.replace(/\s+(?!,)/g, " ").trim()).eq(
+ "1 x, 4 x, 9 x, 16 x, 25 x, 36 x, 49 x, 64 x, 81 x, 100 x",
+ ),
+ );
+ cy.get(cesc2("#/pwithcommas3"))
+ .invoke("text")
+ .then((text) =>
+ expect(text.replace(/\s+(?!,)/g, " ").trim()).eq(
+ "1 x, 4 x, 9 x, 16 x, 25 x, 36 x, 49 x, 64 x, 81 x, 100 x",
+ ),
+ );
+ cy.get(cesc2("#/pwithcommas4"))
+ .invoke("text")
+ .then((text) =>
+ expect(text.replace(/\s+(?!,)/g, " ").trim()).eq(
+ "1 x, 4 x, 9 x, 16 x, 25 x, 36 x, 49 x, 64 x, 81 x, 100 x",
+ ),
+ );
+ cy.get(cesc2("#/pwithcommas5"))
+ .invoke("text")
+ .then((text) =>
+ expect(text.replace(/\s+(?!,)/g, " ").trim()).eq(
+ "1 x, 4 x, 9 x, 16 x, 25 x, 36 x, 49 x, 64 x, 81 x, 100 x",
+ ),
+ );
+ cy.get(cesc2("#/pwithcommas6"))
+ .invoke("text")
+ .then((text) =>
+ expect(text.replace(/\s+(?!,)/g, " ").trim()).eq(
+ "1 x, 4 x, 9 x, 16 x, 25 x, 36 x, 49 x, 64 x, 81 x, 100 x",
+ ),
+ );
+
+ cy.window().then(async (win) => {
+ let stateVariables = await win.returnAllStateVariables1();
+ expect(
+ stateVariables["/pdefault"].stateValues.text
+ .replace(/\s+(?!,)/g, " ")
+ .trim(),
+ ).eq("1 x, 4 x, 9 x, 16 x, 25 x, 36 x, 49 x, 64 x, 81 x, 100 x");
+ expect(
+ stateVariables["/pdefault2"].stateValues.text
+ .replace(/\s+(?!,)/g, " ")
+ .trim(),
+ ).eq("1 x, 4 x, 9 x, 16 x, 25 x, 36 x, 49 x, 64 x, 81 x, 100 x");
+ expect(
+ stateVariables["/pdefault4"].stateValues.text
+ .replace(/\s+(?!,)/g, " ")
+ .trim(),
+ ).eq("1 x, 4 x, 9 x, 16 x, 25 x, 36 x, 49 x, 64 x, 81 x, 100 x");
+ expect(
+ stateVariables["/pdefault5"].stateValues.text
+ .replace(/\s+(?!,)/g, " ")
+ .trim(),
+ ).eq("1 x, 4 x, 9 x, 16 x, 25 x, 36 x, 49 x, 64 x, 81 x, 100 x");
+ expect(
+ stateVariables["/pnocommas"].stateValues.text
+ .replace(/\s+/g, " ")
+ .trim(),
+ ).eq("1 x 4 x 9 x 16 x 25 x 36 x 49 x 64 x 81 x 100 x");
+ expect(
+ stateVariables["/pnocommas2"].stateValues.text
+ .replace(/\s+/g, " ")
+ .trim(),
+ ).eq("1 x 4 x 9 x 16 x 25 x 36 x 49 x 64 x 81 x 100 x");
+ expect(
+ stateVariables["/pnocommas3"].stateValues.text
+ .replace(/\s+/g, " ")
+ .trim(),
+ ).eq("1 x 4 x 9 x 16 x 25 x 36 x 49 x 64 x 81 x 100 x");
+ expect(
+ stateVariables["/pnocommas3a"].stateValues.text
+ .replace(/\s+/g, " ")
+ .trim(),
+ ).eq("1 x 4 x 9 x 16 x 25 x 36 x 49 x 64 x 81 x 100 x");
+ expect(
+ stateVariables["/pnocommas4"].stateValues.text
+ .replace(/\s+/g, " ")
+ .trim(),
+ ).eq("1 x 4 x 9 x 16 x 25 x 36 x 49 x 64 x 81 x 100 x");
+ expect(
+ stateVariables["/pnocommas5"].stateValues.text
+ .replace(/\s+/g, " ")
+ .trim(),
+ ).eq("1 x 4 x 9 x 16 x 25 x 36 x 49 x 64 x 81 x 100 x");
+ expect(
+ stateVariables["/pnocommas6"].stateValues.text
+ .replace(/\s+/g, " ")
+ .trim(),
+ ).eq("1 x 4 x 9 x 16 x 25 x 36 x 49 x 64 x 81 x 100 x");
+ expect(
+ stateVariables["/pnocommas6a"].stateValues.text
+ .replace(/\s+/g, " ")
+ .trim(),
+ ).eq("1 x 4 x 9 x 16 x 25 x 36 x 49 x 64 x 81 x 100 x");
+ expect(
+ stateVariables["/pwithcommas"].stateValues.text
+ .replace(/\s+(?!,)/g, " ")
+ .trim(),
+ ).eq("1 x, 4 x, 9 x, 16 x, 25 x, 36 x, 49 x, 64 x, 81 x, 100 x");
+ expect(
+ stateVariables["/pwithcommas2"].stateValues.text
+ .replace(/\s+(?!,)/g, " ")
+ .trim(),
+ ).eq("1 x, 4 x, 9 x, 16 x, 25 x, 36 x, 49 x, 64 x, 81 x, 100 x");
+ expect(
+ stateVariables["/pwithcommas3"].stateValues.text
+ .replace(/\s+(?!,)/g, " ")
+ .trim(),
+ ).eq("1 x, 4 x, 9 x, 16 x, 25 x, 36 x, 49 x, 64 x, 81 x, 100 x");
+ expect(
+ stateVariables["/pwithcommas4"].stateValues.text
+ .replace(/\s+(?!,)/g, " ")
+ .trim(),
+ ).eq("1 x, 4 x, 9 x, 16 x, 25 x, 36 x, 49 x, 64 x, 81 x, 100 x");
+ expect(
+ stateVariables["/pwithcommas5"].stateValues.text
+ .replace(/\s+(?!,)/g, " ")
+ .trim(),
+ ).eq("1 x, 4 x, 9 x, 16 x, 25 x, 36 x, 49 x, 64 x, 81 x, 100 x");
+ expect(
+ stateVariables["/pwithcommas6"].stateValues.text
+ .replace(/\s+(?!,)/g, " ")
+ .trim(),
+ ).eq("1 x, 4 x, 9 x, 16 x, 25 x, 36 x, 49 x, 64 x, 81 x, 100 x");
+ });
+ });
+
+ it("map displays as list by default, number, string and math in template", () => {
+ cy.window().then(async (win) => {
+ win.postMessage(
+ {
+ doenetML: `
+ a
+
+
+
+ $v^2
+ x
+
+
+
+
+
+
+ $v^2
+ x
+
+
+
+
+
+
+ $v^2
+ x
+
+
+
+ $default
+ $nocommas
+ $withcommas
+ $default{asList="false"}
+ $withcommas{asList="false"}
+ $nocommas{asList="true"}
+
+
+
+
+
+
+
+
+
+
+ `,
+ },
+ "*",
+ );
+ });
+
+ cy.get(cesc2("#/_text1")).should("have.text", "a");
+
+ // make sure Mathjax has run
+ cy.get(cesc2("#/default") + " .mjx-mrow")
+ .eq(0)
+ .should("have.text", "x");
+
+ // Note: we do not remove whitespace that has a following commas,
+ // as we want to test that the whitespace before a comma is removed.
+
+ // Note 2: to check relationship between math and commas,
+ // we will grab the entire text, which includes 3 copies of math right now
+ // (subject to change if MathJax changes how their different formats work)
+ cy.get(cesc2("#/default"))
+ .invoke("text")
+ .then((text) =>
+ expect(text.replace(/\s+(?!,)/g, " ").trim()).eq(
+ "1 xxx, 4 xxx, 9 xxx, 16 xxx, 25 xxx, 36 xxx, 49 xxx, 64 xxx, 81 xxx, 100 xxx",
+ ),
+ );
+ cy.get(cesc2("#/pdefault2"))
+ .invoke("text")
+ .then((text) =>
+ expect(text.replace(/\s+(?!,)/g, " ").trim()).eq(
+ "1 xxx, 4 xxx, 9 xxx, 16 xxx, 25 xxx, 36 xxx, 49 xxx, 64 xxx, 81 xxx, 100 xxx",
+ ),
+ );
+ cy.get(cesc2("#/pdefault4"))
+ .invoke("text")
+ .then((text) =>
+ expect(text.replace(/\s+(?!,)/g, " ").trim()).eq(
+ "1 xxx, 4 xxx, 9 xxx, 16 xxx, 25 xxx, 36 xxx, 49 xxx, 64 xxx, 81 xxx, 100 xxx",
+ ),
+ );
+ cy.get(cesc2("#/pdefault5"))
+ .invoke("text")
+ .then((text) =>
+ expect(text.replace(/\s+(?!,)/g, " ").trim()).eq(
+ "1 xxx, 4 xxx, 9 xxx, 16 xxx, 25 xxx, 36 xxx, 49 xxx, 64 xxx, 81 xxx, 100 xxx",
+ ),
+ );
+ cy.get(cesc2("#/nocommas"))
+ .invoke("text")
+ .then((text) =>
+ expect(text.replace(/\s+/g, " ").trim()).eq(
+ "1 xxx 4 xxx 9 xxx 16 xxx 25 xxx 36 xxx 49 xxx 64 xxx 81 xxx 100 xxx",
+ ),
+ );
+ cy.get(cesc2("#/pnocommas2"))
+ .invoke("text")
+ .then((text) =>
+ expect(text.replace(/\s+/g, " ").trim()).eq(
+ "1 xxx 4 xxx 9 xxx 16 xxx 25 xxx 36 xxx 49 xxx 64 xxx 81 xxx 100 xxx",
+ ),
+ );
+ cy.get(cesc2("#/pnocommas3"))
+ .invoke("text")
+ .then((text) =>
+ expect(text.replace(/\s+/g, " ").trim()).eq(
+ "1 xxx 4 xxx 9 xxx 16 xxx 25 xxx 36 xxx 49 xxx 64 xxx 81 xxx 100 xxx",
+ ),
+ );
+ cy.get(cesc2("#/pnocommas3a"))
+ .invoke("text")
+ .then((text) =>
+ expect(text.replace(/\s+/g, " ").trim()).eq(
+ "1 xxx 4 xxx 9 xxx 16 xxx 25 xxx 36 xxx 49 xxx 64 xxx 81 xxx 100 xxx",
+ ),
+ );
+ cy.get(cesc2("#/pnocommas4"))
+ .invoke("text")
+ .then((text) =>
+ expect(text.replace(/\s+/g, " ").trim()).eq(
+ "1 xxx 4 xxx 9 xxx 16 xxx 25 xxx 36 xxx 49 xxx 64 xxx 81 xxx 100 xxx",
+ ),
+ );
+ cy.get(cesc2("#/pnocommas5"))
+ .invoke("text")
+ .then((text) =>
+ expect(text.replace(/\s+/g, " ").trim()).eq(
+ "1 xxx 4 xxx 9 xxx 16 xxx 25 xxx 36 xxx 49 xxx 64 xxx 81 xxx 100 xxx",
+ ),
+ );
+ cy.get(cesc2("#/pnocommas6"))
+ .invoke("text")
+ .then((text) =>
+ expect(text.replace(/\s+/g, " ").trim()).eq(
+ "1 xxx 4 xxx 9 xxx 16 xxx 25 xxx 36 xxx 49 xxx 64 xxx 81 xxx 100 xxx",
+ ),
+ );
+ cy.get(cesc2("#/pnocommas6a"))
+ .invoke("text")
+ .then((text) =>
+ expect(text.replace(/\s+/g, " ").trim()).eq(
+ "1 xxx 4 xxx 9 xxx 16 xxx 25 xxx 36 xxx 49 xxx 64 xxx 81 xxx 100 xxx",
+ ),
+ );
+
+ cy.get(cesc2("#/withcommas"))
+ .invoke("text")
+ .then((text) =>
+ expect(text.replace(/\s+(?!,)/g, " ").trim()).eq(
+ "1 xxx, 4 xxx, 9 xxx, 16 xxx, 25 xxx, 36 xxx, 49 xxx, 64 xxx, 81 xxx, 100 xxx",
+ ),
+ );
+ cy.get(cesc2("#/pwithcommas2"))
+ .invoke("text")
+ .then((text) =>
+ expect(text.replace(/\s+(?!,)/g, " ").trim()).eq(
+ "1 xxx, 4 xxx, 9 xxx, 16 xxx, 25 xxx, 36 xxx, 49 xxx, 64 xxx, 81 xxx, 100 xxx",
+ ),
+ );
+ cy.get(cesc2("#/pwithcommas3"))
+ .invoke("text")
+ .then((text) =>
+ expect(text.replace(/\s+(?!,)/g, " ").trim()).eq(
+ "1 xxx, 4 xxx, 9 xxx, 16 xxx, 25 xxx, 36 xxx, 49 xxx, 64 xxx, 81 xxx, 100 xxx",
+ ),
+ );
+ cy.get(cesc2("#/pwithcommas4"))
+ .invoke("text")
+ .then((text) =>
+ expect(text.replace(/\s+(?!,)/g, " ").trim()).eq(
+ "1 xxx, 4 xxx, 9 xxx, 16 xxx, 25 xxx, 36 xxx, 49 xxx, 64 xxx, 81 xxx, 100 xxx",
+ ),
+ );
+ cy.get(cesc2("#/pwithcommas5"))
+ .invoke("text")
+ .then((text) =>
+ expect(text.replace(/\s+(?!,)/g, " ").trim()).eq(
+ "1 xxx, 4 xxx, 9 xxx, 16 xxx, 25 xxx, 36 xxx, 49 xxx, 64 xxx, 81 xxx, 100 xxx",
+ ),
+ );
+ cy.get(cesc2("#/pwithcommas6"))
+ .invoke("text")
+ .then((text) =>
+ expect(text.replace(/\s+(?!,)/g, " ").trim()).eq(
+ "1 xxx, 4 xxx, 9 xxx, 16 xxx, 25 xxx, 36 xxx, 49 xxx, 64 xxx, 81 xxx, 100 xxx",
+ ),
+ );
+
+ cy.window().then(async (win) => {
+ let stateVariables = await win.returnAllStateVariables1();
+ expect(
+ stateVariables["/pdefault"].stateValues.text
+ .replace(/\s+(?!,)/g, " ")
+ .trim(),
+ ).eq("1 x, 4 x, 9 x, 16 x, 25 x, 36 x, 49 x, 64 x, 81 x, 100 x");
+ expect(
+ stateVariables["/pdefault2"].stateValues.text
+ .replace(/\s+(?!,)/g, " ")
+ .trim(),
+ ).eq("1 x, 4 x, 9 x, 16 x, 25 x, 36 x, 49 x, 64 x, 81 x, 100 x");
+ expect(
+ stateVariables["/pdefault4"].stateValues.text
+ .replace(/\s+(?!,)/g, " ")
+ .trim(),
+ ).eq("1 x, 4 x, 9 x, 16 x, 25 x, 36 x, 49 x, 64 x, 81 x, 100 x");
+ expect(
+ stateVariables["/pdefault5"].stateValues.text
+ .replace(/\s+(?!,)/g, " ")
+ .trim(),
+ ).eq("1 x, 4 x, 9 x, 16 x, 25 x, 36 x, 49 x, 64 x, 81 x, 100 x");
+ expect(
+ stateVariables["/pnocommas"].stateValues.text
+ .replace(/\s+/g, " ")
+ .trim(),
+ ).eq("1 x 4 x 9 x 16 x 25 x 36 x 49 x 64 x 81 x 100 x");
+ expect(
+ stateVariables["/pnocommas2"].stateValues.text
+ .replace(/\s+/g, " ")
+ .trim(),
+ ).eq("1 x 4 x 9 x 16 x 25 x 36 x 49 x 64 x 81 x 100 x");
+ expect(
+ stateVariables["/pnocommas3"].stateValues.text
+ .replace(/\s+/g, " ")
+ .trim(),
+ ).eq("1 x 4 x 9 x 16 x 25 x 36 x 49 x 64 x 81 x 100 x");
+ expect(
+ stateVariables["/pnocommas3a"].stateValues.text
+ .replace(/\s+/g, " ")
+ .trim(),
+ ).eq("1 x 4 x 9 x 16 x 25 x 36 x 49 x 64 x 81 x 100 x");
+ expect(
+ stateVariables["/pnocommas4"].stateValues.text
+ .replace(/\s+/g, " ")
+ .trim(),
+ ).eq("1 x 4 x 9 x 16 x 25 x 36 x 49 x 64 x 81 x 100 x");
+ expect(
+ stateVariables["/pnocommas5"].stateValues.text
+ .replace(/\s+/g, " ")
+ .trim(),
+ ).eq("1 x 4 x 9 x 16 x 25 x 36 x 49 x 64 x 81 x 100 x");
+ expect(
+ stateVariables["/pnocommas6"].stateValues.text
+ .replace(/\s+/g, " ")
+ .trim(),
+ ).eq("1 x 4 x 9 x 16 x 25 x 36 x 49 x 64 x 81 x 100 x");
+ expect(
+ stateVariables["/pnocommas6a"].stateValues.text
+ .replace(/\s+/g, " ")
+ .trim(),
+ ).eq("1 x 4 x 9 x 16 x 25 x 36 x 49 x 64 x 81 x 100 x");
+ expect(
+ stateVariables["/pwithcommas"].stateValues.text
+ .replace(/\s+(?!,)/g, " ")
+ .trim(),
+ ).eq("1 x, 4 x, 9 x, 16 x, 25 x, 36 x, 49 x, 64 x, 81 x, 100 x");
+ expect(
+ stateVariables["/pwithcommas2"].stateValues.text
+ .replace(/\s+(?!,)/g, " ")
+ .trim(),
+ ).eq("1 x, 4 x, 9 x, 16 x, 25 x, 36 x, 49 x, 64 x, 81 x, 100 x");
+ expect(
+ stateVariables["/pwithcommas3"].stateValues.text
+ .replace(/\s+(?!,)/g, " ")
+ .trim(),
+ ).eq("1 x, 4 x, 9 x, 16 x, 25 x, 36 x, 49 x, 64 x, 81 x, 100 x");
+ expect(
+ stateVariables["/pwithcommas4"].stateValues.text
+ .replace(/\s+(?!,)/g, " ")
+ .trim(),
+ ).eq("1 x, 4 x, 9 x, 16 x, 25 x, 36 x, 49 x, 64 x, 81 x, 100 x");
+ expect(
+ stateVariables["/pwithcommas5"].stateValues.text
+ .replace(/\s+(?!,)/g, " ")
+ .trim(),
+ ).eq("1 x, 4 x, 9 x, 16 x, 25 x, 36 x, 49 x, 64 x, 81 x, 100 x");
+ expect(
+ stateVariables["/pwithcommas6"].stateValues.text
+ .replace(/\s+(?!,)/g, " ")
+ .trim(),
+ ).eq("1 x, 4 x, 9 x, 16 x, 25 x, 36 x, 49 x, 64 x, 81 x, 100 x");
+ });
+ });
+
+ it("map will not display as list if has block components", () => {
+ cy.window().then(async (win) => {
+ win.postMessage(
+ {
+ doenetML: `
+ a
+
+
+ Hello $v
+
+
+
+ `,
+ },
+ "*",
+ );
+ });
+
+ cy.get(cesc2("#/_document1")).should("contain.text", "Hello 1");
+ cy.get(cesc2("#/_document1")).should("contain.text", "Hello 2");
+ cy.get(cesc2("#/_document1")).should("contain.text", "Hello 3");
+ cy.get(cesc2("#/_document1")).should("not.contain.text", ",");
+ });
+
+ it("map will display as list if has components with canBeInList", () => {
+ cy.window().then(async (win) => {
+ win.postMessage(
+ {
+ doenetML: `
+ a
+
+ ($v, $v^2)
+
+ ($v, $v^2)
+
+ y=$v
+
+ 2$v
+ `,
+ },
+ "*",
+ );
+ });
+
+ cy.get(cesc2("#/p1") + " .mjx-mrow")
+ .eq(0)
+ .should("have.text", "(1,1)");
+ cy.get(cesc2("#/p1") + " .mjx-mrow")
+ .eq(2)
+ .should("have.text", "(2,4)");
+ cy.get(cesc2("#/p1") + " .mjx-mrow")
+ .eq(4)
+ .should("have.text", "(3,9)");
+ cy.get(cesc2("#/p1")).should("contain.text", "), (");
+
+ cy.get(cesc2("#/p2") + " .mjx-mrow")
+ .eq(0)
+ .should("have.text", "(1,1)");
+ cy.get(cesc2("#/p2") + " .mjx-mrow")
+ .eq(2)
+ .should("have.text", "(2,4)");
+ cy.get(cesc2("#/p2") + " .mjx-mrow")
+ .eq(4)
+ .should("have.text", "(3,9)");
+ cy.get(cesc2("#/p2")).should("contain.text", "), (");
+
+ cy.get(cesc2("#/p3") + " .mjx-mrow")
+ .eq(0)
+ .should("have.text", "y=1");
+ cy.get(cesc2("#/p3") + " .mjx-mrow")
+ .eq(1)
+ .should("have.text", "y=2");
+ cy.get(cesc2("#/p3") + " .mjx-mrow")
+ .eq(2)
+ .should("have.text", "y=3");
+ cy.get(cesc2("#/p3")).should("contain.text", "1, y");
+ cy.get(cesc2("#/p3")).should("contain.text", "2, y");
+
+ cy.get(cesc2("#/p4") + " .mjx-mrow")
+ .eq(0)
+ .should("have.text", "2");
+ cy.get(cesc2("#/p4") + " .mjx-mrow")
+ .eq(1)
+ .should("have.text", "4");
+ cy.get(cesc2("#/p4") + " .mjx-mrow")
+ .eq(2)
+ .should("have.text", "6");
+ cy.get(cesc2("#/p4")).should("contain.text", "2, 4");
+ cy.get(cesc2("#/p4")).should("contain.text", "4, 6");
+
+ cy.window().then(async (win) => {
+ let stateVariables = await win.returnAllStateVariables1();
+ expect(stateVariables["/p1"].stateValues.text).eq(
+ "( 1, 1 ), ( 2, 4 ), ( 3, 9 )",
+ );
+ expect(stateVariables["/p2"].stateValues.text).eq(
+ "( 1, 1 ), ( 2, 4 ), ( 3, 9 )",
+ );
+ expect(stateVariables["/p3"].stateValues.text).eq("y = 1, y = 2, y = 3");
+ expect(stateVariables["/p4"].stateValues.text).eq("2, 4, 6");
+ });
});
it("properly create unique name to avoid duplicate names", () => {
diff --git a/cypress/e2e/DoenetML/tagSpecific/matchespattern.cy.js b/cypress/e2e/DoenetML/tagSpecific/matchespattern.cy.js
index d6f74c3de0..818b6fd45d 100644
--- a/cypress/e2e/DoenetML/tagSpecific/matchespattern.cy.js
+++ b/cypress/e2e/DoenetML/tagSpecific/matchespattern.cy.js
@@ -387,8 +387,8 @@ describe("MatchesPattern Tag Tests", function () {
Matches:
- $base1.patternMatches[1]{assignNamesSkip="1"} $base1.patternMatches[2]{assignNamesSkip="1"} $base1.patternMatch3{assignNamesSkip="1"}
- $base2.patternMatches[1]{assignNamesSkip="1"} 0 $base2.patternMatch2
+ $base1.patternMatches[1] $base1.patternMatches[2] $base1.patternMatch3
+ $base2.patternMatches[1] 0 $base2.patternMatch2
@@ -398,8 +398,8 @@ describe("MatchesPattern Tag Tests", function () {
Matches:
- $requireNumeric1.patternMatches[1]{assignNamesSkip="1"} $requireNumeric1.patternMatches[2]{assignNamesSkip="1"} $requireNumeric1.patternMatch3{assignNamesSkip="1"}
- $requireNumeric2.patternMatches[1]{assignNamesSkip="1"} 0 $requireNumeric2.patternMatch2
+ $requireNumeric1.patternMatches[1] $requireNumeric1.patternMatches[2] $requireNumeric1.patternMatch3
+ $requireNumeric2.patternMatches[1] 0 $requireNumeric2.patternMatch2
@@ -409,8 +409,8 @@ describe("MatchesPattern Tag Tests", function () {
Matches:
- $excludeX1.patternMatches[1]{assignNamesSkip="1"} $excludeX1.patternMatches[2]{assignNamesSkip="1"} $excludeX1.patternMatch3{assignNamesSkip="1"}
- $excludeX2.patternMatches[1]{assignNamesSkip="1"} 0 $excludeX2.patternMatch2
+ $excludeX1.patternMatches[1] $excludeX1.patternMatches[2] $excludeX1.patternMatch3
+ $excludeX2.patternMatches[1] 0 $excludeX2.patternMatch2
`,
diff --git a/cypress/e2e/DoenetML/tagSpecific/math.cy.js b/cypress/e2e/DoenetML/tagSpecific/math.cy.js
index b00989e1b2..f2f2a4a9eb 100644
--- a/cypress/e2e/DoenetML/tagSpecific/math.cy.js
+++ b/cypress/e2e/DoenetML/tagSpecific/math.cy.js
@@ -101,7 +101,7 @@ describe("Math Tag Tests", function () {
doenetML: `
a
x+1
- 3
+ 3$_math1{name="m1a"} + 5
`,
},
"*",
@@ -129,22 +129,15 @@ describe("Math Tag Tests", function () {
cy.log("Test internal values are set to the correct values");
cy.window().then(async (win) => {
let stateVariables = await win.returnAllStateVariables1();
- let replacement = stateVariables["/_copy1"].replacements[0];
expect(stateVariables["/_math1"].stateValues.value).eqls(["+", "x", 1]);
- expect(stateVariables[replacement.componentName].stateValues.value).eqls([
- "+",
- "x",
- 1,
- ]);
+ expect(stateVariables["/m1a"].stateValues.value).eqls(["+", "x", 1]);
expect(stateVariables["/_math2"].stateValues.value).eqls([
"+",
["*", 3, ["+", "x", 1]],
5,
]);
expect(stateVariables["/_math1"].stateValues.hide).eq(true);
- expect(stateVariables[replacement.componentName].stateValues.hide).eq(
- true,
- );
+ expect(stateVariables["/m1a"].stateValues.hide).eq(true);
expect(stateVariables["/_math2"].stateValues.hide).eq(false);
});
});
@@ -293,9 +286,9 @@ describe("Math Tag Tests", function () {
{
doenetML: `
a
- x + x + $x + $zz
- a
3
- 2 +
+ 2 + $_point1
`,
},
"*",
@@ -354,8 +343,6 @@ describe("Math Tag Tests", function () {
cy.log("Test internal values");
cy.window().then(async (win) => {
let stateVariables = await win.returnAllStateVariables1();
- let point = stateVariables["/_copy1"].replacements[0];
- let coords = point.adapterUsed;
expect(stateVariables["/_math1"].stateValues.value).eq(5);
// expect(stateVariables['/_math1'].activeChildren[1].componentName).equal(coords.componentName);
// expect(coords.adaptedFrom.componentName).eq(point.componentName);
@@ -370,7 +357,7 @@ describe("Math Tag Tests", function () {
a
2
- (
+ ($_math1, 3)
`,
},
@@ -392,7 +379,6 @@ describe("Math Tag Tests", function () {
cy.log("Test internal values");
cy.window().then(async (win) => {
let stateVariables = await win.returnAllStateVariables1();
- // string children are originally 1 and 3
expect(stateVariables["/_math1"].activeChildren[0]).eq("2");
expect(stateVariables["/_math1"].activeChildren[1]).eq("3");
expect(stateVariables["/_math1"].stateValues.value).eq(6);
@@ -408,10 +394,14 @@ describe("Math Tag Tests", function () {
componentName: "/_point1",
args: { x: 7, y: 9 },
});
+ });
+
+ cy.window().then(async (win) => {
let stateVariables = await win.returnAllStateVariables1();
- // second child takes value, third is blank
- expect(stateVariables["/_math1"].activeChildren[0]).eq("7");
- expect(stateVariables["/_math1"].activeChildren[1]).eq("");
+ // Since we mark the component to ignore changes to defining children,
+ // the activeChildren might not be changed
+ // expect(stateVariables["/_math1"].activeChildren[0]).eq("7");
+ // expect(stateVariables["/_math1"].activeChildren[1]).eq("");
expect(stateVariables["/_math1"].stateValues.value).eq(7);
expect(stateVariables["/_point1"].stateValues.xs[0]).eq(7);
expect(stateVariables["/_point1"].stateValues.xs[1]).eq(9);
@@ -1005,25 +995,25 @@ describe("Math Tag Tests", function () {
31.3835205397397634 x + 4pi
621802.3520303639164826281
31.3835205397397634 x + 4pi
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ $expr1{name="expr1Dig5a" displayDigits="5"}
+ $expr2{name="expr2Dig5a" displayDigits="5"}
+ $expr1{name="expr1Dec5a" displayDecimals="5"}
+ $expr2{name="expr2Dec5a" displayDecimals="5"}
+ $expr1Dec5{name="expr1Dig5b" displayDigits="5"}
+ $expr2Dec5{name="expr2Dig5b" displayDigits="5"}
+ $expr1Dig5{name="expr1Dec5b" displayDecimals="5"}
+ $expr2Dig5{name="expr2Dec5b" displayDecimals="5"}
+ $expr1Dec5a{name="expr1Dig5c" displayDigits="5"}
+ $expr2Dec5a{name="expr2Dig5c" displayDigits="5"}
+ $expr1Dig5a{name="expr1Dec5c" displayDecimals="5"}
+ $expr2Dig5a{name="expr2Dec5c" displayDecimals="5"}
+ $expr1Dec5b{name="expr1Dig5d" displayDigits="5"}
+ $expr2Dec5b{name="expr2Dig5d" displayDigits="5"}
+ $expr1Dig5b{name="expr1Dec5d" displayDecimals="5"}
+ $expr2Dig5b{name="expr2Dec5d" displayDecimals="5"}
+
+ $expr1{name="expr1Dig5Dec1" displayDigits="5" displayDecimals="1"}
+ $expr2{name="expr2Dig5Dec1" displayDigits="5" displayDecimals="1"}
`,
},
"*",
@@ -1413,22 +1403,22 @@ describe("Math Tag Tests", function () {
31.3835205397397634 x + 4pi
621802.3520303639164826281
31.3835205397397634 x + 4pi
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ $expr1{name="expr1Dig5a" displayDigits="5"}
+ $expr2{name="expr2Dig5a" displayDigits="5"}
+ $expr1{name="expr1Dec5a" displayDecimals="5"}
+ $expr2{name="expr2Dec5a" displayDecimals="5"}
+ $expr1Dec5{name="expr1Dig8Dec5" displayDigits="8" displayDecimals="5"}
+ $expr2Dec5{name="expr2Dig8Dec5" displayDigits="8" displayDecimals="5"}
+ $expr1Dig5{name="expr1Dec8Dig5" displayDigits="5" displayDecimals="8"}
+ $expr2Dig5{name="expr2Dec8Dig5" displayDigits="5" displayDecimals="8"}
+ $expr1Dec5a{name="expr1Dig8Dec5a" displayDigits="8" displayDecimals="5"}
+ $expr2Dec5a{name="expr2Dig8Dec5a" displayDigits="8" displayDecimals="5"}
+ $expr1Dig5a{name="expr1Dec8Dig5a" displayDigits="5" displayDecimals="8"}
+ $expr2Dig5a{name="expr2Dec8Dig5a" displayDigits="5" displayDecimals="8"}
+ $expr1Dec8Dig5{name="expr1Dig3Dec8" displayDigits="3" displayDecimals="8"}
+ $expr2Dec8Dig5{name="expr2Dig3Dec8" displayDigits="3" displayDecimals="8"}
+ $expr1Dig8Dec5{name="expr1Dec3Dig8" displayDigits="8" displayDecimals="3"}
+ $expr2Dig8Dec5{name="expr2Dec3Dig8" displayDigits="8" displayDecimals="3"}
`,
},
@@ -1775,81 +1765,81 @@ describe("Math Tag Tests", function () {
62.1
162.1*10^(-3)
1.3 x + 4pi
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ $_math1{name="dig5a" displayDigits="5"}
+ $_math1{name="dig5apad" displayDigits="5" padZeros}
+ $_math2{name="dig5b" displayDigits="5"}
+ $_math2{name="dig5bpad" displayDigits="5" padZeros}
+ $_math3{name="dig5c" displayDigits="5"}
+ $_math3{name="dig5cpad" displayDigits="5" padZeros}
+ $_math1{name="dec5a" displayDecimals="5"}
+ $_math1{name="dec5apad" displayDecimals="5" padZeros}
+ $_math2{name="dec5b" displayDecimals="5"}
+ $_math2{name="dec5bpad" displayDecimals="5" padZeros}
+ $_math3{name="dec5c" displayDecimals="5"}
+ $_math3{name="dec5cpad" displayDecimals="5" padZeros}
+ $_math1{name="dig5dec1a" displayDigits="5" displayDecimals="1"}
+ $_math1{name="dig5dec1apad" displayDigits="5" displayDecimals="1" padZeros}
+ $_math2{name="dig5dec1b" displayDigits="5" displayDecimals="1"}
+ $_math2{name="dig5dec1bpad" displayDigits="5" displayDecimals="1" padZeros}
+ $_math3{name="dig5dec1c" displayDigits="5" displayDecimals="1"}
+ $_math3{name="dig5dec1cpad" displayDigits="5" displayDecimals="1" padZeros}
+
+ $dig5a.text{assignNames="dig5aText"}
+ $dig5apad.text{assignNames="dig5apadText"}
+ $dig5b.text{assignNames="dig5bText"}
+ $dig5bpad.text{assignNames="dig5bpadText"}
+ $dig5c.text{assignNames="dig5cText"}
+ $dig5cpad.text{assignNames="dig5cpadText"}
+ $dec5a.text{assignNames="dec5aText"}
+ $dec5apad.text{assignNames="dec5apadText"}
+ $dec5b.text{assignNames="dec5bText"}
+ $dec5bpad.text{assignNames="dec5bpadText"}
+ $dec5c.text{assignNames="dec5cText"}
+ $dec5cpad.text{assignNames="dec5cpadText"}
+ $dig5dec1a.text{assignNames="dig5dec1aText"}
+ $dig5dec1apad.text{assignNames="dig5dec1apadText"}
+ $dig5dec1b.text{assignNames="dig5dec1bText"}
+ $dig5dec1bpad.text{assignNames="dig5dec1bpadText"}
+ $dig5dec1c.text{assignNames="dig5dec1cText"}
+ $dig5dec1cpad.text{assignNames="dig5dec1cpadText"}
+
+ $dig5a.value{assignNames="dig5aValue"}
+ $dig5apad.value{assignNames="dig5apadValue"}
+ $dig5b.value{assignNames="dig5bValue"}
+ $dig5bpad.value{assignNames="dig5bpadValue"}
+ $dig5c.value{assignNames="dig5cValue"}
+ $dig5cpad.value{assignNames="dig5cpadValue"}
+ $dec5a.value{assignNames="dec5aValue"}
+ $dec5apad.value{assignNames="dec5apadValue"}
+ $dec5b.value{assignNames="dec5bValue"}
+ $dec5bpad.value{assignNames="dec5bpadValue"}
+ $dec5c.value{assignNames="dec5cValue"}
+ $dec5cpad.value{assignNames="dec5cpadValue"}
+ $dig5dec1a.value{assignNames="dig5dec1aValue"}
+ $dig5dec1apad.value{assignNames="dig5dec1apadValue"}
+ $dig5dec1b.value{assignNames="dig5dec1bValue"}
+ $dig5dec1bpad.value{assignNames="dig5dec1bpadValue"}
+ $dig5dec1c.value{assignNames="dig5dec1cValue"}
+ $dig5dec1cpad.value{assignNames="dig5dec1cpadValue"}
+
+ $dig5a.number{assignNames="dig5aNumber"}
+ $dig5apad.number{assignNames="dig5apadNumber"}
+ $dig5b.number{assignNames="dig5bNumber"}
+ $dig5bpad.number{assignNames="dig5bpadNumber"}
+ $dig5c.number{assignNames="dig5cNumber"}
+ $dig5cpad.number{assignNames="dig5cpadNumber"}
+ $dec5a.number{assignNames="dec5aNumber"}
+ $dec5apad.number{assignNames="dec5apadNumber"}
+ $dec5b.number{assignNames="dec5bNumber"}
+ $dec5bpad.number{assignNames="dec5bpadNumber"}
+ $dec5c.number{assignNames="dec5cNumber"}
+ $dec5cpad.number{assignNames="dec5cpadNumber"}
+ $dig5dec1a.number{assignNames="dig5dec1aNumber"}
+ $dig5dec1apad.number{assignNames="dig5dec1apadNumber"}
+ $dig5dec1b.number{assignNames="dig5dec1bNumber"}
+ $dig5dec1bpad.number{assignNames="dig5dec1bpadNumber"}
+ $dig5dec1c.number{assignNames="dig5dec1cNumber"}
+ $dig5dec1cpad.number{assignNames="dig5dec1cpadNumber"}
$dig5a
$dig5apad
@@ -1889,24 +1879,24 @@ describe("Math Tag Tests", function () {
$dig5dec1c
$dig5dec1cpad
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ $dig5a.x1{assignNames="dig5aX1"}
+ $dig5apad.x1{assignNames="dig5apadX1"}
+ $dig5b.x1{assignNames="dig5bX1"}
+ $dig5bpad.x1{assignNames="dig5bpadX1"}
+ $dig5c.x1{assignNames="dig5cX1"}
+ $dig5cpad.x1{assignNames="dig5cpadX1"}
+ $dec5a.x1{assignNames="dec5aX1"}
+ $dec5apad.x1{assignNames="dec5apadX1"}
+ $dec5b.x1{assignNames="dec5bX1"}
+ $dec5bpad.x1{assignNames="dec5bpadX1"}
+ $dec5c.x1{assignNames="dec5cX1"}
+ $dec5cpad.x1{assignNames="dec5cpadX1"}
+ $dig5dec1a.x1{assignNames="dig5dec1aX1"}
+ $dig5dec1apad.x1{assignNames="dig5dec1apadX1"}
+ $dig5dec1b.x1{assignNames="dig5dec1bX1"}
+ $dig5dec1bpad.x1{assignNames="dig5dec1bpadX1"}
+ $dig5dec1c.x1{assignNames="dig5dec1cX1"}
+ $dig5dec1cpad.x1{assignNames="dig5dec1cpadX1"}
`,
},
@@ -2520,9 +2510,9 @@ describe("Math Tag Tests", function () {
Number: 35203423.02352343201
Number of digits:
Number of decimals:
-
-
-
+ $n{displayDigits='$ndigits' displayDecimals='$ndecimals' name="na"}
+ $ndigits.value{assignNames="ndigits2"}
+ $ndecimals.value{assignNames="ndecimals2"}
`,
},
"*",
@@ -2778,12 +2768,12 @@ describe("Math Tag Tests", function () {
doenetML: `
a
f(x)+m(x)
- f(x)+m(x)
- f g h k m n
$f(x)
-
-
+ $m1{sourcesAreFunctionSymbols="f" name="m2"}
+ $m2{sourcesAreFunctionSymbols="" name="m3"}
$f(x)
-
-
+ $m4{sourcesAreFunctionSymbols="" name="m5"}
+ $m5{sourcesAreFunctionSymbols="f" name="m6"}
`,
},
"*",
@@ -3032,16 +3022,16 @@ describe("Math Tag Tests", function () {
doenetML: `
a
x+x
-
-
-
-
+ $m1{simplify name="m2"}
+ $m2{simplify="none" name="m3"}
+ $m1.value{simplify assignNames="m2a"}
+ $m2.value{simplify="none" assignNames="m3a"}
x+x
-
-
-
-
+ $m4{simplify="none" name="m5"}
+ $m5{simplify name="m6"}
+ $m4.value{simplify="none" assignNames="m5a"}
+ $m5a.value{simplify assignNames="m6a"}
`,
},
"*",
@@ -3955,12 +3945,12 @@ describe("Math Tag Tests", function () {
doenetML: `
a
xyz
-
-
+ $m1{splitSymbols="false" name="m2"}
+ $m2{splitSymbols name="m3"}
xyz
-
-
+ $m4{splitSymbols name="m5"}
+ $m5{splitSymbols="false" name="m6"}
`,
},
"*",
@@ -4124,14 +4114,14 @@ describe("Math Tag Tests", function () {
$m
$m
- Ndimensions: $m
- x: $m
- y: $m
- z: $m
- x1: $m
- x2: $m
- x3: $m
- x4: $m
+ Ndimensions: $m $m2.numDimensions{assignNames="numDim2"} $m3.numDimensions{assignNames="numDim3"}
+ x: $m $m2.x{assignNames="x_2"} $m3.x{assignNames="x_3"}
+ y: $m $m2.y{assignNames="y_2"} $m3.y{assignNames="y_3"}
+ z: $m $m2.z{assignNames="z_2"} $m3.z{assignNames="z_3"}
+ x1: $m $m2.x1{assignNames="x1_2"} $m3.x1{assignNames="x1_3"}
+ x2: $m $m2.x2{assignNames="x2_2"} $m3.x2{assignNames="x2_3"}
+ x3: $m $m2.x3{assignNames="x3_2"} $m3.x3{assignNames="x3_3"}
+ x4: $m $m2.x4{assignNames="x4_2"} $m3.x4{assignNames="x4_3"}
x:
y:
z:
@@ -4374,68 +4364,381 @@ describe("Math Tag Tests", function () {
check_values(["j", "k", "l"], "altvector");
});
- it("group composite replacements inside math", () => {
+ it("aslist inside math, group", () => {
cy.window().then(async (win) => {
win.postMessage(
{
doenetML: `
- a
-
- a b
-
- a b
-
- a + b
+
+
+ a
+ b
+ c
+
+
+
+ $grp
+ $grp{asList}
+ ($grp)
+ ($grp{asList})
+ 2$grp
+ 2$grp{asList}
+ $grp, sin(x)
+ $grp{asList}, sin(x)
+ f($grp)
+ f($grp{asList})
+
`,
},
"*",
);
});
- cy.get(cesc("#\\/_text1")).should("have.text", "a"); // to wait until loaded
+ cy.get(cesc2("#/nolist") + " .mjx-mrow")
+ .eq(0)
+ .should("have.text", "abc");
- cy.get(cesc(`#\\/groupByDefault`))
- .find(".mjx-mrow")
+ cy.get(cesc2("#/list") + " .mjx-mrow")
.eq(0)
- .invoke("text")
- .then((text) => {
- expect(text.trim().replace(/−/g, "-")).equal("(a,b)");
- });
- cy.get(cesc(`#\\/dontGroup`))
- .find(".mjx-mrow")
+ .should("have.text", "a,b,c");
+
+ cy.get(cesc2("#/nolist2") + " .mjx-mrow")
.eq(0)
- .invoke("text")
- .then((text) => {
- expect(text.trim().replace(/−/g, "-")).equal("ab");
- });
- cy.get(cesc(`#\\/dontGroupDueToString`))
- .find(".mjx-mrow")
+ .should("have.text", "abc");
+
+ cy.get(cesc2("#/tuple") + " .mjx-mrow")
.eq(0)
- .invoke("text")
- .then((text) => {
- expect(text.trim().replace(/−/g, "-")).equal("a+b");
- });
+ .should("have.text", "(a,b,c)");
+
+ cy.get(cesc2("#/doubleNoList") + " .mjx-mrow")
+ .eq(0)
+ .should("have.text", "2abc");
+
+ cy.get(cesc2("#/doubleTuple") + " .mjx-mrow")
+ .eq(0)
+ .should("have.text", "2(a,b,c)");
+
+ cy.get(cesc2("#/appendNoList") + " .mjx-mrow")
+ .eq(0)
+ .should("have.text", "abc,sin(x)");
+
+ cy.get(cesc2("#/appendToList") + " .mjx-mrow")
+ .eq(0)
+ .should("have.text", "a,b,c,sin(x)");
+
+ cy.get(cesc2("#/functionNoList") + " .mjx-mrow")
+ .eq(0)
+ .should("have.text", "f(abc)");
+
+ cy.get(cesc2("#/functionOfList") + " .mjx-mrow")
+ .eq(0)
+ .should("have.text", "f(a,b,c)");
cy.window().then(async (win) => {
let stateVariables = await win.returnAllStateVariables1();
- expect(stateVariables["/groupByDefault"].stateValues.value).eqls([
+ expect(stateVariables["/nolist"].stateValues.value).eqls([
+ "*",
+ "a",
+ "b",
+ "c",
+ ]);
+ expect(stateVariables["/nolist"].stateValues.text).eq("a b c");
+
+ expect(stateVariables["/list"].stateValues.value).eqls([
+ "list",
+ "a",
+ "b",
+ "c",
+ ]);
+ expect(stateVariables["/list"].stateValues.text).eq("a, b, c");
+
+ expect(stateVariables["/nolist2"].stateValues.value).eqls([
+ "*",
+ "a",
+ "b",
+ "c",
+ ]);
+ expect(stateVariables["/nolist2"].stateValues.text).eq("a b c");
+
+ expect(stateVariables["/tuple"].stateValues.value).eqls([
"tuple",
"a",
"b",
+ "c",
]);
- expect(stateVariables["/dontGroup"].stateValues.value).eqls([
+ expect(stateVariables["/tuple"].stateValues.text).eq("( a, b, c )");
+
+ expect(stateVariables["/doubleNoList"].stateValues.value).eqls([
"*",
+ 2,
"a",
"b",
+ "c",
]);
- expect(stateVariables["/dontGroupDueToString"].stateValues.value).eqls([
- "+",
+ expect(stateVariables["/doubleNoList"].stateValues.text).eq("2 a b c");
+
+ expect(stateVariables["/doubleTuple"].stateValues.value).eqls([
+ "*",
+ 2,
+ ["tuple", "a", "b", "c"],
+ ]);
+ expect(stateVariables["/doubleTuple"].stateValues.text).eq(
+ "2 ( a, b, c )",
+ );
+
+ expect(stateVariables["/appendNoList"].stateValues.value).eqls([
+ "list",
+ ["*", "a", "b", "c"],
+ ["apply", "sin", "x"],
+ ]);
+ expect(stateVariables["/appendNoList"].stateValues.text).eq(
+ "a b c, sin(x)",
+ );
+
+ expect(stateVariables["/appendToList"].stateValues.value).eqls([
+ "list",
"a",
"b",
+ "c",
+ ["apply", "sin", "x"],
+ ]);
+ expect(stateVariables["/appendToList"].stateValues.text).eq(
+ "a, b, c, sin(x)",
+ );
+
+ expect(stateVariables["/functionNoList"].stateValues.value).eqls([
+ "apply",
+ "f",
+ ["*", "a", "b", "c"],
+ ]);
+ expect(stateVariables["/functionNoList"].stateValues.text).eq("f(a b c)");
+
+ expect(stateVariables["/functionOfList"].stateValues.value).eqls([
+ "apply",
+ "f",
+ ["tuple", "a", "b", "c"],
+ ]);
+ expect(stateVariables["/functionOfList"].stateValues.text).eq(
+ "f( a, b, c )",
+ );
+ });
+ });
+
+ it("aslist inside math, sequence", () => {
+ cy.window().then(async (win) => {
+ win.postMessage(
+ {
+ doenetML: `
+
+ $seq
+ $seq{asList="false"}
+ ($seq)
+ ($seq{asList="false"})
+ 2$seq
+ 2$seq{asList="false"}
+ $seq, sin(x)
+ $seq{asList="false"}, sin(x)
+ sum($seq)
+ sum($seq{asList="false"})
+
+ `,
+ },
+ "*",
+ );
+ });
+
+ cy.get(cesc2("#/list") + " .mjx-mrow")
+ .eq(0)
+ .should("have.text", "1,2,3,4");
+
+ cy.get(cesc2("#/nolist") + " .mjx-mrow")
+ .eq(0)
+ .should("have.text", "24");
+
+ cy.get(cesc2("#/tuple") + " .mjx-mrow")
+ .eq(0)
+ .should("have.text", "(1,2,3,4)");
+
+ cy.get(cesc2("#/nolist2") + " .mjx-mrow")
+ .eq(0)
+ .should("have.text", "24");
+
+ cy.get(cesc2("#/doubleTuple") + " .mjx-mrow")
+ .eq(0)
+ .should("have.text", "(2,4,6,8)");
+
+ cy.get(cesc2("#/doubleNoList") + " .mjx-mrow")
+ .eq(0)
+ .should("have.text", "48");
+
+ cy.get(cesc2("#/appendToList") + " .mjx-mrow")
+ .eq(0)
+ .should("have.text", "1,2,3,4,sin(x)");
+
+ cy.get(cesc2("#/appendNoList") + " .mjx-mrow")
+ .eq(0)
+ .should("have.text", "24,sin(x)");
+
+ cy.get(cesc2("#/functionOfList") + " .mjx-mrow")
+ .eq(0)
+ .should("have.text", "10");
+
+ cy.get(cesc2("#/functionNoList") + " .mjx-mrow")
+ .eq(0)
+ .should("have.text", "24");
+
+ cy.window().then(async (win) => {
+ let stateVariables = await win.returnAllStateVariables1();
+
+ expect(stateVariables["/list"].stateValues.value).eqls([
+ "list",
+ 1,
+ 2,
+ 3,
+ 4,
+ ]);
+
+ expect(stateVariables["/nolist"].stateValues.value).eq(24);
+
+ expect(stateVariables["/tuple"].stateValues.value).eqls([
+ "tuple",
+ 1,
+ 2,
+ 3,
+ 4,
+ ]);
+
+ expect(stateVariables["/nolist2"].stateValues.value).eq(24);
+
+ expect(stateVariables["/doubleTuple"].stateValues.value).eqls([
+ "tuple",
+ 2,
+ 4,
+ 6,
+ 8,
+ ]);
+
+ expect(stateVariables["/doubleNoList"].stateValues.value).eq(48);
+
+ expect(stateVariables["/appendToList"].stateValues.value).eqls([
+ "list",
+ 1,
+ 2,
+ 3,
+ 4,
+ ["apply", "sin", "x"],
+ ]);
+
+ expect(stateVariables["/appendNoList"].stateValues.value).eqls([
+ "list",
+ 24,
+ ["apply", "sin", "x"],
+ ]);
+
+ expect(stateVariables["/functionOfList"].stateValues.value).eq(10);
+
+ expect(stateVariables["/functionNoList"].stateValues.value).eq(24);
+ });
+ });
+
+ it("aslist inside math, map", () => {
+ cy.window().then(async (win) => {
+ win.postMessage(
+ {
+ doenetML: `
+
+
+
+
+ $v^2
+
+ x
+
+
+
+
+ $map
+ $map{asList="false"}
+ ($map)
+ ($map{asList="false"})
+ 2$map
+ 2$map{asList="false"}
+
+ `,
+ },
+ "*",
+ );
+ });
+
+ cy.get(cesc2("#/list") + " .mjx-mrow")
+ .eq(0)
+ .should("have.text", "x,4x,9x");
+
+ cy.get(cesc2("#/nolist") + " .mjx-mrow")
+ .eq(0)
+ .should("have.text", "36x3");
+
+ cy.get(cesc2("#/tuple") + " .mjx-mrow")
+ .eq(0)
+ .should("have.text", "(x,4x,9x)");
+
+ cy.get(cesc2("#/nolist2") + " .mjx-mrow")
+ .eq(0)
+ .should("have.text", "36x3");
+
+ cy.get(cesc2("#/doubleTuple") + " .mjx-mrow")
+ .eq(0)
+ .should("have.text", "(2x,8x,18x)");
+
+ cy.get(cesc2("#/doubleNoList") + " .mjx-mrow")
+ .eq(0)
+ .should("have.text", "72x3");
+
+ cy.window().then(async (win) => {
+ let stateVariables = await win.returnAllStateVariables1();
+
+ expect(stateVariables["/list"].stateValues.value).eqls([
+ "list",
+ "x",
+ ["*", 4, "x"],
+ ["*", 9, "x"],
+ ]);
+
+ expect(stateVariables["/nolist"].stateValues.value).eqls([
+ "*",
+ 36,
+ ["^", "x", 3],
+ ]);
+
+ expect(stateVariables["/tuple"].stateValues.value).eqls([
+ "tuple",
+ "x",
+ ["*", 4, "x"],
+ ["*", 9, "x"],
+ ]);
+
+ expect(stateVariables["/nolist2"].stateValues.value).eqls([
+ "*",
+ 36,
+ ["^", "x", 3],
+ ]);
+
+ expect(stateVariables["/doubleTuple"].stateValues.value).eqls([
+ "tuple",
+ ["*", 2, "x"],
+ ["*", 8, "x"],
+ ["*", 18, "x"],
+ ]);
+
+ expect(stateVariables["/doubleNoList"].stateValues.value).eqls([
+ "*",
+ 72,
+ ["^", "x", 3],
]);
});
});
@@ -4479,20 +4782,20 @@ describe("Math Tag Tests", function () {
doenetML: `
a
2,3
- 2,3
- 2,3 2,3
2,3
-
-
-
`,
},
@@ -4646,7 +4949,7 @@ describe("Math Tag Tests", function () {
1
`,
},
@@ -4693,7 +4996,7 @@ describe("Math Tag Tests", function () {
(2$n+1,1)
`,
},
@@ -4756,7 +5059,7 @@ describe("Math Tag Tests", function () {
`,
},
diff --git a/cypress/e2e/DoenetML/tagSpecific/mathdisplay.cy.js b/cypress/e2e/DoenetML/tagSpecific/mathdisplay.cy.js
index f048027b2c..b666e4b56f 100644
--- a/cypress/e2e/DoenetML/tagSpecific/mathdisplay.cy.js
+++ b/cypress/e2e/DoenetML/tagSpecific/mathdisplay.cy.js
@@ -55,7 +55,7 @@ describe("Math Display Tag Tests", function () {
We have equation
- From copying properties:
+ From copying properties: $e1.equationTag{assignNames="te1"}, $e2.equationTag{assignNames="te2"}, and $e3.equationTag{assignNames="te3"}.
n6:
z:
-
n6:
z:
-
n6:
z:
-
+
`;
cy.get("#testRunner_toggleControls").click();
@@ -2311,7 +2311,7 @@ describe("MathInput Tag Tests", function () {
+
`;
cy.get("#testRunner_toggleControls").click();
@@ -9264,7 +9264,7 @@ describe("MathInput Tag Tests", function () {
doenetML: `
a
a:
- a2:
+ a2: $a.value{assignNames="a2"}
a3:
`,
},
@@ -9310,7 +9310,7 @@ describe("MathInput Tag Tests", function () {
doenetML: `
a
a:
- a2:
+ a2: $a.value{assignNames="a2"}
a3:
`,
},
@@ -9879,7 +9879,7 @@ describe("MathInput Tag Tests", function () {
doenetML: `
a
a:
- a2:
+ a2: $a.value{assignNames="a2"}
a3: $a
`,
},
@@ -10092,7 +10092,7 @@ describe("MathInput Tag Tests", function () {
doenetML: `
a
a:
- a2:
+ a2: $a.value{assignNames="a2"}
a3: $a
`,
},
@@ -11201,13 +11201,13 @@ describe("MathInput Tag Tests", function () {
@@ -11219,14 +11219,14 @@ describe("MathInput Tag Tests", function () {
@@ -11238,14 +11238,14 @@ describe("MathInput Tag Tests", function () {
@@ -12886,7 +12886,7 @@ describe("MathInput Tag Tests", function () {
doenetML: `
a
- Value:
+ Value: $mi.value{assignNames="m"}
Prefill:
Change prefill:
`,
@@ -13032,7 +13032,7 @@ describe("MathInput Tag Tests", function () {
doenetML: `
a
n:
- Value of n:
+ Value of n: $n.value{assignNames="n2"}
`,
},
"*",
@@ -13066,7 +13066,7 @@ describe("MathInput Tag Tests", function () {
a
c:
- c2:
+ c2: $c.value{assignNames="c2"}
d:
`,
@@ -13117,8 +13117,8 @@ describe("MathInput Tag Tests", function () {
doenetML: `
a
- Value:
- Immediate Value:
+ Value: $mi.value{assignNames="mv"}
+ Immediate Value: $mi.immediateValue{assignNames="miv"}
`,
},
"*",
@@ -13424,8 +13424,8 @@ describe("MathInput Tag Tests", function () {
doenetML: `
a
- Value:
- Immediate Value:
+ Value: $mi.value{assignNames="mv"}
+ Immediate Value: $mi.immediateValue{assignNames="miv"}
`,
},
"*",
@@ -13740,8 +13740,8 @@ describe("MathInput Tag Tests", function () {
doenetML: `
a
- Value:
- Immediate Value:
+ Value: $mi.value{assignNames="mv"}
+ Immediate Value: $mi.immediateValue{assignNames="miv"}
`,
},
"*",
@@ -14057,8 +14057,8 @@ describe("MathInput Tag Tests", function () {
- Value:
- Immediate Value:
+ Value: $mi.value{assignNames="mv"}
+ Immediate Value: $mi.immediateValue{assignNames="miv"}
`,
},
"*",
diff --git a/cypress/e2e/DoenetML/tagSpecific/mathinputgraph.cy.js b/cypress/e2e/DoenetML/tagSpecific/mathinputgraph.cy.js
index 38645aa54f..218e765aa5 100644
--- a/cypress/e2e/DoenetML/tagSpecific/mathinputgraph.cy.js
+++ b/cypress/e2e/DoenetML/tagSpecific/mathinputgraph.cy.js
@@ -19,7 +19,7 @@ describe("MathInput Graph Tests", function () {
- (
+ ($x.value,$y.value)
- (
+ ($x.value^2,$y.value)
- (
+ ($a.value$b.value, -7)
- (
+ ($a.value
7
11
-
+ $_point1.xs{assignNames="x1 x2 x3 x4 x5 x6 x7 x8 x9 x10 x11"}
`,
},
"*",
@@ -1145,18 +1145,18 @@ describe("MathList Tag Tests", function () {
a
q r
-
- u v
-
-
a
a b c d e
-
-
+ $ml1{maxNumber="3" name="ml2"}
+ $ml2{maxNumber="" name="ml3"}
a b c d e
-
-
+ $ml4{maxNumber="4" name="ml5"}
+ $ml5{maxNumber="" name="ml6"}
`,
},
@@ -1702,7 +1702,7 @@ describe("MathList Tag Tests", function () {
doenetML: `
a
x y z u v
-
+ $ml1{maxNumber="$mn2" name="ml2"}
Maximum number 1:
Maximum number 2:
@@ -2172,8 +2172,8 @@ describe("MathList Tag Tests", function () {
Merge math lists:
- Third math:
- Fifth math:
+ Third math: $_mathlist1.math3
+ Fifth math: $_mathlist1.math5
Change values:
a,b,c,d,e
-
Third math:
- Fifth math:
+ Third math: $_mathlist1.math3
+ Fifth math: $_mathlist1.math5
Change values:
a
a b c
-
+ $_mathlist1{name="mathlist1a" hide="false"}
x
- y
-
-
+ $_mathlist2{name="mathlist3" maxNumber="6"}
`,
},
@@ -3580,22 +3580,14 @@ describe("MathList Tag Tests", function () {
cy.log("Test internal values are set to the correct values");
cy.window().then(async (win) => {
let stateVariables = await win.returnAllStateVariables1();
- let mathlist1a =
- stateVariables[
- stateVariables["/mathlist1a"].replacements[0].componentName
- ];
- let mathlist3 =
- stateVariables[
- stateVariables["/mathlist3"].replacements[0].componentName
- ];
expect(stateVariables["/_mathlist1"].stateValues.maths.length).eq(3);
expect(stateVariables["/_mathlist1"].stateValues.maths[0]).eq("a");
expect(stateVariables["/_mathlist1"].stateValues.maths[1]).eq("b");
expect(stateVariables["/_mathlist1"].stateValues.maths[2]).eq("c");
- expect((await mathlist1a.stateValues.maths).length).eq(3);
- expect((await mathlist1a.stateValues.maths)[0]).eq("a");
- expect((await mathlist1a.stateValues.maths)[1]).eq("b");
- expect((await mathlist1a.stateValues.maths)[2]).eq("c");
+ expect(stateVariables["/mathlist1a"].stateValues.maths.length).eq(3);
+ expect(stateVariables["/mathlist1a"].stateValues.maths[0]).eq("a");
+ expect(stateVariables["/mathlist1a"].stateValues.maths[1]).eq("b");
+ expect(stateVariables["/mathlist1a"].stateValues.maths[2]).eq("c");
expect(stateVariables["/_mathlist2"].stateValues.maths.length).eq(8);
expect(stateVariables["/_mathlist2"].stateValues.maths[0]).eq("x");
expect(stateVariables["/_mathlist2"].stateValues.maths[1]).eq("a");
@@ -3605,13 +3597,13 @@ describe("MathList Tag Tests", function () {
expect(stateVariables["/_mathlist2"].stateValues.maths[5]).eq("a");
expect(stateVariables["/_mathlist2"].stateValues.maths[6]).eq("b");
expect(stateVariables["/_mathlist2"].stateValues.maths[7]).eq("c");
- expect((await mathlist3.stateValues.maths).length).eq(6);
- expect((await mathlist3.stateValues.maths)[0]).eq("x");
- expect((await mathlist3.stateValues.maths)[1]).eq("a");
- expect((await mathlist3.stateValues.maths)[2]).eq("b");
- expect((await mathlist3.stateValues.maths)[3]).eq("c");
- expect((await mathlist3.stateValues.maths)[4]).eq("y");
- expect((await mathlist3.stateValues.maths)[5]).eq("a");
+ expect(stateVariables["/mathlist3"].stateValues.maths.length).eq(6);
+ expect(stateVariables["/mathlist3"].stateValues.maths[0]).eq("x");
+ expect(stateVariables["/mathlist3"].stateValues.maths[1]).eq("a");
+ expect(stateVariables["/mathlist3"].stateValues.maths[2]).eq("b");
+ expect(stateVariables["/mathlist3"].stateValues.maths[3]).eq("c");
+ expect(stateVariables["/mathlist3"].stateValues.maths[4]).eq("y");
+ expect(stateVariables["/mathlist3"].stateValues.maths[5]).eq("a");
});
});
@@ -3846,12 +3838,12 @@ describe("MathList Tag Tests", function () {
-
-
-
-
-
-
+ $_mathlist1.maths{assignNames="m1_1 m1_2 m1_3 m1_4 m1_5"}
+ $_mathlist2.maths{assignNames="m2_1 m2_2 m2_3 m2_4 m2_5"}
+ $_mathlist3.maths{assignNames="m3_1 m3_2 m3_3 m3_4 m3_5"}
+ $_mathlist4.maths{assignNames="m4_1 m4_2 m4_3 m4_4 m4_5"}
+ $_mathlist5.maths{assignNames="m5_1 m5_2 m5_3 m5_4 m5_5"}
+ $_mathlist6.maths{assignNames="m6_1 m6_2 m6_3 m6_4 m6_5"}
@@ -3860,12 +3852,12 @@ describe("MathList Tag Tests", function () {
-
-
-
-
-
-
+ $_mathlist1.maths{assignNames="m1_1a m1_2a m1_3a m1_4a m1_5a" link="false"}
+ $_mathlist2.maths{assignNames="m2_1a m2_2a m2_3a m2_4a m2_5a" link="false"}
+ $_mathlist3.maths{assignNames="m3_1a m3_2a m3_3a m3_4a m3_5a" link="false"}
+ $_mathlist4.maths{assignNames="m4_1a m4_2a m4_3a m4_4a m4_5a" link="false"}
+ $_mathlist5.maths{assignNames="m5_1a m5_2a m5_3a m5_4a m5_5a" link="false"}
+ $_mathlist6.maths{assignNames="m6_1a m6_2a m6_3a m6_4a m6_5a" link="false"}
`,
},
diff --git a/cypress/e2e/DoenetML/tagSpecific/mathoperators.cy.js b/cypress/e2e/DoenetML/tagSpecific/mathoperators.cy.js
index 7263947206..3f0c75f4ea 100644
--- a/cypress/e2e/DoenetML/tagSpecific/mathoperators.cy.js
+++ b/cypress/e2e/DoenetML/tagSpecific/mathoperators.cy.js
@@ -1,6 +1,4 @@
import me from "math-expressions";
-import { isStrictMode } from "react-is";
-import { isStyledComponent } from "styled-components";
import { cesc, cesc2 } from "../../../../src/_utils/url";
describe("Math Operator Tag Tests", function () {
@@ -28,8 +26,8 @@ describe("Math Operator Tag Tests", function () {
x x+y x+y+z x x+y x+y+z x x+y x+y+z a
-
+
3
17
5-4
@@ -1088,8 +1080,8 @@ describe("Math Operator Tag Tests", function () {
x x+y x+y+z x x+y x+y+z x x+y x+y+z x x+y x+y+z x x+y x+y+z x x+y x+y+z a
-
+
3
17
5-4
@@ -2421,8 +2401,8 @@ describe("Math Operator Tag Tests", function () {
x x+y x+y+z x x+y x+y+z x x+y x+y+z -12$a
3$a
- -12$a
3$a
- (6,7)
(
- ,
-
)
- (
+ ($_point2.y, $_point2.x)
- exp(20) pi (1,2,3,2,1)
1,2,3,2,1
-
-
-
+ $_math1
+ $_math2
+ $_math3
-
-
-
+ $_convertsettolist1{name="r1"}
+ $_convertsettolist2{name="r2"}
+ $_convertsettolist3{name="r3"}
`,
@@ -3894,15 +3833,6 @@ describe("Math Operator Tag Tests", function () {
cy.window().then(async (win) => {
let stateVariables = await win.returnAllStateVariables1();
- let replacement1Name =
- stateVariables["/r1"].replacements[0].componentName;
- let replacement1Anchor = cesc2("#" + replacement1Name);
- let replacement2Name =
- stateVariables["/r2"].replacements[0].componentName;
- let replacement2Anchor = cesc2("#" + replacement2Name);
- let replacement3Name =
- stateVariables["/r3"].replacements[0].componentName;
- let replacement3Anchor = cesc2("#" + replacement3Name);
cy.get(cesc("#\\/_math1"))
.find(".mjx-mrow")
@@ -3946,21 +3876,21 @@ describe("Math Operator Tag Tests", function () {
.then((text) => {
expect(text.trim()).equal("1,2,3,2,1");
});
- cy.get(replacement1Anchor)
+ cy.get(cesc("#\\/r1"))
.find(".mjx-mrow")
.eq(0)
.invoke("text")
.then((text) => {
expect(text.trim()).equal("1,2,3");
});
- cy.get(replacement2Anchor)
+ cy.get(cesc("#\\/r2"))
.find(".mjx-mrow")
.eq(0)
.invoke("text")
.then((text) => {
expect(text.trim()).equal("(1,2,3,2,1)");
});
- cy.get(replacement3Anchor)
+ cy.get(cesc("#\\/r3"))
.find(".mjx-mrow")
.eq(0)
.invoke("text")
@@ -4015,13 +3945,8 @@ describe("Math Operator Tag Tests", function () {
2,
1,
]);
- expect(stateVariables[replacement1Name].stateValues.value).eqls([
- "list",
- 1,
- 2,
- 3,
- ]);
- expect(stateVariables[replacement2Name].stateValues.value).eqls([
+ expect(stateVariables["/r1"].stateValues.value).eqls(["list", 1, 2, 3]);
+ expect(stateVariables["/r2"].stateValues.value).eqls([
"tuple",
1,
2,
@@ -4029,7 +3954,7 @@ describe("Math Operator Tag Tests", function () {
2,
1,
]);
- expect(stateVariables[replacement3Name].stateValues.value).eqls([
+ expect(stateVariables["/r3"].stateValues.value).eqls([
"list",
1,
2,
@@ -4046,9 +3971,9 @@ describe("Math Operator Tag Tests", function () {
expect(stateVariables["/_convertsettolist3"].stateValues.unordered).eq(
true,
);
- expect(stateVariables[replacement1Name].stateValues.unordered).eq(true);
- expect(stateVariables[replacement2Name].stateValues.unordered).eq(true);
- expect(stateVariables[replacement3Name].stateValues.unordered).eq(true);
+ expect(stateVariables["/r1"].stateValues.unordered).eq(true);
+ expect(stateVariables["/r2"].stateValues.unordered).eq(true);
+ expect(stateVariables["/r3"].stateValues.unordered).eq(true);
});
});
});
@@ -4065,14 +3990,14 @@ describe("Math Operator Tag Tests", function () {
{
-
+ {$m,$n,$p,$m}
+ $_convertsettolist1{name="csl2"}
-
$n3{name="n2"}
+ $num1{name="n"}
+ $n2+$num2
+ $n3+$num3
+ $num3{name="n3"}
1
`,
},
@@ -4091,17 +4016,11 @@ describe("Math Operator Tag Tests", function () {
3,
p,
]);
- expect(
- stateVariables[stateVariables["/csl2"].replacements[0].componentName]
- .stateValues.value,
- ).eqls(["list", 7, 3, p]);
+ expect(stateVariables["/csl2"].stateValues.value).eqls(["list", 7, 3, p]);
expect(stateVariables["/_convertsettolist1"].stateValues.unordered).eq(
true,
);
- expect(
- stateVariables[stateVariables["/csl2"].replacements[0].componentName]
- .stateValues.unordered,
- ).eq(true);
+ expect(stateVariables["/csl2"].stateValues.unordered).eq(true);
});
});
@@ -4114,16 +4033,16 @@ describe("Math Operator Tag Tests", function () {
55.3252326
log(31)
- $_floor1/$_ceil1
+ $_ceil1/$_floor1
Allow for slight roundoff error:
3.999999999999999
-6999.999999999999
- 2.1x
-3.2y
@@ -4138,12 +4057,6 @@ describe("Math Operator Tag Tests", function () {
cy.window().then(async (win) => {
let stateVariables = await win.returnAllStateVariables1();
- let replacement1Name =
- stateVariables["/f2a"].replacements[0].componentName;
- let replacement1Anchor = cesc2("#" + replacement1Name);
- let replacement2Name =
- stateVariables["/c2a"].replacements[0].componentName;
- let replacement2Anchor = cesc2("#" + replacement2Name);
cy.get(cesc("#\\/_floor1"))
.find(".mjx-mrow")
@@ -4187,14 +4100,14 @@ describe("Math Operator Tag Tests", function () {
.then((text) => {
expect(text.trim()).equal("−7000");
});
- cy.get(replacement1Anchor)
+ cy.get(cesc("#\\/f2a"))
.find(".mjx-mrow")
.eq(0)
.invoke("text")
.then((text) => {
expect(text.trim()).equal("13");
});
- cy.get(replacement2Anchor)
+ cy.get(cesc("#\\/c2a"))
.find(".mjx-mrow")
.eq(0)
.invoke("text")
@@ -4223,8 +4136,8 @@ describe("Math Operator Tag Tests", function () {
expect(stateVariables["/_ceil2"].stateValues.value).eq(1);
expect(stateVariables["/_floor3"].stateValues.value).eq(4);
expect(stateVariables["/_ceil3"].stateValues.value).eq(-7000);
- expect(stateVariables[replacement1Name].stateValues.value).eq(13);
- expect(stateVariables[replacement2Name].stateValues.value).eq(1);
+ expect(stateVariables["/f2a"].stateValues.value).eq(13);
+ expect(stateVariables["/c2a"].stateValues.value).eq(1);
expect(stateVariables["/_floor4"].stateValues.value).eqls([
"apply",
"floor",
@@ -4474,7 +4387,7 @@ describe("Math Operator Tag Tests", function () {
a
-9
(
- ,
-
)
- (
+ ($_point2.y , $_point1.x )
- x x+y x+y+z x x+y x+y+z x x+y x+y+z a
-
+
3
17
5-4
@@ -5942,12 +5849,12 @@ describe("Math Operator Tag Tests", function () {
doenetML: `
a
Mean of first primes: 2 3 5 7
- Copying that mean:
- Copying that mean: $meanPrime{name="meanPrimeb"}
+ $pPrime{name="pPrimeb"}
Mean of numbers from 1 to 100:
- Copying that mean:
- Copying that mean: $mean100{name="mean100b"}
+ $p100{name="p100b"}
`,
},
"*",
@@ -5958,18 +5865,6 @@ describe("Math Operator Tag Tests", function () {
cy.window().then(async (win) => {
let stateVariables = await win.returnAllStateVariables1();
- let mean2Anchor = cesc2(
- "#" + stateVariables["/_copy1"].replacements[0].componentName,
- );
- let mean3Anchor = cesc2(
- "#" + stateVariables["/_copy2"].replacements[0].componentName,
- );
- let mean5Anchor = cesc2(
- "#" + stateVariables["/_copy3"].replacements[0].componentName,
- );
- let mean6Anchor = cesc2(
- "#" + stateVariables["/_copy4"].replacements[0].componentName,
- );
cy.log("Test value displayed in browser");
@@ -5980,14 +5875,14 @@ describe("Math Operator Tag Tests", function () {
.then((text) => {
expect(text.trim()).equal("4.25");
});
- cy.get(mean2Anchor)
+ cy.get(cesc("#\\/meanPrimeb"))
.find(".mjx-mrow")
.eq(0)
.invoke("text")
.then((text) => {
expect(text.trim()).equal("4.25");
});
- cy.get(mean3Anchor)
+ cy.get(cesc("#\\/pPrimeb"))
.find(".mjx-mrow")
.eq(0)
.invoke("text")
@@ -6001,14 +5896,14 @@ describe("Math Operator Tag Tests", function () {
.then((text) => {
expect(text.trim()).equal("50.5");
});
- cy.get(mean5Anchor)
+ cy.get(cesc("#\\/mean100b"))
.find(".mjx-mrow")
.eq(0)
.invoke("text")
.then((text) => {
expect(text.trim()).equal("50.5");
});
- cy.get(mean6Anchor)
+ cy.get(cesc("#\\/p100b"))
.find(".mjx-mrow")
.eq(0)
.invoke("text")
@@ -6019,29 +5914,17 @@ describe("Math Operator Tag Tests", function () {
cy.log("Test internal values are set to the correct values");
cy.window().then(async (win) => {
expect(stateVariables["/meanPrime"].stateValues.value).eq(4.25);
+ expect(stateVariables["/meanPrimeb"].stateValues.value).eq(4.25);
expect(
stateVariables[
- stateVariables["/_copy1"].replacements[0].componentName
- ].stateValues.value,
- ).eq(4.25);
- expect(
- stateVariables[
- stateVariables[
- stateVariables["/_copy2"].replacements[0].componentName
- ].activeChildren[1].componentName
+ stateVariables["/pPrimeb"].activeChildren[1].componentName
].stateValues.value,
).eq(4.25);
expect(stateVariables["/mean100"].stateValues.value).eq(50.5);
+ expect(stateVariables["/mean100b"].stateValues.value).eq(50.5);
expect(
stateVariables[
- stateVariables["/_copy3"].replacements[0].componentName
- ].stateValues.value,
- ).eq(50.5);
- expect(
- stateVariables[
- stateVariables[
- stateVariables["/_copy4"].replacements[0].componentName
- ].activeChildren[1].componentName
+ stateVariables["/p100b"].activeChildren[1].componentName
].stateValues.value,
).eq(50.5);
});
@@ -6101,8 +5984,8 @@ describe("Math Operator Tag Tests", function () {
x x+y x+y+z x x+y x+y+z x x+y x+y+z a
-
+
3
17
5-4
@@ -7088,12 +6963,12 @@ describe("Math Operator Tag Tests", function () {
doenetML: `
a
Variance of first primes: 2 3 5 7
- Copying that variance:
- Copying that variance: $variancePrime{name="variancePrimeb"}
+ $pPrime{name="pPrimeb"}
Variance of numbers from 1 to 100:
- Copying that variance:
- Copying that variance: $variance100{name="variance100b"}
+ $p100{name="p100b"}
`,
},
"*",
@@ -7102,107 +6977,84 @@ describe("Math Operator Tag Tests", function () {
cy.get(cesc("#\\/_text1")).should("have.text", "a"); // to wait until loaded
+ let variancePrimes = me.math.variance(2, 3, 5, 7);
+ let variance100 = me.math.variance(
+ Array.from({ length: 100 }, (_, i) => i + 1),
+ );
+
+ cy.log("Test value displayed in browser");
+
+ cy.get(cesc("#\\/variancePrime"))
+ .find(".mjx-mrow")
+ .eq(0)
+ .invoke("text")
+ .then((text) => {
+ expect(Number(text)).closeTo(variancePrimes, 1e-6);
+ });
+ cy.get(cesc("#\\/variancePrimeb"))
+ .find(".mjx-mrow")
+ .eq(0)
+ .invoke("text")
+ .then((text) => {
+ expect(Number(text)).closeTo(variancePrimes, 1e-6);
+ });
+ cy.get(cesc("#\\/pPrimeb"))
+ .find(".mjx-mrow")
+ .eq(0)
+ .invoke("text")
+ .then((text) => {
+ expect(Number(text)).closeTo(variancePrimes, 1e-6);
+ });
+ cy.get(cesc("#\\/variance100"))
+ .find(".mjx-mrow")
+ .eq(0)
+ .invoke("text")
+ .then((text) => {
+ expect(Number(text)).closeTo(variance100, 1e-6);
+ });
+ cy.get(cesc("#\\/variance100b"))
+ .find(".mjx-mrow")
+ .eq(0)
+ .invoke("text")
+ .then((text) => {
+ expect(Number(text)).closeTo(variance100, 1e-6);
+ });
+ cy.get(cesc("#\\/p100b"))
+ .find(".mjx-mrow")
+ .eq(0)
+ .invoke("text")
+ .then((text) => {
+ expect(Number(text)).closeTo(variance100, 1e-6);
+ });
+
+ cy.log("Test internal values are set to the correct values");
cy.window().then(async (win) => {
let stateVariables = await win.returnAllStateVariables1();
- let variance2Anchor = cesc2(
- "#" + stateVariables["/_copy1"].replacements[0].componentName,
+ expect(stateVariables["/variancePrime"].stateValues.value).closeTo(
+ variancePrimes,
+ 1e-12,
);
- let variance3Anchor = cesc2(
- "#" + stateVariables["/_copy2"].replacements[0].componentName,
+ expect(stateVariables["/variancePrimeb"].stateValues.value).closeTo(
+ variancePrimes,
+ 1e-12,
);
- let variance5Anchor = cesc2(
- "#" + stateVariables["/_copy3"].replacements[0].componentName,
- );
- let variance6Anchor = cesc2(
- "#" + stateVariables["/_copy4"].replacements[0].componentName,
+ expect(
+ stateVariables[
+ stateVariables["/pPrimeb"].activeChildren[1].componentName
+ ].stateValues.value,
+ ).closeTo(variancePrimes, 1e-12);
+ expect(stateVariables["/variance100"].stateValues.value).closeTo(
+ variance100,
+ 1e-12,
);
-
- let variancePrimes = me.math.variance(2, 3, 5, 7);
- let variance100 = me.math.variance(
- Array.from({ length: 100 }, (_, i) => i + 1),
+ expect(stateVariables["/variance100b"].stateValues.value).closeTo(
+ variance100,
+ 1e-12,
);
-
- cy.log("Test value displayed in browser");
-
- cy.get(cesc("#\\/variancePrime"))
- .find(".mjx-mrow")
- .eq(0)
- .invoke("text")
- .then((text) => {
- expect(Number(text)).closeTo(variancePrimes, 1e-6);
- });
- cy.get(variance2Anchor)
- .find(".mjx-mrow")
- .eq(0)
- .invoke("text")
- .then((text) => {
- expect(Number(text)).closeTo(variancePrimes, 1e-6);
- });
- cy.get(variance3Anchor)
- .find(".mjx-mrow")
- .eq(0)
- .invoke("text")
- .then((text) => {
- expect(Number(text)).closeTo(variancePrimes, 1e-6);
- });
- cy.get(cesc("#\\/variance100"))
- .find(".mjx-mrow")
- .eq(0)
- .invoke("text")
- .then((text) => {
- expect(Number(text)).closeTo(variance100, 1e-6);
- });
- cy.get(variance5Anchor)
- .find(".mjx-mrow")
- .eq(0)
- .invoke("text")
- .then((text) => {
- expect(Number(text)).closeTo(variance100, 1e-6);
- });
- cy.get(variance6Anchor)
- .find(".mjx-mrow")
- .eq(0)
- .invoke("text")
- .then((text) => {
- expect(Number(text)).closeTo(variance100, 1e-6);
- });
-
- cy.log("Test internal values are set to the correct values");
- cy.window().then(async (win) => {
- let stateVariables = await win.returnAllStateVariables1();
- expect(stateVariables["/variancePrime"].stateValues.value).closeTo(
- variancePrimes,
- 1e-12,
- );
- expect(
- stateVariables[
- stateVariables["/_copy1"].replacements[0].componentName
- ].stateValues.value,
- ).closeTo(variancePrimes, 1e-12);
- expect(
- stateVariables[
- stateVariables[
- stateVariables["/_copy2"].replacements[0].componentName
- ].activeChildren[1].componentName
- ].stateValues.value,
- ).closeTo(variancePrimes, 1e-12);
- expect(stateVariables["/variance100"].stateValues.value).closeTo(
- variance100,
- 1e-12,
- );
- expect(
- stateVariables[
- stateVariables["/_copy3"].replacements[0].componentName
- ].stateValues.value,
- ).closeTo(variance100, 1e-12);
- expect(
- stateVariables[
- stateVariables[
- stateVariables["/_copy4"].replacements[0].componentName
- ].activeChildren[1].componentName
- ].stateValues.value,
- ).closeTo(variance100, 1e-12);
- });
+ expect(
+ stateVariables[stateVariables["/p100b"].activeChildren[1].componentName]
+ .stateValues.value,
+ ).closeTo(variance100, 1e-12);
});
});
@@ -7226,8 +7078,8 @@ describe("Math Operator Tag Tests", function () {
x x+y x+y+z x x+y x+y+z x x+y x+y+z a
Variance of first primes: 2 3 5 7
- Copying that variance:
- Copying that variance: $variancePrime{name="variancePrimeb"}
+ $pPrime{name="pPrimeb"}
Variance of numbers from 1 to 100:
- Copying that variance:
- Copying that variance: $variance100{name="variance100b"}
+ $p100{name="p100b"}
`,
},
"*",
@@ -7506,110 +7350,87 @@ describe("Math Operator Tag Tests", function () {
cy.get(cesc("#\\/_text1")).should("have.text", "a"); // to wait until loaded
+ let variancePrimes = me.math.variance([2, 3, 5, 7], "uncorrected");
+ let variance100 = me.math.variance(
+ Array.from({ length: 100 }, (_, i) => i + 1),
+ "uncorrected",
+ );
+
+ cy.log("Test value displayed in browser");
+
+ cy.get(cesc("#\\/variancePrime"))
+ .find(".mjx-mrow")
+ .eq(0)
+ .invoke("text")
+ .then((text) => {
+ expect(Number(text)).closeTo(variancePrimes, 1e-6);
+ });
+ cy.get(cesc("#\\/variancePrimeb"))
+ .find(".mjx-mrow")
+ .eq(0)
+ .invoke("text")
+ .then((text) => {
+ expect(Number(text)).closeTo(variancePrimes, 1e-6);
+ });
+ cy.get(cesc("#\\/pPrimeb"))
+ .find(".mjx-mrow")
+ .eq(0)
+ .invoke("text")
+ .then((text) => {
+ expect(Number(text)).closeTo(variancePrimes, 1e-6);
+ });
+ cy.get(cesc("#\\/variance100"))
+ .find(".mjx-mrow")
+ .eq(0)
+ .invoke("text")
+ .then((text) => {
+ expect(Number(text)).closeTo(variance100, 1e-6);
+ });
+ cy.get(cesc("#\\/variance100b"))
+ .find(".mjx-mrow")
+ .eq(0)
+ .invoke("text")
+ .then((text) => {
+ expect(Number(text)).closeTo(variance100, 1e-6);
+ });
+ cy.get(cesc("#\\/p100b"))
+ .find(".mjx-mrow")
+ .eq(0)
+ .invoke("text")
+ .then((text) => {
+ expect(Number(text)).closeTo(variance100, 1e-6);
+ });
+
+ cy.log("Test internal values are set to the correct values");
cy.window().then(async (win) => {
let stateVariables = await win.returnAllStateVariables1();
- let variance2Anchor = cesc2(
- "#" + stateVariables["/_copy1"].replacements[0].componentName,
- );
- let variance3Anchor = cesc2(
- "#" + stateVariables["/_copy2"].replacements[0].componentName,
+ expect(stateVariables["/variancePrime"].stateValues.value).closeTo(
+ variancePrimes,
+ 1e-12,
);
- let variance5Anchor = cesc2(
- "#" + stateVariables["/_copy3"].replacements[0].componentName,
+ expect(stateVariables["/variancePrimeb"].stateValues.value).closeTo(
+ variancePrimes,
+ 1e-12,
);
- let variance6Anchor = cesc2(
- "#" + stateVariables["/_copy4"].replacements[0].componentName,
+ expect(
+ stateVariables[
+ stateVariables["/pPrimeb"].activeChildren[1].componentName
+ ].stateValues.value,
+ ).closeTo(variancePrimes, 1e-12);
+ expect(stateVariables["/variance100"].stateValues.value).closeTo(
+ variance100,
+ 1e-12,
);
-
- let variancePrimes = me.math.variance([2, 3, 5, 7], "uncorrected");
- let variance100 = me.math.variance(
- Array.from({ length: 100 }, (_, i) => i + 1),
- "uncorrected",
+ expect(stateVariables["/variance100b"].stateValues.value).closeTo(
+ variance100,
+ 1e-12,
);
-
- cy.log("Test value displayed in browser");
-
- cy.get(cesc("#\\/variancePrime"))
- .find(".mjx-mrow")
- .eq(0)
- .invoke("text")
- .then((text) => {
- expect(Number(text)).closeTo(variancePrimes, 1e-6);
- });
- cy.get(variance2Anchor)
- .find(".mjx-mrow")
- .eq(0)
- .invoke("text")
- .then((text) => {
- expect(Number(text)).closeTo(variancePrimes, 1e-6);
- });
- cy.get(variance3Anchor)
- .find(".mjx-mrow")
- .eq(0)
- .invoke("text")
- .then((text) => {
- expect(Number(text)).closeTo(variancePrimes, 1e-6);
- });
- cy.get(cesc("#\\/variance100"))
- .find(".mjx-mrow")
- .eq(0)
- .invoke("text")
- .then((text) => {
- expect(Number(text)).closeTo(variance100, 1e-6);
- });
- cy.get(variance5Anchor)
- .find(".mjx-mrow")
- .eq(0)
- .invoke("text")
- .then((text) => {
- expect(Number(text)).closeTo(variance100, 1e-6);
- });
- cy.get(variance6Anchor)
- .find(".mjx-mrow")
- .eq(0)
- .invoke("text")
- .then((text) => {
- expect(Number(text)).closeTo(variance100, 1e-6);
- });
-
- cy.log("Test internal values are set to the correct values");
- cy.window().then(async (win) => {
- let stateVariables = await win.returnAllStateVariables1();
- expect(stateVariables["/variancePrime"].stateValues.value).closeTo(
- variancePrimes,
- 1e-12,
- );
- expect(
- stateVariables[
- stateVariables["/_copy1"].replacements[0].componentName
- ].stateValues.value,
- ).closeTo(variancePrimes, 1e-12);
- expect(
- stateVariables[
- stateVariables[
- stateVariables["/_copy2"].replacements[0].componentName
- ].activeChildren[1].componentName
- ].stateValues.value,
- ).closeTo(variancePrimes, 1e-12);
- expect(stateVariables["/variance100"].stateValues.value).closeTo(
- variance100,
- 1e-12,
- );
- expect(
- stateVariables[
- stateVariables["/_copy3"].replacements[0].componentName
- ].stateValues.value,
- ).closeTo(variance100, 1e-12);
- expect(
- stateVariables[
- stateVariables[
- stateVariables["/_copy4"].replacements[0].componentName
- ].activeChildren[1].componentName
- ].stateValues.value,
- ).closeTo(variance100, 1e-12);
- });
- });
- });
+ expect(
+ stateVariables[stateVariables["/p100b"].activeChildren[1].componentName]
+ .stateValues.value,
+ ).closeTo(variance100, 1e-12);
+ });
+ });
// TODO: skipping most checks of ugly expressions for now
it("standard deviation", () => {
@@ -7631,8 +7452,8 @@ describe("Math Operator Tag Tests", function () {
x x+y x+y+z x x+y x+y+z x x+y x+y+z a
-
+
13
25
5-4
@@ -8144,12 +7959,12 @@ describe("Math Operator Tag Tests", function () {
doenetML: `
a
Standard deviation of first primes: 2 3 5 7
- Copying that standard deviation:
- Copying that standard deviation: $standarddeviationPrime{name="standarddeviationPrimeb"}
+ $pPrime{name="pPrimeb"}
Standard deviation of numbers from 1 to 100:
- Copying that standard deviation:
- Copying that standard deviation: $standarddeviation100{name="standarddeviation100b"}
+ $p100{name="p100b"}
`,
},
"*",
@@ -8158,103 +7973,79 @@ describe("Math Operator Tag Tests", function () {
cy.get(cesc("#\\/_text1")).should("have.text", "a"); // to wait until loaded
- cy.window().then(async (win) => {
- let stateVariables = await win.returnAllStateVariables1();
- let std2Anchor = cesc2(
- "#" + stateVariables["/_copy1"].replacements[0].componentName,
- );
- let std3Anchor = cesc2(
- "#" + stateVariables["/_copy2"].replacements[0].componentName,
- );
- let std5Anchor = cesc2(
- "#" + stateVariables["/_copy3"].replacements[0].componentName,
- );
- let std6Anchor = cesc2(
- "#" + stateVariables["/_copy4"].replacements[0].componentName,
- );
-
- let stdPrimes = me.math.std(2, 3, 5, 7);
- let std100 = me.math.std(Array.from({ length: 100 }, (_, i) => i + 1));
+ let stdPrimes = me.math.std(2, 3, 5, 7);
+ let std100 = me.math.std(Array.from({ length: 100 }, (_, i) => i + 1));
- cy.log("Test value displayed in browser");
+ cy.log("Test value displayed in browser");
- cy.get(cesc("#\\/standarddeviationPrime"))
- .find(".mjx-mrow")
- .eq(0)
- .invoke("text")
- .then((text) => {
- expect(Number(text)).closeTo(stdPrimes, 1e-6);
- });
- cy.get(std2Anchor)
- .find(".mjx-mrow")
- .eq(0)
- .invoke("text")
- .then((text) => {
- expect(Number(text)).closeTo(stdPrimes, 1e-6);
- });
- cy.get(std3Anchor)
- .find(".mjx-mrow")
- .eq(0)
- .invoke("text")
- .then((text) => {
- expect(Number(text)).closeTo(stdPrimes, 1e-6);
- });
- cy.get(cesc("#\\/standarddeviation100"))
- .find(".mjx-mrow")
- .eq(0)
- .invoke("text")
- .then((text) => {
- expect(Number(text)).closeTo(std100, 1e-6);
- });
- cy.get(std5Anchor)
- .find(".mjx-mrow")
- .eq(0)
- .invoke("text")
- .then((text) => {
- expect(Number(text)).closeTo(std100, 1e-6);
- });
- cy.get(std6Anchor)
- .find(".mjx-mrow")
- .eq(0)
- .invoke("text")
- .then((text) => {
- expect(Number(text)).closeTo(std100, 1e-6);
- });
-
- cy.log("Test internal values are set to the correct values");
- cy.window().then(async (win) => {
- let stateVariables = await win.returnAllStateVariables1();
- expect(
- stateVariables["/standarddeviationPrime"].stateValues.value,
- ).closeTo(stdPrimes, 1e-12);
- expect(
- stateVariables[
- stateVariables["/_copy1"].replacements[0].componentName
- ].stateValues.value,
- ).closeTo(stdPrimes, 1e-12);
- expect(
- stateVariables[
- stateVariables[
- stateVariables["/_copy2"].replacements[0].componentName
- ].activeChildren[1].componentName
- ].stateValues.value,
- ).closeTo(stdPrimes, 1e-12);
- expect(
- stateVariables["/standarddeviation100"].stateValues.value,
- ).closeTo(std100, 1e-12);
- expect(
- stateVariables[
- stateVariables["/_copy3"].replacements[0].componentName
- ].stateValues.value,
- ).closeTo(std100, 1e-12);
- expect(
- stateVariables[
- stateVariables[
- stateVariables["/_copy4"].replacements[0].componentName
- ].activeChildren[1].componentName
- ].stateValues.value,
- ).closeTo(std100, 1e-12);
+ cy.get(cesc("#\\/standarddeviationPrime"))
+ .find(".mjx-mrow")
+ .eq(0)
+ .invoke("text")
+ .then((text) => {
+ expect(Number(text)).closeTo(stdPrimes, 1e-6);
+ });
+ cy.get(cesc("#\\/standarddeviationPrimeb"))
+ .find(".mjx-mrow")
+ .eq(0)
+ .invoke("text")
+ .then((text) => {
+ expect(Number(text)).closeTo(stdPrimes, 1e-6);
+ });
+ cy.get(cesc("#\\/pPrimeb"))
+ .find(".mjx-mrow")
+ .eq(0)
+ .invoke("text")
+ .then((text) => {
+ expect(Number(text)).closeTo(stdPrimes, 1e-6);
+ });
+ cy.get(cesc("#\\/standarddeviation100"))
+ .find(".mjx-mrow")
+ .eq(0)
+ .invoke("text")
+ .then((text) => {
+ expect(Number(text)).closeTo(std100, 1e-6);
});
+ cy.get(cesc("#\\/standarddeviation100b"))
+ .find(".mjx-mrow")
+ .eq(0)
+ .invoke("text")
+ .then((text) => {
+ expect(Number(text)).closeTo(std100, 1e-6);
+ });
+ cy.get(cesc("#\\/p100b"))
+ .find(".mjx-mrow")
+ .eq(0)
+ .invoke("text")
+ .then((text) => {
+ expect(Number(text)).closeTo(std100, 1e-6);
+ });
+
+ cy.log("Test internal values are set to the correct values");
+ cy.window().then(async (win) => {
+ let stateVariables = await win.returnAllStateVariables1();
+ expect(
+ stateVariables["/standarddeviationPrime"].stateValues.value,
+ ).closeTo(stdPrimes, 1e-12);
+ expect(
+ stateVariables["/standarddeviationPrimeb"].stateValues.value,
+ ).closeTo(stdPrimes, 1e-12);
+ expect(
+ stateVariables[
+ stateVariables["/pPrimeb"].activeChildren[1].componentName
+ ].stateValues.value,
+ ).closeTo(stdPrimes, 1e-12);
+ expect(stateVariables["/standarddeviation100"].stateValues.value).closeTo(
+ std100,
+ 1e-12,
+ );
+ expect(
+ stateVariables["/standarddeviation100b"].stateValues.value,
+ ).closeTo(std100, 1e-12);
+ expect(
+ stateVariables[stateVariables["/p100b"].activeChildren[1].componentName]
+ .stateValues.value,
+ ).closeTo(std100, 1e-12);
});
});
@@ -8278,8 +8069,8 @@ describe("Math Operator Tag Tests", function () {
x x+y x+y+z x x+y x+y+z x x+y x+y+z a
Standard deviation of first primes: 2 3 5 7
- Copying that standard deviation:
- Copying that standard deviation: $standarddeviationPrime{name="standarddeviationPrimeb"}
+ $pPrime{name="pPrimeb"}
Standard deviation of numbers from 1 to 100:
- Copying that standard deviation:
- Copying that standard deviation: $standarddeviation100{name="standarddeviation100b"}
+ $p100{name="p100b"}
`,
},
"*",
@@ -8561,106 +8346,82 @@ describe("Math Operator Tag Tests", function () {
cy.get(cesc("#\\/_text1")).should("have.text", "a"); // to wait until loaded
- cy.window().then(async (win) => {
- let stateVariables = await win.returnAllStateVariables1();
- let std2Anchor = cesc2(
- "#" + stateVariables["/_copy1"].replacements[0].componentName,
- );
- let std3Anchor = cesc2(
- "#" + stateVariables["/_copy2"].replacements[0].componentName,
- );
- let std5Anchor = cesc2(
- "#" + stateVariables["/_copy3"].replacements[0].componentName,
- );
- let std6Anchor = cesc2(
- "#" + stateVariables["/_copy4"].replacements[0].componentName,
- );
+ let stdPrimes = me.math.std([2, 3, 5, 7], "uncorrected");
+ let std100 = me.math.std(
+ Array.from({ length: 100 }, (_, i) => i + 1),
+ "uncorrected",
+ );
- let stdPrimes = me.math.std([2, 3, 5, 7], "uncorrected");
- let std100 = me.math.std(
- Array.from({ length: 100 }, (_, i) => i + 1),
- "uncorrected",
- );
+ cy.log("Test value displayed in browser");
- cy.log("Test value displayed in browser");
-
- cy.get(cesc("#\\/standarddeviationPrime"))
- .find(".mjx-mrow")
- .eq(0)
- .invoke("text")
- .then((text) => {
- expect(Number(text)).closeTo(stdPrimes, 1e-6);
- });
- cy.get(std2Anchor)
- .find(".mjx-mrow")
- .eq(0)
- .invoke("text")
- .then((text) => {
- expect(Number(text)).closeTo(stdPrimes, 1e-6);
- });
- cy.get(std3Anchor)
- .find(".mjx-mrow")
- .eq(0)
- .invoke("text")
- .then((text) => {
- expect(Number(text)).closeTo(stdPrimes, 1e-6);
- });
- cy.get(cesc("#\\/standarddeviation100"))
- .find(".mjx-mrow")
- .eq(0)
- .invoke("text")
- .then((text) => {
- expect(Number(text)).closeTo(std100, 1e-6);
- });
- cy.get(std5Anchor)
- .find(".mjx-mrow")
- .eq(0)
- .invoke("text")
- .then((text) => {
- expect(Number(text)).closeTo(std100, 1e-6);
- });
- cy.get(std6Anchor)
- .find(".mjx-mrow")
- .eq(0)
- .invoke("text")
- .then((text) => {
- expect(Number(text)).closeTo(std100, 1e-6);
- });
-
- cy.log("Test internal values are set to the correct values");
- cy.window().then(async (win) => {
- let stateVariables = await win.returnAllStateVariables1();
- expect(
- stateVariables["/standarddeviationPrime"].stateValues.value,
- ).closeTo(stdPrimes, 1e-12);
- expect(
- stateVariables[
- stateVariables["/_copy1"].replacements[0].componentName
- ].stateValues.value,
- ).closeTo(stdPrimes, 1e-12);
- expect(
- stateVariables[
- stateVariables[
- stateVariables["/_copy2"].replacements[0].componentName
- ].activeChildren[1].componentName
- ].stateValues.value,
- ).closeTo(stdPrimes, 1e-12);
- expect(
- stateVariables["/standarddeviation100"].stateValues.value,
- ).closeTo(std100, 1e-12);
- expect(
- stateVariables[
- stateVariables["/_copy3"].replacements[0].componentName
- ].stateValues.value,
- ).closeTo(std100, 1e-12);
- expect(
- stateVariables[
- stateVariables[
- stateVariables["/_copy4"].replacements[0].componentName
- ].activeChildren[1].componentName
- ].stateValues.value,
- ).closeTo(std100, 1e-12);
+ cy.get(cesc("#\\/standarddeviationPrime"))
+ .find(".mjx-mrow")
+ .eq(0)
+ .invoke("text")
+ .then((text) => {
+ expect(Number(text)).closeTo(stdPrimes, 1e-6);
});
+ cy.get(cesc("#\\/standarddeviationPrimeb"))
+ .find(".mjx-mrow")
+ .eq(0)
+ .invoke("text")
+ .then((text) => {
+ expect(Number(text)).closeTo(stdPrimes, 1e-6);
+ });
+ cy.get(cesc("#\\/pPrimeb"))
+ .find(".mjx-mrow")
+ .eq(0)
+ .invoke("text")
+ .then((text) => {
+ expect(Number(text)).closeTo(stdPrimes, 1e-6);
+ });
+ cy.get(cesc("#\\/standarddeviation100"))
+ .find(".mjx-mrow")
+ .eq(0)
+ .invoke("text")
+ .then((text) => {
+ expect(Number(text)).closeTo(std100, 1e-6);
+ });
+ cy.get(cesc("#\\/standarddeviation100b"))
+ .find(".mjx-mrow")
+ .eq(0)
+ .invoke("text")
+ .then((text) => {
+ expect(Number(text)).closeTo(std100, 1e-6);
+ });
+ cy.get(cesc("#\\/p100b"))
+ .find(".mjx-mrow")
+ .eq(0)
+ .invoke("text")
+ .then((text) => {
+ expect(Number(text)).closeTo(std100, 1e-6);
+ });
+
+ cy.log("Test internal values are set to the correct values");
+ cy.window().then(async (win) => {
+ let stateVariables = await win.returnAllStateVariables1();
+ expect(
+ stateVariables["/standarddeviationPrime"].stateValues.value,
+ ).closeTo(stdPrimes, 1e-12);
+ expect(
+ stateVariables["/standarddeviationPrimeb"].stateValues.value,
+ ).closeTo(stdPrimes, 1e-12);
+ expect(
+ stateVariables[
+ stateVariables["/pPrimeb"].activeChildren[1].componentName
+ ].stateValues.value,
+ ).closeTo(stdPrimes, 1e-12);
+ expect(stateVariables["/standarddeviation100"].stateValues.value).closeTo(
+ std100,
+ 1e-12,
+ );
+ expect(
+ stateVariables["/standarddeviation100b"].stateValues.value,
+ ).closeTo(std100, 1e-12);
+ expect(
+ stateVariables[stateVariables["/p100b"].activeChildren[1].componentName]
+ .stateValues.value,
+ ).closeTo(std100, 1e-12);
});
});
@@ -8683,8 +8444,8 @@ describe("Math Operator Tag Tests", function () {
x x+y x+y+z x x+y x+y+z x x+y x+y+z a
-
+
3
17
5-4
@@ -9651,12 +9404,12 @@ describe("Math Operator Tag Tests", function () {
doenetML: `
a
Count of first primes: 2 3 5 7
- Copying that count:
- Copying that count: $countPrime{name="countPrimeb"}
+ $pPrime{name="pPrimeb"}
Count of numbers from 1 to 100:
- Copying that count:
- Copying that count: $count100{name="count100b"}
+ $p100{name="p100b"}
`,
},
"*",
@@ -9667,18 +9420,6 @@ describe("Math Operator Tag Tests", function () {
cy.window().then(async (win) => {
let stateVariables = await win.returnAllStateVariables1();
- let count2Anchor = cesc2(
- "#" + stateVariables["/_copy1"].replacements[0].componentName,
- );
- let count3Anchor = cesc2(
- "#" + stateVariables["/_copy2"].replacements[0].componentName,
- );
- let count5Anchor = cesc2(
- "#" + stateVariables["/_copy3"].replacements[0].componentName,
- );
- let count6Anchor = cesc2(
- "#" + stateVariables["/_copy4"].replacements[0].componentName,
- );
cy.log("Test value displayed in browser");
@@ -9689,14 +9430,14 @@ describe("Math Operator Tag Tests", function () {
.then((text) => {
expect(text.trim()).equal("4");
});
- cy.get(count2Anchor)
+ cy.get(cesc("#\\/countPrimeb"))
.find(".mjx-mrow")
.eq(0)
.invoke("text")
.then((text) => {
expect(text.trim()).equal("4");
});
- cy.get(count3Anchor)
+ cy.get(cesc("#\\/pPrimeb"))
.find(".mjx-mrow")
.eq(0)
.invoke("text")
@@ -9710,14 +9451,14 @@ describe("Math Operator Tag Tests", function () {
.then((text) => {
expect(text.trim()).equal("100");
});
- cy.get(count5Anchor)
+ cy.get(cesc("#\\/count100b"))
.find(".mjx-mrow")
.eq(0)
.invoke("text")
.then((text) => {
expect(text.trim()).equal("100");
});
- cy.get(count6Anchor)
+ cy.get(cesc("#\\/p100b"))
.find(".mjx-mrow")
.eq(0)
.invoke("text")
@@ -9728,29 +9469,17 @@ describe("Math Operator Tag Tests", function () {
cy.log("Test internal values are set to the correct values");
cy.window().then(async (win) => {
expect(stateVariables["/countPrime"].stateValues.value).eq(4);
+ expect(stateVariables["/countPrimeb"].stateValues.value).eq(4);
expect(
stateVariables[
- stateVariables["/_copy1"].replacements[0].componentName
- ].stateValues.value,
- ).eq(4);
- expect(
- stateVariables[
- stateVariables[
- stateVariables["/_copy2"].replacements[0].componentName
- ].activeChildren[1].componentName
+ stateVariables["/pPrimeb"].activeChildren[1].componentName
].stateValues.value,
).eq(4);
expect(stateVariables["/count100"].stateValues.value).eq(100);
+ expect(stateVariables["/count100b"].stateValues.value).eq(100);
expect(
stateVariables[
- stateVariables["/_copy3"].replacements[0].componentName
- ].stateValues.value,
- ).eq(100);
- expect(
- stateVariables[
- stateVariables[
- stateVariables["/_copy4"].replacements[0].componentName
- ].activeChildren[1].componentName
+ stateVariables["/p100b"].activeChildren[1].componentName
].stateValues.value,
).eq(100);
});
@@ -9776,8 +9505,8 @@ describe("Math Operator Tag Tests", function () {
x x+y x+y+z x x+y x+y+z x x+y x+y+z a
-
+
3
17
5-4
@@ -11231,8 +10954,8 @@ describe("Math Operator Tag Tests", function () {
x x+y x+y+z x x+y x+y+z x x+y x+y+z a
-
+
3
17
5-4
@@ -12687,7 +12404,7 @@ describe("Math Operator Tag Tests", function () {
17 6/2 17 6/2 17 16 9 a
-
+
17
3
diff --git a/cypress/e2e/DoenetML/tagSpecific/matrix.cy.js b/cypress/e2e/DoenetML/tagSpecific/matrix.cy.js
index 47744993f1..6f1a1c95b7 100644
--- a/cypress/e2e/DoenetML/tagSpecific/matrix.cy.js
+++ b/cypress/e2e/DoenetML/tagSpecific/matrix.cy.js
@@ -15,7 +15,7 @@ describe("Matrix Tag Tests", function () {
A:
Copy 1:
Copy 2:
- Copy 3:
+ Copy 3: $A{name="A3"}
Copy 4:
Copy 5: $A
Copy 6: $A.value
@@ -181,7 +181,7 @@ describe("Matrix Tag Tests", function () {
A:
Copy 1:
Copy 2:
- Copy 3:
+ Copy 3: $A{name="A3"}
Copy 4:
Copy 5: $A
Copy 6: $A.value
@@ -853,7 +853,7 @@ describe("Matrix Tag Tests", function () {
A:
Copy 1:
Copy 2:
- Copy 3:
+ Copy 3: $A{name="A3"}
Copy 4:
Copy 5: $A
Copy 6: $A.value
@@ -1517,7 +1517,7 @@ describe("Matrix Tag Tests", function () {
A: 2x
Copy 1:
Copy 2:
- Copy 3:
+ Copy 3: $A{name="A3"}
Copy 4:
Copy 5: $A
Copy 6: $A.value
@@ -2188,7 +2188,7 @@ describe("Matrix Tag Tests", function () {
Copy 1:
Copy 2:
- Copy 3:
+ Copy 3: $A{name="A3"}
Copy 4:
Copy 5: $A
Copy 6: $A.value
@@ -3878,7 +3878,7 @@ describe("Matrix Tag Tests", function () {
Copy 1:
Copy 2:
- Copy 3:
+ Copy 3: $A{name="A3"}
Copy 4:
Copy 5: $A
Copy 6: $A.value
@@ -5569,7 +5569,7 @@ describe("Matrix Tag Tests", function () {
Copy 1:
Copy 2:
- Copy 3:
+ Copy 3: $A{name="A3"}
Copy 4:
Copy 5: $A
Copy 6: $A.value
@@ -6900,7 +6900,7 @@ describe("Matrix Tag Tests", function () {
Copy 1:
Copy 2:
- Copy 3:
+ Copy 3: $A{name="A3"}
Copy 4:
Copy 5: $A
Copy 6: $A.value
@@ -8231,7 +8231,7 @@ describe("Matrix Tag Tests", function () {
Copy 1:
Copy 2:
- Copy 3:
+ Copy 3: $A{name="A3"}
Copy 4:
Copy 5: $A
Copy 6: $A.value
@@ -8869,7 +8869,7 @@ describe("Matrix Tag Tests", function () {
Copy 1:
Copy 2:
- Copy 3:
+ Copy 3: $A{name="A3"}
Copy 4:
Copy 5: $A
Copy 6: $A.value
diff --git a/cypress/e2e/DoenetML/tagSpecific/matrixinput.cy.js b/cypress/e2e/DoenetML/tagSpecific/matrixinput.cy.js
index 634fce28ce..d134c0c54a 100644
--- a/cypress/e2e/DoenetML/tagSpecific/matrixinput.cy.js
+++ b/cypress/e2e/DoenetML/tagSpecific/matrixinput.cy.js
@@ -13,9 +13,9 @@ describe("MatrixInput Tag Tests", function () {
doenetML: `
a
Matrix 1:
- Matrix 2:
- Matrix 3:
- Matrix 4:
+ Matrix 2:
+ Matrix 3: $mi1.value{assignNames="m1"}
+ Matrix 4: $mi1.immediateValue{assignNames="m2"}
`,
},
"*",
@@ -789,7 +789,7 @@ describe("MatrixInput Tag Tests", function () {
doenetML: `
a
Matrix 1:
- Matrix 2:
+ Matrix 2: $mi1.value{assignNames="m1"}
`,
},
"*",
@@ -1252,7 +1252,7 @@ describe("MatrixInput Tag Tests", function () {
Number of columns:
Matrix 1:
- Matrix 2:
+ Matrix 2: $mi1.value{assignNames="m1"}
`,
},
"*",
@@ -1845,7 +1845,7 @@ describe("MatrixInput Tag Tests", function () {
a
Matrix 1:
- Matrix 2:
+ Matrix 2: $mi1.value{assignNames="m1"}
`,
},
"*",
@@ -2324,7 +2324,7 @@ describe("MatrixInput Tag Tests", function () {
a
Matrix 1:
- Matrix 2:
+ Matrix 2: $mi1.value{assignNames="m1"}
`,
},
"*",
@@ -2805,7 +2805,7 @@ describe("MatrixInput Tag Tests", function () {
Number of columns:
Matrix 1:
- Matrix 2:
+ Matrix 2: $mi1.value{assignNames="m1"}
`,
},
"*",
@@ -3401,7 +3401,7 @@ describe("MatrixInput Tag Tests", function () {
Number of columns:
Matrix 1:
- Matrix 2:
+ Matrix 2: $mi1.value{assignNames="m1"}
`,
},
"*",
@@ -3995,7 +3995,7 @@ describe("MatrixInput Tag Tests", function () {
a
Matrix 1:
- Matrix 2:
+ Matrix 2: $mi1.value{assignNames="m1"}
`,
},
"*",
@@ -4449,7 +4449,7 @@ describe("MatrixInput Tag Tests", function () {
a
Matrix 1:
- Matrix 2:
+ Matrix 2: $mi1.value{assignNames="m1"}
`,
},
"*",
@@ -4905,7 +4905,7 @@ describe("MatrixInput Tag Tests", function () {
Number of columns:
Matrix 1:
- Matrix 2:
+ Matrix 2: $mi1.value{assignNames="m1"}
`,
},
"*",
@@ -5501,7 +5501,7 @@ describe("MatrixInput Tag Tests", function () {
Number of columns:
Matrix 1:
- Matrix 2:
+ Matrix 2: $mi1.value{assignNames="m1"}
`,
},
"*",
@@ -6097,7 +6097,7 @@ describe("MatrixInput Tag Tests", function () {
Number of columns:
Matrix 1:
- Matrix 2:
+ Matrix 2: $mi1.value{assignNames="m1"}
`,
},
"*",
@@ -6693,7 +6693,7 @@ describe("MatrixInput Tag Tests", function () {
Number of columns:
Matrix 1:
- Matrix 2:
+ Matrix 2: $mi1.value{assignNames="m1"}
`,
},
"*",
@@ -7290,7 +7290,7 @@ describe("MatrixInput Tag Tests", function () {
Matrix 1: \\begin{matrix}a & b\\\\c & d\\end{matrix}
Matrix 2:
- Matrix 3:
+ Matrix 3: $mi1.value{assignNames="m2"}
`,
},
"*",
@@ -7756,9 +7756,9 @@ describe("MatrixInput Tag Tests", function () {
Matrix 1: \\begin{matrix}a & b\\\\c & d\\end{matrix}
Matrix 2:
- Matrix 3:
+ Matrix 3: $mi1.value{assignNames="m2"}
-
+
`,
},
"*",
@@ -7974,7 +7974,7 @@ describe("MatrixInput Tag Tests", function () {
Vector 1: (a,b)
Matrix 2:
- Matrix 3:
+ Matrix 3: $mi1.value{assignNames="m2"}
`,
},
"*",
@@ -8850,7 +8850,7 @@ describe("MatrixInput Tag Tests", function () {
Vector 1: ⟨a,b⟩
Matrix 2:
- Matrix 3:
+ Matrix 3: $mi1.value{assignNames="m2"}
`,
},
"*",
@@ -9726,9 +9726,9 @@ describe("MatrixInput Tag Tests", function () {
Vector 1: (a,b,c)
Matrix 2:
- Matrix 3:
+ Matrix 3: $mi1.value{assignNames="m2"}
-
+
`,
},
"*",
@@ -10012,9 +10012,9 @@ describe("MatrixInput Tag Tests", function () {
Vector 1: ⟨a,b,c⟩
Matrix 2:
- Matrix 3:
+ Matrix 3: $mi1.value{assignNames="m2"}
-
+
`,
},
"*",
@@ -10298,7 +10298,7 @@ describe("MatrixInput Tag Tests", function () {
Vector 1: (a,b)^T
Matrix 2:
- Matrix 3:
+ Matrix 3: $mi1.value{assignNames="m2"}
`,
},
"*",
@@ -11172,7 +11172,7 @@ describe("MatrixInput Tag Tests", function () {
Vector 1: ⟨a,b⟩^T
Matrix 2:
- Matrix 3:
+ Matrix 3: $mi1.value{assignNames="m2"}
`,
},
"*",
@@ -12046,7 +12046,7 @@ describe("MatrixInput Tag Tests", function () {
Vector 1: (a,b)'
Matrix 2:
- Matrix 3:
+ Matrix 3: $mi1.value{assignNames="m2"}
`,
},
"*",
@@ -12920,7 +12920,7 @@ describe("MatrixInput Tag Tests", function () {
Vector 1: ⟨a,b⟩'
Matrix 2:
- Matrix 3:
+ Matrix 3: $mi1.value{assignNames="m2"}
`,
},
"*",
@@ -13794,9 +13794,9 @@ describe("MatrixInput Tag Tests", function () {
Vector 1: (a,b,c)^T
Matrix 2:
- Matrix 3:
+ Matrix 3: $mi1.value{assignNames="m2"}
-
+
`,
},
"*",
@@ -14073,9 +14073,9 @@ describe("MatrixInput Tag Tests", function () {
Vector 1: ⟨a,b,c⟩^T
Matrix 2:
- Matrix 3:
+ Matrix 3: $mi1.value{assignNames="m2"}
-
+
`,
},
"*",
@@ -14351,8 +14351,8 @@ describe("MatrixInput Tag Tests", function () {
xyz
Matrix 1:
- Matrix 1A:
+ Matrix 1A: $mi1.value{assignNames="m1"}
Matrix 2:
- Matrix 2A:
+ Matrix 2A: $mi2.value{assignNames="m2"}
`,
},
"*",
@@ -15438,11 +15438,11 @@ describe("MatrixInput Tag Tests", function () {
Sparse matrix:
\\begin{matrix}\\\\ & 3\\end{matrix}
- Sparse matrix 2:
+ Sparse matrix 2: $sparse1{link="false" name="sparse2"}
Matrix 1:
- Matrix 1A:
+ Matrix 1A: $mi1.value{assignNames="m1"}
Matrix 2:
- Matrix 2A:
+ Matrix 2A: $mi2.value{assignNames="m2"}
`,
},
"*",
diff --git a/cypress/e2e/DoenetML/tagSpecific/module.cy.js b/cypress/e2e/DoenetML/tagSpecific/module.cy.js
index 24904473bb..ae679da4a0 100644
--- a/cypress/e2e/DoenetML/tagSpecific/module.cy.js
+++ b/cypress/e2e/DoenetML/tagSpecific/module.cy.js
@@ -22,11 +22,11 @@ describe("Module Tag Tests", function () {
Hello $item!
-
+ $m{item="plant"}
-
-
+ $m{item="$item2"}
+ $m
`,
},
@@ -64,10 +64,10 @@ describe("Module Tag Tests", function () {
Hello $(m/item)!
-
- Hello $(m/mads/item)!
-
- Hello $(m/mads/ma/item)!
-
-
+ $y2.value{assignNames="y2a"}
Point coords:
Graph size:
-
+ $ar.value{assignNames="ar2"}
`,
},
"*",
@@ -352,14 +352,14 @@ describe("Module Tag Tests", function () {
$v
- Point coords:
-
+ $y.value{assignNames="y2"}
`,
},
@@ -475,10 +475,10 @@ describe("Module Tag Tests", function () {
a
First one
- Submitted response for problem 1:
- Credit for problem 1:
+ Submitted response for problem 1: $(m1/ans.submittedResponse)
+ Credit for problem 1: $(m1/prob.creditAchieved{assignNames="ca1"})
Second one
@@ -486,9 +486,9 @@ describe("Module Tag Tests", function () {
Now, let's use initial point (-3 , 3 ) and the goal point (7 , -5 )
- Submitted response for problem 2:
- Credit for problem 2:
+ Submitted response for problem 2: $(m2/ans.submittedResponse)
+ Credit for problem 2: $(m2/prob.creditAchieved{assignNames="ca2"})
Make the goal be ($a,$b) .
Make the x value of the initial point be $c .
- Submitted response for problem:
- Credit for problem:
+ Submitted response for problem: $(extMod/ans.submittedResponse)
+ Credit for problem: $(extMod/prob.creditAchieved{assignNames="ca"})
- Make the goal be ($a,$b) .
Make the x value of the initial point be $c .
- Point: $P
-
(5,6)
- Disabled? $disabled
- a
-
+
`,
},
@@ -1410,34 +1411,25 @@ describe("Module Tag Tests", function () {
});
cy.get(cesc("#\\/_text1")).should("have.text", "a"); //wait for page to load
- cy.get(cesc2("#/_customattribute2")).should(
+ cy.get(cesc2("#/_document1")).should(
"contain.text",
"Duplicate component name: duplicate",
);
- cy.get(cesc2("#/_customattribute2")).should("contain.text", "line 6");
+ cy.get(cesc2("#/_document1")).should("contain.text", "line 7");
cy.window().then(async (win) => {
let errorWarnings = await win.returnErrorWarnings1();
expect(errorWarnings.errors.length).eq(1);
- expect(errorWarnings.warnings.length).eq(1);
+ expect(errorWarnings.warnings.length).eq(0);
expect(errorWarnings.errors[0].message).contain(
"Duplicate component name: duplicate",
);
- expect(errorWarnings.errors[0].doenetMLrange.lineBegin).eq(6);
- expect(errorWarnings.errors[0].doenetMLrange.charBegin).eq(7);
- expect(errorWarnings.errors[0].doenetMLrange.lineEnd).eq(6);
- expect(errorWarnings.errors[0].doenetMLrange.charEnd).eq(104);
-
- expect(errorWarnings.warnings[0].message).contain(
- "Could not create . It must be inside a component that is inside a or similar component",
- );
- expect(errorWarnings.warnings[0].level).eq(1);
- expect(errorWarnings.warnings[0].doenetMLrange.lineBegin).eq(4);
- expect(errorWarnings.warnings[0].doenetMLrange.charBegin).eq(7);
- expect(errorWarnings.warnings[0].doenetMLrange.lineEnd).eq(4);
- expect(errorWarnings.warnings[0].doenetMLrange.charEnd).eq(108);
+ expect(errorWarnings.errors[0].doenetMLrange.lineBegin).eq(7);
+ expect(errorWarnings.errors[0].doenetMLrange.charBegin).eq(9);
+ expect(errorWarnings.errors[0].doenetMLrange.lineEnd).eq(7);
+ expect(errorWarnings.errors[0].doenetMLrange.charEnd).eq(106);
});
});
@@ -1577,14 +1569,14 @@ describe("Module Tag Tests", function () {
Next value?
- First one
- Submitted response for problem 1:
- Credit for problem 1:
+ Submitted response for problem 1: $(m1/ans.submittedResponse)
+ Credit for problem 1: $(m1/prob.creditAchieved{assignNames="ca1"})
Second one
@@ -1789,9 +1781,9 @@ describe("Module Tag Tests", function () {
Now, let's use initial point (-3 , 3 ) and the goal point (7 , -5 )
- Submitted response for problem 2:
- Credit for problem 2:
+ $mod{title="Find point again" goalX="$xb" GoaLy="$yb" initialX="$xa" initialy="$ya" width="200px" aspectRatio="1" name="m2"}
+ Submitted response for problem 2: $(m2/ans.submittedResponse)
+ Credit for problem 2: $(m2/prob.creditAchieved{assignNames="ca2"})
a
- 1+1
`,
},
@@ -21,23 +20,15 @@ describe("Number Tag Tests", function () {
);
});
- cy.get(cesc("#\\/_text1")).should("have.text", "a"); // to wait until loaded
+ cy.log("Test value displayed in browser");
+ cy.get(cesc2("#/num")).should("have.text", "2");
+ cy.get(cesc2("#/_number1")).should("have.text", "2");
+ cy.log("Test internal values are set to the correct values");
cy.window().then(async (win) => {
let stateVariables = await win.returnAllStateVariables1();
- let number0Name = stateVariables["/_copy1"].replacements[0].componentName;
- let number0Anchor = cesc2("#" + number0Name);
-
- cy.log("Test value displayed in browser");
- cy.get(number0Anchor).should("have.text", "2");
- cy.get(cesc("#\\/_number1")).should("have.text", "2");
-
- cy.log("Test internal values are set to the correct values");
- cy.window().then(async (win) => {
- let stateVariables = await win.returnAllStateVariables1();
- expect(stateVariables[number0Name].stateValues.value).eq(2);
- expect(stateVariables["/_number1"].stateValues.value).eq(2);
- });
+ expect(stateVariables["/num"].stateValues.value).eq(2);
+ expect(stateVariables["/_number1"].stateValues.value).eq(2);
});
});
@@ -46,8 +37,7 @@ describe("Number Tag Tests", function () {
win.postMessage(
{
doenetML: `
- a
- x+1
`,
},
@@ -55,23 +45,15 @@ describe("Number Tag Tests", function () {
);
});
- cy.get(cesc("#\\/_text1")).should("have.text", "a"); // to wait until loaded
+ cy.log("Test value displayed in browser");
+ cy.get(cesc2("#/num")).should("have.text", "NaN");
+ cy.get(cesc2("#/_number1")).should("have.text", "NaN");
+ cy.log("Test internal values are set to the correct values");
cy.window().then(async (win) => {
let stateVariables = await win.returnAllStateVariables1();
- let number0Name = stateVariables["/_copy1"].replacements[0].componentName;
- let number0Anchor = cesc2("#" + number0Name);
-
- cy.log("Test value displayed in browser");
- cy.get(number0Anchor).should("have.text", "NaN");
- cy.get(cesc("#\\/_number1")).should("have.text", "NaN");
-
- cy.log("Test internal values are set to the correct values");
- cy.window().then(async (win) => {
- let stateVariables = await win.returnAllStateVariables1();
- assert.isNaN(stateVariables[number0Name].stateValues.value);
- assert.isNaN(stateVariables["/_number1"].stateValues.value);
- });
+ assert.isNaN(stateVariables["/num"].stateValues.value);
+ assert.isNaN(stateVariables["/_number1"].stateValues.value);
});
});
@@ -171,7 +153,7 @@ describe("Number Tag Tests", function () {
doenetML: `
a
log(0.5/0.3) ,
- $_number1
`,
},
"*",
@@ -210,29 +192,29 @@ describe("Number Tag Tests", function () {
234234823.34235235324
5.4285023408250342
0.000000000000005023481340324
- $n1a
$n1b
@@ -515,18 +497,18 @@ describe("Number Tag Tests", function () {
a
22
0.000000000000005
- $n1a
$n1apad
@@ -567,44 +549,44 @@ describe("Number Tag Tests", function () {
$n2c
$n2cpad
- Number: 35203423.02352343201
Number of digits:
Number of decimals:
-
+ $n{displayDigits='$ndigits' displayDecimals='$ndecimals' name="na"}
`,
},
"*",
@@ -968,31 +950,31 @@ describe("Number Tag Tests", function () {
doenetML: `
a
8.5203845251
-
8.5203845251
-
0.000000000000000015382487
-
8
-
`,
diff --git a/cypress/e2e/DoenetML/tagSpecific/numberlist.cy.js b/cypress/e2e/DoenetML/tagSpecific/numberlist.cy.js
index 15de9b266e..275cbe2277 100644
--- a/cypress/e2e/DoenetML/tagSpecific/numberlist.cy.js
+++ b/cypress/e2e/DoenetML/tagSpecific/numberlist.cy.js
@@ -522,18 +522,18 @@ describe("Numberlist Tag Tests", function () {
1
2 3
-
- 4 5
-
-
a
1 2 3 4 5
-
+ $nl1{maxNumber="$mn2" name="nl2"}
Maximum number 1:
Maximum number 2:
@@ -858,18 +858,18 @@ describe("Numberlist Tag Tests", function () {
{
doenetML: `
a
- 1 2 3
+ 1 2 3
-
+
-
+
4
- 5
-
-
+
`,
},
@@ -892,38 +892,31 @@ describe("Numberlist Tag Tests", function () {
cy.log("Test internal values are set to the correct values");
cy.window().then(async (win) => {
let stateVariables = await win.returnAllStateVariables1();
- let numberlist1a =
- stateVariables[
- stateVariables["/numberlist1a"].replacements[0].componentName
- ];
- let numberlist3 =
- stateVariables[
- stateVariables["/numberlist3"].replacements[0].componentName
- ];
- expect(stateVariables["/_numberlist1"].stateValues.numbers.length).eq(3);
- expect(stateVariables["/_numberlist1"].stateValues.numbers[0]).eq(1);
- expect(stateVariables["/_numberlist1"].stateValues.numbers[1]).eq(2);
- expect(stateVariables["/_numberlist1"].stateValues.numbers[2]).eq(3);
- expect(numberlist1a.stateValues.numbers.length).eq(3);
- expect(numberlist1a.stateValues.numbers[0]).eq(1);
- expect(numberlist1a.stateValues.numbers[1]).eq(2);
- expect(numberlist1a.stateValues.numbers[2]).eq(3);
- expect(stateVariables["/_numberlist2"].stateValues.numbers.length).eq(8);
- expect(stateVariables["/_numberlist2"].stateValues.numbers[0]).eq(4);
- expect(stateVariables["/_numberlist2"].stateValues.numbers[1]).eq(1);
- expect(stateVariables["/_numberlist2"].stateValues.numbers[2]).eq(2);
- expect(stateVariables["/_numberlist2"].stateValues.numbers[3]).eq(3);
- expect(stateVariables["/_numberlist2"].stateValues.numbers[4]).eq(5);
- expect(stateVariables["/_numberlist2"].stateValues.numbers[5]).eq(1);
- expect(stateVariables["/_numberlist2"].stateValues.numbers[6]).eq(2);
- expect(stateVariables["/_numberlist2"].stateValues.numbers[7]).eq(3);
- expect(numberlist3.stateValues.numbers.length).eq(6);
- expect(numberlist3.stateValues.numbers[0]).eq(4);
- expect(numberlist3.stateValues.numbers[1]).eq(1);
- expect(numberlist3.stateValues.numbers[2]).eq(2);
- expect(numberlist3.stateValues.numbers[3]).eq(3);
- expect(numberlist3.stateValues.numbers[4]).eq(5);
- expect(numberlist3.stateValues.numbers[5]).eq(1);
+
+ expect(stateVariables["/numberlist1"].stateValues.numbers.length).eq(3);
+ expect(stateVariables["/numberlist1"].stateValues.numbers[0]).eq(1);
+ expect(stateVariables["/numberlist1"].stateValues.numbers[1]).eq(2);
+ expect(stateVariables["/numberlist1"].stateValues.numbers[2]).eq(3);
+ expect(stateVariables["/numberlist1a"].stateValues.numbers.length).eq(3);
+ expect(stateVariables["/numberlist1a"].stateValues.numbers[0]).eq(1);
+ expect(stateVariables["/numberlist1a"].stateValues.numbers[1]).eq(2);
+ expect(stateVariables["/numberlist1a"].stateValues.numbers[2]).eq(3);
+ expect(stateVariables["/numberlist2"].stateValues.numbers.length).eq(8);
+ expect(stateVariables["/numberlist2"].stateValues.numbers[0]).eq(4);
+ expect(stateVariables["/numberlist2"].stateValues.numbers[1]).eq(1);
+ expect(stateVariables["/numberlist2"].stateValues.numbers[2]).eq(2);
+ expect(stateVariables["/numberlist2"].stateValues.numbers[3]).eq(3);
+ expect(stateVariables["/numberlist2"].stateValues.numbers[4]).eq(5);
+ expect(stateVariables["/numberlist2"].stateValues.numbers[5]).eq(1);
+ expect(stateVariables["/numberlist2"].stateValues.numbers[6]).eq(2);
+ expect(stateVariables["/numberlist2"].stateValues.numbers[7]).eq(3);
+ expect(stateVariables["/numberlist3"].stateValues.numbers.length).eq(6);
+ expect(stateVariables["/numberlist3"].stateValues.numbers[0]).eq(4);
+ expect(stateVariables["/numberlist3"].stateValues.numbers[1]).eq(1);
+ expect(stateVariables["/numberlist3"].stateValues.numbers[2]).eq(2);
+ expect(stateVariables["/numberlist3"].stateValues.numbers[3]).eq(3);
+ expect(stateVariables["/numberlist3"].stateValues.numbers[4]).eq(5);
+ expect(stateVariables["/numberlist3"].stateValues.numbers[5]).eq(1);
});
});
diff --git a/cypress/e2e/DoenetML/tagSpecific/paginator.cy.js b/cypress/e2e/DoenetML/tagSpecific/paginator.cy.js
index f6e9691ebe..4be9dec9b5 100644
--- a/cypress/e2e/DoenetML/tagSpecific/paginator.cy.js
+++ b/cypress/e2e/DoenetML/tagSpecific/paginator.cy.js
@@ -34,8 +34,8 @@ describe("Paginator Tag Tests", function () {
prev
- Page
next
@@ -43,7 +43,7 @@ describe("Paginator Tag Tests", function () {
What is 2+2? 4
- Credit achieved:
+ Credit achieved: $_document1.creditAchieved{assignNames="ca"}
`;
@@ -794,7 +794,7 @@ describe("Paginator Tag Tests", function () {
- Credit achieved:
+ Credit achieved: $_document1.creditAchieved{assignNames="ca"}
`;
@@ -1095,7 +1095,7 @@ describe("Paginator Tag Tests", function () {
- Credit achieved:
+ Credit achieved: $_document1.creditAchieved{assignNames="ca"}
`;
cy.get("#testRunner_toggleControls").click();
@@ -1426,12 +1426,12 @@ describe("Paginator Tag Tests", function () {
-
- Credit achieved:
+ Credit achieved: $_document1.creditAchieved{assignNames="ca"}
`;
cy.get("#testRunner_toggleControls").click();
@@ -1634,12 +1634,12 @@ describe("Paginator Tag Tests", function () {
-
- Credit achieved:
+ Credit achieved: $_document1.creditAchieved{assignNames="ca"}
`;
cy.get("#testRunner_toggleControls").click();
@@ -1805,7 +1805,7 @@ describe("Paginator Tag Tests", function () {
- Credit achieved:
+ Credit achieved: $_document1.creditAchieved{assignNames="ca"}
`;
cy.get("#testRunner_toggleControls").click();
@@ -1931,7 +1931,7 @@ describe("Paginator Tag Tests", function () {
6: 6
- Credit achieved:
+ Credit achieved: $_document1.creditAchieved{assignNames="ca"}
`;
cy.get("#testRunner_toggleControls").click();
@@ -2062,7 +2062,7 @@ describe("Paginator Tag Tests", function () {
2: 2
- Credit achieved:
+ Credit achieved: $_document1.creditAchieved{assignNames="ca"}
`;
cy.get("#testRunner_toggleControls").click();
@@ -2138,29 +2138,29 @@ describe("Paginator Tag Tests", function () {
- Credit achieved:
+ Credit achieved: $_document1.creditAchieved{assignNames="ca"}
`;
let doenetMLorder1 = `
a
-
- Credit achieved:
+ Credit achieved: $_document1.creditAchieved{assignNames="ca"}
`;
let doenetMLorder2 = `
a
-
- Credit achieved:
+ Credit achieved: $_document1.creditAchieved{assignNames="ca"}
`;
let allDoenetMLs = [
@@ -2733,7 +2733,7 @@ describe("Paginator Tag Tests", function () {
- Credit achieved:
+ Credit achieved: $_document1.creditAchieved{assignNames="ca"}
`;
diff --git a/cypress/e2e/DoenetML/tagSpecific/parabola.cy.js b/cypress/e2e/DoenetML/tagSpecific/parabola.cy.js
index 09aaa8f21e..368f264c68 100644
--- a/cypress/e2e/DoenetML/tagSpecific/parabola.cy.js
+++ b/cypress/e2e/DoenetML/tagSpecific/parabola.cy.js
@@ -23,15 +23,15 @@ describe("Parabola Tag Tests", function () {
a
-
- a =
b =
@@ -51,15 +51,6 @@ describe("Parabola Tag Tests", function () {
cy.window().then(async (win) => {
let stateVariables = await win.returnAllStateVariables1();
- let equationAnchor = cesc2(
- "#" + stateVariables["/e2"].replacements[0].componentName,
- );
- let parabola3Name =
- stateVariables[stateVariables["/g3"].replacements[0].componentName]
- .activeChildren[0].componentName;
- let vertex3Name =
- stateVariables[stateVariables["/g3"].replacements[0].componentName]
- .activeChildren[1].componentName;
cy.window().then(async (win) => {
let a = 1,
@@ -71,7 +62,7 @@ describe("Parabola Tag Tests", function () {
let equationExpression = me.fromText(`y=${a}x^2+${b}x+${c}`);
- cy.get(equationAnchor)
+ cy.get(cesc2("#/e2"))
.find(".mjx-mrow")
.eq(0)
.invoke("text")
@@ -100,114 +91,73 @@ describe("Parabola Tag Tests", function () {
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v"].replacements[0].componentName
- ].stateValues.xs[0],
- )
+ .fromAst(stateVariables["/v"].stateValues.xs[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v"].replacements[0].componentName
- ].stateValues.xs[1],
- )
+ .fromAst(stateVariables["/v"].stateValues.xs[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
- expect(
- stateVariables[stateVariables["/p2"].replacements[0].componentName]
- .stateValues.a,
- ).closeTo(a, 1e-12);
- expect(
- stateVariables[stateVariables["/p2"].replacements[0].componentName]
- .stateValues.b,
- ).closeTo(b, 1e-12);
- expect(
- stateVariables[stateVariables["/p2"].replacements[0].componentName]
- .stateValues.c,
- ).closeTo(c, 1e-12);
+ expect(stateVariables["/p2"].stateValues.a).closeTo(a, 1e-12);
+ expect(stateVariables["/p2"].stateValues.b).closeTo(b, 1e-12);
+ expect(stateVariables["/p2"].stateValues.c).closeTo(c, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/p2"].replacements[0].componentName
- ].stateValues.equation,
- )
+ .fromAst(stateVariables["/p2"].stateValues.equation)
.equals(equationExpression),
).eq(true);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/p2"].replacements[0].componentName
- ].stateValues.vertex[0],
- )
+ .fromAst(stateVariables["/p2"].stateValues.vertex[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/p2"].replacements[0].componentName
- ].stateValues.vertex[1],
- )
+ .fromAst(stateVariables["/p2"].stateValues.vertex[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v2"].replacements[0].componentName
- ].stateValues.xs[0],
- )
+ .fromAst(stateVariables["/v2"].stateValues.xs[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v2"].replacements[0].componentName
- ].stateValues.xs[1],
- )
+ .fromAst(stateVariables["/v2"].stateValues.xs[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/e2"].replacements[0].componentName
- ].stateValues.value,
- )
+ .fromAst(stateVariables["/e2"].stateValues.value)
.equals(equationExpression),
).eq(true);
- expect(stateVariables[parabola3Name].stateValues.a).closeTo(a, 1e-12);
- expect(stateVariables[parabola3Name].stateValues.b).closeTo(b, 1e-12);
- expect(stateVariables[parabola3Name].stateValues.c).closeTo(c, 1e-12);
+ expect(stateVariables["/g3/p2"].stateValues.a).closeTo(a, 1e-12);
+ expect(stateVariables["/g3/p2"].stateValues.b).closeTo(b, 1e-12);
+ expect(stateVariables["/g3/p2"].stateValues.c).closeTo(c, 1e-12);
expect(
me
- .fromAst(stateVariables[parabola3Name].stateValues.equation)
+ .fromAst(stateVariables["/g3/p2"].stateValues.equation)
.equals(equationExpression),
).eq(true);
expect(
me
- .fromAst(stateVariables[parabola3Name].stateValues.vertex[0])
+ .fromAst(stateVariables["/g3/p2"].stateValues.vertex[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(stateVariables[parabola3Name].stateValues.vertex[1])
+ .fromAst(stateVariables["/g3/p2"].stateValues.vertex[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(stateVariables[vertex3Name].stateValues.xs[0])
+ .fromAst(stateVariables["/g3/v2"].stateValues.xs[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(stateVariables[vertex3Name].stateValues.xs[1])
+ .fromAst(stateVariables["/g3/v2"].stateValues.xs[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
});
@@ -229,8 +179,8 @@ describe("Parabola Tag Tests", function () {
let equationExpression = me.fromText(`y=${a}x^2+${b}x+${c}`);
- cy.get(equationAnchor).should("contain.text", "y=−2x2");
- cy.get(equationAnchor)
+ cy.get(cesc2("#/e2")).should("contain.text", "y=−2x2");
+ cy.get(cesc2("#/e2"))
.find(".mjx-mrow")
.eq(0)
.invoke("text")
@@ -261,114 +211,73 @@ describe("Parabola Tag Tests", function () {
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v"].replacements[0].componentName
- ].stateValues.xs[0],
- )
+ .fromAst(stateVariables["/v"].stateValues.xs[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v"].replacements[0].componentName
- ].stateValues.xs[1],
- )
+ .fromAst(stateVariables["/v"].stateValues.xs[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
- expect(
- stateVariables[stateVariables["/p2"].replacements[0].componentName]
- .stateValues.a,
- ).closeTo(a, 1e-12);
- expect(
- stateVariables[stateVariables["/p2"].replacements[0].componentName]
- .stateValues.b,
- ).closeTo(b, 1e-12);
- expect(
- stateVariables[stateVariables["/p2"].replacements[0].componentName]
- .stateValues.c,
- ).closeTo(c, 1e-12);
+ expect(stateVariables["/p2"].stateValues.a).closeTo(a, 1e-12);
+ expect(stateVariables["/p2"].stateValues.b).closeTo(b, 1e-12);
+ expect(stateVariables["/p2"].stateValues.c).closeTo(c, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/p2"].replacements[0].componentName
- ].stateValues.equation,
- )
+ .fromAst(stateVariables["/p2"].stateValues.equation)
.equals(equationExpression),
).eq(true);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/p2"].replacements[0].componentName
- ].stateValues.vertex[0],
- )
+ .fromAst(stateVariables["/p2"].stateValues.vertex[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/p2"].replacements[0].componentName
- ].stateValues.vertex[1],
- )
+ .fromAst(stateVariables["/p2"].stateValues.vertex[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v2"].replacements[0].componentName
- ].stateValues.xs[0],
- )
+ .fromAst(stateVariables["/v2"].stateValues.xs[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v2"].replacements[0].componentName
- ].stateValues.xs[1],
- )
+ .fromAst(stateVariables["/v2"].stateValues.xs[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/e2"].replacements[0].componentName
- ].stateValues.value,
- )
+ .fromAst(stateVariables["/e2"].stateValues.value)
.equals(equationExpression),
).eq(true);
- expect(stateVariables[parabola3Name].stateValues.a).closeTo(a, 1e-12);
- expect(stateVariables[parabola3Name].stateValues.b).closeTo(b, 1e-12);
- expect(stateVariables[parabola3Name].stateValues.c).closeTo(c, 1e-12);
+ expect(stateVariables["/g3/p2"].stateValues.a).closeTo(a, 1e-12);
+ expect(stateVariables["/g3/p2"].stateValues.b).closeTo(b, 1e-12);
+ expect(stateVariables["/g3/p2"].stateValues.c).closeTo(c, 1e-12);
expect(
me
- .fromAst(stateVariables[parabola3Name].stateValues.equation)
+ .fromAst(stateVariables["/g3/p2"].stateValues.equation)
.equals(equationExpression),
).eq(true);
expect(
me
- .fromAst(stateVariables[parabola3Name].stateValues.vertex[0])
+ .fromAst(stateVariables["/g3/p2"].stateValues.vertex[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(stateVariables[parabola3Name].stateValues.vertex[1])
+ .fromAst(stateVariables["/g3/p2"].stateValues.vertex[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(stateVariables[vertex3Name].stateValues.xs[0])
+ .fromAst(stateVariables["/g3/v2"].stateValues.xs[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(stateVariables[vertex3Name].stateValues.xs[1])
+ .fromAst(stateVariables["/g3/v2"].stateValues.xs[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
});
@@ -390,8 +299,8 @@ describe("Parabola Tag Tests", function () {
let equationExpression = me.fromText(`y=${a}x^2+${b}x+${c}`);
- cy.get(equationAnchor).should("contain.text", "y=−2x2+3x");
- cy.get(equationAnchor)
+ cy.get(cesc2("#/e2")).should("contain.text", "y=−2x2+3x");
+ cy.get(cesc2("#/e2"))
.find(".mjx-mrow")
.eq(0)
.invoke("text")
@@ -422,114 +331,73 @@ describe("Parabola Tag Tests", function () {
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v"].replacements[0].componentName
- ].stateValues.xs[0],
- )
+ .fromAst(stateVariables["/v"].stateValues.xs[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v"].replacements[0].componentName
- ].stateValues.xs[1],
- )
+ .fromAst(stateVariables["/v"].stateValues.xs[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
- expect(
- stateVariables[stateVariables["/p2"].replacements[0].componentName]
- .stateValues.a,
- ).closeTo(a, 1e-12);
- expect(
- stateVariables[stateVariables["/p2"].replacements[0].componentName]
- .stateValues.b,
- ).closeTo(b, 1e-12);
- expect(
- stateVariables[stateVariables["/p2"].replacements[0].componentName]
- .stateValues.c,
- ).closeTo(c, 1e-12);
+ expect(stateVariables["/p2"].stateValues.a).closeTo(a, 1e-12);
+ expect(stateVariables["/p2"].stateValues.b).closeTo(b, 1e-12);
+ expect(stateVariables["/p2"].stateValues.c).closeTo(c, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/p2"].replacements[0].componentName
- ].stateValues.equation,
- )
+ .fromAst(stateVariables["/p2"].stateValues.equation)
.equals(equationExpression),
).eq(true);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/p2"].replacements[0].componentName
- ].stateValues.vertex[0],
- )
+ .fromAst(stateVariables["/p2"].stateValues.vertex[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/p2"].replacements[0].componentName
- ].stateValues.vertex[1],
- )
+ .fromAst(stateVariables["/p2"].stateValues.vertex[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v2"].replacements[0].componentName
- ].stateValues.xs[0],
- )
+ .fromAst(stateVariables["/v2"].stateValues.xs[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v2"].replacements[0].componentName
- ].stateValues.xs[1],
- )
+ .fromAst(stateVariables["/v2"].stateValues.xs[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/e2"].replacements[0].componentName
- ].stateValues.value,
- )
+ .fromAst(stateVariables["/e2"].stateValues.value)
.equals(equationExpression),
).eq(true);
- expect(stateVariables[parabola3Name].stateValues.a).closeTo(a, 1e-12);
- expect(stateVariables[parabola3Name].stateValues.b).closeTo(b, 1e-12);
- expect(stateVariables[parabola3Name].stateValues.c).closeTo(c, 1e-12);
+ expect(stateVariables["/g3/p2"].stateValues.a).closeTo(a, 1e-12);
+ expect(stateVariables["/g3/p2"].stateValues.b).closeTo(b, 1e-12);
+ expect(stateVariables["/g3/p2"].stateValues.c).closeTo(c, 1e-12);
expect(
me
- .fromAst(stateVariables[parabola3Name].stateValues.equation)
+ .fromAst(stateVariables["/g3/p2"].stateValues.equation)
.equals(equationExpression),
).eq(true);
expect(
me
- .fromAst(stateVariables[parabola3Name].stateValues.vertex[0])
+ .fromAst(stateVariables["/g3/p2"].stateValues.vertex[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(stateVariables[parabola3Name].stateValues.vertex[1])
+ .fromAst(stateVariables["/g3/p2"].stateValues.vertex[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(stateVariables[vertex3Name].stateValues.xs[0])
+ .fromAst(stateVariables["/g3/v2"].stateValues.xs[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(stateVariables[vertex3Name].stateValues.xs[1])
+ .fromAst(stateVariables["/g3/v2"].stateValues.xs[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
});
@@ -551,8 +419,8 @@ describe("Parabola Tag Tests", function () {
let equationExpression = me.fromText(`y=${a}x^2+${b}x+${c}`);
- cy.get(equationAnchor).should("contain.text", "y=−2x2+3x+9");
- cy.get(equationAnchor)
+ cy.get(cesc2("#/e2")).should("contain.text", "y=−2x2+3x+9");
+ cy.get(cesc2("#/e2"))
.find(".mjx-mrow")
.eq(0)
.invoke("text")
@@ -583,114 +451,73 @@ describe("Parabola Tag Tests", function () {
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v"].replacements[0].componentName
- ].stateValues.xs[0],
- )
+ .fromAst(stateVariables["/v"].stateValues.xs[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v"].replacements[0].componentName
- ].stateValues.xs[1],
- )
+ .fromAst(stateVariables["/v"].stateValues.xs[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
- expect(
- stateVariables[stateVariables["/p2"].replacements[0].componentName]
- .stateValues.a,
- ).closeTo(a, 1e-12);
- expect(
- stateVariables[stateVariables["/p2"].replacements[0].componentName]
- .stateValues.b,
- ).closeTo(b, 1e-12);
- expect(
- stateVariables[stateVariables["/p2"].replacements[0].componentName]
- .stateValues.c,
- ).closeTo(c, 1e-12);
+ expect(stateVariables["/p2"].stateValues.a).closeTo(a, 1e-12);
+ expect(stateVariables["/p2"].stateValues.b).closeTo(b, 1e-12);
+ expect(stateVariables["/p2"].stateValues.c).closeTo(c, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/p2"].replacements[0].componentName
- ].stateValues.equation,
- )
+ .fromAst(stateVariables["/p2"].stateValues.equation)
.equals(equationExpression),
).eq(true);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/p2"].replacements[0].componentName
- ].stateValues.vertex[0],
- )
+ .fromAst(stateVariables["/p2"].stateValues.vertex[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/p2"].replacements[0].componentName
- ].stateValues.vertex[1],
- )
+ .fromAst(stateVariables["/p2"].stateValues.vertex[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v2"].replacements[0].componentName
- ].stateValues.xs[0],
- )
+ .fromAst(stateVariables["/v2"].stateValues.xs[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v2"].replacements[0].componentName
- ].stateValues.xs[1],
- )
+ .fromAst(stateVariables["/v2"].stateValues.xs[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/e2"].replacements[0].componentName
- ].stateValues.value,
- )
+ .fromAst(stateVariables["/e2"].stateValues.value)
.equals(equationExpression),
).eq(true);
- expect(stateVariables[parabola3Name].stateValues.a).closeTo(a, 1e-12);
- expect(stateVariables[parabola3Name].stateValues.b).closeTo(b, 1e-12);
- expect(stateVariables[parabola3Name].stateValues.c).closeTo(c, 1e-12);
+ expect(stateVariables["/g3/p2"].stateValues.a).closeTo(a, 1e-12);
+ expect(stateVariables["/g3/p2"].stateValues.b).closeTo(b, 1e-12);
+ expect(stateVariables["/g3/p2"].stateValues.c).closeTo(c, 1e-12);
expect(
me
- .fromAst(stateVariables[parabola3Name].stateValues.equation)
+ .fromAst(stateVariables["/g3/p2"].stateValues.equation)
.equals(equationExpression),
).eq(true);
expect(
me
- .fromAst(stateVariables[parabola3Name].stateValues.vertex[0])
+ .fromAst(stateVariables["/g3/p2"].stateValues.vertex[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(stateVariables[parabola3Name].stateValues.vertex[1])
+ .fromAst(stateVariables["/g3/p2"].stateValues.vertex[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(stateVariables[vertex3Name].stateValues.xs[0])
+ .fromAst(stateVariables["/g3/v2"].stateValues.xs[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(stateVariables[vertex3Name].stateValues.xs[1])
+ .fromAst(stateVariables["/g3/v2"].stateValues.xs[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
});
@@ -712,8 +539,8 @@ describe("Parabola Tag Tests", function () {
let equationExpression = me.fromText(`y=${a}x^2+${b}x+${c}`);
- cy.get(equationAnchor).should("contain.text", "y=0.2x2+3x+9");
- cy.get(equationAnchor)
+ cy.get(cesc2("#/e2")).should("contain.text", "y=0.2x2+3x+9");
+ cy.get(cesc2("#/e2"))
.find(".mjx-mrow")
.eq(0)
.invoke("text")
@@ -744,114 +571,73 @@ describe("Parabola Tag Tests", function () {
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v"].replacements[0].componentName
- ].stateValues.xs[0],
- )
+ .fromAst(stateVariables["/v"].stateValues.xs[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v"].replacements[0].componentName
- ].stateValues.xs[1],
- )
+ .fromAst(stateVariables["/v"].stateValues.xs[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
- expect(
- stateVariables[stateVariables["/p2"].replacements[0].componentName]
- .stateValues.a,
- ).closeTo(a, 1e-12);
- expect(
- stateVariables[stateVariables["/p2"].replacements[0].componentName]
- .stateValues.b,
- ).closeTo(b, 1e-12);
- expect(
- stateVariables[stateVariables["/p2"].replacements[0].componentName]
- .stateValues.c,
- ).closeTo(c, 1e-12);
+ expect(stateVariables["/p2"].stateValues.a).closeTo(a, 1e-12);
+ expect(stateVariables["/p2"].stateValues.b).closeTo(b, 1e-12);
+ expect(stateVariables["/p2"].stateValues.c).closeTo(c, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/p2"].replacements[0].componentName
- ].stateValues.equation,
- )
+ .fromAst(stateVariables["/p2"].stateValues.equation)
.equals(equationExpression),
).eq(true);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/p2"].replacements[0].componentName
- ].stateValues.vertex[0],
- )
+ .fromAst(stateVariables["/p2"].stateValues.vertex[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/p2"].replacements[0].componentName
- ].stateValues.vertex[1],
- )
+ .fromAst(stateVariables["/p2"].stateValues.vertex[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v2"].replacements[0].componentName
- ].stateValues.xs[0],
- )
+ .fromAst(stateVariables["/v2"].stateValues.xs[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v2"].replacements[0].componentName
- ].stateValues.xs[1],
- )
+ .fromAst(stateVariables["/v2"].stateValues.xs[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/e2"].replacements[0].componentName
- ].stateValues.value,
- )
+ .fromAst(stateVariables["/e2"].stateValues.value)
.equals(equationExpression),
).eq(true);
- expect(stateVariables[parabola3Name].stateValues.a).closeTo(a, 1e-12);
- expect(stateVariables[parabola3Name].stateValues.b).closeTo(b, 1e-12);
- expect(stateVariables[parabola3Name].stateValues.c).closeTo(c, 1e-12);
+ expect(stateVariables["/g3/p2"].stateValues.a).closeTo(a, 1e-12);
+ expect(stateVariables["/g3/p2"].stateValues.b).closeTo(b, 1e-12);
+ expect(stateVariables["/g3/p2"].stateValues.c).closeTo(c, 1e-12);
expect(
me
- .fromAst(stateVariables[parabola3Name].stateValues.equation)
+ .fromAst(stateVariables["/g3/p2"].stateValues.equation)
.equals(equationExpression),
).eq(true);
expect(
me
- .fromAst(stateVariables[parabola3Name].stateValues.vertex[0])
+ .fromAst(stateVariables["/g3/p2"].stateValues.vertex[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(stateVariables[parabola3Name].stateValues.vertex[1])
+ .fromAst(stateVariables["/g3/p2"].stateValues.vertex[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(stateVariables[vertex3Name].stateValues.xs[0])
+ .fromAst(stateVariables["/g3/v2"].stateValues.xs[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(stateVariables[vertex3Name].stateValues.xs[1])
+ .fromAst(stateVariables["/g3/v2"].stateValues.xs[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
});
@@ -873,8 +659,8 @@ describe("Parabola Tag Tests", function () {
let equationExpression = me.fromText(`y=${a}x^2+${b}x+${c}`);
- cy.get(equationAnchor).should("contain.text", "y=0.2x2−1.7x+9");
- cy.get(equationAnchor)
+ cy.get(cesc2("#/e2")).should("contain.text", "y=0.2x2−1.7x+9");
+ cy.get(cesc2("#/e2"))
.find(".mjx-mrow")
.eq(0)
.invoke("text")
@@ -905,114 +691,73 @@ describe("Parabola Tag Tests", function () {
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v"].replacements[0].componentName
- ].stateValues.xs[0],
- )
+ .fromAst(stateVariables["/v"].stateValues.xs[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v"].replacements[0].componentName
- ].stateValues.xs[1],
- )
+ .fromAst(stateVariables["/v"].stateValues.xs[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
- expect(
- stateVariables[stateVariables["/p2"].replacements[0].componentName]
- .stateValues.a,
- ).closeTo(a, 1e-12);
- expect(
- stateVariables[stateVariables["/p2"].replacements[0].componentName]
- .stateValues.b,
- ).closeTo(b, 1e-12);
- expect(
- stateVariables[stateVariables["/p2"].replacements[0].componentName]
- .stateValues.c,
- ).closeTo(c, 1e-12);
+ expect(stateVariables["/p2"].stateValues.a).closeTo(a, 1e-12);
+ expect(stateVariables["/p2"].stateValues.b).closeTo(b, 1e-12);
+ expect(stateVariables["/p2"].stateValues.c).closeTo(c, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/p2"].replacements[0].componentName
- ].stateValues.equation,
- )
+ .fromAst(stateVariables["/p2"].stateValues.equation)
.equals(equationExpression),
).eq(true);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/p2"].replacements[0].componentName
- ].stateValues.vertex[0],
- )
+ .fromAst(stateVariables["/p2"].stateValues.vertex[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/p2"].replacements[0].componentName
- ].stateValues.vertex[1],
- )
+ .fromAst(stateVariables["/p2"].stateValues.vertex[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v2"].replacements[0].componentName
- ].stateValues.xs[0],
- )
+ .fromAst(stateVariables["/v2"].stateValues.xs[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v2"].replacements[0].componentName
- ].stateValues.xs[1],
- )
+ .fromAst(stateVariables["/v2"].stateValues.xs[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/e2"].replacements[0].componentName
- ].stateValues.value,
- )
+ .fromAst(stateVariables["/e2"].stateValues.value)
.equals(equationExpression),
).eq(true);
- expect(stateVariables[parabola3Name].stateValues.a).closeTo(a, 1e-12);
- expect(stateVariables[parabola3Name].stateValues.b).closeTo(b, 1e-12);
- expect(stateVariables[parabola3Name].stateValues.c).closeTo(c, 1e-12);
+ expect(stateVariables["/g3/p2"].stateValues.a).closeTo(a, 1e-12);
+ expect(stateVariables["/g3/p2"].stateValues.b).closeTo(b, 1e-12);
+ expect(stateVariables["/g3/p2"].stateValues.c).closeTo(c, 1e-12);
expect(
me
- .fromAst(stateVariables[parabola3Name].stateValues.equation)
+ .fromAst(stateVariables["/g3/p2"].stateValues.equation)
.equals(equationExpression),
).eq(true);
expect(
me
- .fromAst(stateVariables[parabola3Name].stateValues.vertex[0])
+ .fromAst(stateVariables["/g3/p2"].stateValues.vertex[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(stateVariables[parabola3Name].stateValues.vertex[1])
+ .fromAst(stateVariables["/g3/p2"].stateValues.vertex[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(stateVariables[vertex3Name].stateValues.xs[0])
+ .fromAst(stateVariables["/g3/v2"].stateValues.xs[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(stateVariables[vertex3Name].stateValues.xs[1])
+ .fromAst(stateVariables["/g3/v2"].stateValues.xs[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
});
@@ -1034,8 +779,8 @@ describe("Parabola Tag Tests", function () {
let equationExpression = me.fromText(`y=${a}x^2+${b}x+${c}`);
- cy.get(equationAnchor).should("contain.text", "y=0.2x2−1.7x−4.5");
- cy.get(equationAnchor)
+ cy.get(cesc2("#/e2")).should("contain.text", "y=0.2x2−1.7x−4.5");
+ cy.get(cesc2("#/e2"))
.find(".mjx-mrow")
.eq(0)
.invoke("text")
@@ -1066,114 +811,73 @@ describe("Parabola Tag Tests", function () {
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v"].replacements[0].componentName
- ].stateValues.xs[0],
- )
+ .fromAst(stateVariables["/v"].stateValues.xs[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v"].replacements[0].componentName
- ].stateValues.xs[1],
- )
+ .fromAst(stateVariables["/v"].stateValues.xs[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
- expect(
- stateVariables[stateVariables["/p2"].replacements[0].componentName]
- .stateValues.a,
- ).closeTo(a, 1e-12);
- expect(
- stateVariables[stateVariables["/p2"].replacements[0].componentName]
- .stateValues.b,
- ).closeTo(b, 1e-12);
- expect(
- stateVariables[stateVariables["/p2"].replacements[0].componentName]
- .stateValues.c,
- ).closeTo(c, 1e-12);
+ expect(stateVariables["/p2"].stateValues.a).closeTo(a, 1e-12);
+ expect(stateVariables["/p2"].stateValues.b).closeTo(b, 1e-12);
+ expect(stateVariables["/p2"].stateValues.c).closeTo(c, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/p2"].replacements[0].componentName
- ].stateValues.equation,
- )
+ .fromAst(stateVariables["/p2"].stateValues.equation)
.equals(equationExpression),
).eq(true);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/p2"].replacements[0].componentName
- ].stateValues.vertex[0],
- )
+ .fromAst(stateVariables["/p2"].stateValues.vertex[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/p2"].replacements[0].componentName
- ].stateValues.vertex[1],
- )
+ .fromAst(stateVariables["/p2"].stateValues.vertex[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v2"].replacements[0].componentName
- ].stateValues.xs[0],
- )
+ .fromAst(stateVariables["/v2"].stateValues.xs[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v2"].replacements[0].componentName
- ].stateValues.xs[1],
- )
+ .fromAst(stateVariables["/v2"].stateValues.xs[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/e2"].replacements[0].componentName
- ].stateValues.value,
- )
+ .fromAst(stateVariables["/e2"].stateValues.value)
.equals(equationExpression),
).eq(true);
- expect(stateVariables[parabola3Name].stateValues.a).closeTo(a, 1e-12);
- expect(stateVariables[parabola3Name].stateValues.b).closeTo(b, 1e-12);
- expect(stateVariables[parabola3Name].stateValues.c).closeTo(c, 1e-12);
+ expect(stateVariables["/g3/p2"].stateValues.a).closeTo(a, 1e-12);
+ expect(stateVariables["/g3/p2"].stateValues.b).closeTo(b, 1e-12);
+ expect(stateVariables["/g3/p2"].stateValues.c).closeTo(c, 1e-12);
expect(
me
- .fromAst(stateVariables[parabola3Name].stateValues.equation)
+ .fromAst(stateVariables["/g3/p2"].stateValues.equation)
.equals(equationExpression),
).eq(true);
expect(
me
- .fromAst(stateVariables[parabola3Name].stateValues.vertex[0])
+ .fromAst(stateVariables["/g3/p2"].stateValues.vertex[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(stateVariables[parabola3Name].stateValues.vertex[1])
+ .fromAst(stateVariables["/g3/p2"].stateValues.vertex[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(stateVariables[vertex3Name].stateValues.xs[0])
+ .fromAst(stateVariables["/g3/v2"].stateValues.xs[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(stateVariables[vertex3Name].stateValues.xs[1])
+ .fromAst(stateVariables["/g3/v2"].stateValues.xs[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
});
@@ -1185,7 +889,7 @@ describe("Parabola Tag Tests", function () {
await win.callAction1({
actionName: "movePoint",
- componentName: stateVariables["/v"].replacements[0].componentName,
+ componentName: "/v",
args: { x: -2, y: 1 },
});
@@ -1222,114 +926,73 @@ describe("Parabola Tag Tests", function () {
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v"].replacements[0].componentName
- ].stateValues.xs[0],
- )
+ .fromAst(stateVariables["/v"].stateValues.xs[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v"].replacements[0].componentName
- ].stateValues.xs[1],
- )
+ .fromAst(stateVariables["/v"].stateValues.xs[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
- expect(
- stateVariables[stateVariables["/p2"].replacements[0].componentName]
- .stateValues.a,
- ).closeTo(a, 1e-12);
- expect(
- stateVariables[stateVariables["/p2"].replacements[0].componentName]
- .stateValues.b,
- ).closeTo(b, 1e-12);
- expect(
- stateVariables[stateVariables["/p2"].replacements[0].componentName]
- .stateValues.c,
- ).closeTo(c, 1e-12);
+ expect(stateVariables["/p2"].stateValues.a).closeTo(a, 1e-12);
+ expect(stateVariables["/p2"].stateValues.b).closeTo(b, 1e-12);
+ expect(stateVariables["/p2"].stateValues.c).closeTo(c, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/p2"].replacements[0].componentName
- ].stateValues.equation,
- )
+ .fromAst(stateVariables["/p2"].stateValues.equation)
.equals(equationExpression),
).eq(true);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/p2"].replacements[0].componentName
- ].stateValues.vertex[0],
- )
+ .fromAst(stateVariables["/p2"].stateValues.vertex[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/p2"].replacements[0].componentName
- ].stateValues.vertex[1],
- )
+ .fromAst(stateVariables["/p2"].stateValues.vertex[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v2"].replacements[0].componentName
- ].stateValues.xs[0],
- )
+ .fromAst(stateVariables["/v2"].stateValues.xs[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v2"].replacements[0].componentName
- ].stateValues.xs[1],
- )
+ .fromAst(stateVariables["/v2"].stateValues.xs[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/e2"].replacements[0].componentName
- ].stateValues.value,
- )
+ .fromAst(stateVariables["/e2"].stateValues.value)
.equals(equationExpression),
).eq(true);
- expect(stateVariables[parabola3Name].stateValues.a).closeTo(a, 1e-12);
- expect(stateVariables[parabola3Name].stateValues.b).closeTo(b, 1e-12);
- expect(stateVariables[parabola3Name].stateValues.c).closeTo(c, 1e-12);
+ expect(stateVariables["/g3/p2"].stateValues.a).closeTo(a, 1e-12);
+ expect(stateVariables["/g3/p2"].stateValues.b).closeTo(b, 1e-12);
+ expect(stateVariables["/g3/p2"].stateValues.c).closeTo(c, 1e-12);
expect(
me
- .fromAst(stateVariables[parabola3Name].stateValues.equation)
+ .fromAst(stateVariables["/g3/p2"].stateValues.equation)
.equals(equationExpression),
).eq(true);
expect(
me
- .fromAst(stateVariables[parabola3Name].stateValues.vertex[0])
+ .fromAst(stateVariables["/g3/p2"].stateValues.vertex[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(stateVariables[parabola3Name].stateValues.vertex[1])
+ .fromAst(stateVariables["/g3/p2"].stateValues.vertex[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(stateVariables[vertex3Name].stateValues.xs[0])
+ .fromAst(stateVariables["/g3/v2"].stateValues.xs[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(stateVariables[vertex3Name].stateValues.xs[1])
+ .fromAst(stateVariables["/g3/v2"].stateValues.xs[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
});
@@ -1340,7 +1003,7 @@ describe("Parabola Tag Tests", function () {
let stateVariables = await win.returnAllStateVariables1();
await win.callAction1({
actionName: "movePoint",
- componentName: stateVariables["/v2"].replacements[0].componentName,
+ componentName: "/v2",
args: { x: 5, y: -6 },
});
@@ -1377,114 +1040,73 @@ describe("Parabola Tag Tests", function () {
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v"].replacements[0].componentName
- ].stateValues.xs[0],
- )
+ .fromAst(stateVariables["/v"].stateValues.xs[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v"].replacements[0].componentName
- ].stateValues.xs[1],
- )
+ .fromAst(stateVariables["/v"].stateValues.xs[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
- expect(
- stateVariables[stateVariables["/p2"].replacements[0].componentName]
- .stateValues.a,
- ).closeTo(a, 1e-12);
- expect(
- stateVariables[stateVariables["/p2"].replacements[0].componentName]
- .stateValues.b,
- ).closeTo(b, 1e-12);
- expect(
- stateVariables[stateVariables["/p2"].replacements[0].componentName]
- .stateValues.c,
- ).closeTo(c, 1e-12);
+ expect(stateVariables["/p2"].stateValues.a).closeTo(a, 1e-12);
+ expect(stateVariables["/p2"].stateValues.b).closeTo(b, 1e-12);
+ expect(stateVariables["/p2"].stateValues.c).closeTo(c, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/p2"].replacements[0].componentName
- ].stateValues.equation,
- )
+ .fromAst(stateVariables["/p2"].stateValues.equation)
.equals(equationExpression),
).eq(true);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/p2"].replacements[0].componentName
- ].stateValues.vertex[0],
- )
+ .fromAst(stateVariables["/p2"].stateValues.vertex[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/p2"].replacements[0].componentName
- ].stateValues.vertex[1],
- )
+ .fromAst(stateVariables["/p2"].stateValues.vertex[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v2"].replacements[0].componentName
- ].stateValues.xs[0],
- )
+ .fromAst(stateVariables["/v2"].stateValues.xs[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v2"].replacements[0].componentName
- ].stateValues.xs[1],
- )
+ .fromAst(stateVariables["/v2"].stateValues.xs[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/e2"].replacements[0].componentName
- ].stateValues.value,
- )
+ .fromAst(stateVariables["/e2"].stateValues.value)
.equals(equationExpression),
).eq(true);
- expect(stateVariables[parabola3Name].stateValues.a).closeTo(a, 1e-12);
- expect(stateVariables[parabola3Name].stateValues.b).closeTo(b, 1e-12);
- expect(stateVariables[parabola3Name].stateValues.c).closeTo(c, 1e-12);
+ expect(stateVariables["/g3/p2"].stateValues.a).closeTo(a, 1e-12);
+ expect(stateVariables["/g3/p2"].stateValues.b).closeTo(b, 1e-12);
+ expect(stateVariables["/g3/p2"].stateValues.c).closeTo(c, 1e-12);
expect(
me
- .fromAst(stateVariables[parabola3Name].stateValues.equation)
+ .fromAst(stateVariables["/g3/p2"].stateValues.equation)
.equals(equationExpression),
).eq(true);
expect(
me
- .fromAst(stateVariables[parabola3Name].stateValues.vertex[0])
+ .fromAst(stateVariables["/g3/p2"].stateValues.vertex[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(stateVariables[parabola3Name].stateValues.vertex[1])
+ .fromAst(stateVariables["/g3/p2"].stateValues.vertex[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(stateVariables[vertex3Name].stateValues.xs[0])
+ .fromAst(stateVariables["/g3/v2"].stateValues.xs[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(stateVariables[vertex3Name].stateValues.xs[1])
+ .fromAst(stateVariables["/g3/v2"].stateValues.xs[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
});
@@ -1494,7 +1116,7 @@ describe("Parabola Tag Tests", function () {
cy.window().then(async (win) => {
await win.callAction1({
actionName: "movePoint",
- componentName: vertex3Name,
+ componentName: "/g3/v2",
args: { x: -3, y: -2 },
});
@@ -1531,114 +1153,73 @@ describe("Parabola Tag Tests", function () {
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v"].replacements[0].componentName
- ].stateValues.xs[0],
- )
+ .fromAst(stateVariables["/v"].stateValues.xs[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v"].replacements[0].componentName
- ].stateValues.xs[1],
- )
+ .fromAst(stateVariables["/v"].stateValues.xs[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
- expect(
- stateVariables[stateVariables["/p2"].replacements[0].componentName]
- .stateValues.a,
- ).closeTo(a, 1e-12);
- expect(
- stateVariables[stateVariables["/p2"].replacements[0].componentName]
- .stateValues.b,
- ).closeTo(b, 1e-12);
- expect(
- stateVariables[stateVariables["/p2"].replacements[0].componentName]
- .stateValues.c,
- ).closeTo(c, 1e-12);
+ expect(stateVariables["/p2"].stateValues.a).closeTo(a, 1e-12);
+ expect(stateVariables["/p2"].stateValues.b).closeTo(b, 1e-12);
+ expect(stateVariables["/p2"].stateValues.c).closeTo(c, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/p2"].replacements[0].componentName
- ].stateValues.equation,
- )
+ .fromAst(stateVariables["/p2"].stateValues.equation)
.equals(equationExpression),
).eq(true);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/p2"].replacements[0].componentName
- ].stateValues.vertex[0],
- )
+ .fromAst(stateVariables["/p2"].stateValues.vertex[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/p2"].replacements[0].componentName
- ].stateValues.vertex[1],
- )
+ .fromAst(stateVariables["/p2"].stateValues.vertex[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v2"].replacements[0].componentName
- ].stateValues.xs[0],
- )
+ .fromAst(stateVariables["/v2"].stateValues.xs[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v2"].replacements[0].componentName
- ].stateValues.xs[1],
- )
+ .fromAst(stateVariables["/v2"].stateValues.xs[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/e2"].replacements[0].componentName
- ].stateValues.value,
- )
+ .fromAst(stateVariables["/e2"].stateValues.value)
.equals(equationExpression),
).eq(true);
- expect(stateVariables[parabola3Name].stateValues.a).closeTo(a, 1e-12);
- expect(stateVariables[parabola3Name].stateValues.b).closeTo(b, 1e-12);
- expect(stateVariables[parabola3Name].stateValues.c).closeTo(c, 1e-12);
+ expect(stateVariables["/g3/p2"].stateValues.a).closeTo(a, 1e-12);
+ expect(stateVariables["/g3/p2"].stateValues.b).closeTo(b, 1e-12);
+ expect(stateVariables["/g3/p2"].stateValues.c).closeTo(c, 1e-12);
expect(
me
- .fromAst(stateVariables[parabola3Name].stateValues.equation)
+ .fromAst(stateVariables["/g3/p2"].stateValues.equation)
.equals(equationExpression),
).eq(true);
expect(
me
- .fromAst(stateVariables[parabola3Name].stateValues.vertex[0])
+ .fromAst(stateVariables["/g3/p2"].stateValues.vertex[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(stateVariables[parabola3Name].stateValues.vertex[1])
+ .fromAst(stateVariables["/g3/p2"].stateValues.vertex[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(stateVariables[vertex3Name].stateValues.xs[0])
+ .fromAst(stateVariables["/g3/v2"].stateValues.xs[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(stateVariables[vertex3Name].stateValues.xs[1])
+ .fromAst(stateVariables["/g3/v2"].stateValues.xs[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
});
@@ -1654,15 +1235,15 @@ describe("Parabola Tag Tests", function () {
a
-
- a =
b =
@@ -1682,15 +1263,6 @@ describe("Parabola Tag Tests", function () {
cy.window().then(async (win) => {
let stateVariables = await win.returnAllStateVariables1();
- let equationAnchor = cesc2(
- "#" + stateVariables["/e2"].replacements[0].componentName,
- );
- let parabola3Name =
- stateVariables[stateVariables["/g3"].replacements[0].componentName]
- .activeChildren[0].componentName;
- let vertex3Name =
- stateVariables[stateVariables["/g3"].replacements[0].componentName]
- .activeChildren[1].componentName;
cy.window().then(async (win) => {
let a = 1,
@@ -1702,7 +1274,7 @@ describe("Parabola Tag Tests", function () {
let equationExpression = me.fromText(`y=${a}x^2+${b}x+${c}`);
- cy.get(equationAnchor)
+ cy.get(cesc2("#/e2"))
.find(".mjx-mrow")
.eq(0)
.invoke("text")
@@ -1733,114 +1305,73 @@ describe("Parabola Tag Tests", function () {
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v"].replacements[0].componentName
- ].stateValues.xs[0],
- )
+ .fromAst(stateVariables["/v"].stateValues.xs[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v"].replacements[0].componentName
- ].stateValues.xs[1],
- )
+ .fromAst(stateVariables["/v"].stateValues.xs[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
- expect(
- stateVariables[stateVariables["/p2"].replacements[0].componentName]
- .stateValues.a,
- ).closeTo(a, 1e-12);
- expect(
- stateVariables[stateVariables["/p2"].replacements[0].componentName]
- .stateValues.b,
- ).closeTo(b, 1e-12);
- expect(
- stateVariables[stateVariables["/p2"].replacements[0].componentName]
- .stateValues.c,
- ).closeTo(c, 1e-12);
+ expect(stateVariables["/p2"].stateValues.a).closeTo(a, 1e-12);
+ expect(stateVariables["/p2"].stateValues.b).closeTo(b, 1e-12);
+ expect(stateVariables["/p2"].stateValues.c).closeTo(c, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/p2"].replacements[0].componentName
- ].stateValues.equation,
- )
+ .fromAst(stateVariables["/p2"].stateValues.equation)
.equals(equationExpression),
).eq(true);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/p2"].replacements[0].componentName
- ].stateValues.vertex[0],
- )
+ .fromAst(stateVariables["/p2"].stateValues.vertex[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/p2"].replacements[0].componentName
- ].stateValues.vertex[1],
- )
+ .fromAst(stateVariables["/p2"].stateValues.vertex[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v2"].replacements[0].componentName
- ].stateValues.xs[0],
- )
+ .fromAst(stateVariables["/v2"].stateValues.xs[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v2"].replacements[0].componentName
- ].stateValues.xs[1],
- )
+ .fromAst(stateVariables["/v2"].stateValues.xs[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/e2"].replacements[0].componentName
- ].stateValues.value,
- )
+ .fromAst(stateVariables["/e2"].stateValues.value)
.equals(equationExpression),
).eq(true);
- expect(stateVariables[parabola3Name].stateValues.a).closeTo(a, 1e-12);
- expect(stateVariables[parabola3Name].stateValues.b).closeTo(b, 1e-12);
- expect(stateVariables[parabola3Name].stateValues.c).closeTo(c, 1e-12);
+ expect(stateVariables["/g3/p2"].stateValues.a).closeTo(a, 1e-12);
+ expect(stateVariables["/g3/p2"].stateValues.b).closeTo(b, 1e-12);
+ expect(stateVariables["/g3/p2"].stateValues.c).closeTo(c, 1e-12);
expect(
me
- .fromAst(stateVariables[parabola3Name].stateValues.equation)
+ .fromAst(stateVariables["/g3/p2"].stateValues.equation)
.equals(equationExpression),
).eq(true);
expect(
me
- .fromAst(stateVariables[parabola3Name].stateValues.vertex[0])
+ .fromAst(stateVariables["/g3/p2"].stateValues.vertex[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(stateVariables[parabola3Name].stateValues.vertex[1])
+ .fromAst(stateVariables["/g3/p2"].stateValues.vertex[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(stateVariables[vertex3Name].stateValues.xs[0])
+ .fromAst(stateVariables["/g3/v2"].stateValues.xs[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(stateVariables[vertex3Name].stateValues.xs[1])
+ .fromAst(stateVariables["/g3/v2"].stateValues.xs[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
});
@@ -1862,9 +1393,9 @@ describe("Parabola Tag Tests", function () {
let equationExpression = me.fromText(`y=${a}x^2+${b}x+${c}`);
- cy.get(equationAnchor).should("contain.text", "y=−2x2");
+ cy.get(cesc2("#/e2")).should("contain.text", "y=−2x2");
- cy.get(equationAnchor)
+ cy.get(cesc2("#/e2"))
.find(".mjx-mrow")
.eq(0)
.invoke("text")
@@ -1895,114 +1426,73 @@ describe("Parabola Tag Tests", function () {
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v"].replacements[0].componentName
- ].stateValues.xs[0],
- )
+ .fromAst(stateVariables["/v"].stateValues.xs[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v"].replacements[0].componentName
- ].stateValues.xs[1],
- )
+ .fromAst(stateVariables["/v"].stateValues.xs[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
- expect(
- stateVariables[stateVariables["/p2"].replacements[0].componentName]
- .stateValues.a,
- ).closeTo(a, 1e-12);
- expect(
- stateVariables[stateVariables["/p2"].replacements[0].componentName]
- .stateValues.b,
- ).closeTo(b, 1e-12);
- expect(
- stateVariables[stateVariables["/p2"].replacements[0].componentName]
- .stateValues.c,
- ).closeTo(c, 1e-12);
+ expect(stateVariables["/p2"].stateValues.a).closeTo(a, 1e-12);
+ expect(stateVariables["/p2"].stateValues.b).closeTo(b, 1e-12);
+ expect(stateVariables["/p2"].stateValues.c).closeTo(c, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/p2"].replacements[0].componentName
- ].stateValues.equation,
- )
+ .fromAst(stateVariables["/p2"].stateValues.equation)
.equals(equationExpression),
).eq(true);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/p2"].replacements[0].componentName
- ].stateValues.vertex[0],
- )
+ .fromAst(stateVariables["/p2"].stateValues.vertex[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/p2"].replacements[0].componentName
- ].stateValues.vertex[1],
- )
+ .fromAst(stateVariables["/p2"].stateValues.vertex[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v2"].replacements[0].componentName
- ].stateValues.xs[0],
- )
+ .fromAst(stateVariables["/v2"].stateValues.xs[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v2"].replacements[0].componentName
- ].stateValues.xs[1],
- )
+ .fromAst(stateVariables["/v2"].stateValues.xs[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/e2"].replacements[0].componentName
- ].stateValues.value,
- )
+ .fromAst(stateVariables["/e2"].stateValues.value)
.equals(equationExpression),
).eq(true);
- expect(stateVariables[parabola3Name].stateValues.a).closeTo(a, 1e-12);
- expect(stateVariables[parabola3Name].stateValues.b).closeTo(b, 1e-12);
- expect(stateVariables[parabola3Name].stateValues.c).closeTo(c, 1e-12);
+ expect(stateVariables["/g3/p2"].stateValues.a).closeTo(a, 1e-12);
+ expect(stateVariables["/g3/p2"].stateValues.b).closeTo(b, 1e-12);
+ expect(stateVariables["/g3/p2"].stateValues.c).closeTo(c, 1e-12);
expect(
me
- .fromAst(stateVariables[parabola3Name].stateValues.equation)
+ .fromAst(stateVariables["/g3/p2"].stateValues.equation)
.equals(equationExpression),
).eq(true);
expect(
me
- .fromAst(stateVariables[parabola3Name].stateValues.vertex[0])
+ .fromAst(stateVariables["/g3/p2"].stateValues.vertex[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(stateVariables[parabola3Name].stateValues.vertex[1])
+ .fromAst(stateVariables["/g3/p2"].stateValues.vertex[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(stateVariables[vertex3Name].stateValues.xs[0])
+ .fromAst(stateVariables["/g3/v2"].stateValues.xs[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(stateVariables[vertex3Name].stateValues.xs[1])
+ .fromAst(stateVariables["/g3/v2"].stateValues.xs[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
});
@@ -2024,8 +1514,8 @@ describe("Parabola Tag Tests", function () {
let equationExpression = me.fromText(`y=${a}x^2+${b}x+${c}`);
- cy.get(equationAnchor).should("contain.text", "y=−2x2+3x");
- cy.get(equationAnchor)
+ cy.get(cesc2("#/e2")).should("contain.text", "y=−2x2+3x");
+ cy.get(cesc2("#/e2"))
.find(".mjx-mrow")
.eq(0)
.invoke("text")
@@ -2056,114 +1546,73 @@ describe("Parabola Tag Tests", function () {
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v"].replacements[0].componentName
- ].stateValues.xs[0],
- )
+ .fromAst(stateVariables["/v"].stateValues.xs[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v"].replacements[0].componentName
- ].stateValues.xs[1],
- )
+ .fromAst(stateVariables["/v"].stateValues.xs[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
- expect(
- stateVariables[stateVariables["/p2"].replacements[0].componentName]
- .stateValues.a,
- ).closeTo(a, 1e-12);
- expect(
- stateVariables[stateVariables["/p2"].replacements[0].componentName]
- .stateValues.b,
- ).closeTo(b, 1e-12);
- expect(
- stateVariables[stateVariables["/p2"].replacements[0].componentName]
- .stateValues.c,
- ).closeTo(c, 1e-12);
+ expect(stateVariables["/p2"].stateValues.a).closeTo(a, 1e-12);
+ expect(stateVariables["/p2"].stateValues.b).closeTo(b, 1e-12);
+ expect(stateVariables["/p2"].stateValues.c).closeTo(c, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/p2"].replacements[0].componentName
- ].stateValues.equation,
- )
+ .fromAst(stateVariables["/p2"].stateValues.equation)
.equals(equationExpression),
).eq(true);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/p2"].replacements[0].componentName
- ].stateValues.vertex[0],
- )
+ .fromAst(stateVariables["/p2"].stateValues.vertex[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/p2"].replacements[0].componentName
- ].stateValues.vertex[1],
- )
+ .fromAst(stateVariables["/p2"].stateValues.vertex[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v2"].replacements[0].componentName
- ].stateValues.xs[0],
- )
+ .fromAst(stateVariables["/v2"].stateValues.xs[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v2"].replacements[0].componentName
- ].stateValues.xs[1],
- )
+ .fromAst(stateVariables["/v2"].stateValues.xs[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/e2"].replacements[0].componentName
- ].stateValues.value,
- )
+ .fromAst(stateVariables["/e2"].stateValues.value)
.equals(equationExpression),
).eq(true);
- expect(stateVariables[parabola3Name].stateValues.a).closeTo(a, 1e-12);
- expect(stateVariables[parabola3Name].stateValues.b).closeTo(b, 1e-12);
- expect(stateVariables[parabola3Name].stateValues.c).closeTo(c, 1e-12);
+ expect(stateVariables["/g3/p2"].stateValues.a).closeTo(a, 1e-12);
+ expect(stateVariables["/g3/p2"].stateValues.b).closeTo(b, 1e-12);
+ expect(stateVariables["/g3/p2"].stateValues.c).closeTo(c, 1e-12);
expect(
me
- .fromAst(stateVariables[parabola3Name].stateValues.equation)
+ .fromAst(stateVariables["/g3/p2"].stateValues.equation)
.equals(equationExpression),
).eq(true);
expect(
me
- .fromAst(stateVariables[parabola3Name].stateValues.vertex[0])
+ .fromAst(stateVariables["/g3/p2"].stateValues.vertex[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(stateVariables[parabola3Name].stateValues.vertex[1])
+ .fromAst(stateVariables["/g3/p2"].stateValues.vertex[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(stateVariables[vertex3Name].stateValues.xs[0])
+ .fromAst(stateVariables["/g3/v2"].stateValues.xs[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(stateVariables[vertex3Name].stateValues.xs[1])
+ .fromAst(stateVariables["/g3/v2"].stateValues.xs[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
});
@@ -2185,8 +1634,8 @@ describe("Parabola Tag Tests", function () {
let equationExpression = me.fromText(`y=${a}x^2+${b}x+${c}`);
- cy.get(equationAnchor).should("contain.text", "y=−2x2+3x+9");
- cy.get(equationAnchor)
+ cy.get(cesc2("#/e2")).should("contain.text", "y=−2x2+3x+9");
+ cy.get(cesc2("#/e2"))
.find(".mjx-mrow")
.eq(0)
.invoke("text")
@@ -2217,114 +1666,73 @@ describe("Parabola Tag Tests", function () {
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v"].replacements[0].componentName
- ].stateValues.xs[0],
- )
+ .fromAst(stateVariables["/v"].stateValues.xs[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v"].replacements[0].componentName
- ].stateValues.xs[1],
- )
+ .fromAst(stateVariables["/v"].stateValues.xs[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
- expect(
- stateVariables[stateVariables["/p2"].replacements[0].componentName]
- .stateValues.a,
- ).closeTo(a, 1e-12);
- expect(
- stateVariables[stateVariables["/p2"].replacements[0].componentName]
- .stateValues.b,
- ).closeTo(b, 1e-12);
- expect(
- stateVariables[stateVariables["/p2"].replacements[0].componentName]
- .stateValues.c,
- ).closeTo(c, 1e-12);
+ expect(stateVariables["/p2"].stateValues.a).closeTo(a, 1e-12);
+ expect(stateVariables["/p2"].stateValues.b).closeTo(b, 1e-12);
+ expect(stateVariables["/p2"].stateValues.c).closeTo(c, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/p2"].replacements[0].componentName
- ].stateValues.equation,
- )
+ .fromAst(stateVariables["/p2"].stateValues.equation)
.equals(equationExpression),
).eq(true);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/p2"].replacements[0].componentName
- ].stateValues.vertex[0],
- )
+ .fromAst(stateVariables["/p2"].stateValues.vertex[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/p2"].replacements[0].componentName
- ].stateValues.vertex[1],
- )
+ .fromAst(stateVariables["/p2"].stateValues.vertex[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v2"].replacements[0].componentName
- ].stateValues.xs[0],
- )
+ .fromAst(stateVariables["/v2"].stateValues.xs[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v2"].replacements[0].componentName
- ].stateValues.xs[1],
- )
+ .fromAst(stateVariables["/v2"].stateValues.xs[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/e2"].replacements[0].componentName
- ].stateValues.value,
- )
+ .fromAst(stateVariables["/e2"].stateValues.value)
.equals(equationExpression),
).eq(true);
- expect(stateVariables[parabola3Name].stateValues.a).closeTo(a, 1e-12);
- expect(stateVariables[parabola3Name].stateValues.b).closeTo(b, 1e-12);
- expect(stateVariables[parabola3Name].stateValues.c).closeTo(c, 1e-12);
+ expect(stateVariables["/g3/p2"].stateValues.a).closeTo(a, 1e-12);
+ expect(stateVariables["/g3/p2"].stateValues.b).closeTo(b, 1e-12);
+ expect(stateVariables["/g3/p2"].stateValues.c).closeTo(c, 1e-12);
expect(
me
- .fromAst(stateVariables[parabola3Name].stateValues.equation)
+ .fromAst(stateVariables["/g3/p2"].stateValues.equation)
.equals(equationExpression),
).eq(true);
expect(
me
- .fromAst(stateVariables[parabola3Name].stateValues.vertex[0])
+ .fromAst(stateVariables["/g3/p2"].stateValues.vertex[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(stateVariables[parabola3Name].stateValues.vertex[1])
+ .fromAst(stateVariables["/g3/p2"].stateValues.vertex[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(stateVariables[vertex3Name].stateValues.xs[0])
+ .fromAst(stateVariables["/g3/v2"].stateValues.xs[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(stateVariables[vertex3Name].stateValues.xs[1])
+ .fromAst(stateVariables["/g3/v2"].stateValues.xs[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
});
@@ -2346,8 +1754,8 @@ describe("Parabola Tag Tests", function () {
let equationExpression = me.fromText(`y=${a}x^2+${b}x+${c}`);
- cy.get(equationAnchor).should("contain.text", "y=0.2x2+3x+9");
- cy.get(equationAnchor)
+ cy.get(cesc2("#/e2")).should("contain.text", "y=0.2x2+3x+9");
+ cy.get(cesc2("#/e2"))
.find(".mjx-mrow")
.eq(0)
.invoke("text")
@@ -2378,114 +1786,73 @@ describe("Parabola Tag Tests", function () {
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v"].replacements[0].componentName
- ].stateValues.xs[0],
- )
+ .fromAst(stateVariables["/v"].stateValues.xs[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v"].replacements[0].componentName
- ].stateValues.xs[1],
- )
+ .fromAst(stateVariables["/v"].stateValues.xs[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
- expect(
- stateVariables[stateVariables["/p2"].replacements[0].componentName]
- .stateValues.a,
- ).closeTo(a, 1e-12);
- expect(
- stateVariables[stateVariables["/p2"].replacements[0].componentName]
- .stateValues.b,
- ).closeTo(b, 1e-12);
- expect(
- stateVariables[stateVariables["/p2"].replacements[0].componentName]
- .stateValues.c,
- ).closeTo(c, 1e-12);
+ expect(stateVariables["/p2"].stateValues.a).closeTo(a, 1e-12);
+ expect(stateVariables["/p2"].stateValues.b).closeTo(b, 1e-12);
+ expect(stateVariables["/p2"].stateValues.c).closeTo(c, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/p2"].replacements[0].componentName
- ].stateValues.equation,
- )
+ .fromAst(stateVariables["/p2"].stateValues.equation)
.equals(equationExpression),
).eq(true);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/p2"].replacements[0].componentName
- ].stateValues.vertex[0],
- )
+ .fromAst(stateVariables["/p2"].stateValues.vertex[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/p2"].replacements[0].componentName
- ].stateValues.vertex[1],
- )
+ .fromAst(stateVariables["/p2"].stateValues.vertex[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v2"].replacements[0].componentName
- ].stateValues.xs[0],
- )
+ .fromAst(stateVariables["/v2"].stateValues.xs[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v2"].replacements[0].componentName
- ].stateValues.xs[1],
- )
+ .fromAst(stateVariables["/v2"].stateValues.xs[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/e2"].replacements[0].componentName
- ].stateValues.value,
- )
+ .fromAst(stateVariables["/e2"].stateValues.value)
.equals(equationExpression),
).eq(true);
- expect(stateVariables[parabola3Name].stateValues.a).closeTo(a, 1e-12);
- expect(stateVariables[parabola3Name].stateValues.b).closeTo(b, 1e-12);
- expect(stateVariables[parabola3Name].stateValues.c).closeTo(c, 1e-12);
+ expect(stateVariables["/g3/p2"].stateValues.a).closeTo(a, 1e-12);
+ expect(stateVariables["/g3/p2"].stateValues.b).closeTo(b, 1e-12);
+ expect(stateVariables["/g3/p2"].stateValues.c).closeTo(c, 1e-12);
expect(
me
- .fromAst(stateVariables[parabola3Name].stateValues.equation)
+ .fromAst(stateVariables["/g3/p2"].stateValues.equation)
.equals(equationExpression),
).eq(true);
expect(
me
- .fromAst(stateVariables[parabola3Name].stateValues.vertex[0])
+ .fromAst(stateVariables["/g3/p2"].stateValues.vertex[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(stateVariables[parabola3Name].stateValues.vertex[1])
+ .fromAst(stateVariables["/g3/p2"].stateValues.vertex[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(stateVariables[vertex3Name].stateValues.xs[0])
+ .fromAst(stateVariables["/g3/v2"].stateValues.xs[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(stateVariables[vertex3Name].stateValues.xs[1])
+ .fromAst(stateVariables["/g3/v2"].stateValues.xs[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
});
@@ -2507,8 +1874,8 @@ describe("Parabola Tag Tests", function () {
let equationExpression = me.fromText(`y=${a}x^2+${b}x+${c}`);
- cy.get(equationAnchor).should("contain.text", "y=0.2x2−1.7x+9");
- cy.get(equationAnchor)
+ cy.get(cesc2("#/e2")).should("contain.text", "y=0.2x2−1.7x+9");
+ cy.get(cesc2("#/e2"))
.find(".mjx-mrow")
.eq(0)
.invoke("text")
@@ -2539,114 +1906,73 @@ describe("Parabola Tag Tests", function () {
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v"].replacements[0].componentName
- ].stateValues.xs[0],
- )
+ .fromAst(stateVariables["/v"].stateValues.xs[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v"].replacements[0].componentName
- ].stateValues.xs[1],
- )
+ .fromAst(stateVariables["/v"].stateValues.xs[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
- expect(
- stateVariables[stateVariables["/p2"].replacements[0].componentName]
- .stateValues.a,
- ).closeTo(a, 1e-12);
- expect(
- stateVariables[stateVariables["/p2"].replacements[0].componentName]
- .stateValues.b,
- ).closeTo(b, 1e-12);
- expect(
- stateVariables[stateVariables["/p2"].replacements[0].componentName]
- .stateValues.c,
- ).closeTo(c, 1e-12);
+ expect(stateVariables["/p2"].stateValues.a).closeTo(a, 1e-12);
+ expect(stateVariables["/p2"].stateValues.b).closeTo(b, 1e-12);
+ expect(stateVariables["/p2"].stateValues.c).closeTo(c, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/p2"].replacements[0].componentName
- ].stateValues.equation,
- )
+ .fromAst(stateVariables["/p2"].stateValues.equation)
.equals(equationExpression),
).eq(true);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/p2"].replacements[0].componentName
- ].stateValues.vertex[0],
- )
+ .fromAst(stateVariables["/p2"].stateValues.vertex[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/p2"].replacements[0].componentName
- ].stateValues.vertex[1],
- )
+ .fromAst(stateVariables["/p2"].stateValues.vertex[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v2"].replacements[0].componentName
- ].stateValues.xs[0],
- )
+ .fromAst(stateVariables["/v2"].stateValues.xs[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v2"].replacements[0].componentName
- ].stateValues.xs[1],
- )
+ .fromAst(stateVariables["/v2"].stateValues.xs[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/e2"].replacements[0].componentName
- ].stateValues.value,
- )
+ .fromAst(stateVariables["/e2"].stateValues.value)
.equals(equationExpression),
).eq(true);
- expect(stateVariables[parabola3Name].stateValues.a).closeTo(a, 1e-12);
- expect(stateVariables[parabola3Name].stateValues.b).closeTo(b, 1e-12);
- expect(stateVariables[parabola3Name].stateValues.c).closeTo(c, 1e-12);
+ expect(stateVariables["/g3/p2"].stateValues.a).closeTo(a, 1e-12);
+ expect(stateVariables["/g3/p2"].stateValues.b).closeTo(b, 1e-12);
+ expect(stateVariables["/g3/p2"].stateValues.c).closeTo(c, 1e-12);
expect(
me
- .fromAst(stateVariables[parabola3Name].stateValues.equation)
+ .fromAst(stateVariables["/g3/p2"].stateValues.equation)
.equals(equationExpression),
).eq(true);
expect(
me
- .fromAst(stateVariables[parabola3Name].stateValues.vertex[0])
+ .fromAst(stateVariables["/g3/p2"].stateValues.vertex[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(stateVariables[parabola3Name].stateValues.vertex[1])
+ .fromAst(stateVariables["/g3/p2"].stateValues.vertex[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(stateVariables[vertex3Name].stateValues.xs[0])
+ .fromAst(stateVariables["/g3/v2"].stateValues.xs[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(stateVariables[vertex3Name].stateValues.xs[1])
+ .fromAst(stateVariables["/g3/v2"].stateValues.xs[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
});
@@ -2668,8 +1994,8 @@ describe("Parabola Tag Tests", function () {
let equationExpression = me.fromText(`y=${a}x^2+${b}x+${c}`);
- cy.get(equationAnchor).should("contain.text", "y=0.2x2−1.7x−4.5");
- cy.get(equationAnchor)
+ cy.get(cesc2("#/e2")).should("contain.text", "y=0.2x2−1.7x−4.5");
+ cy.get(cesc2("#/e2"))
.find(".mjx-mrow")
.eq(0)
.invoke("text")
@@ -2700,114 +2026,73 @@ describe("Parabola Tag Tests", function () {
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v"].replacements[0].componentName
- ].stateValues.xs[0],
- )
+ .fromAst(stateVariables["/v"].stateValues.xs[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v"].replacements[0].componentName
- ].stateValues.xs[1],
- )
+ .fromAst(stateVariables["/v"].stateValues.xs[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
- expect(
- stateVariables[stateVariables["/p2"].replacements[0].componentName]
- .stateValues.a,
- ).closeTo(a, 1e-12);
- expect(
- stateVariables[stateVariables["/p2"].replacements[0].componentName]
- .stateValues.b,
- ).closeTo(b, 1e-12);
- expect(
- stateVariables[stateVariables["/p2"].replacements[0].componentName]
- .stateValues.c,
- ).closeTo(c, 1e-12);
+ expect(stateVariables["/p2"].stateValues.a).closeTo(a, 1e-12);
+ expect(stateVariables["/p2"].stateValues.b).closeTo(b, 1e-12);
+ expect(stateVariables["/p2"].stateValues.c).closeTo(c, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/p2"].replacements[0].componentName
- ].stateValues.equation,
- )
+ .fromAst(stateVariables["/p2"].stateValues.equation)
.equals(equationExpression),
).eq(true);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/p2"].replacements[0].componentName
- ].stateValues.vertex[0],
- )
+ .fromAst(stateVariables["/p2"].stateValues.vertex[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/p2"].replacements[0].componentName
- ].stateValues.vertex[1],
- )
+ .fromAst(stateVariables["/p2"].stateValues.vertex[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v2"].replacements[0].componentName
- ].stateValues.xs[0],
- )
+ .fromAst(stateVariables["/v2"].stateValues.xs[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v2"].replacements[0].componentName
- ].stateValues.xs[1],
- )
+ .fromAst(stateVariables["/v2"].stateValues.xs[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/e2"].replacements[0].componentName
- ].stateValues.value,
- )
+ .fromAst(stateVariables["/e2"].stateValues.value)
.equals(equationExpression),
).eq(true);
- expect(stateVariables[parabola3Name].stateValues.a).closeTo(a, 1e-12);
- expect(stateVariables[parabola3Name].stateValues.b).closeTo(b, 1e-12);
- expect(stateVariables[parabola3Name].stateValues.c).closeTo(c, 1e-12);
+ expect(stateVariables["/g3/p2"].stateValues.a).closeTo(a, 1e-12);
+ expect(stateVariables["/g3/p2"].stateValues.b).closeTo(b, 1e-12);
+ expect(stateVariables["/g3/p2"].stateValues.c).closeTo(c, 1e-12);
expect(
me
- .fromAst(stateVariables[parabola3Name].stateValues.equation)
+ .fromAst(stateVariables["/g3/p2"].stateValues.equation)
.equals(equationExpression),
).eq(true);
expect(
me
- .fromAst(stateVariables[parabola3Name].stateValues.vertex[0])
+ .fromAst(stateVariables["/g3/p2"].stateValues.vertex[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(stateVariables[parabola3Name].stateValues.vertex[1])
+ .fromAst(stateVariables["/g3/p2"].stateValues.vertex[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(stateVariables[vertex3Name].stateValues.xs[0])
+ .fromAst(stateVariables["/g3/v2"].stateValues.xs[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(stateVariables[vertex3Name].stateValues.xs[1])
+ .fromAst(stateVariables["/g3/v2"].stateValues.xs[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
});
@@ -2817,7 +2102,7 @@ describe("Parabola Tag Tests", function () {
cy.window().then(async (win) => {
await win.callAction1({
actionName: "movePoint",
- componentName: stateVariables["/v"].replacements[0].componentName,
+ componentName: "/v",
args: { x: -2, y: 1 },
});
@@ -2854,114 +2139,73 @@ describe("Parabola Tag Tests", function () {
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v"].replacements[0].componentName
- ].stateValues.xs[0],
- )
+ .fromAst(stateVariables["/v"].stateValues.xs[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v"].replacements[0].componentName
- ].stateValues.xs[1],
- )
+ .fromAst(stateVariables["/v"].stateValues.xs[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
- expect(
- stateVariables[stateVariables["/p2"].replacements[0].componentName]
- .stateValues.a,
- ).closeTo(a, 1e-12);
- expect(
- stateVariables[stateVariables["/p2"].replacements[0].componentName]
- .stateValues.b,
- ).closeTo(b, 1e-12);
- expect(
- stateVariables[stateVariables["/p2"].replacements[0].componentName]
- .stateValues.c,
- ).closeTo(c, 1e-12);
+ expect(stateVariables["/p2"].stateValues.a).closeTo(a, 1e-12);
+ expect(stateVariables["/p2"].stateValues.b).closeTo(b, 1e-12);
+ expect(stateVariables["/p2"].stateValues.c).closeTo(c, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/p2"].replacements[0].componentName
- ].stateValues.equation,
- )
+ .fromAst(stateVariables["/p2"].stateValues.equation)
.equals(equationExpression),
).eq(true);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/p2"].replacements[0].componentName
- ].stateValues.vertex[0],
- )
+ .fromAst(stateVariables["/p2"].stateValues.vertex[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/p2"].replacements[0].componentName
- ].stateValues.vertex[1],
- )
+ .fromAst(stateVariables["/p2"].stateValues.vertex[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v2"].replacements[0].componentName
- ].stateValues.xs[0],
- )
+ .fromAst(stateVariables["/v2"].stateValues.xs[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v2"].replacements[0].componentName
- ].stateValues.xs[1],
- )
+ .fromAst(stateVariables["/v2"].stateValues.xs[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/e2"].replacements[0].componentName
- ].stateValues.value,
- )
+ .fromAst(stateVariables["/e2"].stateValues.value)
.equals(equationExpression),
).eq(true);
- expect(stateVariables[parabola3Name].stateValues.a).closeTo(a, 1e-12);
- expect(stateVariables[parabola3Name].stateValues.b).closeTo(b, 1e-12);
- expect(stateVariables[parabola3Name].stateValues.c).closeTo(c, 1e-12);
+ expect(stateVariables["/g3/p2"].stateValues.a).closeTo(a, 1e-12);
+ expect(stateVariables["/g3/p2"].stateValues.b).closeTo(b, 1e-12);
+ expect(stateVariables["/g3/p2"].stateValues.c).closeTo(c, 1e-12);
expect(
me
- .fromAst(stateVariables[parabola3Name].stateValues.equation)
+ .fromAst(stateVariables["/g3/p2"].stateValues.equation)
.equals(equationExpression),
).eq(true);
expect(
me
- .fromAst(stateVariables[parabola3Name].stateValues.vertex[0])
+ .fromAst(stateVariables["/g3/p2"].stateValues.vertex[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(stateVariables[parabola3Name].stateValues.vertex[1])
+ .fromAst(stateVariables["/g3/p2"].stateValues.vertex[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(stateVariables[vertex3Name].stateValues.xs[0])
+ .fromAst(stateVariables["/g3/v2"].stateValues.xs[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(stateVariables[vertex3Name].stateValues.xs[1])
+ .fromAst(stateVariables["/g3/v2"].stateValues.xs[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
});
@@ -2971,7 +2215,7 @@ describe("Parabola Tag Tests", function () {
cy.window().then(async (win) => {
await win.callAction1({
actionName: "movePoint",
- componentName: stateVariables["/v2"].replacements[0].componentName,
+ componentName: "/v2",
args: { x: 5, y: -6 },
});
@@ -3008,114 +2252,73 @@ describe("Parabola Tag Tests", function () {
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v"].replacements[0].componentName
- ].stateValues.xs[0],
- )
+ .fromAst(stateVariables["/v"].stateValues.xs[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v"].replacements[0].componentName
- ].stateValues.xs[1],
- )
+ .fromAst(stateVariables["/v"].stateValues.xs[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
- expect(
- stateVariables[stateVariables["/p2"].replacements[0].componentName]
- .stateValues.a,
- ).closeTo(a, 1e-12);
- expect(
- stateVariables[stateVariables["/p2"].replacements[0].componentName]
- .stateValues.b,
- ).closeTo(b, 1e-12);
- expect(
- stateVariables[stateVariables["/p2"].replacements[0].componentName]
- .stateValues.c,
- ).closeTo(c, 1e-12);
+ expect(stateVariables["/p2"].stateValues.a).closeTo(a, 1e-12);
+ expect(stateVariables["/p2"].stateValues.b).closeTo(b, 1e-12);
+ expect(stateVariables["/p2"].stateValues.c).closeTo(c, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/p2"].replacements[0].componentName
- ].stateValues.equation,
- )
+ .fromAst(stateVariables["/p2"].stateValues.equation)
.equals(equationExpression),
).eq(true);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/p2"].replacements[0].componentName
- ].stateValues.vertex[0],
- )
+ .fromAst(stateVariables["/p2"].stateValues.vertex[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/p2"].replacements[0].componentName
- ].stateValues.vertex[1],
- )
+ .fromAst(stateVariables["/p2"].stateValues.vertex[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v2"].replacements[0].componentName
- ].stateValues.xs[0],
- )
+ .fromAst(stateVariables["/v2"].stateValues.xs[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v2"].replacements[0].componentName
- ].stateValues.xs[1],
- )
+ .fromAst(stateVariables["/v2"].stateValues.xs[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/e2"].replacements[0].componentName
- ].stateValues.value,
- )
+ .fromAst(stateVariables["/e2"].stateValues.value)
.equals(equationExpression),
).eq(true);
- expect(stateVariables[parabola3Name].stateValues.a).closeTo(a, 1e-12);
- expect(stateVariables[parabola3Name].stateValues.b).closeTo(b, 1e-12);
- expect(stateVariables[parabola3Name].stateValues.c).closeTo(c, 1e-12);
+ expect(stateVariables["/g3/p2"].stateValues.a).closeTo(a, 1e-12);
+ expect(stateVariables["/g3/p2"].stateValues.b).closeTo(b, 1e-12);
+ expect(stateVariables["/g3/p2"].stateValues.c).closeTo(c, 1e-12);
expect(
me
- .fromAst(stateVariables[parabola3Name].stateValues.equation)
+ .fromAst(stateVariables["/g3/p2"].stateValues.equation)
.equals(equationExpression),
).eq(true);
expect(
me
- .fromAst(stateVariables[parabola3Name].stateValues.vertex[0])
+ .fromAst(stateVariables["/g3/p2"].stateValues.vertex[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(stateVariables[parabola3Name].stateValues.vertex[1])
+ .fromAst(stateVariables["/g3/p2"].stateValues.vertex[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(stateVariables[vertex3Name].stateValues.xs[0])
+ .fromAst(stateVariables["/g3/v2"].stateValues.xs[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(stateVariables[vertex3Name].stateValues.xs[1])
+ .fromAst(stateVariables["/g3/v2"].stateValues.xs[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
});
@@ -3125,7 +2328,7 @@ describe("Parabola Tag Tests", function () {
cy.window().then(async (win) => {
await win.callAction1({
actionName: "movePoint",
- componentName: vertex3Name,
+ componentName: "/g3/v2",
args: { x: -3, y: -2 },
});
@@ -3162,114 +2365,73 @@ describe("Parabola Tag Tests", function () {
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v"].replacements[0].componentName
- ].stateValues.xs[0],
- )
+ .fromAst(stateVariables["/v"].stateValues.xs[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v"].replacements[0].componentName
- ].stateValues.xs[1],
- )
+ .fromAst(stateVariables["/v"].stateValues.xs[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
- expect(
- stateVariables[stateVariables["/p2"].replacements[0].componentName]
- .stateValues.a,
- ).closeTo(a, 1e-12);
- expect(
- stateVariables[stateVariables["/p2"].replacements[0].componentName]
- .stateValues.b,
- ).closeTo(b, 1e-12);
- expect(
- stateVariables[stateVariables["/p2"].replacements[0].componentName]
- .stateValues.c,
- ).closeTo(c, 1e-12);
+ expect(stateVariables["/p2"].stateValues.a).closeTo(a, 1e-12);
+ expect(stateVariables["/p2"].stateValues.b).closeTo(b, 1e-12);
+ expect(stateVariables["/p2"].stateValues.c).closeTo(c, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/p2"].replacements[0].componentName
- ].stateValues.equation,
- )
+ .fromAst(stateVariables["/p2"].stateValues.equation)
.equals(equationExpression),
).eq(true);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/p2"].replacements[0].componentName
- ].stateValues.vertex[0],
- )
+ .fromAst(stateVariables["/p2"].stateValues.vertex[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/p2"].replacements[0].componentName
- ].stateValues.vertex[1],
- )
+ .fromAst(stateVariables["/p2"].stateValues.vertex[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v2"].replacements[0].componentName
- ].stateValues.xs[0],
- )
+ .fromAst(stateVariables["/v2"].stateValues.xs[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v2"].replacements[0].componentName
- ].stateValues.xs[1],
- )
+ .fromAst(stateVariables["/v2"].stateValues.xs[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/e2"].replacements[0].componentName
- ].stateValues.value,
- )
+ .fromAst(stateVariables["/e2"].stateValues.value)
.equals(equationExpression),
).eq(true);
- expect(stateVariables[parabola3Name].stateValues.a).closeTo(a, 1e-12);
- expect(stateVariables[parabola3Name].stateValues.b).closeTo(b, 1e-12);
- expect(stateVariables[parabola3Name].stateValues.c).closeTo(c, 1e-12);
+ expect(stateVariables["/g3/p2"].stateValues.a).closeTo(a, 1e-12);
+ expect(stateVariables["/g3/p2"].stateValues.b).closeTo(b, 1e-12);
+ expect(stateVariables["/g3/p2"].stateValues.c).closeTo(c, 1e-12);
expect(
me
- .fromAst(stateVariables[parabola3Name].stateValues.equation)
+ .fromAst(stateVariables["/g3/p2"].stateValues.equation)
.equals(equationExpression),
).eq(true);
expect(
me
- .fromAst(stateVariables[parabola3Name].stateValues.vertex[0])
+ .fromAst(stateVariables["/g3/p2"].stateValues.vertex[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(stateVariables[parabola3Name].stateValues.vertex[1])
+ .fromAst(stateVariables["/g3/p2"].stateValues.vertex[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(stateVariables[vertex3Name].stateValues.xs[0])
+ .fromAst(stateVariables["/g3/v2"].stateValues.xs[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(stateVariables[vertex3Name].stateValues.xs[1])
+ .fromAst(stateVariables["/g3/v2"].stateValues.xs[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
});
@@ -3286,15 +2448,15 @@ describe("Parabola Tag Tests", function () {
(1,2)
-
- a =
b =
@@ -3314,15 +2476,6 @@ describe("Parabola Tag Tests", function () {
cy.window().then(async (win) => {
let stateVariables = await win.returnAllStateVariables1();
- let equationAnchor = cesc2(
- "#" + stateVariables["/e2"].replacements[0].componentName,
- );
- let parabola3Name =
- stateVariables[stateVariables["/g3"].replacements[0].componentName]
- .activeChildren[0].componentName;
- let vertex3Name =
- stateVariables[stateVariables["/g3"].replacements[0].componentName]
- .activeChildren[1].componentName;
cy.window().then(async (win) => {
let a = 1,
@@ -3355,114 +2508,73 @@ describe("Parabola Tag Tests", function () {
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v"].replacements[0].componentName
- ].stateValues.xs[0],
- )
+ .fromAst(stateVariables["/v"].stateValues.xs[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v"].replacements[0].componentName
- ].stateValues.xs[1],
- )
+ .fromAst(stateVariables["/v"].stateValues.xs[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
- expect(
- stateVariables[stateVariables["/p2"].replacements[0].componentName]
- .stateValues.a,
- ).closeTo(a, 1e-12);
- expect(
- stateVariables[stateVariables["/p2"].replacements[0].componentName]
- .stateValues.b,
- ).closeTo(b, 1e-12);
- expect(
- stateVariables[stateVariables["/p2"].replacements[0].componentName]
- .stateValues.c,
- ).closeTo(c, 1e-12);
+ expect(stateVariables["/p2"].stateValues.a).closeTo(a, 1e-12);
+ expect(stateVariables["/p2"].stateValues.b).closeTo(b, 1e-12);
+ expect(stateVariables["/p2"].stateValues.c).closeTo(c, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/p2"].replacements[0].componentName
- ].stateValues.equation,
- )
+ .fromAst(stateVariables["/p2"].stateValues.equation)
.equals(equationExpression),
).eq(true);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/p2"].replacements[0].componentName
- ].stateValues.vertex[0],
- )
+ .fromAst(stateVariables["/p2"].stateValues.vertex[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/p2"].replacements[0].componentName
- ].stateValues.vertex[1],
- )
+ .fromAst(stateVariables["/p2"].stateValues.vertex[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v2"].replacements[0].componentName
- ].stateValues.xs[0],
- )
+ .fromAst(stateVariables["/v2"].stateValues.xs[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v2"].replacements[0].componentName
- ].stateValues.xs[1],
- )
+ .fromAst(stateVariables["/v2"].stateValues.xs[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/e2"].replacements[0].componentName
- ].stateValues.value,
- )
+ .fromAst(stateVariables["/e2"].stateValues.value)
.equals(equationExpression),
).eq(true);
- expect(stateVariables[parabola3Name].stateValues.a).closeTo(a, 1e-12);
- expect(stateVariables[parabola3Name].stateValues.b).closeTo(b, 1e-12);
- expect(stateVariables[parabola3Name].stateValues.c).closeTo(c, 1e-12);
+ expect(stateVariables["/g3/p2"].stateValues.a).closeTo(a, 1e-12);
+ expect(stateVariables["/g3/p2"].stateValues.b).closeTo(b, 1e-12);
+ expect(stateVariables["/g3/p2"].stateValues.c).closeTo(c, 1e-12);
expect(
me
- .fromAst(stateVariables[parabola3Name].stateValues.equation)
+ .fromAst(stateVariables["/g3/p2"].stateValues.equation)
.equals(equationExpression),
).eq(true);
expect(
me
- .fromAst(stateVariables[parabola3Name].stateValues.vertex[0])
+ .fromAst(stateVariables["/g3/p2"].stateValues.vertex[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(stateVariables[parabola3Name].stateValues.vertex[1])
+ .fromAst(stateVariables["/g3/p2"].stateValues.vertex[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(stateVariables[vertex3Name].stateValues.xs[0])
+ .fromAst(stateVariables["/g3/v2"].stateValues.xs[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(stateVariables[vertex3Name].stateValues.xs[1])
+ .fromAst(stateVariables["/g3/v2"].stateValues.xs[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
expect(
@@ -3492,7 +2604,7 @@ describe("Parabola Tag Tests", function () {
let vertex_x = -b / (2 * a);
let vertex_y = c - b ** 2 / (4 * a);
- cy.get(equationAnchor).should("contain.text", "y=−2x2−2x+3");
+ cy.get(cesc2("#/e2")).should("contain.text", "y=−2x2−2x+3");
let equationExpression = me.fromText(`y=${a}x^2+${b}x+${c}`);
cy.window().then(async (win) => {
@@ -3518,114 +2630,73 @@ describe("Parabola Tag Tests", function () {
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v"].replacements[0].componentName
- ].stateValues.xs[0],
- )
+ .fromAst(stateVariables["/v"].stateValues.xs[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v"].replacements[0].componentName
- ].stateValues.xs[1],
- )
+ .fromAst(stateVariables["/v"].stateValues.xs[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
- expect(
- stateVariables[stateVariables["/p2"].replacements[0].componentName]
- .stateValues.a,
- ).closeTo(a, 1e-12);
- expect(
- stateVariables[stateVariables["/p2"].replacements[0].componentName]
- .stateValues.b,
- ).closeTo(b, 1e-12);
- expect(
- stateVariables[stateVariables["/p2"].replacements[0].componentName]
- .stateValues.c,
- ).closeTo(c, 1e-12);
+ expect(stateVariables["/p2"].stateValues.a).closeTo(a, 1e-12);
+ expect(stateVariables["/p2"].stateValues.b).closeTo(b, 1e-12);
+ expect(stateVariables["/p2"].stateValues.c).closeTo(c, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/p2"].replacements[0].componentName
- ].stateValues.equation,
- )
+ .fromAst(stateVariables["/p2"].stateValues.equation)
.equals(equationExpression),
).eq(true);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/p2"].replacements[0].componentName
- ].stateValues.vertex[0],
- )
+ .fromAst(stateVariables["/p2"].stateValues.vertex[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/p2"].replacements[0].componentName
- ].stateValues.vertex[1],
- )
+ .fromAst(stateVariables["/p2"].stateValues.vertex[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v2"].replacements[0].componentName
- ].stateValues.xs[0],
- )
+ .fromAst(stateVariables["/v2"].stateValues.xs[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v2"].replacements[0].componentName
- ].stateValues.xs[1],
- )
+ .fromAst(stateVariables["/v2"].stateValues.xs[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/e2"].replacements[0].componentName
- ].stateValues.value,
- )
+ .fromAst(stateVariables["/e2"].stateValues.value)
.equals(equationExpression),
).eq(true);
- expect(stateVariables[parabola3Name].stateValues.a).closeTo(a, 1e-12);
- expect(stateVariables[parabola3Name].stateValues.b).closeTo(b, 1e-12);
- expect(stateVariables[parabola3Name].stateValues.c).closeTo(c, 1e-12);
+ expect(stateVariables["/g3/p2"].stateValues.a).closeTo(a, 1e-12);
+ expect(stateVariables["/g3/p2"].stateValues.b).closeTo(b, 1e-12);
+ expect(stateVariables["/g3/p2"].stateValues.c).closeTo(c, 1e-12);
expect(
me
- .fromAst(stateVariables[parabola3Name].stateValues.equation)
+ .fromAst(stateVariables["/g3/p2"].stateValues.equation)
.equals(equationExpression),
).eq(true);
expect(
me
- .fromAst(stateVariables[parabola3Name].stateValues.vertex[0])
+ .fromAst(stateVariables["/g3/p2"].stateValues.vertex[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(stateVariables[parabola3Name].stateValues.vertex[1])
+ .fromAst(stateVariables["/g3/p2"].stateValues.vertex[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(stateVariables[vertex3Name].stateValues.xs[0])
+ .fromAst(stateVariables["/g3/v2"].stateValues.xs[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(stateVariables[vertex3Name].stateValues.xs[1])
+ .fromAst(stateVariables["/g3/v2"].stateValues.xs[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
expect(
@@ -3655,7 +2726,7 @@ describe("Parabola Tag Tests", function () {
let vertex_x = -b / (2 * a);
let vertex_y = c - b ** 2 / (4 * a);
- cy.get(equationAnchor).should("contain.text", "y=−2x2+3x+3");
+ cy.get(cesc2("#/e2")).should("contain.text", "y=−2x2+3x+3");
let equationExpression = me.fromText(`y=${a}x^2+${b}x+${c}`);
cy.window().then(async (win) => {
@@ -3681,114 +2752,73 @@ describe("Parabola Tag Tests", function () {
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v"].replacements[0].componentName
- ].stateValues.xs[0],
- )
+ .fromAst(stateVariables["/v"].stateValues.xs[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v"].replacements[0].componentName
- ].stateValues.xs[1],
- )
+ .fromAst(stateVariables["/v"].stateValues.xs[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
- expect(
- stateVariables[stateVariables["/p2"].replacements[0].componentName]
- .stateValues.a,
- ).closeTo(a, 1e-12);
- expect(
- stateVariables[stateVariables["/p2"].replacements[0].componentName]
- .stateValues.b,
- ).closeTo(b, 1e-12);
- expect(
- stateVariables[stateVariables["/p2"].replacements[0].componentName]
- .stateValues.c,
- ).closeTo(c, 1e-12);
+ expect(stateVariables["/p2"].stateValues.a).closeTo(a, 1e-12);
+ expect(stateVariables["/p2"].stateValues.b).closeTo(b, 1e-12);
+ expect(stateVariables["/p2"].stateValues.c).closeTo(c, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/p2"].replacements[0].componentName
- ].stateValues.equation,
- )
+ .fromAst(stateVariables["/p2"].stateValues.equation)
.equals(equationExpression),
).eq(true);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/p2"].replacements[0].componentName
- ].stateValues.vertex[0],
- )
+ .fromAst(stateVariables["/p2"].stateValues.vertex[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/p2"].replacements[0].componentName
- ].stateValues.vertex[1],
- )
+ .fromAst(stateVariables["/p2"].stateValues.vertex[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v2"].replacements[0].componentName
- ].stateValues.xs[0],
- )
+ .fromAst(stateVariables["/v2"].stateValues.xs[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v2"].replacements[0].componentName
- ].stateValues.xs[1],
- )
+ .fromAst(stateVariables["/v2"].stateValues.xs[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/e2"].replacements[0].componentName
- ].stateValues.value,
- )
+ .fromAst(stateVariables["/e2"].stateValues.value)
.equals(equationExpression),
).eq(true);
- expect(stateVariables[parabola3Name].stateValues.a).closeTo(a, 1e-12);
- expect(stateVariables[parabola3Name].stateValues.b).closeTo(b, 1e-12);
- expect(stateVariables[parabola3Name].stateValues.c).closeTo(c, 1e-12);
+ expect(stateVariables["/g3/p2"].stateValues.a).closeTo(a, 1e-12);
+ expect(stateVariables["/g3/p2"].stateValues.b).closeTo(b, 1e-12);
+ expect(stateVariables["/g3/p2"].stateValues.c).closeTo(c, 1e-12);
expect(
me
- .fromAst(stateVariables[parabola3Name].stateValues.equation)
+ .fromAst(stateVariables["/g3/p2"].stateValues.equation)
.equals(equationExpression),
).eq(true);
expect(
me
- .fromAst(stateVariables[parabola3Name].stateValues.vertex[0])
+ .fromAst(stateVariables["/g3/p2"].stateValues.vertex[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(stateVariables[parabola3Name].stateValues.vertex[1])
+ .fromAst(stateVariables["/g3/p2"].stateValues.vertex[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(stateVariables[vertex3Name].stateValues.xs[0])
+ .fromAst(stateVariables["/g3/v2"].stateValues.xs[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(stateVariables[vertex3Name].stateValues.xs[1])
+ .fromAst(stateVariables["/g3/v2"].stateValues.xs[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
expect(
@@ -3818,7 +2848,7 @@ describe("Parabola Tag Tests", function () {
let vertex_x = -b / (2 * a);
let vertex_y = c - b ** 2 / (4 * a);
- cy.get(equationAnchor).should("contain.text", "y=−2x2+3x+9");
+ cy.get(cesc2("#/e2")).should("contain.text", "y=−2x2+3x+9");
let equationExpression = me.fromText(`y=${a}x^2+${b}x+${c}`);
cy.window().then(async (win) => {
@@ -3844,114 +2874,73 @@ describe("Parabola Tag Tests", function () {
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v"].replacements[0].componentName
- ].stateValues.xs[0],
- )
+ .fromAst(stateVariables["/v"].stateValues.xs[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v"].replacements[0].componentName
- ].stateValues.xs[1],
- )
+ .fromAst(stateVariables["/v"].stateValues.xs[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
- expect(
- stateVariables[stateVariables["/p2"].replacements[0].componentName]
- .stateValues.a,
- ).closeTo(a, 1e-12);
- expect(
- stateVariables[stateVariables["/p2"].replacements[0].componentName]
- .stateValues.b,
- ).closeTo(b, 1e-12);
- expect(
- stateVariables[stateVariables["/p2"].replacements[0].componentName]
- .stateValues.c,
- ).closeTo(c, 1e-12);
+ expect(stateVariables["/p2"].stateValues.a).closeTo(a, 1e-12);
+ expect(stateVariables["/p2"].stateValues.b).closeTo(b, 1e-12);
+ expect(stateVariables["/p2"].stateValues.c).closeTo(c, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/p2"].replacements[0].componentName
- ].stateValues.equation,
- )
+ .fromAst(stateVariables["/p2"].stateValues.equation)
.equals(equationExpression),
).eq(true);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/p2"].replacements[0].componentName
- ].stateValues.vertex[0],
- )
+ .fromAst(stateVariables["/p2"].stateValues.vertex[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/p2"].replacements[0].componentName
- ].stateValues.vertex[1],
- )
+ .fromAst(stateVariables["/p2"].stateValues.vertex[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v2"].replacements[0].componentName
- ].stateValues.xs[0],
- )
+ .fromAst(stateVariables["/v2"].stateValues.xs[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v2"].replacements[0].componentName
- ].stateValues.xs[1],
- )
+ .fromAst(stateVariables["/v2"].stateValues.xs[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/e2"].replacements[0].componentName
- ].stateValues.value,
- )
+ .fromAst(stateVariables["/e2"].stateValues.value)
.equals(equationExpression),
).eq(true);
- expect(stateVariables[parabola3Name].stateValues.a).closeTo(a, 1e-12);
- expect(stateVariables[parabola3Name].stateValues.b).closeTo(b, 1e-12);
- expect(stateVariables[parabola3Name].stateValues.c).closeTo(c, 1e-12);
+ expect(stateVariables["/g3/p2"].stateValues.a).closeTo(a, 1e-12);
+ expect(stateVariables["/g3/p2"].stateValues.b).closeTo(b, 1e-12);
+ expect(stateVariables["/g3/p2"].stateValues.c).closeTo(c, 1e-12);
expect(
me
- .fromAst(stateVariables[parabola3Name].stateValues.equation)
+ .fromAst(stateVariables["/g3/p2"].stateValues.equation)
.equals(equationExpression),
).eq(true);
expect(
me
- .fromAst(stateVariables[parabola3Name].stateValues.vertex[0])
+ .fromAst(stateVariables["/g3/p2"].stateValues.vertex[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(stateVariables[parabola3Name].stateValues.vertex[1])
+ .fromAst(stateVariables["/g3/p2"].stateValues.vertex[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(stateVariables[vertex3Name].stateValues.xs[0])
+ .fromAst(stateVariables["/g3/v2"].stateValues.xs[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(stateVariables[vertex3Name].stateValues.xs[1])
+ .fromAst(stateVariables["/g3/v2"].stateValues.xs[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
expect(
@@ -3981,7 +2970,7 @@ describe("Parabola Tag Tests", function () {
let vertex_x = -b / (2 * a);
let vertex_y = c - b ** 2 / (4 * a);
- cy.get(equationAnchor).should("contain.text", "y=0.2x2+3x+9");
+ cy.get(cesc2("#/e2")).should("contain.text", "y=0.2x2+3x+9");
let equationExpression = me.fromText(`y=${a}x^2+${b}x+${c}`);
cy.window().then(async (win) => {
@@ -4007,114 +2996,73 @@ describe("Parabola Tag Tests", function () {
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v"].replacements[0].componentName
- ].stateValues.xs[0],
- )
+ .fromAst(stateVariables["/v"].stateValues.xs[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v"].replacements[0].componentName
- ].stateValues.xs[1],
- )
+ .fromAst(stateVariables["/v"].stateValues.xs[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
- expect(
- stateVariables[stateVariables["/p2"].replacements[0].componentName]
- .stateValues.a,
- ).closeTo(a, 1e-12);
- expect(
- stateVariables[stateVariables["/p2"].replacements[0].componentName]
- .stateValues.b,
- ).closeTo(b, 1e-12);
- expect(
- stateVariables[stateVariables["/p2"].replacements[0].componentName]
- .stateValues.c,
- ).closeTo(c, 1e-12);
+ expect(stateVariables["/p2"].stateValues.a).closeTo(a, 1e-12);
+ expect(stateVariables["/p2"].stateValues.b).closeTo(b, 1e-12);
+ expect(stateVariables["/p2"].stateValues.c).closeTo(c, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/p2"].replacements[0].componentName
- ].stateValues.equation,
- )
+ .fromAst(stateVariables["/p2"].stateValues.equation)
.equals(equationExpression),
).eq(true);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/p2"].replacements[0].componentName
- ].stateValues.vertex[0],
- )
+ .fromAst(stateVariables["/p2"].stateValues.vertex[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/p2"].replacements[0].componentName
- ].stateValues.vertex[1],
- )
+ .fromAst(stateVariables["/p2"].stateValues.vertex[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v2"].replacements[0].componentName
- ].stateValues.xs[0],
- )
+ .fromAst(stateVariables["/v2"].stateValues.xs[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v2"].replacements[0].componentName
- ].stateValues.xs[1],
- )
+ .fromAst(stateVariables["/v2"].stateValues.xs[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/e2"].replacements[0].componentName
- ].stateValues.value,
- )
+ .fromAst(stateVariables["/e2"].stateValues.value)
.equals(equationExpression),
).eq(true);
- expect(stateVariables[parabola3Name].stateValues.a).closeTo(a, 1e-12);
- expect(stateVariables[parabola3Name].stateValues.b).closeTo(b, 1e-12);
- expect(stateVariables[parabola3Name].stateValues.c).closeTo(c, 1e-12);
+ expect(stateVariables["/g3/p2"].stateValues.a).closeTo(a, 1e-12);
+ expect(stateVariables["/g3/p2"].stateValues.b).closeTo(b, 1e-12);
+ expect(stateVariables["/g3/p2"].stateValues.c).closeTo(c, 1e-12);
expect(
me
- .fromAst(stateVariables[parabola3Name].stateValues.equation)
+ .fromAst(stateVariables["/g3/p2"].stateValues.equation)
.equals(equationExpression),
).eq(true);
expect(
me
- .fromAst(stateVariables[parabola3Name].stateValues.vertex[0])
+ .fromAst(stateVariables["/g3/p2"].stateValues.vertex[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(stateVariables[parabola3Name].stateValues.vertex[1])
+ .fromAst(stateVariables["/g3/p2"].stateValues.vertex[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(stateVariables[vertex3Name].stateValues.xs[0])
+ .fromAst(stateVariables["/g3/v2"].stateValues.xs[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(stateVariables[vertex3Name].stateValues.xs[1])
+ .fromAst(stateVariables["/g3/v2"].stateValues.xs[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
expect(
@@ -4144,7 +3092,7 @@ describe("Parabola Tag Tests", function () {
let vertex_x = -b / (2 * a);
let vertex_y = c - b ** 2 / (4 * a);
- cy.get(equationAnchor).should("contain.text", "y=0.2x2−1.7x+9");
+ cy.get(cesc2("#/e2")).should("contain.text", "y=0.2x2−1.7x+9");
let equationExpression = me.fromText(`y=${a}x^2+${b}x+${c}`);
cy.window().then(async (win) => {
@@ -4170,114 +3118,73 @@ describe("Parabola Tag Tests", function () {
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v"].replacements[0].componentName
- ].stateValues.xs[0],
- )
+ .fromAst(stateVariables["/v"].stateValues.xs[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v"].replacements[0].componentName
- ].stateValues.xs[1],
- )
+ .fromAst(stateVariables["/v"].stateValues.xs[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
- expect(
- stateVariables[stateVariables["/p2"].replacements[0].componentName]
- .stateValues.a,
- ).closeTo(a, 1e-12);
- expect(
- stateVariables[stateVariables["/p2"].replacements[0].componentName]
- .stateValues.b,
- ).closeTo(b, 1e-12);
- expect(
- stateVariables[stateVariables["/p2"].replacements[0].componentName]
- .stateValues.c,
- ).closeTo(c, 1e-12);
+ expect(stateVariables["/p2"].stateValues.a).closeTo(a, 1e-12);
+ expect(stateVariables["/p2"].stateValues.b).closeTo(b, 1e-12);
+ expect(stateVariables["/p2"].stateValues.c).closeTo(c, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/p2"].replacements[0].componentName
- ].stateValues.equation,
- )
+ .fromAst(stateVariables["/p2"].stateValues.equation)
.equals(equationExpression),
).eq(true);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/p2"].replacements[0].componentName
- ].stateValues.vertex[0],
- )
+ .fromAst(stateVariables["/p2"].stateValues.vertex[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/p2"].replacements[0].componentName
- ].stateValues.vertex[1],
- )
+ .fromAst(stateVariables["/p2"].stateValues.vertex[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v2"].replacements[0].componentName
- ].stateValues.xs[0],
- )
+ .fromAst(stateVariables["/v2"].stateValues.xs[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v2"].replacements[0].componentName
- ].stateValues.xs[1],
- )
+ .fromAst(stateVariables["/v2"].stateValues.xs[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/e2"].replacements[0].componentName
- ].stateValues.value,
- )
+ .fromAst(stateVariables["/e2"].stateValues.value)
.equals(equationExpression),
).eq(true);
- expect(stateVariables[parabola3Name].stateValues.a).closeTo(a, 1e-12);
- expect(stateVariables[parabola3Name].stateValues.b).closeTo(b, 1e-12);
- expect(stateVariables[parabola3Name].stateValues.c).closeTo(c, 1e-12);
+ expect(stateVariables["/g3/p2"].stateValues.a).closeTo(a, 1e-12);
+ expect(stateVariables["/g3/p2"].stateValues.b).closeTo(b, 1e-12);
+ expect(stateVariables["/g3/p2"].stateValues.c).closeTo(c, 1e-12);
expect(
me
- .fromAst(stateVariables[parabola3Name].stateValues.equation)
+ .fromAst(stateVariables["/g3/p2"].stateValues.equation)
.equals(equationExpression),
).eq(true);
expect(
me
- .fromAst(stateVariables[parabola3Name].stateValues.vertex[0])
+ .fromAst(stateVariables["/g3/p2"].stateValues.vertex[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(stateVariables[parabola3Name].stateValues.vertex[1])
+ .fromAst(stateVariables["/g3/p2"].stateValues.vertex[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(stateVariables[vertex3Name].stateValues.xs[0])
+ .fromAst(stateVariables["/g3/v2"].stateValues.xs[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(stateVariables[vertex3Name].stateValues.xs[1])
+ .fromAst(stateVariables["/g3/v2"].stateValues.xs[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
expect(
@@ -4307,7 +3214,7 @@ describe("Parabola Tag Tests", function () {
let vertex_x = -b / (2 * a);
let vertex_y = c - b ** 2 / (4 * a);
- cy.get(equationAnchor).should("contain.text", "y=0.2x2−1.7x−4.5");
+ cy.get(cesc2("#/e2")).should("contain.text", "y=0.2x2−1.7x−4.5");
let equationExpression = me.fromText(`y=${a}x^2+${b}x+${c}`);
cy.window().then(async (win) => {
@@ -4333,114 +3240,73 @@ describe("Parabola Tag Tests", function () {
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v"].replacements[0].componentName
- ].stateValues.xs[0],
- )
+ .fromAst(stateVariables["/v"].stateValues.xs[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v"].replacements[0].componentName
- ].stateValues.xs[1],
- )
+ .fromAst(stateVariables["/v"].stateValues.xs[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
- expect(
- stateVariables[stateVariables["/p2"].replacements[0].componentName]
- .stateValues.a,
- ).closeTo(a, 1e-12);
- expect(
- stateVariables[stateVariables["/p2"].replacements[0].componentName]
- .stateValues.b,
- ).closeTo(b, 1e-12);
- expect(
- stateVariables[stateVariables["/p2"].replacements[0].componentName]
- .stateValues.c,
- ).closeTo(c, 1e-12);
+ expect(stateVariables["/p2"].stateValues.a).closeTo(a, 1e-12);
+ expect(stateVariables["/p2"].stateValues.b).closeTo(b, 1e-12);
+ expect(stateVariables["/p2"].stateValues.c).closeTo(c, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/p2"].replacements[0].componentName
- ].stateValues.equation,
- )
+ .fromAst(stateVariables["/p2"].stateValues.equation)
.equals(equationExpression),
).eq(true);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/p2"].replacements[0].componentName
- ].stateValues.vertex[0],
- )
+ .fromAst(stateVariables["/p2"].stateValues.vertex[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/p2"].replacements[0].componentName
- ].stateValues.vertex[1],
- )
+ .fromAst(stateVariables["/p2"].stateValues.vertex[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v2"].replacements[0].componentName
- ].stateValues.xs[0],
- )
+ .fromAst(stateVariables["/v2"].stateValues.xs[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v2"].replacements[0].componentName
- ].stateValues.xs[1],
- )
+ .fromAst(stateVariables["/v2"].stateValues.xs[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/e2"].replacements[0].componentName
- ].stateValues.value,
- )
+ .fromAst(stateVariables["/e2"].stateValues.value)
.equals(equationExpression),
).eq(true);
- expect(stateVariables[parabola3Name].stateValues.a).closeTo(a, 1e-12);
- expect(stateVariables[parabola3Name].stateValues.b).closeTo(b, 1e-12);
- expect(stateVariables[parabola3Name].stateValues.c).closeTo(c, 1e-12);
+ expect(stateVariables["/g3/p2"].stateValues.a).closeTo(a, 1e-12);
+ expect(stateVariables["/g3/p2"].stateValues.b).closeTo(b, 1e-12);
+ expect(stateVariables["/g3/p2"].stateValues.c).closeTo(c, 1e-12);
expect(
me
- .fromAst(stateVariables[parabola3Name].stateValues.equation)
+ .fromAst(stateVariables["/g3/p2"].stateValues.equation)
.equals(equationExpression),
).eq(true);
expect(
me
- .fromAst(stateVariables[parabola3Name].stateValues.vertex[0])
+ .fromAst(stateVariables["/g3/p2"].stateValues.vertex[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(stateVariables[parabola3Name].stateValues.vertex[1])
+ .fromAst(stateVariables["/g3/p2"].stateValues.vertex[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(stateVariables[vertex3Name].stateValues.xs[0])
+ .fromAst(stateVariables["/g3/v2"].stateValues.xs[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(stateVariables[vertex3Name].stateValues.xs[1])
+ .fromAst(stateVariables["/g3/v2"].stateValues.xs[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
expect(
@@ -4460,7 +3326,7 @@ describe("Parabola Tag Tests", function () {
cy.window().then(async (win) => {
await win.callAction1({
actionName: "movePoint",
- componentName: stateVariables["/v"].replacements[0].componentName,
+ componentName: "/v",
args: { x: -2, y: 1 },
});
@@ -4497,114 +3363,73 @@ describe("Parabola Tag Tests", function () {
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v"].replacements[0].componentName
- ].stateValues.xs[0],
- )
+ .fromAst(stateVariables["/v"].stateValues.xs[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v"].replacements[0].componentName
- ].stateValues.xs[1],
- )
+ .fromAst(stateVariables["/v"].stateValues.xs[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
- expect(
- stateVariables[stateVariables["/p2"].replacements[0].componentName]
- .stateValues.a,
- ).closeTo(a, 1e-12);
- expect(
- stateVariables[stateVariables["/p2"].replacements[0].componentName]
- .stateValues.b,
- ).closeTo(b, 1e-12);
- expect(
- stateVariables[stateVariables["/p2"].replacements[0].componentName]
- .stateValues.c,
- ).closeTo(c, 1e-12);
+ expect(stateVariables["/p2"].stateValues.a).closeTo(a, 1e-12);
+ expect(stateVariables["/p2"].stateValues.b).closeTo(b, 1e-12);
+ expect(stateVariables["/p2"].stateValues.c).closeTo(c, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/p2"].replacements[0].componentName
- ].stateValues.equation,
- )
+ .fromAst(stateVariables["/p2"].stateValues.equation)
.equals(equationExpression),
).eq(true);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/p2"].replacements[0].componentName
- ].stateValues.vertex[0],
- )
+ .fromAst(stateVariables["/p2"].stateValues.vertex[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/p2"].replacements[0].componentName
- ].stateValues.vertex[1],
- )
+ .fromAst(stateVariables["/p2"].stateValues.vertex[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v2"].replacements[0].componentName
- ].stateValues.xs[0],
- )
+ .fromAst(stateVariables["/v2"].stateValues.xs[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v2"].replacements[0].componentName
- ].stateValues.xs[1],
- )
+ .fromAst(stateVariables["/v2"].stateValues.xs[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/e2"].replacements[0].componentName
- ].stateValues.value,
- )
+ .fromAst(stateVariables["/e2"].stateValues.value)
.equals(equationExpression),
).eq(true);
- expect(stateVariables[parabola3Name].stateValues.a).closeTo(a, 1e-12);
- expect(stateVariables[parabola3Name].stateValues.b).closeTo(b, 1e-12);
- expect(stateVariables[parabola3Name].stateValues.c).closeTo(c, 1e-12);
+ expect(stateVariables["/g3/p2"].stateValues.a).closeTo(a, 1e-12);
+ expect(stateVariables["/g3/p2"].stateValues.b).closeTo(b, 1e-12);
+ expect(stateVariables["/g3/p2"].stateValues.c).closeTo(c, 1e-12);
expect(
me
- .fromAst(stateVariables[parabola3Name].stateValues.equation)
+ .fromAst(stateVariables["/g3/p2"].stateValues.equation)
.equals(equationExpression),
).eq(true);
expect(
me
- .fromAst(stateVariables[parabola3Name].stateValues.vertex[0])
+ .fromAst(stateVariables["/g3/p2"].stateValues.vertex[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(stateVariables[parabola3Name].stateValues.vertex[1])
+ .fromAst(stateVariables["/g3/p2"].stateValues.vertex[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(stateVariables[vertex3Name].stateValues.xs[0])
+ .fromAst(stateVariables["/g3/v2"].stateValues.xs[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(stateVariables[vertex3Name].stateValues.xs[1])
+ .fromAst(stateVariables["/g3/v2"].stateValues.xs[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
expect(
@@ -4624,7 +3449,7 @@ describe("Parabola Tag Tests", function () {
cy.window().then(async (win) => {
await win.callAction1({
actionName: "movePoint",
- componentName: stateVariables["/v2"].replacements[0].componentName,
+ componentName: "/v2",
args: { x: 5, y: -6 },
});
@@ -4661,114 +3486,73 @@ describe("Parabola Tag Tests", function () {
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v"].replacements[0].componentName
- ].stateValues.xs[0],
- )
+ .fromAst(stateVariables["/v"].stateValues.xs[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v"].replacements[0].componentName
- ].stateValues.xs[1],
- )
+ .fromAst(stateVariables["/v"].stateValues.xs[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
- expect(
- stateVariables[stateVariables["/p2"].replacements[0].componentName]
- .stateValues.a,
- ).closeTo(a, 1e-12);
- expect(
- stateVariables[stateVariables["/p2"].replacements[0].componentName]
- .stateValues.b,
- ).closeTo(b, 1e-12);
- expect(
- stateVariables[stateVariables["/p2"].replacements[0].componentName]
- .stateValues.c,
- ).closeTo(c, 1e-12);
+ expect(stateVariables["/p2"].stateValues.a).closeTo(a, 1e-12);
+ expect(stateVariables["/p2"].stateValues.b).closeTo(b, 1e-12);
+ expect(stateVariables["/p2"].stateValues.c).closeTo(c, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/p2"].replacements[0].componentName
- ].stateValues.equation,
- )
+ .fromAst(stateVariables["/p2"].stateValues.equation)
.equals(equationExpression),
).eq(true);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/p2"].replacements[0].componentName
- ].stateValues.vertex[0],
- )
+ .fromAst(stateVariables["/p2"].stateValues.vertex[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/p2"].replacements[0].componentName
- ].stateValues.vertex[1],
- )
+ .fromAst(stateVariables["/p2"].stateValues.vertex[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v2"].replacements[0].componentName
- ].stateValues.xs[0],
- )
+ .fromAst(stateVariables["/v2"].stateValues.xs[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v2"].replacements[0].componentName
- ].stateValues.xs[1],
- )
+ .fromAst(stateVariables["/v2"].stateValues.xs[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/e2"].replacements[0].componentName
- ].stateValues.value,
- )
+ .fromAst(stateVariables["/e2"].stateValues.value)
.equals(equationExpression),
).eq(true);
- expect(stateVariables[parabola3Name].stateValues.a).closeTo(a, 1e-12);
- expect(stateVariables[parabola3Name].stateValues.b).closeTo(b, 1e-12);
- expect(stateVariables[parabola3Name].stateValues.c).closeTo(c, 1e-12);
+ expect(stateVariables["/g3/p2"].stateValues.a).closeTo(a, 1e-12);
+ expect(stateVariables["/g3/p2"].stateValues.b).closeTo(b, 1e-12);
+ expect(stateVariables["/g3/p2"].stateValues.c).closeTo(c, 1e-12);
expect(
me
- .fromAst(stateVariables[parabola3Name].stateValues.equation)
+ .fromAst(stateVariables["/g3/p2"].stateValues.equation)
.equals(equationExpression),
).eq(true);
expect(
me
- .fromAst(stateVariables[parabola3Name].stateValues.vertex[0])
+ .fromAst(stateVariables["/g3/p2"].stateValues.vertex[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(stateVariables[parabola3Name].stateValues.vertex[1])
+ .fromAst(stateVariables["/g3/p2"].stateValues.vertex[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(stateVariables[vertex3Name].stateValues.xs[0])
+ .fromAst(stateVariables["/g3/v2"].stateValues.xs[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(stateVariables[vertex3Name].stateValues.xs[1])
+ .fromAst(stateVariables["/g3/v2"].stateValues.xs[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
expect(
@@ -4825,114 +3609,73 @@ describe("Parabola Tag Tests", function () {
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v"].replacements[0].componentName
- ].stateValues.xs[0],
- )
+ .fromAst(stateVariables["/v"].stateValues.xs[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v"].replacements[0].componentName
- ].stateValues.xs[1],
- )
+ .fromAst(stateVariables["/v"].stateValues.xs[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
- expect(
- stateVariables[stateVariables["/p2"].replacements[0].componentName]
- .stateValues.a,
- ).closeTo(a, 1e-12);
- expect(
- stateVariables[stateVariables["/p2"].replacements[0].componentName]
- .stateValues.b,
- ).closeTo(b, 1e-12);
- expect(
- stateVariables[stateVariables["/p2"].replacements[0].componentName]
- .stateValues.c,
- ).closeTo(c, 1e-12);
+ expect(stateVariables["/p2"].stateValues.a).closeTo(a, 1e-12);
+ expect(stateVariables["/p2"].stateValues.b).closeTo(b, 1e-12);
+ expect(stateVariables["/p2"].stateValues.c).closeTo(c, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/p2"].replacements[0].componentName
- ].stateValues.equation,
- )
+ .fromAst(stateVariables["/p2"].stateValues.equation)
.equals(equationExpression),
).eq(true);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/p2"].replacements[0].componentName
- ].stateValues.vertex[0],
- )
+ .fromAst(stateVariables["/p2"].stateValues.vertex[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/p2"].replacements[0].componentName
- ].stateValues.vertex[1],
- )
+ .fromAst(stateVariables["/p2"].stateValues.vertex[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v2"].replacements[0].componentName
- ].stateValues.xs[0],
- )
+ .fromAst(stateVariables["/v2"].stateValues.xs[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v2"].replacements[0].componentName
- ].stateValues.xs[1],
- )
+ .fromAst(stateVariables["/v2"].stateValues.xs[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/e2"].replacements[0].componentName
- ].stateValues.value,
- )
+ .fromAst(stateVariables["/e2"].stateValues.value)
.equals(equationExpression),
).eq(true);
- expect(stateVariables[parabola3Name].stateValues.a).closeTo(a, 1e-12);
- expect(stateVariables[parabola3Name].stateValues.b).closeTo(b, 1e-12);
- expect(stateVariables[parabola3Name].stateValues.c).closeTo(c, 1e-12);
+ expect(stateVariables["/g3/p2"].stateValues.a).closeTo(a, 1e-12);
+ expect(stateVariables["/g3/p2"].stateValues.b).closeTo(b, 1e-12);
+ expect(stateVariables["/g3/p2"].stateValues.c).closeTo(c, 1e-12);
expect(
me
- .fromAst(stateVariables[parabola3Name].stateValues.equation)
+ .fromAst(stateVariables["/g3/p2"].stateValues.equation)
.equals(equationExpression),
).eq(true);
expect(
me
- .fromAst(stateVariables[parabola3Name].stateValues.vertex[0])
+ .fromAst(stateVariables["/g3/p2"].stateValues.vertex[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(stateVariables[parabola3Name].stateValues.vertex[1])
+ .fromAst(stateVariables["/g3/p2"].stateValues.vertex[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(stateVariables[vertex3Name].stateValues.xs[0])
+ .fromAst(stateVariables["/g3/v2"].stateValues.xs[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(stateVariables[vertex3Name].stateValues.xs[1])
+ .fromAst(stateVariables["/g3/v2"].stateValues.xs[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
expect(
@@ -4960,15 +3703,15 @@ describe("Parabola Tag Tests", function () {
(1,2)
(3,4)
-
- a =
b =
@@ -4988,17 +3731,8 @@ describe("Parabola Tag Tests", function () {
cy.window().then(async (win) => {
let stateVariables = await win.returnAllStateVariables1();
- let equationAnchor = cesc2(
- "#" + stateVariables["/e2"].replacements[0].componentName,
- );
- let parabola3Name =
- stateVariables[stateVariables["/g3"].replacements[0].componentName]
- .activeChildren[0].componentName;
- let vertex3Name =
- stateVariables[stateVariables["/g3"].replacements[0].componentName]
- .activeChildren[1].componentName;
- cy.get(equationAnchor).should("contain.text", "y=x2−3x+4");
+ cy.get(cesc2("#/e2")).should("contain.text", "y=x2−3x+4");
cy.window().then(async (win) => {
let x1 = 1,
@@ -5037,114 +3771,73 @@ describe("Parabola Tag Tests", function () {
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v"].replacements[0].componentName
- ].stateValues.xs[0],
- )
+ .fromAst(stateVariables["/v"].stateValues.xs[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v"].replacements[0].componentName
- ].stateValues.xs[1],
- )
+ .fromAst(stateVariables["/v"].stateValues.xs[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
- expect(
- stateVariables[stateVariables["/p2"].replacements[0].componentName]
- .stateValues.a,
- ).closeTo(a, 1e-12);
- expect(
- stateVariables[stateVariables["/p2"].replacements[0].componentName]
- .stateValues.b,
- ).closeTo(b, 1e-12);
- expect(
- stateVariables[stateVariables["/p2"].replacements[0].componentName]
- .stateValues.c,
- ).closeTo(c, 1e-12);
+ expect(stateVariables["/p2"].stateValues.a).closeTo(a, 1e-12);
+ expect(stateVariables["/p2"].stateValues.b).closeTo(b, 1e-12);
+ expect(stateVariables["/p2"].stateValues.c).closeTo(c, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/p2"].replacements[0].componentName
- ].stateValues.equation,
- )
+ .fromAst(stateVariables["/p2"].stateValues.equation)
.equals(equationExpression),
).eq(true);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/p2"].replacements[0].componentName
- ].stateValues.vertex[0],
- )
+ .fromAst(stateVariables["/p2"].stateValues.vertex[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/p2"].replacements[0].componentName
- ].stateValues.vertex[1],
- )
+ .fromAst(stateVariables["/p2"].stateValues.vertex[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v2"].replacements[0].componentName
- ].stateValues.xs[0],
- )
+ .fromAst(stateVariables["/v2"].stateValues.xs[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v2"].replacements[0].componentName
- ].stateValues.xs[1],
- )
+ .fromAst(stateVariables["/v2"].stateValues.xs[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/e2"].replacements[0].componentName
- ].stateValues.value,
- )
+ .fromAst(stateVariables["/e2"].stateValues.value)
.equals(equationExpression),
).eq(true);
- expect(stateVariables[parabola3Name].stateValues.a).closeTo(a, 1e-12);
- expect(stateVariables[parabola3Name].stateValues.b).closeTo(b, 1e-12);
- expect(stateVariables[parabola3Name].stateValues.c).closeTo(c, 1e-12);
+ expect(stateVariables["/g3/p2"].stateValues.a).closeTo(a, 1e-12);
+ expect(stateVariables["/g3/p2"].stateValues.b).closeTo(b, 1e-12);
+ expect(stateVariables["/g3/p2"].stateValues.c).closeTo(c, 1e-12);
expect(
me
- .fromAst(stateVariables[parabola3Name].stateValues.equation)
+ .fromAst(stateVariables["/g3/p2"].stateValues.equation)
.equals(equationExpression),
).eq(true);
expect(
me
- .fromAst(stateVariables[parabola3Name].stateValues.vertex[0])
+ .fromAst(stateVariables["/g3/p2"].stateValues.vertex[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(stateVariables[parabola3Name].stateValues.vertex[1])
+ .fromAst(stateVariables["/g3/p2"].stateValues.vertex[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(stateVariables[vertex3Name].stateValues.xs[0])
+ .fromAst(stateVariables["/g3/v2"].stateValues.xs[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(stateVariables[vertex3Name].stateValues.xs[1])
+ .fromAst(stateVariables["/g3/v2"].stateValues.xs[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
expect(
@@ -5196,7 +3889,7 @@ describe("Parabola Tag Tests", function () {
let vertex_x = -b / (2 * a);
let vertex_y = c - b ** 2 / (4 * a);
- cy.get(equationAnchor).should("contain.text", "y=−2x2−3x+4");
+ cy.get(cesc2("#/e2")).should("contain.text", "y=−2x2−3x+4");
let equationExpression = me.fromText(`y=${a}x^2+${b}x+${c}`);
cy.window().then(async (win) => {
@@ -5222,114 +3915,73 @@ describe("Parabola Tag Tests", function () {
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v"].replacements[0].componentName
- ].stateValues.xs[0],
- )
+ .fromAst(stateVariables["/v"].stateValues.xs[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v"].replacements[0].componentName
- ].stateValues.xs[1],
- )
+ .fromAst(stateVariables["/v"].stateValues.xs[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
- expect(
- stateVariables[stateVariables["/p2"].replacements[0].componentName]
- .stateValues.a,
- ).closeTo(a, 1e-12);
- expect(
- stateVariables[stateVariables["/p2"].replacements[0].componentName]
- .stateValues.b,
- ).closeTo(b, 1e-12);
- expect(
- stateVariables[stateVariables["/p2"].replacements[0].componentName]
- .stateValues.c,
- ).closeTo(c, 1e-12);
+ expect(stateVariables["/p2"].stateValues.a).closeTo(a, 1e-12);
+ expect(stateVariables["/p2"].stateValues.b).closeTo(b, 1e-12);
+ expect(stateVariables["/p2"].stateValues.c).closeTo(c, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/p2"].replacements[0].componentName
- ].stateValues.equation,
- )
+ .fromAst(stateVariables["/p2"].stateValues.equation)
.equals(equationExpression),
).eq(true);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/p2"].replacements[0].componentName
- ].stateValues.vertex[0],
- )
+ .fromAst(stateVariables["/p2"].stateValues.vertex[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/p2"].replacements[0].componentName
- ].stateValues.vertex[1],
- )
+ .fromAst(stateVariables["/p2"].stateValues.vertex[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v2"].replacements[0].componentName
- ].stateValues.xs[0],
- )
+ .fromAst(stateVariables["/v2"].stateValues.xs[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v2"].replacements[0].componentName
- ].stateValues.xs[1],
- )
+ .fromAst(stateVariables["/v2"].stateValues.xs[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/e2"].replacements[0].componentName
- ].stateValues.value,
- )
+ .fromAst(stateVariables["/e2"].stateValues.value)
.equals(equationExpression),
).eq(true);
- expect(stateVariables[parabola3Name].stateValues.a).closeTo(a, 1e-12);
- expect(stateVariables[parabola3Name].stateValues.b).closeTo(b, 1e-12);
- expect(stateVariables[parabola3Name].stateValues.c).closeTo(c, 1e-12);
+ expect(stateVariables["/g3/p2"].stateValues.a).closeTo(a, 1e-12);
+ expect(stateVariables["/g3/p2"].stateValues.b).closeTo(b, 1e-12);
+ expect(stateVariables["/g3/p2"].stateValues.c).closeTo(c, 1e-12);
expect(
me
- .fromAst(stateVariables[parabola3Name].stateValues.equation)
+ .fromAst(stateVariables["/g3/p2"].stateValues.equation)
.equals(equationExpression),
).eq(true);
expect(
me
- .fromAst(stateVariables[parabola3Name].stateValues.vertex[0])
+ .fromAst(stateVariables["/g3/p2"].stateValues.vertex[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(stateVariables[parabola3Name].stateValues.vertex[1])
+ .fromAst(stateVariables["/g3/p2"].stateValues.vertex[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(stateVariables[vertex3Name].stateValues.xs[0])
+ .fromAst(stateVariables["/g3/v2"].stateValues.xs[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(stateVariables[vertex3Name].stateValues.xs[1])
+ .fromAst(stateVariables["/g3/v2"].stateValues.xs[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
expect(
@@ -5381,7 +4033,7 @@ describe("Parabola Tag Tests", function () {
let vertex_x = -b / (2 * a);
let vertex_y = c - b ** 2 / (4 * a);
- cy.get(equationAnchor).should("contain.text", "y=−2x2+3x+4");
+ cy.get(cesc2("#/e2")).should("contain.text", "y=−2x2+3x+4");
let equationExpression = me.fromText(`y=${a}x^2+${b}x+${c}`);
cy.window().then(async (win) => {
@@ -5407,114 +4059,73 @@ describe("Parabola Tag Tests", function () {
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v"].replacements[0].componentName
- ].stateValues.xs[0],
- )
+ .fromAst(stateVariables["/v"].stateValues.xs[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v"].replacements[0].componentName
- ].stateValues.xs[1],
- )
+ .fromAst(stateVariables["/v"].stateValues.xs[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
- expect(
- stateVariables[stateVariables["/p2"].replacements[0].componentName]
- .stateValues.a,
- ).closeTo(a, 1e-12);
- expect(
- stateVariables[stateVariables["/p2"].replacements[0].componentName]
- .stateValues.b,
- ).closeTo(b, 1e-12);
- expect(
- stateVariables[stateVariables["/p2"].replacements[0].componentName]
- .stateValues.c,
- ).closeTo(c, 1e-12);
+ expect(stateVariables["/p2"].stateValues.a).closeTo(a, 1e-12);
+ expect(stateVariables["/p2"].stateValues.b).closeTo(b, 1e-12);
+ expect(stateVariables["/p2"].stateValues.c).closeTo(c, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/p2"].replacements[0].componentName
- ].stateValues.equation,
- )
+ .fromAst(stateVariables["/p2"].stateValues.equation)
.equals(equationExpression),
).eq(true);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/p2"].replacements[0].componentName
- ].stateValues.vertex[0],
- )
+ .fromAst(stateVariables["/p2"].stateValues.vertex[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/p2"].replacements[0].componentName
- ].stateValues.vertex[1],
- )
+ .fromAst(stateVariables["/p2"].stateValues.vertex[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v2"].replacements[0].componentName
- ].stateValues.xs[0],
- )
+ .fromAst(stateVariables["/v2"].stateValues.xs[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v2"].replacements[0].componentName
- ].stateValues.xs[1],
- )
+ .fromAst(stateVariables["/v2"].stateValues.xs[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/e2"].replacements[0].componentName
- ].stateValues.value,
- )
+ .fromAst(stateVariables["/e2"].stateValues.value)
.equals(equationExpression),
).eq(true);
- expect(stateVariables[parabola3Name].stateValues.a).closeTo(a, 1e-12);
- expect(stateVariables[parabola3Name].stateValues.b).closeTo(b, 1e-12);
- expect(stateVariables[parabola3Name].stateValues.c).closeTo(c, 1e-12);
+ expect(stateVariables["/g3/p2"].stateValues.a).closeTo(a, 1e-12);
+ expect(stateVariables["/g3/p2"].stateValues.b).closeTo(b, 1e-12);
+ expect(stateVariables["/g3/p2"].stateValues.c).closeTo(c, 1e-12);
expect(
me
- .fromAst(stateVariables[parabola3Name].stateValues.equation)
+ .fromAst(stateVariables["/g3/p2"].stateValues.equation)
.equals(equationExpression),
).eq(true);
expect(
me
- .fromAst(stateVariables[parabola3Name].stateValues.vertex[0])
+ .fromAst(stateVariables["/g3/p2"].stateValues.vertex[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(stateVariables[parabola3Name].stateValues.vertex[1])
+ .fromAst(stateVariables["/g3/p2"].stateValues.vertex[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(stateVariables[vertex3Name].stateValues.xs[0])
+ .fromAst(stateVariables["/g3/v2"].stateValues.xs[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(stateVariables[vertex3Name].stateValues.xs[1])
+ .fromAst(stateVariables["/g3/v2"].stateValues.xs[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
expect(
@@ -5560,7 +4171,7 @@ describe("Parabola Tag Tests", function () {
let vertex_x = -b / (2 * a);
let vertex_y = c - b ** 2 / (4 * a);
- cy.get(equationAnchor).should("contain.text", "y=−2x2+3x+9");
+ cy.get(cesc2("#/e2")).should("contain.text", "y=−2x2+3x+9");
let equationExpression = me.fromText(`y=${a}x^2+${b}x+${c}`);
cy.window().then(async (win) => {
@@ -5586,114 +4197,73 @@ describe("Parabola Tag Tests", function () {
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v"].replacements[0].componentName
- ].stateValues.xs[0],
- )
+ .fromAst(stateVariables["/v"].stateValues.xs[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v"].replacements[0].componentName
- ].stateValues.xs[1],
- )
+ .fromAst(stateVariables["/v"].stateValues.xs[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
- expect(
- stateVariables[stateVariables["/p2"].replacements[0].componentName]
- .stateValues.a,
- ).closeTo(a, 1e-12);
- expect(
- stateVariables[stateVariables["/p2"].replacements[0].componentName]
- .stateValues.b,
- ).closeTo(b, 1e-12);
- expect(
- stateVariables[stateVariables["/p2"].replacements[0].componentName]
- .stateValues.c,
- ).closeTo(c, 1e-12);
+ expect(stateVariables["/p2"].stateValues.a).closeTo(a, 1e-12);
+ expect(stateVariables["/p2"].stateValues.b).closeTo(b, 1e-12);
+ expect(stateVariables["/p2"].stateValues.c).closeTo(c, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/p2"].replacements[0].componentName
- ].stateValues.equation,
- )
+ .fromAst(stateVariables["/p2"].stateValues.equation)
.equals(equationExpression),
).eq(true);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/p2"].replacements[0].componentName
- ].stateValues.vertex[0],
- )
+ .fromAst(stateVariables["/p2"].stateValues.vertex[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/p2"].replacements[0].componentName
- ].stateValues.vertex[1],
- )
+ .fromAst(stateVariables["/p2"].stateValues.vertex[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v2"].replacements[0].componentName
- ].stateValues.xs[0],
- )
+ .fromAst(stateVariables["/v2"].stateValues.xs[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v2"].replacements[0].componentName
- ].stateValues.xs[1],
- )
+ .fromAst(stateVariables["/v2"].stateValues.xs[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/e2"].replacements[0].componentName
- ].stateValues.value,
- )
+ .fromAst(stateVariables["/e2"].stateValues.value)
.equals(equationExpression),
).eq(true);
- expect(stateVariables[parabola3Name].stateValues.a).closeTo(a, 1e-12);
- expect(stateVariables[parabola3Name].stateValues.b).closeTo(b, 1e-12);
- expect(stateVariables[parabola3Name].stateValues.c).closeTo(c, 1e-12);
+ expect(stateVariables["/g3/p2"].stateValues.a).closeTo(a, 1e-12);
+ expect(stateVariables["/g3/p2"].stateValues.b).closeTo(b, 1e-12);
+ expect(stateVariables["/g3/p2"].stateValues.c).closeTo(c, 1e-12);
expect(
me
- .fromAst(stateVariables[parabola3Name].stateValues.equation)
+ .fromAst(stateVariables["/g3/p2"].stateValues.equation)
.equals(equationExpression),
).eq(true);
expect(
me
- .fromAst(stateVariables[parabola3Name].stateValues.vertex[0])
+ .fromAst(stateVariables["/g3/p2"].stateValues.vertex[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(stateVariables[parabola3Name].stateValues.vertex[1])
+ .fromAst(stateVariables["/g3/p2"].stateValues.vertex[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(stateVariables[vertex3Name].stateValues.xs[0])
+ .fromAst(stateVariables["/g3/v2"].stateValues.xs[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(stateVariables[vertex3Name].stateValues.xs[1])
+ .fromAst(stateVariables["/g3/v2"].stateValues.xs[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
expect(
@@ -5739,7 +4309,7 @@ describe("Parabola Tag Tests", function () {
let vertex_x = -b / (2 * a);
let vertex_y = c - b ** 2 / (4 * a);
- cy.get(equationAnchor).should("contain.text", "y=0.2x2+3x+9");
+ cy.get(cesc2("#/e2")).should("contain.text", "y=0.2x2+3x+9");
let equationExpression = me.fromText(`y=${a}x^2+${b}x+${c}`);
cy.window().then(async (win) => {
@@ -5765,114 +4335,73 @@ describe("Parabola Tag Tests", function () {
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v"].replacements[0].componentName
- ].stateValues.xs[0],
- )
+ .fromAst(stateVariables["/v"].stateValues.xs[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v"].replacements[0].componentName
- ].stateValues.xs[1],
- )
+ .fromAst(stateVariables["/v"].stateValues.xs[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
- expect(
- stateVariables[stateVariables["/p2"].replacements[0].componentName]
- .stateValues.a,
- ).closeTo(a, 1e-12);
- expect(
- stateVariables[stateVariables["/p2"].replacements[0].componentName]
- .stateValues.b,
- ).closeTo(b, 1e-12);
- expect(
- stateVariables[stateVariables["/p2"].replacements[0].componentName]
- .stateValues.c,
- ).closeTo(c, 1e-12);
+ expect(stateVariables["/p2"].stateValues.a).closeTo(a, 1e-12);
+ expect(stateVariables["/p2"].stateValues.b).closeTo(b, 1e-12);
+ expect(stateVariables["/p2"].stateValues.c).closeTo(c, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/p2"].replacements[0].componentName
- ].stateValues.equation,
- )
+ .fromAst(stateVariables["/p2"].stateValues.equation)
.equals(equationExpression),
).eq(true);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/p2"].replacements[0].componentName
- ].stateValues.vertex[0],
- )
+ .fromAst(stateVariables["/p2"].stateValues.vertex[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/p2"].replacements[0].componentName
- ].stateValues.vertex[1],
- )
+ .fromAst(stateVariables["/p2"].stateValues.vertex[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v2"].replacements[0].componentName
- ].stateValues.xs[0],
- )
+ .fromAst(stateVariables["/v2"].stateValues.xs[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v2"].replacements[0].componentName
- ].stateValues.xs[1],
- )
+ .fromAst(stateVariables["/v2"].stateValues.xs[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/e2"].replacements[0].componentName
- ].stateValues.value,
- )
+ .fromAst(stateVariables["/e2"].stateValues.value)
.equals(equationExpression),
).eq(true);
- expect(stateVariables[parabola3Name].stateValues.a).closeTo(a, 1e-12);
- expect(stateVariables[parabola3Name].stateValues.b).closeTo(b, 1e-12);
- expect(stateVariables[parabola3Name].stateValues.c).closeTo(c, 1e-12);
+ expect(stateVariables["/g3/p2"].stateValues.a).closeTo(a, 1e-12);
+ expect(stateVariables["/g3/p2"].stateValues.b).closeTo(b, 1e-12);
+ expect(stateVariables["/g3/p2"].stateValues.c).closeTo(c, 1e-12);
expect(
me
- .fromAst(stateVariables[parabola3Name].stateValues.equation)
+ .fromAst(stateVariables["/g3/p2"].stateValues.equation)
.equals(equationExpression),
).eq(true);
expect(
me
- .fromAst(stateVariables[parabola3Name].stateValues.vertex[0])
+ .fromAst(stateVariables["/g3/p2"].stateValues.vertex[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(stateVariables[parabola3Name].stateValues.vertex[1])
+ .fromAst(stateVariables["/g3/p2"].stateValues.vertex[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(stateVariables[vertex3Name].stateValues.xs[0])
+ .fromAst(stateVariables["/g3/v2"].stateValues.xs[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(stateVariables[vertex3Name].stateValues.xs[1])
+ .fromAst(stateVariables["/g3/v2"].stateValues.xs[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
expect(
@@ -5918,7 +4447,7 @@ describe("Parabola Tag Tests", function () {
let vertex_x = -b / (2 * a);
let vertex_y = c - b ** 2 / (4 * a);
- cy.get(equationAnchor).should("contain.text", "y=0.2x2−1.7x+9");
+ cy.get(cesc2("#/e2")).should("contain.text", "y=0.2x2−1.7x+9");
let equationExpression = me.fromText(`y=${a}x^2+${b}x+${c}`);
cy.window().then(async (win) => {
@@ -5944,114 +4473,73 @@ describe("Parabola Tag Tests", function () {
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v"].replacements[0].componentName
- ].stateValues.xs[0],
- )
+ .fromAst(stateVariables["/v"].stateValues.xs[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v"].replacements[0].componentName
- ].stateValues.xs[1],
- )
+ .fromAst(stateVariables["/v"].stateValues.xs[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
- expect(
- stateVariables[stateVariables["/p2"].replacements[0].componentName]
- .stateValues.a,
- ).closeTo(a, 1e-12);
- expect(
- stateVariables[stateVariables["/p2"].replacements[0].componentName]
- .stateValues.b,
- ).closeTo(b, 1e-12);
- expect(
- stateVariables[stateVariables["/p2"].replacements[0].componentName]
- .stateValues.c,
- ).closeTo(c, 1e-12);
+ expect(stateVariables["/p2"].stateValues.a).closeTo(a, 1e-12);
+ expect(stateVariables["/p2"].stateValues.b).closeTo(b, 1e-12);
+ expect(stateVariables["/p2"].stateValues.c).closeTo(c, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/p2"].replacements[0].componentName
- ].stateValues.equation,
- )
+ .fromAst(stateVariables["/p2"].stateValues.equation)
.equals(equationExpression),
).eq(true);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/p2"].replacements[0].componentName
- ].stateValues.vertex[0],
- )
+ .fromAst(stateVariables["/p2"].stateValues.vertex[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/p2"].replacements[0].componentName
- ].stateValues.vertex[1],
- )
+ .fromAst(stateVariables["/p2"].stateValues.vertex[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v2"].replacements[0].componentName
- ].stateValues.xs[0],
- )
+ .fromAst(stateVariables["/v2"].stateValues.xs[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v2"].replacements[0].componentName
- ].stateValues.xs[1],
- )
+ .fromAst(stateVariables["/v2"].stateValues.xs[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/e2"].replacements[0].componentName
- ].stateValues.value,
- )
+ .fromAst(stateVariables["/e2"].stateValues.value)
.equals(equationExpression),
).eq(true);
- expect(stateVariables[parabola3Name].stateValues.a).closeTo(a, 1e-12);
- expect(stateVariables[parabola3Name].stateValues.b).closeTo(b, 1e-12);
- expect(stateVariables[parabola3Name].stateValues.c).closeTo(c, 1e-12);
+ expect(stateVariables["/g3/p2"].stateValues.a).closeTo(a, 1e-12);
+ expect(stateVariables["/g3/p2"].stateValues.b).closeTo(b, 1e-12);
+ expect(stateVariables["/g3/p2"].stateValues.c).closeTo(c, 1e-12);
expect(
me
- .fromAst(stateVariables[parabola3Name].stateValues.equation)
+ .fromAst(stateVariables["/g3/p2"].stateValues.equation)
.equals(equationExpression),
).eq(true);
expect(
me
- .fromAst(stateVariables[parabola3Name].stateValues.vertex[0])
+ .fromAst(stateVariables["/g3/p2"].stateValues.vertex[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(stateVariables[parabola3Name].stateValues.vertex[1])
+ .fromAst(stateVariables["/g3/p2"].stateValues.vertex[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(stateVariables[vertex3Name].stateValues.xs[0])
+ .fromAst(stateVariables["/g3/v2"].stateValues.xs[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(stateVariables[vertex3Name].stateValues.xs[1])
+ .fromAst(stateVariables["/g3/v2"].stateValues.xs[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
expect(
@@ -6097,7 +4585,7 @@ describe("Parabola Tag Tests", function () {
let vertex_x = -b / (2 * a);
let vertex_y = c - b ** 2 / (4 * a);
- cy.get(equationAnchor).should("contain.text", "y=0.2x2−1.7x−4.5");
+ cy.get(cesc2("#/e2")).should("contain.text", "y=0.2x2−1.7x−4.5");
let equationExpression = me.fromText(`y=${a}x^2+${b}x+${c}`);
cy.window().then(async (win) => {
@@ -6123,114 +4611,73 @@ describe("Parabola Tag Tests", function () {
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v"].replacements[0].componentName
- ].stateValues.xs[0],
- )
+ .fromAst(stateVariables["/v"].stateValues.xs[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v"].replacements[0].componentName
- ].stateValues.xs[1],
- )
+ .fromAst(stateVariables["/v"].stateValues.xs[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
- expect(
- stateVariables[stateVariables["/p2"].replacements[0].componentName]
- .stateValues.a,
- ).closeTo(a, 1e-12);
- expect(
- stateVariables[stateVariables["/p2"].replacements[0].componentName]
- .stateValues.b,
- ).closeTo(b, 1e-12);
- expect(
- stateVariables[stateVariables["/p2"].replacements[0].componentName]
- .stateValues.c,
- ).closeTo(c, 1e-12);
+ expect(stateVariables["/p2"].stateValues.a).closeTo(a, 1e-12);
+ expect(stateVariables["/p2"].stateValues.b).closeTo(b, 1e-12);
+ expect(stateVariables["/p2"].stateValues.c).closeTo(c, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/p2"].replacements[0].componentName
- ].stateValues.equation,
- )
+ .fromAst(stateVariables["/p2"].stateValues.equation)
.equals(equationExpression),
).eq(true);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/p2"].replacements[0].componentName
- ].stateValues.vertex[0],
- )
+ .fromAst(stateVariables["/p2"].stateValues.vertex[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/p2"].replacements[0].componentName
- ].stateValues.vertex[1],
- )
+ .fromAst(stateVariables["/p2"].stateValues.vertex[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v2"].replacements[0].componentName
- ].stateValues.xs[0],
- )
+ .fromAst(stateVariables["/v2"].stateValues.xs[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v2"].replacements[0].componentName
- ].stateValues.xs[1],
- )
+ .fromAst(stateVariables["/v2"].stateValues.xs[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/e2"].replacements[0].componentName
- ].stateValues.value,
- )
+ .fromAst(stateVariables["/e2"].stateValues.value)
.equals(equationExpression),
).eq(true);
- expect(stateVariables[parabola3Name].stateValues.a).closeTo(a, 1e-12);
- expect(stateVariables[parabola3Name].stateValues.b).closeTo(b, 1e-12);
- expect(stateVariables[parabola3Name].stateValues.c).closeTo(c, 1e-12);
+ expect(stateVariables["/g3/p2"].stateValues.a).closeTo(a, 1e-12);
+ expect(stateVariables["/g3/p2"].stateValues.b).closeTo(b, 1e-12);
+ expect(stateVariables["/g3/p2"].stateValues.c).closeTo(c, 1e-12);
expect(
me
- .fromAst(stateVariables[parabola3Name].stateValues.equation)
+ .fromAst(stateVariables["/g3/p2"].stateValues.equation)
.equals(equationExpression),
).eq(true);
expect(
me
- .fromAst(stateVariables[parabola3Name].stateValues.vertex[0])
+ .fromAst(stateVariables["/g3/p2"].stateValues.vertex[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(stateVariables[parabola3Name].stateValues.vertex[1])
+ .fromAst(stateVariables["/g3/p2"].stateValues.vertex[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(stateVariables[vertex3Name].stateValues.xs[0])
+ .fromAst(stateVariables["/g3/v2"].stateValues.xs[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(stateVariables[vertex3Name].stateValues.xs[1])
+ .fromAst(stateVariables["/g3/v2"].stateValues.xs[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
expect(
@@ -6260,7 +4707,7 @@ describe("Parabola Tag Tests", function () {
cy.window().then(async (win) => {
await win.callAction1({
actionName: "movePoint",
- componentName: stateVariables["/v"].replacements[0].componentName,
+ componentName: "/v",
args: { x: -2, y: 1 },
});
@@ -6303,114 +4750,73 @@ describe("Parabola Tag Tests", function () {
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v"].replacements[0].componentName
- ].stateValues.xs[0],
- )
+ .fromAst(stateVariables["/v"].stateValues.xs[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v"].replacements[0].componentName
- ].stateValues.xs[1],
- )
+ .fromAst(stateVariables["/v"].stateValues.xs[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
- expect(
- stateVariables[stateVariables["/p2"].replacements[0].componentName]
- .stateValues.a,
- ).closeTo(a, 1e-12);
- expect(
- stateVariables[stateVariables["/p2"].replacements[0].componentName]
- .stateValues.b,
- ).closeTo(b, 1e-12);
- expect(
- stateVariables[stateVariables["/p2"].replacements[0].componentName]
- .stateValues.c,
- ).closeTo(c, 1e-12);
+ expect(stateVariables["/p2"].stateValues.a).closeTo(a, 1e-12);
+ expect(stateVariables["/p2"].stateValues.b).closeTo(b, 1e-12);
+ expect(stateVariables["/p2"].stateValues.c).closeTo(c, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/p2"].replacements[0].componentName
- ].stateValues.equation,
- )
+ .fromAst(stateVariables["/p2"].stateValues.equation)
.equals(equationExpression),
).eq(true);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/p2"].replacements[0].componentName
- ].stateValues.vertex[0],
- )
+ .fromAst(stateVariables["/p2"].stateValues.vertex[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/p2"].replacements[0].componentName
- ].stateValues.vertex[1],
- )
+ .fromAst(stateVariables["/p2"].stateValues.vertex[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v2"].replacements[0].componentName
- ].stateValues.xs[0],
- )
+ .fromAst(stateVariables["/v2"].stateValues.xs[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v2"].replacements[0].componentName
- ].stateValues.xs[1],
- )
+ .fromAst(stateVariables["/v2"].stateValues.xs[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/e2"].replacements[0].componentName
- ].stateValues.value,
- )
+ .fromAst(stateVariables["/e2"].stateValues.value)
.equals(equationExpression),
).eq(true);
- expect(stateVariables[parabola3Name].stateValues.a).closeTo(a, 1e-12);
- expect(stateVariables[parabola3Name].stateValues.b).closeTo(b, 1e-12);
- expect(stateVariables[parabola3Name].stateValues.c).closeTo(c, 1e-12);
+ expect(stateVariables["/g3/p2"].stateValues.a).closeTo(a, 1e-12);
+ expect(stateVariables["/g3/p2"].stateValues.b).closeTo(b, 1e-12);
+ expect(stateVariables["/g3/p2"].stateValues.c).closeTo(c, 1e-12);
expect(
me
- .fromAst(stateVariables[parabola3Name].stateValues.equation)
+ .fromAst(stateVariables["/g3/p2"].stateValues.equation)
.equals(equationExpression),
).eq(true);
expect(
me
- .fromAst(stateVariables[parabola3Name].stateValues.vertex[0])
+ .fromAst(stateVariables["/g3/p2"].stateValues.vertex[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(stateVariables[parabola3Name].stateValues.vertex[1])
+ .fromAst(stateVariables["/g3/p2"].stateValues.vertex[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(stateVariables[vertex3Name].stateValues.xs[0])
+ .fromAst(stateVariables["/g3/v2"].stateValues.xs[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(stateVariables[vertex3Name].stateValues.xs[1])
+ .fromAst(stateVariables["/g3/v2"].stateValues.xs[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
expect(
@@ -6440,7 +4846,7 @@ describe("Parabola Tag Tests", function () {
cy.window().then(async (win) => {
await win.callAction1({
actionName: "movePoint",
- componentName: stateVariables["/v2"].replacements[0].componentName,
+ componentName: "/v2",
args: { x: 5, y: -6 },
});
@@ -6483,114 +4889,73 @@ describe("Parabola Tag Tests", function () {
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v"].replacements[0].componentName
- ].stateValues.xs[0],
- )
+ .fromAst(stateVariables["/v"].stateValues.xs[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v"].replacements[0].componentName
- ].stateValues.xs[1],
- )
+ .fromAst(stateVariables["/v"].stateValues.xs[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
- expect(
- stateVariables[stateVariables["/p2"].replacements[0].componentName]
- .stateValues.a,
- ).closeTo(a, 1e-12);
- expect(
- stateVariables[stateVariables["/p2"].replacements[0].componentName]
- .stateValues.b,
- ).closeTo(b, 1e-12);
- expect(
- stateVariables[stateVariables["/p2"].replacements[0].componentName]
- .stateValues.c,
- ).closeTo(c, 1e-12);
+ expect(stateVariables["/p2"].stateValues.a).closeTo(a, 1e-12);
+ expect(stateVariables["/p2"].stateValues.b).closeTo(b, 1e-12);
+ expect(stateVariables["/p2"].stateValues.c).closeTo(c, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/p2"].replacements[0].componentName
- ].stateValues.equation,
- )
+ .fromAst(stateVariables["/p2"].stateValues.equation)
.equals(equationExpression),
).eq(true);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/p2"].replacements[0].componentName
- ].stateValues.vertex[0],
- )
+ .fromAst(stateVariables["/p2"].stateValues.vertex[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/p2"].replacements[0].componentName
- ].stateValues.vertex[1],
- )
+ .fromAst(stateVariables["/p2"].stateValues.vertex[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v2"].replacements[0].componentName
- ].stateValues.xs[0],
- )
+ .fromAst(stateVariables["/v2"].stateValues.xs[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v2"].replacements[0].componentName
- ].stateValues.xs[1],
- )
+ .fromAst(stateVariables["/v2"].stateValues.xs[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/e2"].replacements[0].componentName
- ].stateValues.value,
- )
+ .fromAst(stateVariables["/e2"].stateValues.value)
.equals(equationExpression),
).eq(true);
- expect(stateVariables[parabola3Name].stateValues.a).closeTo(a, 1e-12);
- expect(stateVariables[parabola3Name].stateValues.b).closeTo(b, 1e-12);
- expect(stateVariables[parabola3Name].stateValues.c).closeTo(c, 1e-12);
+ expect(stateVariables["/g3/p2"].stateValues.a).closeTo(a, 1e-12);
+ expect(stateVariables["/g3/p2"].stateValues.b).closeTo(b, 1e-12);
+ expect(stateVariables["/g3/p2"].stateValues.c).closeTo(c, 1e-12);
expect(
me
- .fromAst(stateVariables[parabola3Name].stateValues.equation)
+ .fromAst(stateVariables["/g3/p2"].stateValues.equation)
.equals(equationExpression),
).eq(true);
expect(
me
- .fromAst(stateVariables[parabola3Name].stateValues.vertex[0])
+ .fromAst(stateVariables["/g3/p2"].stateValues.vertex[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(stateVariables[parabola3Name].stateValues.vertex[1])
+ .fromAst(stateVariables["/g3/p2"].stateValues.vertex[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(stateVariables[vertex3Name].stateValues.xs[0])
+ .fromAst(stateVariables["/g3/v2"].stateValues.xs[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(stateVariables[vertex3Name].stateValues.xs[1])
+ .fromAst(stateVariables["/g3/v2"].stateValues.xs[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
expect(
@@ -6667,114 +5032,73 @@ describe("Parabola Tag Tests", function () {
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v"].replacements[0].componentName
- ].stateValues.xs[0],
- )
+ .fromAst(stateVariables["/v"].stateValues.xs[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v"].replacements[0].componentName
- ].stateValues.xs[1],
- )
+ .fromAst(stateVariables["/v"].stateValues.xs[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
- expect(
- stateVariables[stateVariables["/p2"].replacements[0].componentName]
- .stateValues.a,
- ).closeTo(a, 1e-12);
- expect(
- stateVariables[stateVariables["/p2"].replacements[0].componentName]
- .stateValues.b,
- ).closeTo(b, 1e-12);
- expect(
- stateVariables[stateVariables["/p2"].replacements[0].componentName]
- .stateValues.c,
- ).closeTo(c, 1e-12);
+ expect(stateVariables["/p2"].stateValues.a).closeTo(a, 1e-12);
+ expect(stateVariables["/p2"].stateValues.b).closeTo(b, 1e-12);
+ expect(stateVariables["/p2"].stateValues.c).closeTo(c, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/p2"].replacements[0].componentName
- ].stateValues.equation,
- )
+ .fromAst(stateVariables["/p2"].stateValues.equation)
.equals(equationExpression),
).eq(true);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/p2"].replacements[0].componentName
- ].stateValues.vertex[0],
- )
+ .fromAst(stateVariables["/p2"].stateValues.vertex[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/p2"].replacements[0].componentName
- ].stateValues.vertex[1],
- )
+ .fromAst(stateVariables["/p2"].stateValues.vertex[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v2"].replacements[0].componentName
- ].stateValues.xs[0],
- )
+ .fromAst(stateVariables["/v2"].stateValues.xs[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v2"].replacements[0].componentName
- ].stateValues.xs[1],
- )
+ .fromAst(stateVariables["/v2"].stateValues.xs[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/e2"].replacements[0].componentName
- ].stateValues.value,
- )
+ .fromAst(stateVariables["/e2"].stateValues.value)
.equals(equationExpression),
).eq(true);
- expect(stateVariables[parabola3Name].stateValues.a).closeTo(a, 1e-12);
- expect(stateVariables[parabola3Name].stateValues.b).closeTo(b, 1e-12);
- expect(stateVariables[parabola3Name].stateValues.c).closeTo(c, 1e-12);
+ expect(stateVariables["/g3/p2"].stateValues.a).closeTo(a, 1e-12);
+ expect(stateVariables["/g3/p2"].stateValues.b).closeTo(b, 1e-12);
+ expect(stateVariables["/g3/p2"].stateValues.c).closeTo(c, 1e-12);
expect(
me
- .fromAst(stateVariables[parabola3Name].stateValues.equation)
+ .fromAst(stateVariables["/g3/p2"].stateValues.equation)
.equals(equationExpression),
).eq(true);
expect(
me
- .fromAst(stateVariables[parabola3Name].stateValues.vertex[0])
+ .fromAst(stateVariables["/g3/p2"].stateValues.vertex[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(stateVariables[parabola3Name].stateValues.vertex[1])
+ .fromAst(stateVariables["/g3/p2"].stateValues.vertex[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(stateVariables[vertex3Name].stateValues.xs[0])
+ .fromAst(stateVariables["/g3/v2"].stateValues.xs[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(stateVariables[vertex3Name].stateValues.xs[1])
+ .fromAst(stateVariables["/g3/v2"].stateValues.xs[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
expect(
@@ -6851,114 +5175,73 @@ describe("Parabola Tag Tests", function () {
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v"].replacements[0].componentName
- ].stateValues.xs[0],
- )
+ .fromAst(stateVariables["/v"].stateValues.xs[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v"].replacements[0].componentName
- ].stateValues.xs[1],
- )
+ .fromAst(stateVariables["/v"].stateValues.xs[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
- expect(
- stateVariables[stateVariables["/p2"].replacements[0].componentName]
- .stateValues.a,
- ).closeTo(a, 1e-12);
- expect(
- stateVariables[stateVariables["/p2"].replacements[0].componentName]
- .stateValues.b,
- ).closeTo(b, 1e-12);
- expect(
- stateVariables[stateVariables["/p2"].replacements[0].componentName]
- .stateValues.c,
- ).closeTo(c, 1e-12);
+ expect(stateVariables["/p2"].stateValues.a).closeTo(a, 1e-12);
+ expect(stateVariables["/p2"].stateValues.b).closeTo(b, 1e-12);
+ expect(stateVariables["/p2"].stateValues.c).closeTo(c, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/p2"].replacements[0].componentName
- ].stateValues.equation,
- )
+ .fromAst(stateVariables["/p2"].stateValues.equation)
.equals(equationExpression),
).eq(true);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/p2"].replacements[0].componentName
- ].stateValues.vertex[0],
- )
+ .fromAst(stateVariables["/p2"].stateValues.vertex[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/p2"].replacements[0].componentName
- ].stateValues.vertex[1],
- )
+ .fromAst(stateVariables["/p2"].stateValues.vertex[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v2"].replacements[0].componentName
- ].stateValues.xs[0],
- )
+ .fromAst(stateVariables["/v2"].stateValues.xs[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v2"].replacements[0].componentName
- ].stateValues.xs[1],
- )
+ .fromAst(stateVariables["/v2"].stateValues.xs[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/e2"].replacements[0].componentName
- ].stateValues.value,
- )
+ .fromAst(stateVariables["/e2"].stateValues.value)
.equals(equationExpression),
).eq(true);
- expect(stateVariables[parabola3Name].stateValues.a).closeTo(a, 1e-12);
- expect(stateVariables[parabola3Name].stateValues.b).closeTo(b, 1e-12);
- expect(stateVariables[parabola3Name].stateValues.c).closeTo(c, 1e-12);
+ expect(stateVariables["/g3/p2"].stateValues.a).closeTo(a, 1e-12);
+ expect(stateVariables["/g3/p2"].stateValues.b).closeTo(b, 1e-12);
+ expect(stateVariables["/g3/p2"].stateValues.c).closeTo(c, 1e-12);
expect(
me
- .fromAst(stateVariables[parabola3Name].stateValues.equation)
+ .fromAst(stateVariables["/g3/p2"].stateValues.equation)
.equals(equationExpression),
).eq(true);
expect(
me
- .fromAst(stateVariables[parabola3Name].stateValues.vertex[0])
+ .fromAst(stateVariables["/g3/p2"].stateValues.vertex[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(stateVariables[parabola3Name].stateValues.vertex[1])
+ .fromAst(stateVariables["/g3/p2"].stateValues.vertex[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(stateVariables[vertex3Name].stateValues.xs[0])
+ .fromAst(stateVariables["/g3/v2"].stateValues.xs[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(stateVariables[vertex3Name].stateValues.xs[1])
+ .fromAst(stateVariables["/g3/v2"].stateValues.xs[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
expect(
@@ -7011,47 +5294,26 @@ describe("Parabola Tag Tests", function () {
"\uff3f",
"\uff3f",
]);
- expect(
- stateVariables[stateVariables["/v"].replacements[0].componentName]
- .stateValues.xs[0],
- ).eq("\uff3f");
- expect(
- stateVariables[stateVariables["/v"].replacements[0].componentName]
- .stateValues.xs[1],
- ).eq("\uff3f");
- assert.isNaN(
- stateVariables[stateVariables["/p2"].replacements[0].componentName]
- .stateValues.a,
- );
- assert.isNaN(
- stateVariables[stateVariables["/p2"].replacements[0].componentName]
- .stateValues.b,
- );
- assert.isNaN(
- stateVariables[stateVariables["/p2"].replacements[0].componentName]
- .stateValues.c,
- );
- expect(
- stateVariables[stateVariables["/p2"].replacements[0].componentName]
- .stateValues.vertex,
- ).eqls(["\uff3f", "\uff3f"]);
- expect(
- stateVariables[stateVariables["/v2"].replacements[0].componentName]
- .stateValues.xs[0],
- ).eq("\uff3f");
- expect(
- stateVariables[stateVariables["/v2"].replacements[0].componentName]
- .stateValues.xs[1],
- ).eq("\uff3f");
- assert.isNaN(stateVariables[parabola3Name].stateValues.a);
- assert.isNaN(stateVariables[parabola3Name].stateValues.b);
- assert.isNaN(stateVariables[parabola3Name].stateValues.c);
- expect(stateVariables[parabola3Name].stateValues.vertex).eqls([
+ expect(stateVariables["/v"].stateValues.xs[0]).eq("\uff3f");
+ expect(stateVariables["/v"].stateValues.xs[1]).eq("\uff3f");
+ assert.isNaN(stateVariables["/p2"].stateValues.a);
+ assert.isNaN(stateVariables["/p2"].stateValues.b);
+ assert.isNaN(stateVariables["/p2"].stateValues.c);
+ expect(stateVariables["/p2"].stateValues.vertex).eqls([
+ "\uff3f",
+ "\uff3f",
+ ]);
+ expect(stateVariables["/v2"].stateValues.xs[0]).eq("\uff3f");
+ expect(stateVariables["/v2"].stateValues.xs[1]).eq("\uff3f");
+ assert.isNaN(stateVariables["/g3/p2"].stateValues.a);
+ assert.isNaN(stateVariables["/g3/p2"].stateValues.b);
+ assert.isNaN(stateVariables["/g3/p2"].stateValues.c);
+ expect(stateVariables["/g3/p2"].stateValues.vertex).eqls([
"\uff3f",
"\uff3f",
]);
- expect(stateVariables[vertex3Name].stateValues.xs[0]).eq("\uff3f");
- expect(stateVariables[vertex3Name].stateValues.xs[1]).eq("\uff3f");
+ expect(stateVariables["/g3/v2"].stateValues.xs[0]).eq("\uff3f");
+ expect(stateVariables["/g3/v2"].stateValues.xs[1]).eq("\uff3f");
expect(
me
.fromAst(stateVariables["/_point1"].stateValues.xs[0])
@@ -7126,114 +5388,73 @@ describe("Parabola Tag Tests", function () {
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v"].replacements[0].componentName
- ].stateValues.xs[0],
- )
+ .fromAst(stateVariables["/v"].stateValues.xs[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v"].replacements[0].componentName
- ].stateValues.xs[1],
- )
+ .fromAst(stateVariables["/v"].stateValues.xs[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
- expect(
- stateVariables[stateVariables["/p2"].replacements[0].componentName]
- .stateValues.a,
- ).closeTo(a, 1e-12);
- expect(
- stateVariables[stateVariables["/p2"].replacements[0].componentName]
- .stateValues.b,
- ).closeTo(b, 1e-12);
- expect(
- stateVariables[stateVariables["/p2"].replacements[0].componentName]
- .stateValues.c,
- ).closeTo(c, 1e-12);
+ expect(stateVariables["/p2"].stateValues.a).closeTo(a, 1e-12);
+ expect(stateVariables["/p2"].stateValues.b).closeTo(b, 1e-12);
+ expect(stateVariables["/p2"].stateValues.c).closeTo(c, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/p2"].replacements[0].componentName
- ].stateValues.equation,
- )
+ .fromAst(stateVariables["/p2"].stateValues.equation)
.equals(equationExpression),
).eq(true);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/p2"].replacements[0].componentName
- ].stateValues.vertex[0],
- )
+ .fromAst(stateVariables["/p2"].stateValues.vertex[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/p2"].replacements[0].componentName
- ].stateValues.vertex[1],
- )
+ .fromAst(stateVariables["/p2"].stateValues.vertex[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v2"].replacements[0].componentName
- ].stateValues.xs[0],
- )
+ .fromAst(stateVariables["/v2"].stateValues.xs[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v2"].replacements[0].componentName
- ].stateValues.xs[1],
- )
+ .fromAst(stateVariables["/v2"].stateValues.xs[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/e2"].replacements[0].componentName
- ].stateValues.value,
- )
+ .fromAst(stateVariables["/e2"].stateValues.value)
.equals(equationExpression),
).eq(true);
- expect(stateVariables[parabola3Name].stateValues.a).closeTo(a, 1e-12);
- expect(stateVariables[parabola3Name].stateValues.b).closeTo(b, 1e-12);
- expect(stateVariables[parabola3Name].stateValues.c).closeTo(c, 1e-12);
+ expect(stateVariables["/g3/p2"].stateValues.a).closeTo(a, 1e-12);
+ expect(stateVariables["/g3/p2"].stateValues.b).closeTo(b, 1e-12);
+ expect(stateVariables["/g3/p2"].stateValues.c).closeTo(c, 1e-12);
expect(
me
- .fromAst(stateVariables[parabola3Name].stateValues.equation)
+ .fromAst(stateVariables["/g3/p2"].stateValues.equation)
.equals(equationExpression),
).eq(true);
expect(
me
- .fromAst(stateVariables[parabola3Name].stateValues.vertex[0])
+ .fromAst(stateVariables["/g3/p2"].stateValues.vertex[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(stateVariables[parabola3Name].stateValues.vertex[1])
+ .fromAst(stateVariables["/g3/p2"].stateValues.vertex[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(stateVariables[vertex3Name].stateValues.xs[0])
+ .fromAst(stateVariables["/g3/v2"].stateValues.xs[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(stateVariables[vertex3Name].stateValues.xs[1])
+ .fromAst(stateVariables["/g3/v2"].stateValues.xs[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
expect(
@@ -7272,15 +5493,15 @@ describe("Parabola Tag Tests", function () {
(3,4)
(5,6)
-
- a =
b =
@@ -7300,15 +5521,6 @@ describe("Parabola Tag Tests", function () {
cy.window().then(async (win) => {
let stateVariables = await win.returnAllStateVariables1();
- let equationAnchor = cesc2(
- "#" + stateVariables["/e2"].replacements[0].componentName,
- );
- let parabola3Name =
- stateVariables[stateVariables["/g3"].replacements[0].componentName]
- .activeChildren[0].componentName;
- let vertex3Name =
- stateVariables[stateVariables["/g3"].replacements[0].componentName]
- .activeChildren[1].componentName;
cy.window().then(async (win) => {
let x1 = 1,
@@ -7354,76 +5566,37 @@ describe("Parabola Tag Tests", function () {
expect(stateVariables["/_parabola1"].stateValues.vertex[1]).eq(
"\uff3f",
);
- expect(
- stateVariables[stateVariables["/v"].replacements[0].componentName]
- .stateValues.xs[0],
- ).eq("\uff3f");
- expect(
- stateVariables[stateVariables["/v"].replacements[0].componentName]
- .stateValues.xs[1],
- ).eq("\uff3f");
- expect(
- stateVariables[stateVariables["/p2"].replacements[0].componentName]
- .stateValues.a,
- ).closeTo(a, 1e-12);
- expect(
- stateVariables[stateVariables["/p2"].replacements[0].componentName]
- .stateValues.b,
- ).closeTo(b, 1e-12);
- expect(
- stateVariables[stateVariables["/p2"].replacements[0].componentName]
- .stateValues.c,
- ).closeTo(c, 1e-12);
+ expect(stateVariables["/v"].stateValues.xs[0]).eq("\uff3f");
+ expect(stateVariables["/v"].stateValues.xs[1]).eq("\uff3f");
+ expect(stateVariables["/p2"].stateValues.a).closeTo(a, 1e-12);
+ expect(stateVariables["/p2"].stateValues.b).closeTo(b, 1e-12);
+ expect(stateVariables["/p2"].stateValues.c).closeTo(c, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/p2"].replacements[0].componentName
- ].stateValues.equation,
- )
+ .fromAst(stateVariables["/p2"].stateValues.equation)
.equals(equationExpression),
).eq(true);
- expect(
- stateVariables[stateVariables["/p2"].replacements[0].componentName]
- .stateValues.vertex[0],
- ).eq("\uff3f");
- expect(
- stateVariables[stateVariables["/p2"].replacements[0].componentName]
- .stateValues.vertex[1],
- ).eq("\uff3f");
- expect(
- stateVariables[stateVariables["/v2"].replacements[0].componentName]
- .stateValues.xs[0],
- ).eq("\uff3f");
- expect(
- stateVariables[stateVariables["/v2"].replacements[0].componentName]
- .stateValues.xs[1],
- ).eq("\uff3f");
+ expect(stateVariables["/p2"].stateValues.vertex[0]).eq("\uff3f");
+ expect(stateVariables["/p2"].stateValues.vertex[1]).eq("\uff3f");
+ expect(stateVariables["/v2"].stateValues.xs[0]).eq("\uff3f");
+ expect(stateVariables["/v2"].stateValues.xs[1]).eq("\uff3f");
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/e2"].replacements[0].componentName
- ].stateValues.value,
- )
+ .fromAst(stateVariables["/e2"].stateValues.value)
.equals(equationExpression),
).eq(true);
- expect(stateVariables[parabola3Name].stateValues.a).closeTo(a, 1e-12);
- expect(stateVariables[parabola3Name].stateValues.b).closeTo(b, 1e-12);
- expect(stateVariables[parabola3Name].stateValues.c).closeTo(c, 1e-12);
+ expect(stateVariables["/g3/p2"].stateValues.a).closeTo(a, 1e-12);
+ expect(stateVariables["/g3/p2"].stateValues.b).closeTo(b, 1e-12);
+ expect(stateVariables["/g3/p2"].stateValues.c).closeTo(c, 1e-12);
expect(
me
- .fromAst(stateVariables[parabola3Name].stateValues.equation)
+ .fromAst(stateVariables["/g3/p2"].stateValues.equation)
.equals(equationExpression),
).eq(true);
- expect(stateVariables[parabola3Name].stateValues.vertex[0]).eq(
- "\uff3f",
- );
- expect(stateVariables[parabola3Name].stateValues.vertex[1]).eq(
- "\uff3f",
- );
- expect(stateVariables[vertex3Name].stateValues.xs[0]).eq("\uff3f");
- expect(stateVariables[vertex3Name].stateValues.xs[1]).eq("\uff3f");
+ expect(stateVariables["/g3/p2"].stateValues.vertex[0]).eq("\uff3f");
+ expect(stateVariables["/g3/p2"].stateValues.vertex[1]).eq("\uff3f");
+ expect(stateVariables["/g3/v2"].stateValues.xs[0]).eq("\uff3f");
+ expect(stateVariables["/g3/v2"].stateValues.xs[1]).eq("\uff3f");
expect(
me
.fromAst(stateVariables["/_point1"].stateValues.xs[0])
@@ -7501,7 +5674,7 @@ describe("Parabola Tag Tests", function () {
let vertex_x = -b / (2 * a);
let vertex_y = c - b ** 2 / (4 * a);
- cy.get(equationAnchor).should("contain.text", "y=−2x2+x+1");
+ cy.get(cesc2("#/e2")).should("contain.text", "y=−2x2+x+1");
let equationExpression = me.fromText(`y=${a}x^2+${b}x+${c}`);
cy.window().then(async (win) => {
@@ -7527,114 +5700,73 @@ describe("Parabola Tag Tests", function () {
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v"].replacements[0].componentName
- ].stateValues.xs[0],
- )
+ .fromAst(stateVariables["/v"].stateValues.xs[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v"].replacements[0].componentName
- ].stateValues.xs[1],
- )
+ .fromAst(stateVariables["/v"].stateValues.xs[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
- expect(
- stateVariables[stateVariables["/p2"].replacements[0].componentName]
- .stateValues.a,
- ).closeTo(a, 1e-12);
- expect(
- stateVariables[stateVariables["/p2"].replacements[0].componentName]
- .stateValues.b,
- ).closeTo(b, 1e-12);
- expect(
- stateVariables[stateVariables["/p2"].replacements[0].componentName]
- .stateValues.c,
- ).closeTo(c, 1e-12);
+ expect(stateVariables["/p2"].stateValues.a).closeTo(a, 1e-12);
+ expect(stateVariables["/p2"].stateValues.b).closeTo(b, 1e-12);
+ expect(stateVariables["/p2"].stateValues.c).closeTo(c, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/p2"].replacements[0].componentName
- ].stateValues.equation,
- )
+ .fromAst(stateVariables["/p2"].stateValues.equation)
.equals(equationExpression),
).eq(true);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/p2"].replacements[0].componentName
- ].stateValues.vertex[0],
- )
+ .fromAst(stateVariables["/p2"].stateValues.vertex[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/p2"].replacements[0].componentName
- ].stateValues.vertex[1],
- )
+ .fromAst(stateVariables["/p2"].stateValues.vertex[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v2"].replacements[0].componentName
- ].stateValues.xs[0],
- )
+ .fromAst(stateVariables["/v2"].stateValues.xs[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v2"].replacements[0].componentName
- ].stateValues.xs[1],
- )
+ .fromAst(stateVariables["/v2"].stateValues.xs[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/e2"].replacements[0].componentName
- ].stateValues.value,
- )
+ .fromAst(stateVariables["/e2"].stateValues.value)
.equals(equationExpression),
).eq(true);
- expect(stateVariables[parabola3Name].stateValues.a).closeTo(a, 1e-12);
- expect(stateVariables[parabola3Name].stateValues.b).closeTo(b, 1e-12);
- expect(stateVariables[parabola3Name].stateValues.c).closeTo(c, 1e-12);
+ expect(stateVariables["/g3/p2"].stateValues.a).closeTo(a, 1e-12);
+ expect(stateVariables["/g3/p2"].stateValues.b).closeTo(b, 1e-12);
+ expect(stateVariables["/g3/p2"].stateValues.c).closeTo(c, 1e-12);
expect(
me
- .fromAst(stateVariables[parabola3Name].stateValues.equation)
+ .fromAst(stateVariables["/g3/p2"].stateValues.equation)
.equals(equationExpression),
).eq(true);
expect(
me
- .fromAst(stateVariables[parabola3Name].stateValues.vertex[0])
+ .fromAst(stateVariables["/g3/p2"].stateValues.vertex[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(stateVariables[parabola3Name].stateValues.vertex[1])
+ .fromAst(stateVariables["/g3/p2"].stateValues.vertex[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(stateVariables[vertex3Name].stateValues.xs[0])
+ .fromAst(stateVariables["/g3/v2"].stateValues.xs[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(stateVariables[vertex3Name].stateValues.xs[1])
+ .fromAst(stateVariables["/g3/v2"].stateValues.xs[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
expect(
@@ -7714,7 +5846,7 @@ describe("Parabola Tag Tests", function () {
let vertex_x = -b / (2 * a);
let vertex_y = c - b ** 2 / (4 * a);
- cy.get(equationAnchor).should("contain.text", "y=−2x2+3x+1");
+ cy.get(cesc2("#/e2")).should("contain.text", "y=−2x2+3x+1");
let equationExpression = me.fromText(`y=${a}x^2+${b}x+${c}`);
cy.window().then(async (win) => {
@@ -7740,114 +5872,73 @@ describe("Parabola Tag Tests", function () {
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v"].replacements[0].componentName
- ].stateValues.xs[0],
- )
+ .fromAst(stateVariables["/v"].stateValues.xs[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v"].replacements[0].componentName
- ].stateValues.xs[1],
- )
+ .fromAst(stateVariables["/v"].stateValues.xs[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
- expect(
- stateVariables[stateVariables["/p2"].replacements[0].componentName]
- .stateValues.a,
- ).closeTo(a, 1e-12);
- expect(
- stateVariables[stateVariables["/p2"].replacements[0].componentName]
- .stateValues.b,
- ).closeTo(b, 1e-12);
- expect(
- stateVariables[stateVariables["/p2"].replacements[0].componentName]
- .stateValues.c,
- ).closeTo(c, 1e-12);
+ expect(stateVariables["/p2"].stateValues.a).closeTo(a, 1e-12);
+ expect(stateVariables["/p2"].stateValues.b).closeTo(b, 1e-12);
+ expect(stateVariables["/p2"].stateValues.c).closeTo(c, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/p2"].replacements[0].componentName
- ].stateValues.equation,
- )
+ .fromAst(stateVariables["/p2"].stateValues.equation)
.equals(equationExpression),
).eq(true);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/p2"].replacements[0].componentName
- ].stateValues.vertex[0],
- )
+ .fromAst(stateVariables["/p2"].stateValues.vertex[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/p2"].replacements[0].componentName
- ].stateValues.vertex[1],
- )
+ .fromAst(stateVariables["/p2"].stateValues.vertex[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v2"].replacements[0].componentName
- ].stateValues.xs[0],
- )
+ .fromAst(stateVariables["/v2"].stateValues.xs[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v2"].replacements[0].componentName
- ].stateValues.xs[1],
- )
+ .fromAst(stateVariables["/v2"].stateValues.xs[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/e2"].replacements[0].componentName
- ].stateValues.value,
- )
+ .fromAst(stateVariables["/e2"].stateValues.value)
.equals(equationExpression),
).eq(true);
- expect(stateVariables[parabola3Name].stateValues.a).closeTo(a, 1e-12);
- expect(stateVariables[parabola3Name].stateValues.b).closeTo(b, 1e-12);
- expect(stateVariables[parabola3Name].stateValues.c).closeTo(c, 1e-12);
+ expect(stateVariables["/g3/p2"].stateValues.a).closeTo(a, 1e-12);
+ expect(stateVariables["/g3/p2"].stateValues.b).closeTo(b, 1e-12);
+ expect(stateVariables["/g3/p2"].stateValues.c).closeTo(c, 1e-12);
expect(
me
- .fromAst(stateVariables[parabola3Name].stateValues.equation)
+ .fromAst(stateVariables["/g3/p2"].stateValues.equation)
.equals(equationExpression),
).eq(true);
expect(
me
- .fromAst(stateVariables[parabola3Name].stateValues.vertex[0])
+ .fromAst(stateVariables["/g3/p2"].stateValues.vertex[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(stateVariables[parabola3Name].stateValues.vertex[1])
+ .fromAst(stateVariables["/g3/p2"].stateValues.vertex[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(stateVariables[vertex3Name].stateValues.xs[0])
+ .fromAst(stateVariables["/g3/v2"].stateValues.xs[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(stateVariables[vertex3Name].stateValues.xs[1])
+ .fromAst(stateVariables["/g3/v2"].stateValues.xs[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
expect(
@@ -7905,7 +5996,7 @@ describe("Parabola Tag Tests", function () {
let vertex_x = -b / (2 * a);
let vertex_y = c - b ** 2 / (4 * a);
- cy.get(equationAnchor).should("contain.text", "y=−2x2+3x+9");
+ cy.get(cesc2("#/e2")).should("contain.text", "y=−2x2+3x+9");
let equationExpression = me.fromText(`y=${a}x^2+${b}x+${c}`);
cy.window().then(async (win) => {
@@ -7931,114 +6022,73 @@ describe("Parabola Tag Tests", function () {
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v"].replacements[0].componentName
- ].stateValues.xs[0],
- )
+ .fromAst(stateVariables["/v"].stateValues.xs[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v"].replacements[0].componentName
- ].stateValues.xs[1],
- )
+ .fromAst(stateVariables["/v"].stateValues.xs[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
- expect(
- stateVariables[stateVariables["/p2"].replacements[0].componentName]
- .stateValues.a,
- ).closeTo(a, 1e-12);
- expect(
- stateVariables[stateVariables["/p2"].replacements[0].componentName]
- .stateValues.b,
- ).closeTo(b, 1e-12);
- expect(
- stateVariables[stateVariables["/p2"].replacements[0].componentName]
- .stateValues.c,
- ).closeTo(c, 1e-12);
+ expect(stateVariables["/p2"].stateValues.a).closeTo(a, 1e-12);
+ expect(stateVariables["/p2"].stateValues.b).closeTo(b, 1e-12);
+ expect(stateVariables["/p2"].stateValues.c).closeTo(c, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/p2"].replacements[0].componentName
- ].stateValues.equation,
- )
+ .fromAst(stateVariables["/p2"].stateValues.equation)
.equals(equationExpression),
).eq(true);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/p2"].replacements[0].componentName
- ].stateValues.vertex[0],
- )
+ .fromAst(stateVariables["/p2"].stateValues.vertex[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/p2"].replacements[0].componentName
- ].stateValues.vertex[1],
- )
+ .fromAst(stateVariables["/p2"].stateValues.vertex[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v2"].replacements[0].componentName
- ].stateValues.xs[0],
- )
+ .fromAst(stateVariables["/v2"].stateValues.xs[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v2"].replacements[0].componentName
- ].stateValues.xs[1],
- )
+ .fromAst(stateVariables["/v2"].stateValues.xs[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/e2"].replacements[0].componentName
- ].stateValues.value,
- )
+ .fromAst(stateVariables["/e2"].stateValues.value)
.equals(equationExpression),
).eq(true);
- expect(stateVariables[parabola3Name].stateValues.a).closeTo(a, 1e-12);
- expect(stateVariables[parabola3Name].stateValues.b).closeTo(b, 1e-12);
- expect(stateVariables[parabola3Name].stateValues.c).closeTo(c, 1e-12);
+ expect(stateVariables["/g3/p2"].stateValues.a).closeTo(a, 1e-12);
+ expect(stateVariables["/g3/p2"].stateValues.b).closeTo(b, 1e-12);
+ expect(stateVariables["/g3/p2"].stateValues.c).closeTo(c, 1e-12);
expect(
me
- .fromAst(stateVariables[parabola3Name].stateValues.equation)
+ .fromAst(stateVariables["/g3/p2"].stateValues.equation)
.equals(equationExpression),
).eq(true);
expect(
me
- .fromAst(stateVariables[parabola3Name].stateValues.vertex[0])
+ .fromAst(stateVariables["/g3/p2"].stateValues.vertex[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(stateVariables[parabola3Name].stateValues.vertex[1])
+ .fromAst(stateVariables["/g3/p2"].stateValues.vertex[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(stateVariables[vertex3Name].stateValues.xs[0])
+ .fromAst(stateVariables["/g3/v2"].stateValues.xs[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(stateVariables[vertex3Name].stateValues.xs[1])
+ .fromAst(stateVariables["/g3/v2"].stateValues.xs[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
expect(
@@ -8096,7 +6146,7 @@ describe("Parabola Tag Tests", function () {
let vertex_x = -b / (2 * a);
let vertex_y = c - b ** 2 / (4 * a);
- cy.get(equationAnchor).should("contain.text", "y=0.2x2+3x+9");
+ cy.get(cesc2("#/e2")).should("contain.text", "y=0.2x2+3x+9");
let equationExpression = me.fromText(`y=${a}x^2+${b}x+${c}`);
cy.window().then(async (win) => {
@@ -8122,114 +6172,73 @@ describe("Parabola Tag Tests", function () {
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v"].replacements[0].componentName
- ].stateValues.xs[0],
- )
+ .fromAst(stateVariables["/v"].stateValues.xs[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v"].replacements[0].componentName
- ].stateValues.xs[1],
- )
+ .fromAst(stateVariables["/v"].stateValues.xs[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
- expect(
- stateVariables[stateVariables["/p2"].replacements[0].componentName]
- .stateValues.a,
- ).closeTo(a, 1e-12);
- expect(
- stateVariables[stateVariables["/p2"].replacements[0].componentName]
- .stateValues.b,
- ).closeTo(b, 1e-12);
- expect(
- stateVariables[stateVariables["/p2"].replacements[0].componentName]
- .stateValues.c,
- ).closeTo(c, 1e-12);
+ expect(stateVariables["/p2"].stateValues.a).closeTo(a, 1e-12);
+ expect(stateVariables["/p2"].stateValues.b).closeTo(b, 1e-12);
+ expect(stateVariables["/p2"].stateValues.c).closeTo(c, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/p2"].replacements[0].componentName
- ].stateValues.equation,
- )
+ .fromAst(stateVariables["/p2"].stateValues.equation)
.equals(equationExpression),
).eq(true);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/p2"].replacements[0].componentName
- ].stateValues.vertex[0],
- )
+ .fromAst(stateVariables["/p2"].stateValues.vertex[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/p2"].replacements[0].componentName
- ].stateValues.vertex[1],
- )
+ .fromAst(stateVariables["/p2"].stateValues.vertex[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v2"].replacements[0].componentName
- ].stateValues.xs[0],
- )
+ .fromAst(stateVariables["/v2"].stateValues.xs[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v2"].replacements[0].componentName
- ].stateValues.xs[1],
- )
+ .fromAst(stateVariables["/v2"].stateValues.xs[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/e2"].replacements[0].componentName
- ].stateValues.value,
- )
+ .fromAst(stateVariables["/e2"].stateValues.value)
.equals(equationExpression),
).eq(true);
- expect(stateVariables[parabola3Name].stateValues.a).closeTo(a, 1e-12);
- expect(stateVariables[parabola3Name].stateValues.b).closeTo(b, 1e-12);
- expect(stateVariables[parabola3Name].stateValues.c).closeTo(c, 1e-12);
+ expect(stateVariables["/g3/p2"].stateValues.a).closeTo(a, 1e-12);
+ expect(stateVariables["/g3/p2"].stateValues.b).closeTo(b, 1e-12);
+ expect(stateVariables["/g3/p2"].stateValues.c).closeTo(c, 1e-12);
expect(
me
- .fromAst(stateVariables[parabola3Name].stateValues.equation)
+ .fromAst(stateVariables["/g3/p2"].stateValues.equation)
.equals(equationExpression),
).eq(true);
expect(
me
- .fromAst(stateVariables[parabola3Name].stateValues.vertex[0])
+ .fromAst(stateVariables["/g3/p2"].stateValues.vertex[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(stateVariables[parabola3Name].stateValues.vertex[1])
+ .fromAst(stateVariables["/g3/p2"].stateValues.vertex[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(stateVariables[vertex3Name].stateValues.xs[0])
+ .fromAst(stateVariables["/g3/v2"].stateValues.xs[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(stateVariables[vertex3Name].stateValues.xs[1])
+ .fromAst(stateVariables["/g3/v2"].stateValues.xs[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
expect(
@@ -8287,7 +6296,7 @@ describe("Parabola Tag Tests", function () {
let vertex_x = -b / (2 * a);
let vertex_y = c - b ** 2 / (4 * a);
- cy.get(equationAnchor).should("contain.text", "y=0.2x2−1.7x+9");
+ cy.get(cesc2("#/e2")).should("contain.text", "y=0.2x2−1.7x+9");
let equationExpression = me.fromText(`y=${a}x^2+${b}x+${c}`);
cy.window().then(async (win) => {
@@ -8313,114 +6322,73 @@ describe("Parabola Tag Tests", function () {
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v"].replacements[0].componentName
- ].stateValues.xs[0],
- )
+ .fromAst(stateVariables["/v"].stateValues.xs[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v"].replacements[0].componentName
- ].stateValues.xs[1],
- )
+ .fromAst(stateVariables["/v"].stateValues.xs[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
- expect(
- stateVariables[stateVariables["/p2"].replacements[0].componentName]
- .stateValues.a,
- ).closeTo(a, 1e-12);
- expect(
- stateVariables[stateVariables["/p2"].replacements[0].componentName]
- .stateValues.b,
- ).closeTo(b, 1e-12);
- expect(
- stateVariables[stateVariables["/p2"].replacements[0].componentName]
- .stateValues.c,
- ).closeTo(c, 1e-12);
+ expect(stateVariables["/p2"].stateValues.a).closeTo(a, 1e-12);
+ expect(stateVariables["/p2"].stateValues.b).closeTo(b, 1e-12);
+ expect(stateVariables["/p2"].stateValues.c).closeTo(c, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/p2"].replacements[0].componentName
- ].stateValues.equation,
- )
+ .fromAst(stateVariables["/p2"].stateValues.equation)
.equals(equationExpression),
).eq(true);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/p2"].replacements[0].componentName
- ].stateValues.vertex[0],
- )
+ .fromAst(stateVariables["/p2"].stateValues.vertex[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/p2"].replacements[0].componentName
- ].stateValues.vertex[1],
- )
+ .fromAst(stateVariables["/p2"].stateValues.vertex[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v2"].replacements[0].componentName
- ].stateValues.xs[0],
- )
+ .fromAst(stateVariables["/v2"].stateValues.xs[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v2"].replacements[0].componentName
- ].stateValues.xs[1],
- )
+ .fromAst(stateVariables["/v2"].stateValues.xs[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/e2"].replacements[0].componentName
- ].stateValues.value,
- )
+ .fromAst(stateVariables["/e2"].stateValues.value)
.equals(equationExpression),
).eq(true);
- expect(stateVariables[parabola3Name].stateValues.a).closeTo(a, 1e-12);
- expect(stateVariables[parabola3Name].stateValues.b).closeTo(b, 1e-12);
- expect(stateVariables[parabola3Name].stateValues.c).closeTo(c, 1e-12);
+ expect(stateVariables["/g3/p2"].stateValues.a).closeTo(a, 1e-12);
+ expect(stateVariables["/g3/p2"].stateValues.b).closeTo(b, 1e-12);
+ expect(stateVariables["/g3/p2"].stateValues.c).closeTo(c, 1e-12);
expect(
me
- .fromAst(stateVariables[parabola3Name].stateValues.equation)
+ .fromAst(stateVariables["/g3/p2"].stateValues.equation)
.equals(equationExpression),
).eq(true);
expect(
me
- .fromAst(stateVariables[parabola3Name].stateValues.vertex[0])
+ .fromAst(stateVariables["/g3/p2"].stateValues.vertex[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(stateVariables[parabola3Name].stateValues.vertex[1])
+ .fromAst(stateVariables["/g3/p2"].stateValues.vertex[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(stateVariables[vertex3Name].stateValues.xs[0])
+ .fromAst(stateVariables["/g3/v2"].stateValues.xs[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(stateVariables[vertex3Name].stateValues.xs[1])
+ .fromAst(stateVariables["/g3/v2"].stateValues.xs[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
expect(
@@ -8478,7 +6446,7 @@ describe("Parabola Tag Tests", function () {
let vertex_x = -b / (2 * a);
let vertex_y = c - b ** 2 / (4 * a);
- cy.get(equationAnchor).should("contain.text", "y=0.2x2−1.7x−4.5");
+ cy.get(cesc2("#/e2")).should("contain.text", "y=0.2x2−1.7x−4.5");
let equationExpression = me.fromText(`y=${a}x^2+${b}x+${c}`);
cy.window().then(async (win) => {
@@ -8504,114 +6472,73 @@ describe("Parabola Tag Tests", function () {
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v"].replacements[0].componentName
- ].stateValues.xs[0],
- )
+ .fromAst(stateVariables["/v"].stateValues.xs[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v"].replacements[0].componentName
- ].stateValues.xs[1],
- )
+ .fromAst(stateVariables["/v"].stateValues.xs[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
- expect(
- stateVariables[stateVariables["/p2"].replacements[0].componentName]
- .stateValues.a,
- ).closeTo(a, 1e-12);
- expect(
- stateVariables[stateVariables["/p2"].replacements[0].componentName]
- .stateValues.b,
- ).closeTo(b, 1e-12);
- expect(
- stateVariables[stateVariables["/p2"].replacements[0].componentName]
- .stateValues.c,
- ).closeTo(c, 1e-12);
+ expect(stateVariables["/p2"].stateValues.a).closeTo(a, 1e-12);
+ expect(stateVariables["/p2"].stateValues.b).closeTo(b, 1e-12);
+ expect(stateVariables["/p2"].stateValues.c).closeTo(c, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/p2"].replacements[0].componentName
- ].stateValues.equation,
- )
+ .fromAst(stateVariables["/p2"].stateValues.equation)
.equals(equationExpression),
).eq(true);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/p2"].replacements[0].componentName
- ].stateValues.vertex[0],
- )
+ .fromAst(stateVariables["/p2"].stateValues.vertex[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/p2"].replacements[0].componentName
- ].stateValues.vertex[1],
- )
+ .fromAst(stateVariables["/p2"].stateValues.vertex[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v2"].replacements[0].componentName
- ].stateValues.xs[0],
- )
+ .fromAst(stateVariables["/v2"].stateValues.xs[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v2"].replacements[0].componentName
- ].stateValues.xs[1],
- )
+ .fromAst(stateVariables["/v2"].stateValues.xs[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/e2"].replacements[0].componentName
- ].stateValues.value,
- )
+ .fromAst(stateVariables["/e2"].stateValues.value)
.equals(equationExpression),
).eq(true);
- expect(stateVariables[parabola3Name].stateValues.a).closeTo(a, 1e-12);
- expect(stateVariables[parabola3Name].stateValues.b).closeTo(b, 1e-12);
- expect(stateVariables[parabola3Name].stateValues.c).closeTo(c, 1e-12);
+ expect(stateVariables["/g3/p2"].stateValues.a).closeTo(a, 1e-12);
+ expect(stateVariables["/g3/p2"].stateValues.b).closeTo(b, 1e-12);
+ expect(stateVariables["/g3/p2"].stateValues.c).closeTo(c, 1e-12);
expect(
me
- .fromAst(stateVariables[parabola3Name].stateValues.equation)
+ .fromAst(stateVariables["/g3/p2"].stateValues.equation)
.equals(equationExpression),
).eq(true);
expect(
me
- .fromAst(stateVariables[parabola3Name].stateValues.vertex[0])
+ .fromAst(stateVariables["/g3/p2"].stateValues.vertex[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(stateVariables[parabola3Name].stateValues.vertex[1])
+ .fromAst(stateVariables["/g3/p2"].stateValues.vertex[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(stateVariables[vertex3Name].stateValues.xs[0])
+ .fromAst(stateVariables["/g3/v2"].stateValues.xs[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(stateVariables[vertex3Name].stateValues.xs[1])
+ .fromAst(stateVariables["/g3/v2"].stateValues.xs[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
expect(
@@ -8651,7 +6578,7 @@ describe("Parabola Tag Tests", function () {
cy.window().then(async (win) => {
await win.callAction1({
actionName: "movePoint",
- componentName: stateVariables["/v"].replacements[0].componentName,
+ componentName: "/v",
args: { x: -2, y: 1 },
});
@@ -8696,114 +6623,73 @@ describe("Parabola Tag Tests", function () {
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v"].replacements[0].componentName
- ].stateValues.xs[0],
- )
+ .fromAst(stateVariables["/v"].stateValues.xs[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v"].replacements[0].componentName
- ].stateValues.xs[1],
- )
+ .fromAst(stateVariables["/v"].stateValues.xs[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
- expect(
- stateVariables[stateVariables["/p2"].replacements[0].componentName]
- .stateValues.a,
- ).closeTo(a, 1e-12);
- expect(
- stateVariables[stateVariables["/p2"].replacements[0].componentName]
- .stateValues.b,
- ).closeTo(b, 1e-12);
- expect(
- stateVariables[stateVariables["/p2"].replacements[0].componentName]
- .stateValues.c,
- ).closeTo(c, 1e-12);
+ expect(stateVariables["/p2"].stateValues.a).closeTo(a, 1e-12);
+ expect(stateVariables["/p2"].stateValues.b).closeTo(b, 1e-12);
+ expect(stateVariables["/p2"].stateValues.c).closeTo(c, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/p2"].replacements[0].componentName
- ].stateValues.equation,
- )
+ .fromAst(stateVariables["/p2"].stateValues.equation)
.equals(equationExpression),
).eq(true);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/p2"].replacements[0].componentName
- ].stateValues.vertex[0],
- )
+ .fromAst(stateVariables["/p2"].stateValues.vertex[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/p2"].replacements[0].componentName
- ].stateValues.vertex[1],
- )
+ .fromAst(stateVariables["/p2"].stateValues.vertex[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v2"].replacements[0].componentName
- ].stateValues.xs[0],
- )
+ .fromAst(stateVariables["/v2"].stateValues.xs[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v2"].replacements[0].componentName
- ].stateValues.xs[1],
- )
+ .fromAst(stateVariables["/v2"].stateValues.xs[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/e2"].replacements[0].componentName
- ].stateValues.value,
- )
+ .fromAst(stateVariables["/e2"].stateValues.value)
.equals(equationExpression),
).eq(true);
- expect(stateVariables[parabola3Name].stateValues.a).closeTo(a, 1e-12);
- expect(stateVariables[parabola3Name].stateValues.b).closeTo(b, 1e-12);
- expect(stateVariables[parabola3Name].stateValues.c).closeTo(c, 1e-12);
+ expect(stateVariables["/g3/p2"].stateValues.a).closeTo(a, 1e-12);
+ expect(stateVariables["/g3/p2"].stateValues.b).closeTo(b, 1e-12);
+ expect(stateVariables["/g3/p2"].stateValues.c).closeTo(c, 1e-12);
expect(
me
- .fromAst(stateVariables[parabola3Name].stateValues.equation)
+ .fromAst(stateVariables["/g3/p2"].stateValues.equation)
.equals(equationExpression),
).eq(true);
expect(
me
- .fromAst(stateVariables[parabola3Name].stateValues.vertex[0])
+ .fromAst(stateVariables["/g3/p2"].stateValues.vertex[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(stateVariables[parabola3Name].stateValues.vertex[1])
+ .fromAst(stateVariables["/g3/p2"].stateValues.vertex[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(stateVariables[vertex3Name].stateValues.xs[0])
+ .fromAst(stateVariables["/g3/v2"].stateValues.xs[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(stateVariables[vertex3Name].stateValues.xs[1])
+ .fromAst(stateVariables["/g3/v2"].stateValues.xs[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
expect(
@@ -8843,7 +6729,7 @@ describe("Parabola Tag Tests", function () {
cy.window().then(async (win) => {
await win.callAction1({
actionName: "movePoint",
- componentName: stateVariables["/v2"].replacements[0].componentName,
+ componentName: "/v2",
args: { x: 5, y: -6 },
});
@@ -8888,114 +6774,73 @@ describe("Parabola Tag Tests", function () {
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v"].replacements[0].componentName
- ].stateValues.xs[0],
- )
+ .fromAst(stateVariables["/v"].stateValues.xs[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v"].replacements[0].componentName
- ].stateValues.xs[1],
- )
+ .fromAst(stateVariables["/v"].stateValues.xs[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
- expect(
- stateVariables[stateVariables["/p2"].replacements[0].componentName]
- .stateValues.a,
- ).closeTo(a, 1e-12);
- expect(
- stateVariables[stateVariables["/p2"].replacements[0].componentName]
- .stateValues.b,
- ).closeTo(b, 1e-12);
- expect(
- stateVariables[stateVariables["/p2"].replacements[0].componentName]
- .stateValues.c,
- ).closeTo(c, 1e-12);
+ expect(stateVariables["/p2"].stateValues.a).closeTo(a, 1e-12);
+ expect(stateVariables["/p2"].stateValues.b).closeTo(b, 1e-12);
+ expect(stateVariables["/p2"].stateValues.c).closeTo(c, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/p2"].replacements[0].componentName
- ].stateValues.equation,
- )
+ .fromAst(stateVariables["/p2"].stateValues.equation)
.equals(equationExpression),
).eq(true);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/p2"].replacements[0].componentName
- ].stateValues.vertex[0],
- )
+ .fromAst(stateVariables["/p2"].stateValues.vertex[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/p2"].replacements[0].componentName
- ].stateValues.vertex[1],
- )
+ .fromAst(stateVariables["/p2"].stateValues.vertex[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v2"].replacements[0].componentName
- ].stateValues.xs[0],
- )
+ .fromAst(stateVariables["/v2"].stateValues.xs[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v2"].replacements[0].componentName
- ].stateValues.xs[1],
- )
+ .fromAst(stateVariables["/v2"].stateValues.xs[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/e2"].replacements[0].componentName
- ].stateValues.value,
- )
+ .fromAst(stateVariables["/e2"].stateValues.value)
.equals(equationExpression),
).eq(true);
- expect(stateVariables[parabola3Name].stateValues.a).closeTo(a, 1e-12);
- expect(stateVariables[parabola3Name].stateValues.b).closeTo(b, 1e-12);
- expect(stateVariables[parabola3Name].stateValues.c).closeTo(c, 1e-12);
+ expect(stateVariables["/g3/p2"].stateValues.a).closeTo(a, 1e-12);
+ expect(stateVariables["/g3/p2"].stateValues.b).closeTo(b, 1e-12);
+ expect(stateVariables["/g3/p2"].stateValues.c).closeTo(c, 1e-12);
expect(
me
- .fromAst(stateVariables[parabola3Name].stateValues.equation)
+ .fromAst(stateVariables["/g3/p2"].stateValues.equation)
.equals(equationExpression),
).eq(true);
expect(
me
- .fromAst(stateVariables[parabola3Name].stateValues.vertex[0])
+ .fromAst(stateVariables["/g3/p2"].stateValues.vertex[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(stateVariables[parabola3Name].stateValues.vertex[1])
+ .fromAst(stateVariables["/g3/p2"].stateValues.vertex[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(stateVariables[vertex3Name].stateValues.xs[0])
+ .fromAst(stateVariables["/g3/v2"].stateValues.xs[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(stateVariables[vertex3Name].stateValues.xs[1])
+ .fromAst(stateVariables["/g3/v2"].stateValues.xs[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
expect(
@@ -9103,114 +6948,73 @@ describe("Parabola Tag Tests", function () {
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v"].replacements[0].componentName
- ].stateValues.xs[0],
- )
+ .fromAst(stateVariables["/v"].stateValues.xs[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v"].replacements[0].componentName
- ].stateValues.xs[1],
- )
+ .fromAst(stateVariables["/v"].stateValues.xs[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
- expect(
- stateVariables[stateVariables["/p2"].replacements[0].componentName]
- .stateValues.a,
- ).closeTo(a, 1e-12);
- expect(
- stateVariables[stateVariables["/p2"].replacements[0].componentName]
- .stateValues.b,
- ).closeTo(b, 1e-12);
- expect(
- stateVariables[stateVariables["/p2"].replacements[0].componentName]
- .stateValues.c,
- ).closeTo(c, 1e-12);
+ expect(stateVariables["/p2"].stateValues.a).closeTo(a, 1e-12);
+ expect(stateVariables["/p2"].stateValues.b).closeTo(b, 1e-12);
+ expect(stateVariables["/p2"].stateValues.c).closeTo(c, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/p2"].replacements[0].componentName
- ].stateValues.equation,
- )
+ .fromAst(stateVariables["/p2"].stateValues.equation)
.equals(equationExpression),
).eq(true);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/p2"].replacements[0].componentName
- ].stateValues.vertex[0],
- )
+ .fromAst(stateVariables["/p2"].stateValues.vertex[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/p2"].replacements[0].componentName
- ].stateValues.vertex[1],
- )
+ .fromAst(stateVariables["/p2"].stateValues.vertex[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v2"].replacements[0].componentName
- ].stateValues.xs[0],
- )
+ .fromAst(stateVariables["/v2"].stateValues.xs[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v2"].replacements[0].componentName
- ].stateValues.xs[1],
- )
+ .fromAst(stateVariables["/v2"].stateValues.xs[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/e2"].replacements[0].componentName
- ].stateValues.value,
- )
+ .fromAst(stateVariables["/e2"].stateValues.value)
.equals(equationExpression),
).eq(true);
- expect(stateVariables[parabola3Name].stateValues.a).closeTo(a, 1e-12);
- expect(stateVariables[parabola3Name].stateValues.b).closeTo(b, 1e-12);
- expect(stateVariables[parabola3Name].stateValues.c).closeTo(c, 1e-12);
+ expect(stateVariables["/g3/p2"].stateValues.a).closeTo(a, 1e-12);
+ expect(stateVariables["/g3/p2"].stateValues.b).closeTo(b, 1e-12);
+ expect(stateVariables["/g3/p2"].stateValues.c).closeTo(c, 1e-12);
expect(
me
- .fromAst(stateVariables[parabola3Name].stateValues.equation)
+ .fromAst(stateVariables["/g3/p2"].stateValues.equation)
.equals(equationExpression),
).eq(true);
expect(
me
- .fromAst(stateVariables[parabola3Name].stateValues.vertex[0])
+ .fromAst(stateVariables["/g3/p2"].stateValues.vertex[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(stateVariables[parabola3Name].stateValues.vertex[1])
+ .fromAst(stateVariables["/g3/p2"].stateValues.vertex[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(stateVariables[vertex3Name].stateValues.xs[0])
+ .fromAst(stateVariables["/g3/v2"].stateValues.xs[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(stateVariables[vertex3Name].stateValues.xs[1])
+ .fromAst(stateVariables["/g3/v2"].stateValues.xs[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
expect(
@@ -9304,114 +7108,73 @@ describe("Parabola Tag Tests", function () {
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v"].replacements[0].componentName
- ].stateValues.xs[0],
- )
+ .fromAst(stateVariables["/v"].stateValues.xs[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v"].replacements[0].componentName
- ].stateValues.xs[1],
- )
+ .fromAst(stateVariables["/v"].stateValues.xs[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
- expect(
- stateVariables[stateVariables["/p2"].replacements[0].componentName]
- .stateValues.a,
- ).closeTo(a, 1e-12);
- expect(
- stateVariables[stateVariables["/p2"].replacements[0].componentName]
- .stateValues.b,
- ).closeTo(b, 1e-12);
- expect(
- stateVariables[stateVariables["/p2"].replacements[0].componentName]
- .stateValues.c,
- ).closeTo(c, 1e-12);
+ expect(stateVariables["/p2"].stateValues.a).closeTo(a, 1e-12);
+ expect(stateVariables["/p2"].stateValues.b).closeTo(b, 1e-12);
+ expect(stateVariables["/p2"].stateValues.c).closeTo(c, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/p2"].replacements[0].componentName
- ].stateValues.equation,
- )
+ .fromAst(stateVariables["/p2"].stateValues.equation)
.equals(equationExpression),
).eq(true);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/p2"].replacements[0].componentName
- ].stateValues.vertex[0],
- )
+ .fromAst(stateVariables["/p2"].stateValues.vertex[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/p2"].replacements[0].componentName
- ].stateValues.vertex[1],
- )
+ .fromAst(stateVariables["/p2"].stateValues.vertex[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v2"].replacements[0].componentName
- ].stateValues.xs[0],
- )
+ .fromAst(stateVariables["/v2"].stateValues.xs[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v2"].replacements[0].componentName
- ].stateValues.xs[1],
- )
+ .fromAst(stateVariables["/v2"].stateValues.xs[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/e2"].replacements[0].componentName
- ].stateValues.value,
- )
+ .fromAst(stateVariables["/e2"].stateValues.value)
.equals(equationExpression),
).eq(true);
- expect(stateVariables[parabola3Name].stateValues.a).closeTo(a, 1e-12);
- expect(stateVariables[parabola3Name].stateValues.b).closeTo(b, 1e-12);
- expect(stateVariables[parabola3Name].stateValues.c).closeTo(c, 1e-12);
+ expect(stateVariables["/g3/p2"].stateValues.a).closeTo(a, 1e-12);
+ expect(stateVariables["/g3/p2"].stateValues.b).closeTo(b, 1e-12);
+ expect(stateVariables["/g3/p2"].stateValues.c).closeTo(c, 1e-12);
expect(
me
- .fromAst(stateVariables[parabola3Name].stateValues.equation)
+ .fromAst(stateVariables["/g3/p2"].stateValues.equation)
.equals(equationExpression),
).eq(true);
expect(
me
- .fromAst(stateVariables[parabola3Name].stateValues.vertex[0])
+ .fromAst(stateVariables["/g3/p2"].stateValues.vertex[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(stateVariables[parabola3Name].stateValues.vertex[1])
+ .fromAst(stateVariables["/g3/p2"].stateValues.vertex[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(stateVariables[vertex3Name].stateValues.xs[0])
+ .fromAst(stateVariables["/g3/v2"].stateValues.xs[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(stateVariables[vertex3Name].stateValues.xs[1])
+ .fromAst(stateVariables["/g3/v2"].stateValues.xs[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
expect(
@@ -9495,114 +7258,73 @@ describe("Parabola Tag Tests", function () {
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v"].replacements[0].componentName
- ].stateValues.xs[0],
- )
+ .fromAst(stateVariables["/v"].stateValues.xs[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v"].replacements[0].componentName
- ].stateValues.xs[1],
- )
+ .fromAst(stateVariables["/v"].stateValues.xs[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
- expect(
- stateVariables[stateVariables["/p2"].replacements[0].componentName]
- .stateValues.a,
- ).closeTo(a, 1e-12);
- expect(
- stateVariables[stateVariables["/p2"].replacements[0].componentName]
- .stateValues.b,
- ).closeTo(b, 1e-12);
- expect(
- stateVariables[stateVariables["/p2"].replacements[0].componentName]
- .stateValues.c,
- ).closeTo(c, 1e-12);
+ expect(stateVariables["/p2"].stateValues.a).closeTo(a, 1e-12);
+ expect(stateVariables["/p2"].stateValues.b).closeTo(b, 1e-12);
+ expect(stateVariables["/p2"].stateValues.c).closeTo(c, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/p2"].replacements[0].componentName
- ].stateValues.equation,
- )
+ .fromAst(stateVariables["/p2"].stateValues.equation)
.equals(equationExpression),
).eq(true);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/p2"].replacements[0].componentName
- ].stateValues.vertex[0],
- )
+ .fromAst(stateVariables["/p2"].stateValues.vertex[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/p2"].replacements[0].componentName
- ].stateValues.vertex[1],
- )
+ .fromAst(stateVariables["/p2"].stateValues.vertex[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v2"].replacements[0].componentName
- ].stateValues.xs[0],
- )
+ .fromAst(stateVariables["/v2"].stateValues.xs[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v2"].replacements[0].componentName
- ].stateValues.xs[1],
- )
+ .fromAst(stateVariables["/v2"].stateValues.xs[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/e2"].replacements[0].componentName
- ].stateValues.value,
- )
+ .fromAst(stateVariables["/e2"].stateValues.value)
.equals(equationExpression),
).eq(true);
- expect(stateVariables[parabola3Name].stateValues.a).closeTo(a, 1e-12);
- expect(stateVariables[parabola3Name].stateValues.b).closeTo(b, 1e-12);
- expect(stateVariables[parabola3Name].stateValues.c).closeTo(c, 1e-12);
+ expect(stateVariables["/g3/p2"].stateValues.a).closeTo(a, 1e-12);
+ expect(stateVariables["/g3/p2"].stateValues.b).closeTo(b, 1e-12);
+ expect(stateVariables["/g3/p2"].stateValues.c).closeTo(c, 1e-12);
expect(
me
- .fromAst(stateVariables[parabola3Name].stateValues.equation)
+ .fromAst(stateVariables["/g3/p2"].stateValues.equation)
.equals(equationExpression),
).eq(true);
expect(
me
- .fromAst(stateVariables[parabola3Name].stateValues.vertex[0])
+ .fromAst(stateVariables["/g3/p2"].stateValues.vertex[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(stateVariables[parabola3Name].stateValues.vertex[1])
+ .fromAst(stateVariables["/g3/p2"].stateValues.vertex[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(stateVariables[vertex3Name].stateValues.xs[0])
+ .fromAst(stateVariables["/g3/v2"].stateValues.xs[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(stateVariables[vertex3Name].stateValues.xs[1])
+ .fromAst(stateVariables["/g3/v2"].stateValues.xs[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
expect(
@@ -9686,114 +7408,73 @@ describe("Parabola Tag Tests", function () {
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v"].replacements[0].componentName
- ].stateValues.xs[0],
- )
+ .fromAst(stateVariables["/v"].stateValues.xs[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v"].replacements[0].componentName
- ].stateValues.xs[1],
- )
+ .fromAst(stateVariables["/v"].stateValues.xs[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
- expect(
- stateVariables[stateVariables["/p2"].replacements[0].componentName]
- .stateValues.a,
- ).closeTo(a, 1e-12);
- expect(
- stateVariables[stateVariables["/p2"].replacements[0].componentName]
- .stateValues.b,
- ).closeTo(b, 1e-12);
- expect(
- stateVariables[stateVariables["/p2"].replacements[0].componentName]
- .stateValues.c,
- ).closeTo(c, 1e-12);
+ expect(stateVariables["/p2"].stateValues.a).closeTo(a, 1e-12);
+ expect(stateVariables["/p2"].stateValues.b).closeTo(b, 1e-12);
+ expect(stateVariables["/p2"].stateValues.c).closeTo(c, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/p2"].replacements[0].componentName
- ].stateValues.equation,
- )
+ .fromAst(stateVariables["/p2"].stateValues.equation)
.equals(equationExpression),
).eq(true);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/p2"].replacements[0].componentName
- ].stateValues.vertex[0],
- )
+ .fromAst(stateVariables["/p2"].stateValues.vertex[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/p2"].replacements[0].componentName
- ].stateValues.vertex[1],
- )
+ .fromAst(stateVariables["/p2"].stateValues.vertex[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v2"].replacements[0].componentName
- ].stateValues.xs[0],
- )
+ .fromAst(stateVariables["/v2"].stateValues.xs[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v2"].replacements[0].componentName
- ].stateValues.xs[1],
- )
+ .fromAst(stateVariables["/v2"].stateValues.xs[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/e2"].replacements[0].componentName
- ].stateValues.value,
- )
+ .fromAst(stateVariables["/e2"].stateValues.value)
.equals(equationExpression),
).eq(true);
- expect(stateVariables[parabola3Name].stateValues.a).closeTo(a, 1e-12);
- expect(stateVariables[parabola3Name].stateValues.b).closeTo(b, 1e-12);
- expect(stateVariables[parabola3Name].stateValues.c).closeTo(c, 1e-12);
+ expect(stateVariables["/g3/p2"].stateValues.a).closeTo(a, 1e-12);
+ expect(stateVariables["/g3/p2"].stateValues.b).closeTo(b, 1e-12);
+ expect(stateVariables["/g3/p2"].stateValues.c).closeTo(c, 1e-12);
expect(
me
- .fromAst(stateVariables[parabola3Name].stateValues.equation)
+ .fromAst(stateVariables["/g3/p2"].stateValues.equation)
.equals(equationExpression),
).eq(true);
expect(
me
- .fromAst(stateVariables[parabola3Name].stateValues.vertex[0])
+ .fromAst(stateVariables["/g3/p2"].stateValues.vertex[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(stateVariables[parabola3Name].stateValues.vertex[1])
+ .fromAst(stateVariables["/g3/p2"].stateValues.vertex[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(stateVariables[vertex3Name].stateValues.xs[0])
+ .fromAst(stateVariables["/g3/v2"].stateValues.xs[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(stateVariables[vertex3Name].stateValues.xs[1])
+ .fromAst(stateVariables["/g3/v2"].stateValues.xs[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
expect(
@@ -9882,114 +7563,73 @@ describe("Parabola Tag Tests", function () {
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v"].replacements[0].componentName
- ].stateValues.xs[0],
- )
+ .fromAst(stateVariables["/v"].stateValues.xs[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v"].replacements[0].componentName
- ].stateValues.xs[1],
- )
+ .fromAst(stateVariables["/v"].stateValues.xs[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
- expect(
- stateVariables[stateVariables["/p2"].replacements[0].componentName]
- .stateValues.a,
- ).closeTo(a, 1e-12);
- expect(
- stateVariables[stateVariables["/p2"].replacements[0].componentName]
- .stateValues.b,
- ).closeTo(b, 1e-12);
- expect(
- stateVariables[stateVariables["/p2"].replacements[0].componentName]
- .stateValues.c,
- ).closeTo(c, 1e-12);
+ expect(stateVariables["/p2"].stateValues.a).closeTo(a, 1e-12);
+ expect(stateVariables["/p2"].stateValues.b).closeTo(b, 1e-12);
+ expect(stateVariables["/p2"].stateValues.c).closeTo(c, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/p2"].replacements[0].componentName
- ].stateValues.equation,
- )
+ .fromAst(stateVariables["/p2"].stateValues.equation)
.equals(equationExpression),
).eq(true);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/p2"].replacements[0].componentName
- ].stateValues.vertex[0],
- )
+ .fromAst(stateVariables["/p2"].stateValues.vertex[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/p2"].replacements[0].componentName
- ].stateValues.vertex[1],
- )
+ .fromAst(stateVariables["/p2"].stateValues.vertex[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v2"].replacements[0].componentName
- ].stateValues.xs[0],
- )
+ .fromAst(stateVariables["/v2"].stateValues.xs[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v2"].replacements[0].componentName
- ].stateValues.xs[1],
- )
+ .fromAst(stateVariables["/v2"].stateValues.xs[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/e2"].replacements[0].componentName
- ].stateValues.value,
- )
+ .fromAst(stateVariables["/e2"].stateValues.value)
.equals(equationExpression),
).eq(true);
- expect(stateVariables[parabola3Name].stateValues.a).closeTo(a, 1e-12);
- expect(stateVariables[parabola3Name].stateValues.b).closeTo(b, 1e-12);
- expect(stateVariables[parabola3Name].stateValues.c).closeTo(c, 1e-12);
+ expect(stateVariables["/g3/p2"].stateValues.a).closeTo(a, 1e-12);
+ expect(stateVariables["/g3/p2"].stateValues.b).closeTo(b, 1e-12);
+ expect(stateVariables["/g3/p2"].stateValues.c).closeTo(c, 1e-12);
expect(
me
- .fromAst(stateVariables[parabola3Name].stateValues.equation)
+ .fromAst(stateVariables["/g3/p2"].stateValues.equation)
.equals(equationExpression),
).eq(true);
expect(
me
- .fromAst(stateVariables[parabola3Name].stateValues.vertex[0])
+ .fromAst(stateVariables["/g3/p2"].stateValues.vertex[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(stateVariables[parabola3Name].stateValues.vertex[1])
+ .fromAst(stateVariables["/g3/p2"].stateValues.vertex[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(stateVariables[vertex3Name].stateValues.xs[0])
+ .fromAst(stateVariables["/g3/v2"].stateValues.xs[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(stateVariables[vertex3Name].stateValues.xs[1])
+ .fromAst(stateVariables["/g3/v2"].stateValues.xs[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
expect(
@@ -10060,47 +7700,26 @@ describe("Parabola Tag Tests", function () {
"\uff3f",
"\uff3f",
]);
- expect(
- stateVariables[stateVariables["/v"].replacements[0].componentName]
- .stateValues.xs[0],
- ).eq("\uff3f");
- expect(
- stateVariables[stateVariables["/v"].replacements[0].componentName]
- .stateValues.xs[1],
- ).eq("\uff3f");
- assert.isNaN(
- stateVariables[stateVariables["/p2"].replacements[0].componentName]
- .stateValues.a,
- );
- assert.isNaN(
- stateVariables[stateVariables["/p2"].replacements[0].componentName]
- .stateValues.b,
- );
- assert.isNaN(
- stateVariables[stateVariables["/p2"].replacements[0].componentName]
- .stateValues.c,
- );
- expect(
- stateVariables[stateVariables["/p2"].replacements[0].componentName]
- .stateValues.vertex,
- ).eqls(["\uff3f", "\uff3f"]);
- expect(
- stateVariables[stateVariables["/v2"].replacements[0].componentName]
- .stateValues.xs[0],
- ).eq("\uff3f");
- expect(
- stateVariables[stateVariables["/v2"].replacements[0].componentName]
- .stateValues.xs[1],
- ).eq("\uff3f");
- assert.isNaN(stateVariables[parabola3Name].stateValues.a);
- assert.isNaN(stateVariables[parabola3Name].stateValues.b);
- assert.isNaN(stateVariables[parabola3Name].stateValues.c);
- expect(stateVariables[parabola3Name].stateValues.vertex).eqls([
+ expect(stateVariables["/v"].stateValues.xs[0]).eq("\uff3f");
+ expect(stateVariables["/v"].stateValues.xs[1]).eq("\uff3f");
+ assert.isNaN(stateVariables["/p2"].stateValues.a);
+ assert.isNaN(stateVariables["/p2"].stateValues.b);
+ assert.isNaN(stateVariables["/p2"].stateValues.c);
+ expect(stateVariables["/p2"].stateValues.vertex).eqls([
"\uff3f",
"\uff3f",
]);
- expect(stateVariables[vertex3Name].stateValues.xs[0]).eq("\uff3f");
- expect(stateVariables[vertex3Name].stateValues.xs[1]).eq("\uff3f");
+ expect(stateVariables["/v2"].stateValues.xs[0]).eq("\uff3f");
+ expect(stateVariables["/v2"].stateValues.xs[1]).eq("\uff3f");
+ assert.isNaN(stateVariables["/g3/p2"].stateValues.a);
+ assert.isNaN(stateVariables["/g3/p2"].stateValues.b);
+ assert.isNaN(stateVariables["/g3/p2"].stateValues.c);
+ expect(stateVariables["/g3/p2"].stateValues.vertex).eqls([
+ "\uff3f",
+ "\uff3f",
+ ]);
+ expect(stateVariables["/g3/v2"].stateValues.xs[0]).eq("\uff3f");
+ expect(stateVariables["/g3/v2"].stateValues.xs[1]).eq("\uff3f");
expect(
me
.fromAst(stateVariables["/_point1"].stateValues.xs[0])
@@ -10201,114 +7820,73 @@ describe("Parabola Tag Tests", function () {
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v"].replacements[0].componentName
- ].stateValues.xs[0],
- )
+ .fromAst(stateVariables["/v"].stateValues.xs[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v"].replacements[0].componentName
- ].stateValues.xs[1],
- )
+ .fromAst(stateVariables["/v"].stateValues.xs[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
- expect(
- stateVariables[stateVariables["/p2"].replacements[0].componentName]
- .stateValues.a,
- ).closeTo(a, 1e-12);
- expect(
- stateVariables[stateVariables["/p2"].replacements[0].componentName]
- .stateValues.b,
- ).closeTo(b, 1e-12);
- expect(
- stateVariables[stateVariables["/p2"].replacements[0].componentName]
- .stateValues.c,
- ).closeTo(c, 1e-12);
+ expect(stateVariables["/p2"].stateValues.a).closeTo(a, 1e-12);
+ expect(stateVariables["/p2"].stateValues.b).closeTo(b, 1e-12);
+ expect(stateVariables["/p2"].stateValues.c).closeTo(c, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/p2"].replacements[0].componentName
- ].stateValues.equation,
- )
+ .fromAst(stateVariables["/p2"].stateValues.equation)
.equals(equationExpression),
).eq(true);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/p2"].replacements[0].componentName
- ].stateValues.vertex[0],
- )
+ .fromAst(stateVariables["/p2"].stateValues.vertex[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/p2"].replacements[0].componentName
- ].stateValues.vertex[1],
- )
+ .fromAst(stateVariables["/p2"].stateValues.vertex[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v2"].replacements[0].componentName
- ].stateValues.xs[0],
- )
+ .fromAst(stateVariables["/v2"].stateValues.xs[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v2"].replacements[0].componentName
- ].stateValues.xs[1],
- )
+ .fromAst(stateVariables["/v2"].stateValues.xs[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/e2"].replacements[0].componentName
- ].stateValues.value,
- )
+ .fromAst(stateVariables["/e2"].stateValues.value)
.equals(equationExpression),
).eq(true);
- expect(stateVariables[parabola3Name].stateValues.a).closeTo(a, 1e-12);
- expect(stateVariables[parabola3Name].stateValues.b).closeTo(b, 1e-12);
- expect(stateVariables[parabola3Name].stateValues.c).closeTo(c, 1e-12);
+ expect(stateVariables["/g3/p2"].stateValues.a).closeTo(a, 1e-12);
+ expect(stateVariables["/g3/p2"].stateValues.b).closeTo(b, 1e-12);
+ expect(stateVariables["/g3/p2"].stateValues.c).closeTo(c, 1e-12);
expect(
me
- .fromAst(stateVariables[parabola3Name].stateValues.equation)
+ .fromAst(stateVariables["/g3/p2"].stateValues.equation)
.equals(equationExpression),
).eq(true);
expect(
me
- .fromAst(stateVariables[parabola3Name].stateValues.vertex[0])
+ .fromAst(stateVariables["/g3/p2"].stateValues.vertex[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(stateVariables[parabola3Name].stateValues.vertex[1])
+ .fromAst(stateVariables["/g3/p2"].stateValues.vertex[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(stateVariables[vertex3Name].stateValues.xs[0])
+ .fromAst(stateVariables["/g3/v2"].stateValues.xs[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(stateVariables[vertex3Name].stateValues.xs[1])
+ .fromAst(stateVariables["/g3/v2"].stateValues.xs[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
expect(
@@ -10395,17 +7973,17 @@ describe("Parabola Tag Tests", function () {
($i+0 , $m+0 )
- $n.value
-
-
- a =
b =
@@ -10446,53 +8024,22 @@ describe("Parabola Tag Tests", function () {
expect(stateVariables["/_parabola1"].stateValues.vertex[1]).eq(
vertex_y,
);
- expect(
- stateVariables[stateVariables["/v"].replacements[0].componentName]
- .stateValues.xs[0],
- ).eq(vertex_x);
- expect(
- stateVariables[stateVariables["/v"].replacements[0].componentName]
- .stateValues.xs[1],
- ).eq(vertex_y);
- expect(
- stateVariables[stateVariables["/p2"].replacements[0].componentName]
- .stateValues.a,
- ).closeTo(a, 1e-12);
- expect(
- stateVariables[stateVariables["/p2"].replacements[0].componentName]
- .stateValues.b,
- ).closeTo(b, 1e-12);
- expect(
- stateVariables[stateVariables["/p2"].replacements[0].componentName]
- .stateValues.c,
- ).closeTo(c, 1e-12);
- expect(
- stateVariables[stateVariables["/p2"].replacements[0].componentName]
- .stateValues.vertex[0],
- ).eq(vertex_x);
- expect(
- stateVariables[stateVariables["/p2"].replacements[0].componentName]
- .stateValues.vertex[1],
- ).eq(vertex_y);
- expect(
- stateVariables[stateVariables["/v2"].replacements[0].componentName]
- .stateValues.xs[0],
- ).eq(vertex_x);
- expect(
- stateVariables[stateVariables["/v2"].replacements[0].componentName]
- .stateValues.xs[1],
- ).eq(vertex_y);
- expect(stateVariables[parabola3Name].stateValues.a).closeTo(a, 1e-12);
- expect(stateVariables[parabola3Name].stateValues.b).closeTo(b, 1e-12);
- expect(stateVariables[parabola3Name].stateValues.c).closeTo(c, 1e-12);
- expect(stateVariables[parabola3Name].stateValues.vertex[0]).eq(
- vertex_x,
- );
- expect(stateVariables[parabola3Name].stateValues.vertex[1]).eq(
- vertex_y,
- );
- expect(stateVariables[vertex3Name].stateValues.xs[0]).eq(vertex_x);
- expect(stateVariables[vertex3Name].stateValues.xs[1]).eq(vertex_y);
+ expect(stateVariables["/v"].stateValues.xs[0]).eq(vertex_x);
+ expect(stateVariables["/v"].stateValues.xs[1]).eq(vertex_y);
+ expect(stateVariables["/p2"].stateValues.a).closeTo(a, 1e-12);
+ expect(stateVariables["/p2"].stateValues.b).closeTo(b, 1e-12);
+ expect(stateVariables["/p2"].stateValues.c).closeTo(c, 1e-12);
+ expect(stateVariables["/p2"].stateValues.vertex[0]).eq(vertex_x);
+ expect(stateVariables["/p2"].stateValues.vertex[1]).eq(vertex_y);
+ expect(stateVariables["/v2"].stateValues.xs[0]).eq(vertex_x);
+ expect(stateVariables["/v2"].stateValues.xs[1]).eq(vertex_y);
+ expect(stateVariables["/g3/p2"].stateValues.a).closeTo(a, 1e-12);
+ expect(stateVariables["/g3/p2"].stateValues.b).closeTo(b, 1e-12);
+ expect(stateVariables["/g3/p2"].stateValues.c).closeTo(c, 1e-12);
+ expect(stateVariables["/g3/p2"].stateValues.vertex[0]).eq(vertex_x);
+ expect(stateVariables["/g3/p2"].stateValues.vertex[1]).eq(vertex_y);
+ expect(stateVariables["/g3/v2"].stateValues.xs[0]).eq(vertex_x);
+ expect(stateVariables["/g3/v2"].stateValues.xs[1]).eq(vertex_y);
});
});
@@ -10520,53 +8067,22 @@ describe("Parabola Tag Tests", function () {
expect(stateVariables["/_parabola1"].stateValues.vertex[1]).eq(
vertex_y,
);
- expect(
- stateVariables[stateVariables["/v"].replacements[0].componentName]
- .stateValues.xs[0],
- ).eq(vertex_x);
- expect(
- stateVariables[stateVariables["/v"].replacements[0].componentName]
- .stateValues.xs[1],
- ).eq(vertex_y);
- expect(
- stateVariables[stateVariables["/p2"].replacements[0].componentName]
- .stateValues.a,
- ).closeTo(a, 1e-12);
- expect(
- stateVariables[stateVariables["/p2"].replacements[0].componentName]
- .stateValues.b,
- ).closeTo(b, 1e-12);
- expect(
- stateVariables[stateVariables["/p2"].replacements[0].componentName]
- .stateValues.c,
- ).closeTo(c, 1e-12);
- expect(
- stateVariables[stateVariables["/p2"].replacements[0].componentName]
- .stateValues.vertex[0],
- ).eq(vertex_x);
- expect(
- stateVariables[stateVariables["/p2"].replacements[0].componentName]
- .stateValues.vertex[1],
- ).eq(vertex_y);
- expect(
- stateVariables[stateVariables["/v2"].replacements[0].componentName]
- .stateValues.xs[0],
- ).eq(vertex_x);
- expect(
- stateVariables[stateVariables["/v2"].replacements[0].componentName]
- .stateValues.xs[1],
- ).eq(vertex_y);
- expect(stateVariables[parabola3Name].stateValues.a).closeTo(a, 1e-12);
- expect(stateVariables[parabola3Name].stateValues.b).closeTo(b, 1e-12);
- expect(stateVariables[parabola3Name].stateValues.c).closeTo(c, 1e-12);
- expect(stateVariables[parabola3Name].stateValues.vertex[0]).eq(
- vertex_x,
- );
- expect(stateVariables[parabola3Name].stateValues.vertex[1]).eq(
- vertex_y,
- );
- expect(stateVariables[vertex3Name].stateValues.xs[0]).eq(vertex_x);
- expect(stateVariables[vertex3Name].stateValues.xs[1]).eq(vertex_y);
+ expect(stateVariables["/v"].stateValues.xs[0]).eq(vertex_x);
+ expect(stateVariables["/v"].stateValues.xs[1]).eq(vertex_y);
+ expect(stateVariables["/p2"].stateValues.a).closeTo(a, 1e-12);
+ expect(stateVariables["/p2"].stateValues.b).closeTo(b, 1e-12);
+ expect(stateVariables["/p2"].stateValues.c).closeTo(c, 1e-12);
+ expect(stateVariables["/p2"].stateValues.vertex[0]).eq(vertex_x);
+ expect(stateVariables["/p2"].stateValues.vertex[1]).eq(vertex_y);
+ expect(stateVariables["/v2"].stateValues.xs[0]).eq(vertex_x);
+ expect(stateVariables["/v2"].stateValues.xs[1]).eq(vertex_y);
+ expect(stateVariables["/g3/p2"].stateValues.a).closeTo(a, 1e-12);
+ expect(stateVariables["/g3/p2"].stateValues.b).closeTo(b, 1e-12);
+ expect(stateVariables["/g3/p2"].stateValues.c).closeTo(c, 1e-12);
+ expect(stateVariables["/g3/p2"].stateValues.vertex[0]).eq(vertex_x);
+ expect(stateVariables["/g3/p2"].stateValues.vertex[1]).eq(vertex_y);
+ expect(stateVariables["/g3/v2"].stateValues.xs[0]).eq(vertex_x);
+ expect(stateVariables["/g3/v2"].stateValues.xs[1]).eq(vertex_y);
});
});
@@ -10594,53 +8110,22 @@ describe("Parabola Tag Tests", function () {
expect(stateVariables["/_parabola1"].stateValues.vertex[1]).eq(
vertex_y,
);
- expect(
- stateVariables[stateVariables["/v"].replacements[0].componentName]
- .stateValues.xs[0],
- ).eq(vertex_x);
- expect(
- stateVariables[stateVariables["/v"].replacements[0].componentName]
- .stateValues.xs[1],
- ).eq(vertex_y);
- expect(
- stateVariables[stateVariables["/p2"].replacements[0].componentName]
- .stateValues.a,
- ).closeTo(a, 1e-12);
- expect(
- stateVariables[stateVariables["/p2"].replacements[0].componentName]
- .stateValues.b,
- ).closeTo(b, 1e-12);
- expect(
- stateVariables[stateVariables["/p2"].replacements[0].componentName]
- .stateValues.c,
- ).closeTo(c, 1e-12);
- expect(
- stateVariables[stateVariables["/p2"].replacements[0].componentName]
- .stateValues.vertex[0],
- ).eq(vertex_x);
- expect(
- stateVariables[stateVariables["/p2"].replacements[0].componentName]
- .stateValues.vertex[1],
- ).eq(vertex_y);
- expect(
- stateVariables[stateVariables["/v2"].replacements[0].componentName]
- .stateValues.xs[0],
- ).eq(vertex_x);
- expect(
- stateVariables[stateVariables["/v2"].replacements[0].componentName]
- .stateValues.xs[1],
- ).eq(vertex_y);
- expect(stateVariables[parabola3Name].stateValues.a).closeTo(a, 1e-12);
- expect(stateVariables[parabola3Name].stateValues.b).closeTo(b, 1e-12);
- expect(stateVariables[parabola3Name].stateValues.c).closeTo(c, 1e-12);
- expect(stateVariables[parabola3Name].stateValues.vertex[0]).eq(
- vertex_x,
- );
- expect(stateVariables[parabola3Name].stateValues.vertex[1]).eq(
- vertex_y,
- );
- expect(stateVariables[vertex3Name].stateValues.xs[0]).eq(vertex_x);
- expect(stateVariables[vertex3Name].stateValues.xs[1]).eq(vertex_y);
+ expect(stateVariables["/v"].stateValues.xs[0]).eq(vertex_x);
+ expect(stateVariables["/v"].stateValues.xs[1]).eq(vertex_y);
+ expect(stateVariables["/p2"].stateValues.a).closeTo(a, 1e-12);
+ expect(stateVariables["/p2"].stateValues.b).closeTo(b, 1e-12);
+ expect(stateVariables["/p2"].stateValues.c).closeTo(c, 1e-12);
+ expect(stateVariables["/p2"].stateValues.vertex[0]).eq(vertex_x);
+ expect(stateVariables["/p2"].stateValues.vertex[1]).eq(vertex_y);
+ expect(stateVariables["/v2"].stateValues.xs[0]).eq(vertex_x);
+ expect(stateVariables["/v2"].stateValues.xs[1]).eq(vertex_y);
+ expect(stateVariables["/g3/p2"].stateValues.a).closeTo(a, 1e-12);
+ expect(stateVariables["/g3/p2"].stateValues.b).closeTo(b, 1e-12);
+ expect(stateVariables["/g3/p2"].stateValues.c).closeTo(c, 1e-12);
+ expect(stateVariables["/g3/p2"].stateValues.vertex[0]).eq(vertex_x);
+ expect(stateVariables["/g3/p2"].stateValues.vertex[1]).eq(vertex_y);
+ expect(stateVariables["/g3/v2"].stateValues.xs[0]).eq(vertex_x);
+ expect(stateVariables["/g3/v2"].stateValues.xs[1]).eq(vertex_y);
});
});
@@ -10649,7 +8134,7 @@ describe("Parabola Tag Tests", function () {
let stateVariables = await win.returnAllStateVariables1();
await win.callAction1({
actionName: "movePoint",
- componentName: stateVariables["/v"].replacements[0].componentName,
+ componentName: "/v",
args: { x: -2, y: 1 },
});
@@ -10671,53 +8156,22 @@ describe("Parabola Tag Tests", function () {
expect(stateVariables["/_parabola1"].stateValues.vertex[1]).eq(
vertex_y,
);
- expect(
- stateVariables[stateVariables["/v"].replacements[0].componentName]
- .stateValues.xs[0],
- ).eq(vertex_x);
- expect(
- stateVariables[stateVariables["/v"].replacements[0].componentName]
- .stateValues.xs[1],
- ).eq(vertex_y);
- expect(
- stateVariables[stateVariables["/p2"].replacements[0].componentName]
- .stateValues.a,
- ).closeTo(a, 1e-12);
- expect(
- stateVariables[stateVariables["/p2"].replacements[0].componentName]
- .stateValues.b,
- ).closeTo(b, 1e-12);
- expect(
- stateVariables[stateVariables["/p2"].replacements[0].componentName]
- .stateValues.c,
- ).closeTo(c, 1e-12);
- expect(
- stateVariables[stateVariables["/p2"].replacements[0].componentName]
- .stateValues.vertex[0],
- ).eq(vertex_x);
- expect(
- stateVariables[stateVariables["/p2"].replacements[0].componentName]
- .stateValues.vertex[1],
- ).eq(vertex_y);
- expect(
- stateVariables[stateVariables["/v2"].replacements[0].componentName]
- .stateValues.xs[0],
- ).eq(vertex_x);
- expect(
- stateVariables[stateVariables["/v2"].replacements[0].componentName]
- .stateValues.xs[1],
- ).eq(vertex_y);
- expect(stateVariables[parabola3Name].stateValues.a).closeTo(a, 1e-12);
- expect(stateVariables[parabola3Name].stateValues.b).closeTo(b, 1e-12);
- expect(stateVariables[parabola3Name].stateValues.c).closeTo(c, 1e-12);
- expect(stateVariables[parabola3Name].stateValues.vertex[0]).eq(
- vertex_x,
- );
- expect(stateVariables[parabola3Name].stateValues.vertex[1]).eq(
- vertex_y,
- );
- expect(stateVariables[vertex3Name].stateValues.xs[0]).eq(vertex_x);
- expect(stateVariables[vertex3Name].stateValues.xs[1]).eq(vertex_y);
+ expect(stateVariables["/v"].stateValues.xs[0]).eq(vertex_x);
+ expect(stateVariables["/v"].stateValues.xs[1]).eq(vertex_y);
+ expect(stateVariables["/p2"].stateValues.a).closeTo(a, 1e-12);
+ expect(stateVariables["/p2"].stateValues.b).closeTo(b, 1e-12);
+ expect(stateVariables["/p2"].stateValues.c).closeTo(c, 1e-12);
+ expect(stateVariables["/p2"].stateValues.vertex[0]).eq(vertex_x);
+ expect(stateVariables["/p2"].stateValues.vertex[1]).eq(vertex_y);
+ expect(stateVariables["/v2"].stateValues.xs[0]).eq(vertex_x);
+ expect(stateVariables["/v2"].stateValues.xs[1]).eq(vertex_y);
+ expect(stateVariables["/g3/p2"].stateValues.a).closeTo(a, 1e-12);
+ expect(stateVariables["/g3/p2"].stateValues.b).closeTo(b, 1e-12);
+ expect(stateVariables["/g3/p2"].stateValues.c).closeTo(c, 1e-12);
+ expect(stateVariables["/g3/p2"].stateValues.vertex[0]).eq(vertex_x);
+ expect(stateVariables["/g3/p2"].stateValues.vertex[1]).eq(vertex_y);
+ expect(stateVariables["/g3/v2"].stateValues.xs[0]).eq(vertex_x);
+ expect(stateVariables["/g3/v2"].stateValues.xs[1]).eq(vertex_y);
});
});
@@ -10751,53 +8205,22 @@ describe("Parabola Tag Tests", function () {
expect(stateVariables["/_parabola1"].stateValues.vertex[1]).eq(
vertex_y,
);
- expect(
- stateVariables[stateVariables["/v"].replacements[0].componentName]
- .stateValues.xs[0],
- ).eq(vertex_x);
- expect(
- stateVariables[stateVariables["/v"].replacements[0].componentName]
- .stateValues.xs[1],
- ).eq(vertex_y);
- expect(
- stateVariables[stateVariables["/p2"].replacements[0].componentName]
- .stateValues.a,
- ).closeTo(a, 1e-12);
- expect(
- stateVariables[stateVariables["/p2"].replacements[0].componentName]
- .stateValues.b,
- ).closeTo(b, 1e-12);
- expect(
- stateVariables[stateVariables["/p2"].replacements[0].componentName]
- .stateValues.c,
- ).closeTo(c, 1e-12);
- expect(
- stateVariables[stateVariables["/p2"].replacements[0].componentName]
- .stateValues.vertex[0],
- ).eq(vertex_x);
- expect(
- stateVariables[stateVariables["/p2"].replacements[0].componentName]
- .stateValues.vertex[1],
- ).eq(vertex_y);
- expect(
- stateVariables[stateVariables["/v2"].replacements[0].componentName]
- .stateValues.xs[0],
- ).eq(vertex_x);
- expect(
- stateVariables[stateVariables["/v2"].replacements[0].componentName]
- .stateValues.xs[1],
- ).eq(vertex_y);
- expect(stateVariables[parabola3Name].stateValues.a).closeTo(a, 1e-12);
- expect(stateVariables[parabola3Name].stateValues.b).closeTo(b, 1e-12);
- expect(stateVariables[parabola3Name].stateValues.c).closeTo(c, 1e-12);
- expect(stateVariables[parabola3Name].stateValues.vertex[0]).eq(
- vertex_x,
- );
- expect(stateVariables[parabola3Name].stateValues.vertex[1]).eq(
- vertex_y,
- );
- expect(stateVariables[vertex3Name].stateValues.xs[0]).eq(vertex_x);
- expect(stateVariables[vertex3Name].stateValues.xs[1]).eq(vertex_y);
+ expect(stateVariables["/v"].stateValues.xs[0]).eq(vertex_x);
+ expect(stateVariables["/v"].stateValues.xs[1]).eq(vertex_y);
+ expect(stateVariables["/p2"].stateValues.a).closeTo(a, 1e-12);
+ expect(stateVariables["/p2"].stateValues.b).closeTo(b, 1e-12);
+ expect(stateVariables["/p2"].stateValues.c).closeTo(c, 1e-12);
+ expect(stateVariables["/p2"].stateValues.vertex[0]).eq(vertex_x);
+ expect(stateVariables["/p2"].stateValues.vertex[1]).eq(vertex_y);
+ expect(stateVariables["/v2"].stateValues.xs[0]).eq(vertex_x);
+ expect(stateVariables["/v2"].stateValues.xs[1]).eq(vertex_y);
+ expect(stateVariables["/g3/p2"].stateValues.a).closeTo(a, 1e-12);
+ expect(stateVariables["/g3/p2"].stateValues.b).closeTo(b, 1e-12);
+ expect(stateVariables["/g3/p2"].stateValues.c).closeTo(c, 1e-12);
+ expect(stateVariables["/g3/p2"].stateValues.vertex[0]).eq(vertex_x);
+ expect(stateVariables["/g3/p2"].stateValues.vertex[1]).eq(vertex_y);
+ expect(stateVariables["/g3/v2"].stateValues.xs[0]).eq(vertex_x);
+ expect(stateVariables["/g3/v2"].stateValues.xs[1]).eq(vertex_y);
});
});
@@ -10864,114 +8287,73 @@ describe("Parabola Tag Tests", function () {
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v"].replacements[0].componentName
- ].stateValues.xs[0],
- )
+ .fromAst(stateVariables["/v"].stateValues.xs[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v"].replacements[0].componentName
- ].stateValues.xs[1],
- )
+ .fromAst(stateVariables["/v"].stateValues.xs[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
- expect(
- stateVariables[stateVariables["/p2"].replacements[0].componentName]
- .stateValues.a,
- ).closeTo(a, 1e-12);
- expect(
- stateVariables[stateVariables["/p2"].replacements[0].componentName]
- .stateValues.b,
- ).closeTo(b, 1e-12);
- expect(
- stateVariables[stateVariables["/p2"].replacements[0].componentName]
- .stateValues.c,
- ).closeTo(c, 1e-12);
+ expect(stateVariables["/p2"].stateValues.a).closeTo(a, 1e-12);
+ expect(stateVariables["/p2"].stateValues.b).closeTo(b, 1e-12);
+ expect(stateVariables["/p2"].stateValues.c).closeTo(c, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/p2"].replacements[0].componentName
- ].stateValues.equation,
- )
+ .fromAst(stateVariables["/p2"].stateValues.equation)
.equals(equationExpression),
).eq(true);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/p2"].replacements[0].componentName
- ].stateValues.vertex[0],
- )
+ .fromAst(stateVariables["/p2"].stateValues.vertex[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/p2"].replacements[0].componentName
- ].stateValues.vertex[1],
- )
+ .fromAst(stateVariables["/p2"].stateValues.vertex[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v2"].replacements[0].componentName
- ].stateValues.xs[0],
- )
+ .fromAst(stateVariables["/v2"].stateValues.xs[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v2"].replacements[0].componentName
- ].stateValues.xs[1],
- )
+ .fromAst(stateVariables["/v2"].stateValues.xs[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/e2"].replacements[0].componentName
- ].stateValues.value,
- )
+ .fromAst(stateVariables["/e2"].stateValues.value)
.equals(equationExpression),
).eq(true);
- expect(stateVariables[parabola3Name].stateValues.a).closeTo(a, 1e-12);
- expect(stateVariables[parabola3Name].stateValues.b).closeTo(b, 1e-12);
- expect(stateVariables[parabola3Name].stateValues.c).closeTo(c, 1e-12);
+ expect(stateVariables["/g3/p2"].stateValues.a).closeTo(a, 1e-12);
+ expect(stateVariables["/g3/p2"].stateValues.b).closeTo(b, 1e-12);
+ expect(stateVariables["/g3/p2"].stateValues.c).closeTo(c, 1e-12);
expect(
me
- .fromAst(stateVariables[parabola3Name].stateValues.equation)
+ .fromAst(stateVariables["/g3/p2"].stateValues.equation)
.equals(equationExpression),
).eq(true);
expect(
me
- .fromAst(stateVariables[parabola3Name].stateValues.vertex[0])
+ .fromAst(stateVariables["/g3/p2"].stateValues.vertex[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(stateVariables[parabola3Name].stateValues.vertex[1])
+ .fromAst(stateVariables["/g3/p2"].stateValues.vertex[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(stateVariables[vertex3Name].stateValues.xs[0])
+ .fromAst(stateVariables["/g3/v2"].stateValues.xs[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(stateVariables[vertex3Name].stateValues.xs[1])
+ .fromAst(stateVariables["/g3/v2"].stateValues.xs[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
expect(
@@ -11076,114 +8458,73 @@ describe("Parabola Tag Tests", function () {
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v"].replacements[0].componentName
- ].stateValues.xs[0],
- )
+ .fromAst(stateVariables["/v"].stateValues.xs[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v"].replacements[0].componentName
- ].stateValues.xs[1],
- )
+ .fromAst(stateVariables["/v"].stateValues.xs[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
- expect(
- stateVariables[stateVariables["/p2"].replacements[0].componentName]
- .stateValues.a,
- ).closeTo(a, 1e-12);
- expect(
- stateVariables[stateVariables["/p2"].replacements[0].componentName]
- .stateValues.b,
- ).closeTo(b, 1e-12);
- expect(
- stateVariables[stateVariables["/p2"].replacements[0].componentName]
- .stateValues.c,
- ).closeTo(c, 1e-12);
+ expect(stateVariables["/p2"].stateValues.a).closeTo(a, 1e-12);
+ expect(stateVariables["/p2"].stateValues.b).closeTo(b, 1e-12);
+ expect(stateVariables["/p2"].stateValues.c).closeTo(c, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/p2"].replacements[0].componentName
- ].stateValues.equation,
- )
+ .fromAst(stateVariables["/p2"].stateValues.equation)
.equals(equationExpression),
).eq(true);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/p2"].replacements[0].componentName
- ].stateValues.vertex[0],
- )
+ .fromAst(stateVariables["/p2"].stateValues.vertex[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/p2"].replacements[0].componentName
- ].stateValues.vertex[1],
- )
+ .fromAst(stateVariables["/p2"].stateValues.vertex[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v2"].replacements[0].componentName
- ].stateValues.xs[0],
- )
+ .fromAst(stateVariables["/v2"].stateValues.xs[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v2"].replacements[0].componentName
- ].stateValues.xs[1],
- )
+ .fromAst(stateVariables["/v2"].stateValues.xs[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/e2"].replacements[0].componentName
- ].stateValues.value,
- )
+ .fromAst(stateVariables["/e2"].stateValues.value)
.equals(equationExpression),
).eq(true);
- expect(stateVariables[parabola3Name].stateValues.a).closeTo(a, 1e-12);
- expect(stateVariables[parabola3Name].stateValues.b).closeTo(b, 1e-12);
- expect(stateVariables[parabola3Name].stateValues.c).closeTo(c, 1e-12);
+ expect(stateVariables["/g3/p2"].stateValues.a).closeTo(a, 1e-12);
+ expect(stateVariables["/g3/p2"].stateValues.b).closeTo(b, 1e-12);
+ expect(stateVariables["/g3/p2"].stateValues.c).closeTo(c, 1e-12);
expect(
me
- .fromAst(stateVariables[parabola3Name].stateValues.equation)
+ .fromAst(stateVariables["/g3/p2"].stateValues.equation)
.equals(equationExpression),
).eq(true);
expect(
me
- .fromAst(stateVariables[parabola3Name].stateValues.vertex[0])
+ .fromAst(stateVariables["/g3/p2"].stateValues.vertex[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(stateVariables[parabola3Name].stateValues.vertex[1])
+ .fromAst(stateVariables["/g3/p2"].stateValues.vertex[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(stateVariables[vertex3Name].stateValues.xs[0])
+ .fromAst(stateVariables["/g3/v2"].stateValues.xs[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(stateVariables[vertex3Name].stateValues.xs[1])
+ .fromAst(stateVariables["/g3/v2"].stateValues.xs[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
expect(
@@ -11265,114 +8606,73 @@ describe("Parabola Tag Tests", function () {
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v"].replacements[0].componentName
- ].stateValues.xs[0],
- )
+ .fromAst(stateVariables["/v"].stateValues.xs[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v"].replacements[0].componentName
- ].stateValues.xs[1],
- )
+ .fromAst(stateVariables["/v"].stateValues.xs[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
- expect(
- stateVariables[stateVariables["/p2"].replacements[0].componentName]
- .stateValues.a,
- ).closeTo(a, 1e-12);
- expect(
- stateVariables[stateVariables["/p2"].replacements[0].componentName]
- .stateValues.b,
- ).closeTo(b, 1e-12);
- expect(
- stateVariables[stateVariables["/p2"].replacements[0].componentName]
- .stateValues.c,
- ).closeTo(c, 1e-12);
+ expect(stateVariables["/p2"].stateValues.a).closeTo(a, 1e-12);
+ expect(stateVariables["/p2"].stateValues.b).closeTo(b, 1e-12);
+ expect(stateVariables["/p2"].stateValues.c).closeTo(c, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/p2"].replacements[0].componentName
- ].stateValues.equation,
- )
+ .fromAst(stateVariables["/p2"].stateValues.equation)
.equals(equationExpression),
).eq(true);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/p2"].replacements[0].componentName
- ].stateValues.vertex[0],
- )
+ .fromAst(stateVariables["/p2"].stateValues.vertex[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/p2"].replacements[0].componentName
- ].stateValues.vertex[1],
- )
+ .fromAst(stateVariables["/p2"].stateValues.vertex[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v2"].replacements[0].componentName
- ].stateValues.xs[0],
- )
+ .fromAst(stateVariables["/v2"].stateValues.xs[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v2"].replacements[0].componentName
- ].stateValues.xs[1],
- )
+ .fromAst(stateVariables["/v2"].stateValues.xs[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/e2"].replacements[0].componentName
- ].stateValues.value,
- )
+ .fromAst(stateVariables["/e2"].stateValues.value)
.equals(equationExpression),
).eq(true);
- expect(stateVariables[parabola3Name].stateValues.a).closeTo(a, 1e-12);
- expect(stateVariables[parabola3Name].stateValues.b).closeTo(b, 1e-12);
- expect(stateVariables[parabola3Name].stateValues.c).closeTo(c, 1e-12);
+ expect(stateVariables["/g3/p2"].stateValues.a).closeTo(a, 1e-12);
+ expect(stateVariables["/g3/p2"].stateValues.b).closeTo(b, 1e-12);
+ expect(stateVariables["/g3/p2"].stateValues.c).closeTo(c, 1e-12);
expect(
me
- .fromAst(stateVariables[parabola3Name].stateValues.equation)
+ .fromAst(stateVariables["/g3/p2"].stateValues.equation)
.equals(equationExpression),
).eq(true);
expect(
me
- .fromAst(stateVariables[parabola3Name].stateValues.vertex[0])
+ .fromAst(stateVariables["/g3/p2"].stateValues.vertex[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(stateVariables[parabola3Name].stateValues.vertex[1])
+ .fromAst(stateVariables["/g3/p2"].stateValues.vertex[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(stateVariables[vertex3Name].stateValues.xs[0])
+ .fromAst(stateVariables["/g3/v2"].stateValues.xs[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(stateVariables[vertex3Name].stateValues.xs[1])
+ .fromAst(stateVariables["/g3/v2"].stateValues.xs[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
expect(
@@ -11454,114 +8754,73 @@ describe("Parabola Tag Tests", function () {
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v"].replacements[0].componentName
- ].stateValues.xs[0],
- )
+ .fromAst(stateVariables["/v"].stateValues.xs[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v"].replacements[0].componentName
- ].stateValues.xs[1],
- )
+ .fromAst(stateVariables["/v"].stateValues.xs[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
- expect(
- stateVariables[stateVariables["/p2"].replacements[0].componentName]
- .stateValues.a,
- ).closeTo(a, 1e-12);
- expect(
- stateVariables[stateVariables["/p2"].replacements[0].componentName]
- .stateValues.b,
- ).closeTo(b, 1e-12);
- expect(
- stateVariables[stateVariables["/p2"].replacements[0].componentName]
- .stateValues.c,
- ).closeTo(c, 1e-12);
+ expect(stateVariables["/p2"].stateValues.a).closeTo(a, 1e-12);
+ expect(stateVariables["/p2"].stateValues.b).closeTo(b, 1e-12);
+ expect(stateVariables["/p2"].stateValues.c).closeTo(c, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/p2"].replacements[0].componentName
- ].stateValues.equation,
- )
+ .fromAst(stateVariables["/p2"].stateValues.equation)
.equals(equationExpression),
).eq(true);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/p2"].replacements[0].componentName
- ].stateValues.vertex[0],
- )
+ .fromAst(stateVariables["/p2"].stateValues.vertex[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/p2"].replacements[0].componentName
- ].stateValues.vertex[1],
- )
+ .fromAst(stateVariables["/p2"].stateValues.vertex[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v2"].replacements[0].componentName
- ].stateValues.xs[0],
- )
+ .fromAst(stateVariables["/v2"].stateValues.xs[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v2"].replacements[0].componentName
- ].stateValues.xs[1],
- )
+ .fromAst(stateVariables["/v2"].stateValues.xs[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/e2"].replacements[0].componentName
- ].stateValues.value,
- )
+ .fromAst(stateVariables["/e2"].stateValues.value)
.equals(equationExpression),
).eq(true);
- expect(stateVariables[parabola3Name].stateValues.a).closeTo(a, 1e-12);
- expect(stateVariables[parabola3Name].stateValues.b).closeTo(b, 1e-12);
- expect(stateVariables[parabola3Name].stateValues.c).closeTo(c, 1e-12);
+ expect(stateVariables["/g3/p2"].stateValues.a).closeTo(a, 1e-12);
+ expect(stateVariables["/g3/p2"].stateValues.b).closeTo(b, 1e-12);
+ expect(stateVariables["/g3/p2"].stateValues.c).closeTo(c, 1e-12);
expect(
me
- .fromAst(stateVariables[parabola3Name].stateValues.equation)
+ .fromAst(stateVariables["/g3/p2"].stateValues.equation)
.equals(equationExpression),
).eq(true);
expect(
me
- .fromAst(stateVariables[parabola3Name].stateValues.vertex[0])
+ .fromAst(stateVariables["/g3/p2"].stateValues.vertex[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(stateVariables[parabola3Name].stateValues.vertex[1])
+ .fromAst(stateVariables["/g3/p2"].stateValues.vertex[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(stateVariables[vertex3Name].stateValues.xs[0])
+ .fromAst(stateVariables["/g3/v2"].stateValues.xs[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(stateVariables[vertex3Name].stateValues.xs[1])
+ .fromAst(stateVariables["/g3/v2"].stateValues.xs[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
expect(
@@ -11643,114 +8902,73 @@ describe("Parabola Tag Tests", function () {
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v"].replacements[0].componentName
- ].stateValues.xs[0],
- )
+ .fromAst(stateVariables["/v"].stateValues.xs[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v"].replacements[0].componentName
- ].stateValues.xs[1],
- )
+ .fromAst(stateVariables["/v"].stateValues.xs[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
- expect(
- stateVariables[stateVariables["/p2"].replacements[0].componentName]
- .stateValues.a,
- ).closeTo(a, 1e-12);
- expect(
- stateVariables[stateVariables["/p2"].replacements[0].componentName]
- .stateValues.b,
- ).closeTo(b, 1e-12);
- expect(
- stateVariables[stateVariables["/p2"].replacements[0].componentName]
- .stateValues.c,
- ).closeTo(c, 1e-12);
+ expect(stateVariables["/p2"].stateValues.a).closeTo(a, 1e-12);
+ expect(stateVariables["/p2"].stateValues.b).closeTo(b, 1e-12);
+ expect(stateVariables["/p2"].stateValues.c).closeTo(c, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/p2"].replacements[0].componentName
- ].stateValues.equation,
- )
+ .fromAst(stateVariables["/p2"].stateValues.equation)
.equals(equationExpression),
).eq(true);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/p2"].replacements[0].componentName
- ].stateValues.vertex[0],
- )
+ .fromAst(stateVariables["/p2"].stateValues.vertex[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/p2"].replacements[0].componentName
- ].stateValues.vertex[1],
- )
+ .fromAst(stateVariables["/p2"].stateValues.vertex[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v2"].replacements[0].componentName
- ].stateValues.xs[0],
- )
+ .fromAst(stateVariables["/v2"].stateValues.xs[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v2"].replacements[0].componentName
- ].stateValues.xs[1],
- )
+ .fromAst(stateVariables["/v2"].stateValues.xs[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/e2"].replacements[0].componentName
- ].stateValues.value,
- )
+ .fromAst(stateVariables["/e2"].stateValues.value)
.equals(equationExpression),
).eq(true);
- expect(stateVariables[parabola3Name].stateValues.a).closeTo(a, 1e-12);
- expect(stateVariables[parabola3Name].stateValues.b).closeTo(b, 1e-12);
- expect(stateVariables[parabola3Name].stateValues.c).closeTo(c, 1e-12);
+ expect(stateVariables["/g3/p2"].stateValues.a).closeTo(a, 1e-12);
+ expect(stateVariables["/g3/p2"].stateValues.b).closeTo(b, 1e-12);
+ expect(stateVariables["/g3/p2"].stateValues.c).closeTo(c, 1e-12);
expect(
me
- .fromAst(stateVariables[parabola3Name].stateValues.equation)
+ .fromAst(stateVariables["/g3/p2"].stateValues.equation)
.equals(equationExpression),
).eq(true);
expect(
me
- .fromAst(stateVariables[parabola3Name].stateValues.vertex[0])
+ .fromAst(stateVariables["/g3/p2"].stateValues.vertex[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(stateVariables[parabola3Name].stateValues.vertex[1])
+ .fromAst(stateVariables["/g3/p2"].stateValues.vertex[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(stateVariables[vertex3Name].stateValues.xs[0])
+ .fromAst(stateVariables["/g3/v2"].stateValues.xs[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(stateVariables[vertex3Name].stateValues.xs[1])
+ .fromAst(stateVariables["/g3/v2"].stateValues.xs[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
expect(
@@ -11832,114 +9050,73 @@ describe("Parabola Tag Tests", function () {
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v"].replacements[0].componentName
- ].stateValues.xs[0],
- )
+ .fromAst(stateVariables["/v"].stateValues.xs[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v"].replacements[0].componentName
- ].stateValues.xs[1],
- )
+ .fromAst(stateVariables["/v"].stateValues.xs[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
- expect(
- stateVariables[stateVariables["/p2"].replacements[0].componentName]
- .stateValues.a,
- ).closeTo(a, 1e-12);
- expect(
- stateVariables[stateVariables["/p2"].replacements[0].componentName]
- .stateValues.b,
- ).closeTo(b, 1e-12);
- expect(
- stateVariables[stateVariables["/p2"].replacements[0].componentName]
- .stateValues.c,
- ).closeTo(c, 1e-12);
+ expect(stateVariables["/p2"].stateValues.a).closeTo(a, 1e-12);
+ expect(stateVariables["/p2"].stateValues.b).closeTo(b, 1e-12);
+ expect(stateVariables["/p2"].stateValues.c).closeTo(c, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/p2"].replacements[0].componentName
- ].stateValues.equation,
- )
+ .fromAst(stateVariables["/p2"].stateValues.equation)
.equals(equationExpression),
).eq(true);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/p2"].replacements[0].componentName
- ].stateValues.vertex[0],
- )
+ .fromAst(stateVariables["/p2"].stateValues.vertex[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/p2"].replacements[0].componentName
- ].stateValues.vertex[1],
- )
+ .fromAst(stateVariables["/p2"].stateValues.vertex[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v2"].replacements[0].componentName
- ].stateValues.xs[0],
- )
+ .fromAst(stateVariables["/v2"].stateValues.xs[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v2"].replacements[0].componentName
- ].stateValues.xs[1],
- )
+ .fromAst(stateVariables["/v2"].stateValues.xs[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/e2"].replacements[0].componentName
- ].stateValues.value,
- )
+ .fromAst(stateVariables["/e2"].stateValues.value)
.equals(equationExpression),
).eq(true);
- expect(stateVariables[parabola3Name].stateValues.a).closeTo(a, 1e-12);
- expect(stateVariables[parabola3Name].stateValues.b).closeTo(b, 1e-12);
- expect(stateVariables[parabola3Name].stateValues.c).closeTo(c, 1e-12);
+ expect(stateVariables["/g3/p2"].stateValues.a).closeTo(a, 1e-12);
+ expect(stateVariables["/g3/p2"].stateValues.b).closeTo(b, 1e-12);
+ expect(stateVariables["/g3/p2"].stateValues.c).closeTo(c, 1e-12);
expect(
me
- .fromAst(stateVariables[parabola3Name].stateValues.equation)
+ .fromAst(stateVariables["/g3/p2"].stateValues.equation)
.equals(equationExpression),
).eq(true);
expect(
me
- .fromAst(stateVariables[parabola3Name].stateValues.vertex[0])
+ .fromAst(stateVariables["/g3/p2"].stateValues.vertex[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(stateVariables[parabola3Name].stateValues.vertex[1])
+ .fromAst(stateVariables["/g3/p2"].stateValues.vertex[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(stateVariables[vertex3Name].stateValues.xs[0])
+ .fromAst(stateVariables["/g3/v2"].stateValues.xs[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(stateVariables[vertex3Name].stateValues.xs[1])
+ .fromAst(stateVariables["/g3/v2"].stateValues.xs[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
expect(
@@ -11980,7 +9157,7 @@ describe("Parabola Tag Tests", function () {
let stateVariables = await win.returnAllStateVariables1();
await win.callAction1({
actionName: "movePoint",
- componentName: stateVariables["/v"].replacements[0].componentName,
+ componentName: "/v",
args: { x: -2, y: 1 },
});
@@ -12023,114 +9200,73 @@ describe("Parabola Tag Tests", function () {
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v"].replacements[0].componentName
- ].stateValues.xs[0],
- )
+ .fromAst(stateVariables["/v"].stateValues.xs[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v"].replacements[0].componentName
- ].stateValues.xs[1],
- )
+ .fromAst(stateVariables["/v"].stateValues.xs[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
- expect(
- stateVariables[stateVariables["/p2"].replacements[0].componentName]
- .stateValues.a,
- ).closeTo(a, 1e-12);
- expect(
- stateVariables[stateVariables["/p2"].replacements[0].componentName]
- .stateValues.b,
- ).closeTo(b, 1e-12);
- expect(
- stateVariables[stateVariables["/p2"].replacements[0].componentName]
- .stateValues.c,
- ).closeTo(c, 1e-12);
+ expect(stateVariables["/p2"].stateValues.a).closeTo(a, 1e-12);
+ expect(stateVariables["/p2"].stateValues.b).closeTo(b, 1e-12);
+ expect(stateVariables["/p2"].stateValues.c).closeTo(c, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/p2"].replacements[0].componentName
- ].stateValues.equation,
- )
+ .fromAst(stateVariables["/p2"].stateValues.equation)
.equals(equationExpression),
).eq(true);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/p2"].replacements[0].componentName
- ].stateValues.vertex[0],
- )
+ .fromAst(stateVariables["/p2"].stateValues.vertex[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/p2"].replacements[0].componentName
- ].stateValues.vertex[1],
- )
+ .fromAst(stateVariables["/p2"].stateValues.vertex[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v2"].replacements[0].componentName
- ].stateValues.xs[0],
- )
+ .fromAst(stateVariables["/v2"].stateValues.xs[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v2"].replacements[0].componentName
- ].stateValues.xs[1],
- )
+ .fromAst(stateVariables["/v2"].stateValues.xs[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/e2"].replacements[0].componentName
- ].stateValues.value,
- )
+ .fromAst(stateVariables["/e2"].stateValues.value)
.equals(equationExpression),
).eq(true);
- expect(stateVariables[parabola3Name].stateValues.a).closeTo(a, 1e-12);
- expect(stateVariables[parabola3Name].stateValues.b).closeTo(b, 1e-12);
- expect(stateVariables[parabola3Name].stateValues.c).closeTo(c, 1e-12);
+ expect(stateVariables["/g3/p2"].stateValues.a).closeTo(a, 1e-12);
+ expect(stateVariables["/g3/p2"].stateValues.b).closeTo(b, 1e-12);
+ expect(stateVariables["/g3/p2"].stateValues.c).closeTo(c, 1e-12);
expect(
me
- .fromAst(stateVariables[parabola3Name].stateValues.equation)
+ .fromAst(stateVariables["/g3/p2"].stateValues.equation)
.equals(equationExpression),
).eq(true);
expect(
me
- .fromAst(stateVariables[parabola3Name].stateValues.vertex[0])
+ .fromAst(stateVariables["/g3/p2"].stateValues.vertex[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(stateVariables[parabola3Name].stateValues.vertex[1])
+ .fromAst(stateVariables["/g3/p2"].stateValues.vertex[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(stateVariables[vertex3Name].stateValues.xs[0])
+ .fromAst(stateVariables["/g3/v2"].stateValues.xs[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(stateVariables[vertex3Name].stateValues.xs[1])
+ .fromAst(stateVariables["/g3/v2"].stateValues.xs[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
expect(
@@ -12171,7 +9307,7 @@ describe("Parabola Tag Tests", function () {
let stateVariables = await win.returnAllStateVariables1();
await win.callAction1({
actionName: "movePoint",
- componentName: stateVariables["/v2"].replacements[0].componentName,
+ componentName: "/v2",
args: { x: 5, y: -6 },
});
@@ -12214,114 +9350,73 @@ describe("Parabola Tag Tests", function () {
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v"].replacements[0].componentName
- ].stateValues.xs[0],
- )
+ .fromAst(stateVariables["/v"].stateValues.xs[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v"].replacements[0].componentName
- ].stateValues.xs[1],
- )
+ .fromAst(stateVariables["/v"].stateValues.xs[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
- expect(
- stateVariables[stateVariables["/p2"].replacements[0].componentName]
- .stateValues.a,
- ).closeTo(a, 1e-12);
- expect(
- stateVariables[stateVariables["/p2"].replacements[0].componentName]
- .stateValues.b,
- ).closeTo(b, 1e-12);
- expect(
- stateVariables[stateVariables["/p2"].replacements[0].componentName]
- .stateValues.c,
- ).closeTo(c, 1e-12);
+ expect(stateVariables["/p2"].stateValues.a).closeTo(a, 1e-12);
+ expect(stateVariables["/p2"].stateValues.b).closeTo(b, 1e-12);
+ expect(stateVariables["/p2"].stateValues.c).closeTo(c, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/p2"].replacements[0].componentName
- ].stateValues.equation,
- )
+ .fromAst(stateVariables["/p2"].stateValues.equation)
.equals(equationExpression),
).eq(true);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/p2"].replacements[0].componentName
- ].stateValues.vertex[0],
- )
+ .fromAst(stateVariables["/p2"].stateValues.vertex[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/p2"].replacements[0].componentName
- ].stateValues.vertex[1],
- )
+ .fromAst(stateVariables["/p2"].stateValues.vertex[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v2"].replacements[0].componentName
- ].stateValues.xs[0],
- )
+ .fromAst(stateVariables["/v2"].stateValues.xs[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v2"].replacements[0].componentName
- ].stateValues.xs[1],
- )
+ .fromAst(stateVariables["/v2"].stateValues.xs[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/e2"].replacements[0].componentName
- ].stateValues.value,
- )
+ .fromAst(stateVariables["/e2"].stateValues.value)
.equals(equationExpression),
).eq(true);
- expect(stateVariables[parabola3Name].stateValues.a).closeTo(a, 1e-12);
- expect(stateVariables[parabola3Name].stateValues.b).closeTo(b, 1e-12);
- expect(stateVariables[parabola3Name].stateValues.c).closeTo(c, 1e-12);
+ expect(stateVariables["/g3/p2"].stateValues.a).closeTo(a, 1e-12);
+ expect(stateVariables["/g3/p2"].stateValues.b).closeTo(b, 1e-12);
+ expect(stateVariables["/g3/p2"].stateValues.c).closeTo(c, 1e-12);
expect(
me
- .fromAst(stateVariables[parabola3Name].stateValues.equation)
+ .fromAst(stateVariables["/g3/p2"].stateValues.equation)
.equals(equationExpression),
).eq(true);
expect(
me
- .fromAst(stateVariables[parabola3Name].stateValues.vertex[0])
+ .fromAst(stateVariables["/g3/p2"].stateValues.vertex[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(stateVariables[parabola3Name].stateValues.vertex[1])
+ .fromAst(stateVariables["/g3/p2"].stateValues.vertex[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(stateVariables[vertex3Name].stateValues.xs[0])
+ .fromAst(stateVariables["/g3/v2"].stateValues.xs[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(stateVariables[vertex3Name].stateValues.xs[1])
+ .fromAst(stateVariables["/g3/v2"].stateValues.xs[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
expect(
@@ -12429,114 +9524,73 @@ describe("Parabola Tag Tests", function () {
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v"].replacements[0].componentName
- ].stateValues.xs[0],
- )
+ .fromAst(stateVariables["/v"].stateValues.xs[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v"].replacements[0].componentName
- ].stateValues.xs[1],
- )
+ .fromAst(stateVariables["/v"].stateValues.xs[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
- expect(
- stateVariables[stateVariables["/p2"].replacements[0].componentName]
- .stateValues.a,
- ).closeTo(a, 1e-12);
- expect(
- stateVariables[stateVariables["/p2"].replacements[0].componentName]
- .stateValues.b,
- ).closeTo(b, 1e-12);
- expect(
- stateVariables[stateVariables["/p2"].replacements[0].componentName]
- .stateValues.c,
- ).closeTo(c, 1e-12);
+ expect(stateVariables["/p2"].stateValues.a).closeTo(a, 1e-12);
+ expect(stateVariables["/p2"].stateValues.b).closeTo(b, 1e-12);
+ expect(stateVariables["/p2"].stateValues.c).closeTo(c, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/p2"].replacements[0].componentName
- ].stateValues.equation,
- )
+ .fromAst(stateVariables["/p2"].stateValues.equation)
.equals(equationExpression),
).eq(true);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/p2"].replacements[0].componentName
- ].stateValues.vertex[0],
- )
+ .fromAst(stateVariables["/p2"].stateValues.vertex[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/p2"].replacements[0].componentName
- ].stateValues.vertex[1],
- )
+ .fromAst(stateVariables["/p2"].stateValues.vertex[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v2"].replacements[0].componentName
- ].stateValues.xs[0],
- )
+ .fromAst(stateVariables["/v2"].stateValues.xs[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v2"].replacements[0].componentName
- ].stateValues.xs[1],
- )
+ .fromAst(stateVariables["/v2"].stateValues.xs[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/e2"].replacements[0].componentName
- ].stateValues.value,
- )
+ .fromAst(stateVariables["/e2"].stateValues.value)
.equals(equationExpression),
).eq(true);
- expect(stateVariables[parabola3Name].stateValues.a).closeTo(a, 1e-12);
- expect(stateVariables[parabola3Name].stateValues.b).closeTo(b, 1e-12);
- expect(stateVariables[parabola3Name].stateValues.c).closeTo(c, 1e-12);
+ expect(stateVariables["/g3/p2"].stateValues.a).closeTo(a, 1e-12);
+ expect(stateVariables["/g3/p2"].stateValues.b).closeTo(b, 1e-12);
+ expect(stateVariables["/g3/p2"].stateValues.c).closeTo(c, 1e-12);
expect(
me
- .fromAst(stateVariables[parabola3Name].stateValues.equation)
+ .fromAst(stateVariables["/g3/p2"].stateValues.equation)
.equals(equationExpression),
).eq(true);
expect(
me
- .fromAst(stateVariables[parabola3Name].stateValues.vertex[0])
+ .fromAst(stateVariables["/g3/p2"].stateValues.vertex[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(stateVariables[parabola3Name].stateValues.vertex[1])
+ .fromAst(stateVariables["/g3/p2"].stateValues.vertex[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(stateVariables[vertex3Name].stateValues.xs[0])
+ .fromAst(stateVariables["/g3/v2"].stateValues.xs[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(stateVariables[vertex3Name].stateValues.xs[1])
+ .fromAst(stateVariables["/g3/v2"].stateValues.xs[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
expect(
@@ -12630,114 +9684,73 @@ describe("Parabola Tag Tests", function () {
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v"].replacements[0].componentName
- ].stateValues.xs[0],
- )
+ .fromAst(stateVariables["/v"].stateValues.xs[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v"].replacements[0].componentName
- ].stateValues.xs[1],
- )
+ .fromAst(stateVariables["/v"].stateValues.xs[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
- expect(
- stateVariables[stateVariables["/p2"].replacements[0].componentName]
- .stateValues.a,
- ).closeTo(a, 1e-12);
- expect(
- stateVariables[stateVariables["/p2"].replacements[0].componentName]
- .stateValues.b,
- ).closeTo(b, 1e-12);
- expect(
- stateVariables[stateVariables["/p2"].replacements[0].componentName]
- .stateValues.c,
- ).closeTo(c, 1e-12);
+ expect(stateVariables["/p2"].stateValues.a).closeTo(a, 1e-12);
+ expect(stateVariables["/p2"].stateValues.b).closeTo(b, 1e-12);
+ expect(stateVariables["/p2"].stateValues.c).closeTo(c, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/p2"].replacements[0].componentName
- ].stateValues.equation,
- )
+ .fromAst(stateVariables["/p2"].stateValues.equation)
.equals(equationExpression),
).eq(true);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/p2"].replacements[0].componentName
- ].stateValues.vertex[0],
- )
+ .fromAst(stateVariables["/p2"].stateValues.vertex[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/p2"].replacements[0].componentName
- ].stateValues.vertex[1],
- )
+ .fromAst(stateVariables["/p2"].stateValues.vertex[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v2"].replacements[0].componentName
- ].stateValues.xs[0],
- )
+ .fromAst(stateVariables["/v2"].stateValues.xs[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v2"].replacements[0].componentName
- ].stateValues.xs[1],
- )
+ .fromAst(stateVariables["/v2"].stateValues.xs[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/e2"].replacements[0].componentName
- ].stateValues.value,
- )
+ .fromAst(stateVariables["/e2"].stateValues.value)
.equals(equationExpression),
).eq(true);
- expect(stateVariables[parabola3Name].stateValues.a).closeTo(a, 1e-12);
- expect(stateVariables[parabola3Name].stateValues.b).closeTo(b, 1e-12);
- expect(stateVariables[parabola3Name].stateValues.c).closeTo(c, 1e-12);
+ expect(stateVariables["/g3/p2"].stateValues.a).closeTo(a, 1e-12);
+ expect(stateVariables["/g3/p2"].stateValues.b).closeTo(b, 1e-12);
+ expect(stateVariables["/g3/p2"].stateValues.c).closeTo(c, 1e-12);
expect(
me
- .fromAst(stateVariables[parabola3Name].stateValues.equation)
+ .fromAst(stateVariables["/g3/p2"].stateValues.equation)
.equals(equationExpression),
).eq(true);
expect(
me
- .fromAst(stateVariables[parabola3Name].stateValues.vertex[0])
+ .fromAst(stateVariables["/g3/p2"].stateValues.vertex[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(stateVariables[parabola3Name].stateValues.vertex[1])
+ .fromAst(stateVariables["/g3/p2"].stateValues.vertex[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(stateVariables[vertex3Name].stateValues.xs[0])
+ .fromAst(stateVariables["/g3/v2"].stateValues.xs[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(stateVariables[vertex3Name].stateValues.xs[1])
+ .fromAst(stateVariables["/g3/v2"].stateValues.xs[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
expect(
@@ -12821,114 +9834,73 @@ describe("Parabola Tag Tests", function () {
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v"].replacements[0].componentName
- ].stateValues.xs[0],
- )
+ .fromAst(stateVariables["/v"].stateValues.xs[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v"].replacements[0].componentName
- ].stateValues.xs[1],
- )
+ .fromAst(stateVariables["/v"].stateValues.xs[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
- expect(
- stateVariables[stateVariables["/p2"].replacements[0].componentName]
- .stateValues.a,
- ).closeTo(a, 1e-12);
- expect(
- stateVariables[stateVariables["/p2"].replacements[0].componentName]
- .stateValues.b,
- ).closeTo(b, 1e-12);
- expect(
- stateVariables[stateVariables["/p2"].replacements[0].componentName]
- .stateValues.c,
- ).closeTo(c, 1e-12);
+ expect(stateVariables["/p2"].stateValues.a).closeTo(a, 1e-12);
+ expect(stateVariables["/p2"].stateValues.b).closeTo(b, 1e-12);
+ expect(stateVariables["/p2"].stateValues.c).closeTo(c, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/p2"].replacements[0].componentName
- ].stateValues.equation,
- )
+ .fromAst(stateVariables["/p2"].stateValues.equation)
.equals(equationExpression),
).eq(true);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/p2"].replacements[0].componentName
- ].stateValues.vertex[0],
- )
+ .fromAst(stateVariables["/p2"].stateValues.vertex[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/p2"].replacements[0].componentName
- ].stateValues.vertex[1],
- )
+ .fromAst(stateVariables["/p2"].stateValues.vertex[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v2"].replacements[0].componentName
- ].stateValues.xs[0],
- )
+ .fromAst(stateVariables["/v2"].stateValues.xs[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v2"].replacements[0].componentName
- ].stateValues.xs[1],
- )
+ .fromAst(stateVariables["/v2"].stateValues.xs[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/e2"].replacements[0].componentName
- ].stateValues.value,
- )
+ .fromAst(stateVariables["/e2"].stateValues.value)
.equals(equationExpression),
).eq(true);
- expect(stateVariables[parabola3Name].stateValues.a).closeTo(a, 1e-12);
- expect(stateVariables[parabola3Name].stateValues.b).closeTo(b, 1e-12);
- expect(stateVariables[parabola3Name].stateValues.c).closeTo(c, 1e-12);
+ expect(stateVariables["/g3/p2"].stateValues.a).closeTo(a, 1e-12);
+ expect(stateVariables["/g3/p2"].stateValues.b).closeTo(b, 1e-12);
+ expect(stateVariables["/g3/p2"].stateValues.c).closeTo(c, 1e-12);
expect(
me
- .fromAst(stateVariables[parabola3Name].stateValues.equation)
+ .fromAst(stateVariables["/g3/p2"].stateValues.equation)
.equals(equationExpression),
).eq(true);
expect(
me
- .fromAst(stateVariables[parabola3Name].stateValues.vertex[0])
+ .fromAst(stateVariables["/g3/p2"].stateValues.vertex[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(stateVariables[parabola3Name].stateValues.vertex[1])
+ .fromAst(stateVariables["/g3/p2"].stateValues.vertex[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(stateVariables[vertex3Name].stateValues.xs[0])
+ .fromAst(stateVariables["/g3/v2"].stateValues.xs[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(stateVariables[vertex3Name].stateValues.xs[1])
+ .fromAst(stateVariables["/g3/v2"].stateValues.xs[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
expect(
@@ -13012,114 +9984,73 @@ describe("Parabola Tag Tests", function () {
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v"].replacements[0].componentName
- ].stateValues.xs[0],
- )
+ .fromAst(stateVariables["/v"].stateValues.xs[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v"].replacements[0].componentName
- ].stateValues.xs[1],
- )
+ .fromAst(stateVariables["/v"].stateValues.xs[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
- expect(
- stateVariables[stateVariables["/p2"].replacements[0].componentName]
- .stateValues.a,
- ).closeTo(a, 1e-12);
- expect(
- stateVariables[stateVariables["/p2"].replacements[0].componentName]
- .stateValues.b,
- ).closeTo(b, 1e-12);
- expect(
- stateVariables[stateVariables["/p2"].replacements[0].componentName]
- .stateValues.c,
- ).closeTo(c, 1e-12);
+ expect(stateVariables["/p2"].stateValues.a).closeTo(a, 1e-12);
+ expect(stateVariables["/p2"].stateValues.b).closeTo(b, 1e-12);
+ expect(stateVariables["/p2"].stateValues.c).closeTo(c, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/p2"].replacements[0].componentName
- ].stateValues.equation,
- )
+ .fromAst(stateVariables["/p2"].stateValues.equation)
.equals(equationExpression),
).eq(true);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/p2"].replacements[0].componentName
- ].stateValues.vertex[0],
- )
+ .fromAst(stateVariables["/p2"].stateValues.vertex[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/p2"].replacements[0].componentName
- ].stateValues.vertex[1],
- )
+ .fromAst(stateVariables["/p2"].stateValues.vertex[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v2"].replacements[0].componentName
- ].stateValues.xs[0],
- )
+ .fromAst(stateVariables["/v2"].stateValues.xs[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v2"].replacements[0].componentName
- ].stateValues.xs[1],
- )
+ .fromAst(stateVariables["/v2"].stateValues.xs[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/e2"].replacements[0].componentName
- ].stateValues.value,
- )
+ .fromAst(stateVariables["/e2"].stateValues.value)
.equals(equationExpression),
).eq(true);
- expect(stateVariables[parabola3Name].stateValues.a).closeTo(a, 1e-12);
- expect(stateVariables[parabola3Name].stateValues.b).closeTo(b, 1e-12);
- expect(stateVariables[parabola3Name].stateValues.c).closeTo(c, 1e-12);
+ expect(stateVariables["/g3/p2"].stateValues.a).closeTo(a, 1e-12);
+ expect(stateVariables["/g3/p2"].stateValues.b).closeTo(b, 1e-12);
+ expect(stateVariables["/g3/p2"].stateValues.c).closeTo(c, 1e-12);
expect(
me
- .fromAst(stateVariables[parabola3Name].stateValues.equation)
+ .fromAst(stateVariables["/g3/p2"].stateValues.equation)
.equals(equationExpression),
).eq(true);
expect(
me
- .fromAst(stateVariables[parabola3Name].stateValues.vertex[0])
+ .fromAst(stateVariables["/g3/p2"].stateValues.vertex[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(stateVariables[parabola3Name].stateValues.vertex[1])
+ .fromAst(stateVariables["/g3/p2"].stateValues.vertex[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(stateVariables[vertex3Name].stateValues.xs[0])
+ .fromAst(stateVariables["/g3/v2"].stateValues.xs[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(stateVariables[vertex3Name].stateValues.xs[1])
+ .fromAst(stateVariables["/g3/v2"].stateValues.xs[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
expect(
@@ -13208,114 +10139,73 @@ describe("Parabola Tag Tests", function () {
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v"].replacements[0].componentName
- ].stateValues.xs[0],
- )
+ .fromAst(stateVariables["/v"].stateValues.xs[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v"].replacements[0].componentName
- ].stateValues.xs[1],
- )
+ .fromAst(stateVariables["/v"].stateValues.xs[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
- expect(
- stateVariables[stateVariables["/p2"].replacements[0].componentName]
- .stateValues.a,
- ).closeTo(a, 1e-12);
- expect(
- stateVariables[stateVariables["/p2"].replacements[0].componentName]
- .stateValues.b,
- ).closeTo(b, 1e-12);
- expect(
- stateVariables[stateVariables["/p2"].replacements[0].componentName]
- .stateValues.c,
- ).closeTo(c, 1e-12);
+ expect(stateVariables["/p2"].stateValues.a).closeTo(a, 1e-12);
+ expect(stateVariables["/p2"].stateValues.b).closeTo(b, 1e-12);
+ expect(stateVariables["/p2"].stateValues.c).closeTo(c, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/p2"].replacements[0].componentName
- ].stateValues.equation,
- )
+ .fromAst(stateVariables["/p2"].stateValues.equation)
.equals(equationExpression),
).eq(true);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/p2"].replacements[0].componentName
- ].stateValues.vertex[0],
- )
+ .fromAst(stateVariables["/p2"].stateValues.vertex[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/p2"].replacements[0].componentName
- ].stateValues.vertex[1],
- )
+ .fromAst(stateVariables["/p2"].stateValues.vertex[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v2"].replacements[0].componentName
- ].stateValues.xs[0],
- )
+ .fromAst(stateVariables["/v2"].stateValues.xs[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v2"].replacements[0].componentName
- ].stateValues.xs[1],
- )
+ .fromAst(stateVariables["/v2"].stateValues.xs[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/e2"].replacements[0].componentName
- ].stateValues.value,
- )
+ .fromAst(stateVariables["/e2"].stateValues.value)
.equals(equationExpression),
).eq(true);
- expect(stateVariables[parabola3Name].stateValues.a).closeTo(a, 1e-12);
- expect(stateVariables[parabola3Name].stateValues.b).closeTo(b, 1e-12);
- expect(stateVariables[parabola3Name].stateValues.c).closeTo(c, 1e-12);
+ expect(stateVariables["/g3/p2"].stateValues.a).closeTo(a, 1e-12);
+ expect(stateVariables["/g3/p2"].stateValues.b).closeTo(b, 1e-12);
+ expect(stateVariables["/g3/p2"].stateValues.c).closeTo(c, 1e-12);
expect(
me
- .fromAst(stateVariables[parabola3Name].stateValues.equation)
+ .fromAst(stateVariables["/g3/p2"].stateValues.equation)
.equals(equationExpression),
).eq(true);
expect(
me
- .fromAst(stateVariables[parabola3Name].stateValues.vertex[0])
+ .fromAst(stateVariables["/g3/p2"].stateValues.vertex[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(stateVariables[parabola3Name].stateValues.vertex[1])
+ .fromAst(stateVariables["/g3/p2"].stateValues.vertex[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(stateVariables[vertex3Name].stateValues.xs[0])
+ .fromAst(stateVariables["/g3/v2"].stateValues.xs[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(stateVariables[vertex3Name].stateValues.xs[1])
+ .fromAst(stateVariables["/g3/v2"].stateValues.xs[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
expect(
@@ -13386,47 +10276,26 @@ describe("Parabola Tag Tests", function () {
"\uff3f",
"\uff3f",
]);
- expect(
- stateVariables[stateVariables["/v"].replacements[0].componentName]
- .stateValues.xs[0],
- ).eq("\uff3f");
- expect(
- stateVariables[stateVariables["/v"].replacements[0].componentName]
- .stateValues.xs[1],
- ).eq("\uff3f");
- assert.isNaN(
- stateVariables[stateVariables["/p2"].replacements[0].componentName]
- .stateValues.a,
- );
- assert.isNaN(
- stateVariables[stateVariables["/p2"].replacements[0].componentName]
- .stateValues.b,
- );
- assert.isNaN(
- stateVariables[stateVariables["/p2"].replacements[0].componentName]
- .stateValues.c,
- );
- expect(
- stateVariables[stateVariables["/p2"].replacements[0].componentName]
- .stateValues.vertex,
- ).eqls(["\uff3f", "\uff3f"]);
- expect(
- stateVariables[stateVariables["/v2"].replacements[0].componentName]
- .stateValues.xs[0],
- ).eq("\uff3f");
- expect(
- stateVariables[stateVariables["/v2"].replacements[0].componentName]
- .stateValues.xs[1],
- ).eq("\uff3f");
- assert.isNaN(stateVariables[parabola3Name].stateValues.a);
- assert.isNaN(stateVariables[parabola3Name].stateValues.b);
- assert.isNaN(stateVariables[parabola3Name].stateValues.c);
- expect(stateVariables[parabola3Name].stateValues.vertex).eqls([
+ expect(stateVariables["/v"].stateValues.xs[0]).eq("\uff3f");
+ expect(stateVariables["/v"].stateValues.xs[1]).eq("\uff3f");
+ assert.isNaN(stateVariables["/p2"].stateValues.a);
+ assert.isNaN(stateVariables["/p2"].stateValues.b);
+ assert.isNaN(stateVariables["/p2"].stateValues.c);
+ expect(stateVariables["/p2"].stateValues.vertex).eqls([
+ "\uff3f",
+ "\uff3f",
+ ]);
+ expect(stateVariables["/v2"].stateValues.xs[0]).eq("\uff3f");
+ expect(stateVariables["/v2"].stateValues.xs[1]).eq("\uff3f");
+ assert.isNaN(stateVariables["/g3/p2"].stateValues.a);
+ assert.isNaN(stateVariables["/g3/p2"].stateValues.b);
+ assert.isNaN(stateVariables["/g3/p2"].stateValues.c);
+ expect(stateVariables["/g3/p2"].stateValues.vertex).eqls([
"\uff3f",
"\uff3f",
]);
- expect(stateVariables[vertex3Name].stateValues.xs[0]).eq("\uff3f");
- expect(stateVariables[vertex3Name].stateValues.xs[1]).eq("\uff3f");
+ expect(stateVariables["/g3/v2"].stateValues.xs[0]).eq("\uff3f");
+ expect(stateVariables["/g3/v2"].stateValues.xs[1]).eq("\uff3f");
expect(
me
.fromAst(stateVariables["/_point1"].stateValues.xs[0])
@@ -13527,114 +10396,73 @@ describe("Parabola Tag Tests", function () {
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v"].replacements[0].componentName
- ].stateValues.xs[0],
- )
+ .fromAst(stateVariables["/v"].stateValues.xs[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v"].replacements[0].componentName
- ].stateValues.xs[1],
- )
+ .fromAst(stateVariables["/v"].stateValues.xs[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
- expect(
- stateVariables[stateVariables["/p2"].replacements[0].componentName]
- .stateValues.a,
- ).closeTo(a, 1e-12);
- expect(
- stateVariables[stateVariables["/p2"].replacements[0].componentName]
- .stateValues.b,
- ).closeTo(b, 1e-12);
- expect(
- stateVariables[stateVariables["/p2"].replacements[0].componentName]
- .stateValues.c,
- ).closeTo(c, 1e-12);
+ expect(stateVariables["/p2"].stateValues.a).closeTo(a, 1e-12);
+ expect(stateVariables["/p2"].stateValues.b).closeTo(b, 1e-12);
+ expect(stateVariables["/p2"].stateValues.c).closeTo(c, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/p2"].replacements[0].componentName
- ].stateValues.equation,
- )
+ .fromAst(stateVariables["/p2"].stateValues.equation)
.equals(equationExpression),
).eq(true);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/p2"].replacements[0].componentName
- ].stateValues.vertex[0],
- )
+ .fromAst(stateVariables["/p2"].stateValues.vertex[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/p2"].replacements[0].componentName
- ].stateValues.vertex[1],
- )
+ .fromAst(stateVariables["/p2"].stateValues.vertex[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v2"].replacements[0].componentName
- ].stateValues.xs[0],
- )
+ .fromAst(stateVariables["/v2"].stateValues.xs[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/v2"].replacements[0].componentName
- ].stateValues.xs[1],
- )
+ .fromAst(stateVariables["/v2"].stateValues.xs[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(
- stateVariables[
- stateVariables["/e2"].replacements[0].componentName
- ].stateValues.value,
- )
+ .fromAst(stateVariables["/e2"].stateValues.value)
.equals(equationExpression),
).eq(true);
- expect(stateVariables[parabola3Name].stateValues.a).closeTo(a, 1e-12);
- expect(stateVariables[parabola3Name].stateValues.b).closeTo(b, 1e-12);
- expect(stateVariables[parabola3Name].stateValues.c).closeTo(c, 1e-12);
+ expect(stateVariables["/g3/p2"].stateValues.a).closeTo(a, 1e-12);
+ expect(stateVariables["/g3/p2"].stateValues.b).closeTo(b, 1e-12);
+ expect(stateVariables["/g3/p2"].stateValues.c).closeTo(c, 1e-12);
expect(
me
- .fromAst(stateVariables[parabola3Name].stateValues.equation)
+ .fromAst(stateVariables["/g3/p2"].stateValues.equation)
.equals(equationExpression),
).eq(true);
expect(
me
- .fromAst(stateVariables[parabola3Name].stateValues.vertex[0])
+ .fromAst(stateVariables["/g3/p2"].stateValues.vertex[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(stateVariables[parabola3Name].stateValues.vertex[1])
+ .fromAst(stateVariables["/g3/p2"].stateValues.vertex[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
expect(
me
- .fromAst(stateVariables[vertex3Name].stateValues.xs[0])
+ .fromAst(stateVariables["/g3/v2"].stateValues.xs[0])
.evaluate_numbers().tree,
).closeTo(vertex_x, 1e-12);
expect(
me
- .fromAst(stateVariables[vertex3Name].stateValues.xs[1])
+ .fromAst(stateVariables["/g3/v2"].stateValues.xs[1])
.evaluate_numbers().tree,
).closeTo(vertex_y, 1e-12);
expect(
@@ -13687,10 +10515,10 @@ describe("Parabola Tag Tests", function () {
-
-
-
-
-
-
-
- a
- Credit achieved:
+ Credit achieved: $_answer1.creditAchieved{assignNames="ca"}
`,
},
"*",
@@ -290,13 +290,13 @@ describe("PeriodicSet Tag Tests", function () {
- $a{name="a2"} = $b{name="b2"}
- Credit achieved:
+ Credit achieved: $_answer1.creditAchieved{assignNames="ca"}
- Redundancies:
+ Redundancies: $a.redundantOffsets, $b.redundantOffsets, $a2.redundantOffsets, $b2.redundantOffsets
`,
},
"*",
@@ -319,14 +319,8 @@ describe("PeriodicSet Tag Tests", function () {
let stateVariables = await win.returnAllStateVariables1();
expect(stateVariables["/a"].stateValues.value).eq("\uFF3F");
expect(stateVariables["/b"].stateValues.value).eq("\uFF3F");
- expect(
- stateVariables[stateVariables["/a2"].replacements[0].componentName]
- .stateValues.value,
- ).eq("\uFF3F");
- expect(
- stateVariables[stateVariables["/b2"].replacements[0].componentName]
- .stateValues.value,
- ).eq("\uFF3F");
+ expect(stateVariables["/a2"].stateValues.value).eq("\uFF3F");
+ expect(stateVariables["/b2"].stateValues.value).eq("\uFF3F");
expect(stateVariables["/_answer1"].stateValues.creditAchieved).eq(0);
});
@@ -344,14 +338,8 @@ describe("PeriodicSet Tag Tests", function () {
let stateVariables = await win.returnAllStateVariables1();
expect(stateVariables["/a"].stateValues.value).eq("\uFF3F");
expect(stateVariables["/b"].stateValues.value).eq("\uFF3F");
- expect(
- stateVariables[stateVariables["/a2"].replacements[0].componentName]
- .stateValues.value,
- ).eq("\uFF3F");
- expect(
- stateVariables[stateVariables["/b2"].replacements[0].componentName]
- .stateValues.value,
- ).eq("\uFF3F");
+ expect(stateVariables["/a2"].stateValues.value).eq("\uFF3F");
+ expect(stateVariables["/b2"].stateValues.value).eq("\uFF3F");
expect(stateVariables["/_answer1"].stateValues.creditAchieved).eq(0);
});
@@ -390,26 +378,14 @@ describe("PeriodicSet Tag Tests", function () {
]);
expect(stateVariables["/a"].stateValues.period).eqls(["/", "pi", 2]);
expect(stateVariables["/a"].stateValues.redundantOffsets).eq(false);
- expect(
- stateVariables[stateVariables["/a2"].replacements[0].componentName]
- .stateValues.value,
- ).eqls(a);
- expect(
- stateVariables[stateVariables["/a2"].replacements[0].componentName]
- .stateValues.numOffsets,
- ).eq(1);
- expect(
- stateVariables[stateVariables["/a2"].replacements[0].componentName]
- .stateValues.offsets[0],
- ).eqls(["-", ["/", "pi", 4]]);
- expect(
- stateVariables[stateVariables["/a2"].replacements[0].componentName]
- .stateValues.period,
- ).eqls(["/", "pi", 2]);
- expect(
- stateVariables[stateVariables["/a2"].replacements[0].componentName]
- .stateValues.redundantOffsets,
- ).eq(false);
+ expect(stateVariables["/a2"].stateValues.value).eqls(a);
+ expect(stateVariables["/a2"].stateValues.numOffsets).eq(1);
+ expect(stateVariables["/a2"].stateValues.offsets[0]).eqls([
+ "-",
+ ["/", "pi", 4],
+ ]);
+ expect(stateVariables["/a2"].stateValues.period).eqls(["/", "pi", 2]);
+ expect(stateVariables["/a2"].stateValues.redundantOffsets).eq(false);
let b = ["periodic_set"];
b.push([
@@ -427,26 +403,14 @@ describe("PeriodicSet Tag Tests", function () {
]);
expect(stateVariables["/b"].stateValues.redundantOffsets).eq(false);
expect(stateVariables["/b"].stateValues.period).eqls(["*", 2, "pi"]);
- expect(
- stateVariables[stateVariables["/b2"].replacements[0].componentName]
- .stateValues.value,
- ).eqls(b);
- expect(
- stateVariables[stateVariables["/b2"].replacements[0].componentName]
- .stateValues.numOffsets,
- ).eq(1);
- expect(
- stateVariables[stateVariables["/b2"].replacements[0].componentName]
- .stateValues.offsets[0],
- ).eqls(["-", ["/", "pi", 4]]);
- expect(
- stateVariables[stateVariables["/b2"].replacements[0].componentName]
- .stateValues.period,
- ).eqls(["*", 2, "pi"]);
- expect(
- stateVariables[stateVariables["/b2"].replacements[0].componentName]
- .stateValues.redundantOffsets,
- ).eq(false);
+ expect(stateVariables["/b2"].stateValues.value).eqls(b);
+ expect(stateVariables["/b2"].stateValues.numOffsets).eq(1);
+ expect(stateVariables["/b2"].stateValues.offsets[0]).eqls([
+ "-",
+ ["/", "pi", 4],
+ ]);
+ expect(stateVariables["/b2"].stateValues.period).eqls(["*", 2, "pi"]);
+ expect(stateVariables["/b2"].stateValues.redundantOffsets).eq(false);
expect(stateVariables["/_answer1"].stateValues.creditAchieved).eq(0);
});
@@ -485,26 +449,14 @@ describe("PeriodicSet Tag Tests", function () {
]);
expect(stateVariables["/a"].stateValues.period).eqls(["/", "pi", 2]);
expect(stateVariables["/a"].stateValues.redundantOffsets).eq(false);
- expect(
- stateVariables[stateVariables["/a2"].replacements[0].componentName]
- .stateValues.value,
- ).eqls(a);
- expect(
- stateVariables[stateVariables["/a2"].replacements[0].componentName]
- .stateValues.numOffsets,
- ).eq(1);
- expect(
- stateVariables[stateVariables["/a2"].replacements[0].componentName]
- .stateValues.offsets[0],
- ).eqls(["-", ["/", "pi", 4]]);
- expect(
- stateVariables[stateVariables["/a2"].replacements[0].componentName]
- .stateValues.period,
- ).eqls(["/", "pi", 2]);
- expect(
- stateVariables[stateVariables["/a2"].replacements[0].componentName]
- .stateValues.redundantOffsets,
- ).eq(false);
+ expect(stateVariables["/a2"].stateValues.value).eqls(a);
+ expect(stateVariables["/a2"].stateValues.numOffsets).eq(1);
+ expect(stateVariables["/a2"].stateValues.offsets[0]).eqls([
+ "-",
+ ["/", "pi", 4],
+ ]);
+ expect(stateVariables["/a2"].stateValues.period).eqls(["/", "pi", 2]);
+ expect(stateVariables["/a2"].stateValues.redundantOffsets).eq(false);
let b = ["periodic_set"];
@@ -525,38 +477,14 @@ describe("PeriodicSet Tag Tests", function () {
expect(stateVariables["/b"].stateValues.offsets[3]).eqls(offset3);
expect(stateVariables["/b"].stateValues.redundantOffsets).eq(false);
expect(stateVariables["/b"].stateValues.period).eqls(["*", 2, "pi"]);
- expect(
- stateVariables[stateVariables["/b2"].replacements[0].componentName]
- .stateValues.value,
- ).eqls(b);
- expect(
- stateVariables[stateVariables["/b2"].replacements[0].componentName]
- .stateValues.numOffsets,
- ).eq(4);
- expect(
- stateVariables[stateVariables["/b2"].replacements[0].componentName]
- .stateValues.offsets[0],
- ).eqls(offset0);
- expect(
- stateVariables[stateVariables["/b2"].replacements[0].componentName]
- .stateValues.offsets[1],
- ).eqls(offset1);
- expect(
- stateVariables[stateVariables["/b2"].replacements[0].componentName]
- .stateValues.offsets[2],
- ).eqls(offset2);
- expect(
- stateVariables[stateVariables["/b2"].replacements[0].componentName]
- .stateValues.offsets[3],
- ).eqls(offset3);
- expect(
- stateVariables[stateVariables["/b2"].replacements[0].componentName]
- .stateValues.period,
- ).eqls(["*", 2, "pi"]);
- expect(
- stateVariables[stateVariables["/b2"].replacements[0].componentName]
- .stateValues.redundantOffsets,
- ).eq(false);
+ expect(stateVariables["/b2"].stateValues.value).eqls(b);
+ expect(stateVariables["/b2"].stateValues.numOffsets).eq(4);
+ expect(stateVariables["/b2"].stateValues.offsets[0]).eqls(offset0);
+ expect(stateVariables["/b2"].stateValues.offsets[1]).eqls(offset1);
+ expect(stateVariables["/b2"].stateValues.offsets[2]).eqls(offset2);
+ expect(stateVariables["/b2"].stateValues.offsets[3]).eqls(offset3);
+ expect(stateVariables["/b2"].stateValues.period).eqls(["*", 2, "pi"]);
+ expect(stateVariables["/b2"].stateValues.redundantOffsets).eq(false);
expect(stateVariables["/_answer1"].stateValues.creditAchieved).eq(1);
});
@@ -590,30 +518,12 @@ describe("PeriodicSet Tag Tests", function () {
expect(stateVariables["/a"].stateValues.offsets[1]).eqls(offset1);
expect(stateVariables["/a"].stateValues.period).eqls(["/", "pi", 2]);
expect(stateVariables["/a"].stateValues.redundantOffsets).eq(true);
- expect(
- stateVariables[stateVariables["/a2"].replacements[0].componentName]
- .stateValues.value,
- ).eqls(a);
- expect(
- stateVariables[stateVariables["/a2"].replacements[0].componentName]
- .stateValues.numOffsets,
- ).eq(2);
- expect(
- stateVariables[stateVariables["/a2"].replacements[0].componentName]
- .stateValues.offsets[0],
- ).eqls(offset0);
- expect(
- stateVariables[stateVariables["/a2"].replacements[0].componentName]
- .stateValues.offsets[1],
- ).eqls(offset1);
- expect(
- stateVariables[stateVariables["/a2"].replacements[0].componentName]
- .stateValues.period,
- ).eqls(["/", "pi", 2]);
- expect(
- stateVariables[stateVariables["/a2"].replacements[0].componentName]
- .stateValues.redundantOffsets,
- ).eq(true);
+ expect(stateVariables["/a2"].stateValues.value).eqls(a);
+ expect(stateVariables["/a2"].stateValues.numOffsets).eq(2);
+ expect(stateVariables["/a2"].stateValues.offsets[0]).eqls(offset0);
+ expect(stateVariables["/a2"].stateValues.offsets[1]).eqls(offset1);
+ expect(stateVariables["/a2"].stateValues.period).eqls(["/", "pi", 2]);
+ expect(stateVariables["/a2"].stateValues.redundantOffsets).eq(true);
let b = ["periodic_set"];
@@ -634,38 +544,14 @@ describe("PeriodicSet Tag Tests", function () {
expect(stateVariables["/b"].stateValues.offsets[3]).eqls(offset3);
expect(stateVariables["/b"].stateValues.redundantOffsets).eq(false);
expect(stateVariables["/b"].stateValues.period).eqls(["*", 2, "pi"]);
- expect(
- stateVariables[stateVariables["/b2"].replacements[0].componentName]
- .stateValues.value,
- ).eqls(b);
- expect(
- stateVariables[stateVariables["/b2"].replacements[0].componentName]
- .stateValues.numOffsets,
- ).eq(4);
- expect(
- stateVariables[stateVariables["/b2"].replacements[0].componentName]
- .stateValues.offsets[0],
- ).eqls(offset0);
- expect(
- stateVariables[stateVariables["/b2"].replacements[0].componentName]
- .stateValues.offsets[1],
- ).eqls(offset1);
- expect(
- stateVariables[stateVariables["/b2"].replacements[0].componentName]
- .stateValues.offsets[2],
- ).eqls(offset2);
- expect(
- stateVariables[stateVariables["/b2"].replacements[0].componentName]
- .stateValues.offsets[3],
- ).eqls(offset3);
- expect(
- stateVariables[stateVariables["/b2"].replacements[0].componentName]
- .stateValues.period,
- ).eqls(["*", 2, "pi"]);
- expect(
- stateVariables[stateVariables["/b2"].replacements[0].componentName]
- .stateValues.redundantOffsets,
- ).eq(false);
+ expect(stateVariables["/b2"].stateValues.value).eqls(b);
+ expect(stateVariables["/b2"].stateValues.numOffsets).eq(4);
+ expect(stateVariables["/b2"].stateValues.offsets[0]).eqls(offset0);
+ expect(stateVariables["/b2"].stateValues.offsets[1]).eqls(offset1);
+ expect(stateVariables["/b2"].stateValues.offsets[2]).eqls(offset2);
+ expect(stateVariables["/b2"].stateValues.offsets[3]).eqls(offset3);
+ expect(stateVariables["/b2"].stateValues.period).eqls(["*", 2, "pi"]);
+ expect(stateVariables["/b2"].stateValues.redundantOffsets).eq(false);
expect(stateVariables["/_answer1"].stateValues.creditAchieved).eq(1);
});
@@ -700,30 +586,12 @@ describe("PeriodicSet Tag Tests", function () {
expect(stateVariables["/a"].stateValues.offsets[1]).eqls(offset1);
expect(stateVariables["/a"].stateValues.period).eqls(["/", "pi", 2]);
expect(stateVariables["/a"].stateValues.redundantOffsets).eq(true);
- expect(
- stateVariables[stateVariables["/a2"].replacements[0].componentName]
- .stateValues.value,
- ).eqls(a);
- expect(
- stateVariables[stateVariables["/a2"].replacements[0].componentName]
- .stateValues.numOffsets,
- ).eq(2);
- expect(
- stateVariables[stateVariables["/a2"].replacements[0].componentName]
- .stateValues.offsets[0],
- ).eqls(offset0);
- expect(
- stateVariables[stateVariables["/a2"].replacements[0].componentName]
- .stateValues.offsets[1],
- ).eqls(offset1);
- expect(
- stateVariables[stateVariables["/a2"].replacements[0].componentName]
- .stateValues.period,
- ).eqls(["/", "pi", 2]);
- expect(
- stateVariables[stateVariables["/a2"].replacements[0].componentName]
- .stateValues.redundantOffsets,
- ).eq(true);
+ expect(stateVariables["/a2"].stateValues.value).eqls(a);
+ expect(stateVariables["/a2"].stateValues.numOffsets).eq(2);
+ expect(stateVariables["/a2"].stateValues.offsets[0]).eqls(offset0);
+ expect(stateVariables["/a2"].stateValues.offsets[1]).eqls(offset1);
+ expect(stateVariables["/a2"].stateValues.period).eqls(["/", "pi", 2]);
+ expect(stateVariables["/a2"].stateValues.redundantOffsets).eq(true);
let b = ["periodic_set"];
@@ -744,38 +612,14 @@ describe("PeriodicSet Tag Tests", function () {
expect(stateVariables["/b"].stateValues.offsets[3]).eqls(offset3);
expect(stateVariables["/b"].stateValues.redundantOffsets).eq(true);
expect(stateVariables["/b"].stateValues.period).eqls("pi");
- expect(
- stateVariables[stateVariables["/b2"].replacements[0].componentName]
- .stateValues.value,
- ).eqls(b);
- expect(
- stateVariables[stateVariables["/b2"].replacements[0].componentName]
- .stateValues.numOffsets,
- ).eq(4);
- expect(
- stateVariables[stateVariables["/b2"].replacements[0].componentName]
- .stateValues.offsets[0],
- ).eqls(offset0);
- expect(
- stateVariables[stateVariables["/b2"].replacements[0].componentName]
- .stateValues.offsets[1],
- ).eqls(offset1);
- expect(
- stateVariables[stateVariables["/b2"].replacements[0].componentName]
- .stateValues.offsets[2],
- ).eqls(offset2);
- expect(
- stateVariables[stateVariables["/b2"].replacements[0].componentName]
- .stateValues.offsets[3],
- ).eqls(offset3);
- expect(
- stateVariables[stateVariables["/b2"].replacements[0].componentName]
- .stateValues.period,
- ).eqls("pi");
- expect(
- stateVariables[stateVariables["/b2"].replacements[0].componentName]
- .stateValues.redundantOffsets,
- ).eq(true);
+ expect(stateVariables["/b2"].stateValues.value).eqls(b);
+ expect(stateVariables["/b2"].stateValues.numOffsets).eq(4);
+ expect(stateVariables["/b2"].stateValues.offsets[0]).eqls(offset0);
+ expect(stateVariables["/b2"].stateValues.offsets[1]).eqls(offset1);
+ expect(stateVariables["/b2"].stateValues.offsets[2]).eqls(offset2);
+ expect(stateVariables["/b2"].stateValues.offsets[3]).eqls(offset3);
+ expect(stateVariables["/b2"].stateValues.period).eqls("pi");
+ expect(stateVariables["/b2"].stateValues.redundantOffsets).eq(true);
expect(stateVariables["/_answer1"].stateValues.creditAchieved).eq(1);
});
@@ -809,30 +653,12 @@ describe("PeriodicSet Tag Tests", function () {
expect(stateVariables["/a"].stateValues.offsets[1]).eqls(offset1);
expect(stateVariables["/a"].stateValues.period).eqls(["/", "pi", 2]);
expect(stateVariables["/a"].stateValues.redundantOffsets).eq(true);
- expect(
- stateVariables[stateVariables["/a2"].replacements[0].componentName]
- .stateValues.value,
- ).eqls(a);
- expect(
- stateVariables[stateVariables["/a2"].replacements[0].componentName]
- .stateValues.numOffsets,
- ).eq(2);
- expect(
- stateVariables[stateVariables["/a2"].replacements[0].componentName]
- .stateValues.offsets[0],
- ).eqls(offset0);
- expect(
- stateVariables[stateVariables["/a2"].replacements[0].componentName]
- .stateValues.offsets[1],
- ).eqls(offset1);
- expect(
- stateVariables[stateVariables["/a2"].replacements[0].componentName]
- .stateValues.period,
- ).eqls(["/", "pi", 2]);
- expect(
- stateVariables[stateVariables["/a2"].replacements[0].componentName]
- .stateValues.redundantOffsets,
- ).eq(true);
+ expect(stateVariables["/a2"].stateValues.value).eqls(a);
+ expect(stateVariables["/a2"].stateValues.numOffsets).eq(2);
+ expect(stateVariables["/a2"].stateValues.offsets[0]).eqls(offset0);
+ expect(stateVariables["/a2"].stateValues.offsets[1]).eqls(offset1);
+ expect(stateVariables["/a2"].stateValues.period).eqls(["/", "pi", 2]);
+ expect(stateVariables["/a2"].stateValues.redundantOffsets).eq(true);
let b = ["periodic_set"];
@@ -856,42 +682,15 @@ describe("PeriodicSet Tag Tests", function () {
expect(stateVariables["/b"].stateValues.offsets[4]).eqls(offset4);
expect(stateVariables["/b"].stateValues.redundantOffsets).eq(true);
expect(stateVariables["/b"].stateValues.period).eqls("pi");
- expect(
- stateVariables[stateVariables["/b2"].replacements[0].componentName]
- .stateValues.value,
- ).eqls(b);
- expect(
- stateVariables[stateVariables["/b2"].replacements[0].componentName]
- .stateValues.numOffsets,
- ).eq(5);
- expect(
- stateVariables[stateVariables["/b2"].replacements[0].componentName]
- .stateValues.offsets[0],
- ).eqls(offset0);
- expect(
- stateVariables[stateVariables["/b2"].replacements[0].componentName]
- .stateValues.offsets[1],
- ).eqls(offset1);
- expect(
- stateVariables[stateVariables["/b2"].replacements[0].componentName]
- .stateValues.offsets[2],
- ).eqls(offset2);
- expect(
- stateVariables[stateVariables["/b2"].replacements[0].componentName]
- .stateValues.offsets[3],
- ).eqls(offset3);
- expect(
- stateVariables[stateVariables["/b2"].replacements[0].componentName]
- .stateValues.offsets[4],
- ).eqls(offset4);
- expect(
- stateVariables[stateVariables["/b2"].replacements[0].componentName]
- .stateValues.period,
- ).eqls("pi");
- expect(
- stateVariables[stateVariables["/b2"].replacements[0].componentName]
- .stateValues.redundantOffsets,
- ).eq(true);
+ expect(stateVariables["/b2"].stateValues.value).eqls(b);
+ expect(stateVariables["/b2"].stateValues.numOffsets).eq(5);
+ expect(stateVariables["/b2"].stateValues.offsets[0]).eqls(offset0);
+ expect(stateVariables["/b2"].stateValues.offsets[1]).eqls(offset1);
+ expect(stateVariables["/b2"].stateValues.offsets[2]).eqls(offset2);
+ expect(stateVariables["/b2"].stateValues.offsets[3]).eqls(offset3);
+ expect(stateVariables["/b2"].stateValues.offsets[4]).eqls(offset4);
+ expect(stateVariables["/b2"].stateValues.period).eqls("pi");
+ expect(stateVariables["/b2"].stateValues.redundantOffsets).eq(true);
expect(stateVariables["/_answer1"].stateValues.creditAchieved).eq(0);
});
@@ -904,7 +703,7 @@ describe("PeriodicSet Tag Tests", function () {
doenetML: `
30,150
- 180
@@ -972,7 +771,7 @@ describe("PeriodicSet Tag Tests", function () {
- $userPeriodicSet.redundantOffsets
$p$o
@@ -1295,15 +1094,15 @@ describe("PeriodicSet Tag Tests", function () {
As list:
+ As list: $pset.asList{assignNames="l1"}
Min index:
As list with specified min/max:
+ As list with specified min/max: $pset2.asList{assignNames="l2"}
-
+ $offsets.value{assignNames="offsets2"}
`,
},
diff --git a/cypress/e2e/DoenetML/tagSpecific/pluralize.cy.js b/cypress/e2e/DoenetML/tagSpecific/pluralize.cy.js
index c6659652de..66b5106664 100644
--- a/cypress/e2e/DoenetML/tagSpecific/pluralize.cy.js
+++ b/cypress/e2e/DoenetML/tagSpecific/pluralize.cy.js
@@ -223,7 +223,7 @@ describe("Pluralize Tag Tests", function () {
How many geese?
How many teeth?
- I have
+ I have $ngeese.value goose even if one doesn't have $nteeth.value tooth
`,
},
"*",
diff --git a/cypress/e2e/DoenetML/tagSpecific/point.cy.js b/cypress/e2e/DoenetML/tagSpecific/point.cy.js
index d79a10bc8f..c68cf71316 100644
--- a/cypress/e2e/DoenetML/tagSpecific/point.cy.js
+++ b/cypress/e2e/DoenetML/tagSpecific/point.cy.js
@@ -15,10 +15,10 @@ describe("Point Tag Tests", function () {
a
(5,6)
- (1,
+ (1, $_point1.y)
- a
(5,6)P
- Q (1, Q (1, $_point1.y)
- (5,6)
P (5,6)Q P (5,6)
(1,3)
- $_point1.label'
`,
@@ -393,13 +393,13 @@ describe("Point Tag Tests", function () {
-
-
-
-
-
-
+ $A{labelIsName}
@@ -852,7 +852,7 @@ describe("Point Tag Tests", function () {
-
+
@@ -860,7 +860,7 @@ describe("Point Tag Tests", function () {
-
+
`,
},
"*",
@@ -893,7 +893,9 @@ describe("Point Tag Tests", function () {
expect(stateVariables["/_point4"].stateValues.labelForGraph).eq(
"_point4",
);
- let c3p = stateVariables["/_copy3"].replacements[0].componentName;
+ let c3p =
+ stateVariables[stateVariables["/grp"].replacements[0].componentName]
+ .replacements[0].componentName;
expect(stateVariables[c3p].stateValues.label).eq("A");
expect(stateVariables[c3p].stateValues.labelForGraph).eq("A");
});
@@ -924,7 +926,9 @@ describe("Point Tag Tests", function () {
expect(stateVariables["/_point4"].stateValues.labelForGraph).eq(
"_point4",
);
- let c3p = stateVariables["/_copy3"].replacements[0].componentName;
+ let c3p =
+ stateVariables[stateVariables["/grp"].replacements[0].componentName]
+ .replacements[0].componentName;
expect(stateVariables[c3p].stateValues.label).eq("A");
expect(stateVariables[c3p].stateValues.labelForGraph).eq("A");
});
@@ -955,7 +959,9 @@ describe("Point Tag Tests", function () {
expect(stateVariables["/_point4"].stateValues.labelForGraph).eq(
"_point4",
);
- let c3p = stateVariables["/_copy3"].replacements[0].componentName;
+ let c3p =
+ stateVariables[stateVariables["/grp"].replacements[0].componentName]
+ .replacements[0].componentName;
expect(stateVariables[c3p].stateValues.label).eq("A");
expect(stateVariables[c3p].stateValues.labelForGraph).eq("A");
});
@@ -986,7 +992,9 @@ describe("Point Tag Tests", function () {
expect(stateVariables["/_point4"].stateValues.labelForGraph).eq(
"_point4",
);
- let c3p = stateVariables["/_copy3"].replacements[0].componentName;
+ let c3p =
+ stateVariables[stateVariables["/grp"].replacements[0].componentName]
+ .replacements[0].componentName;
expect(stateVariables[c3p].stateValues.label).eq("A");
expect(stateVariables[c3p].stateValues.labelForGraph).eq("A");
});
@@ -1017,7 +1025,9 @@ describe("Point Tag Tests", function () {
expect(stateVariables["/_point4"].stateValues.labelForGraph).eq(
"_point4",
);
- let c3p = stateVariables["/_copy3"].replacements[0].componentName;
+ let c3p =
+ stateVariables[stateVariables["/grp"].replacements[0].componentName]
+ .replacements[0].componentName;
expect(stateVariables[c3p].stateValues.label).eq("A");
expect(stateVariables[c3p].stateValues.labelForGraph).eq("A");
});
@@ -1048,7 +1058,9 @@ describe("Point Tag Tests", function () {
expect(stateVariables["/_point4"].stateValues.labelForGraph).eq(
"_point4",
);
- let c3p = stateVariables["/_copy3"].replacements[0].componentName;
+ let c3p =
+ stateVariables[stateVariables["/grp"].replacements[0].componentName]
+ .replacements[0].componentName;
expect(stateVariables[c3p].stateValues.label).eq("A");
expect(stateVariables[c3p].stateValues.labelForGraph).eq("A");
});
@@ -1079,7 +1091,9 @@ describe("Point Tag Tests", function () {
expect(stateVariables["/E"].stateValues.labelForGraph).eq("J");
expect(stateVariables["/_point4"].stateValues.label).eq("K");
expect(stateVariables["/_point4"].stateValues.labelForGraph).eq("K");
- let c3p = stateVariables["/_copy3"].replacements[0].componentName;
+ let c3p =
+ stateVariables[stateVariables["/grp"].replacements[0].componentName]
+ .replacements[0].componentName;
expect(stateVariables[c3p].stateValues.label).eq("A");
expect(stateVariables[c3p].stateValues.labelForGraph).eq("A");
});
@@ -1108,7 +1122,9 @@ describe("Point Tag Tests", function () {
expect(stateVariables["/E"].stateValues.labelForGraph).eq("J");
expect(stateVariables["/_point4"].stateValues.label).eq("K");
expect(stateVariables["/_point4"].stateValues.labelForGraph).eq("K");
- let c3p = stateVariables["/_copy3"].replacements[0].componentName;
+ let c3p =
+ stateVariables[stateVariables["/grp"].replacements[0].componentName]
+ .replacements[0].componentName;
expect(stateVariables[c3p].stateValues.label).eq("L");
expect(stateVariables[c3p].stateValues.labelForGraph).eq("L");
});
@@ -2104,10 +2120,10 @@ describe("Point Tag Tests", function () {
$(coords.value{createComponentOfType="math"})
-
- $coords
-
- $coords
-
- $v
-
- 2 3 , 1 )
- a
- (
(a ,2,3)
- a
- (
(a ,2,3)
- a
a
(1,2)
-
-
- a
- (1 )
+ ($y^2/10, 1 )
- 1 , sin($x))
-
(1,2)
- (
x=y
-
(1,2)
- 5
-
- (
(5,3)
- $_point2.x+1
`,
},
"*",
@@ -3654,15 +3670,15 @@ describe("Point Tag Tests", function () {
a
- (
- (
+ ($d,3-$d)
- $b+1 ,
+ $_point2.y$c ,
+ $_point2.x$d*0.01 ,
5
`,
},
@@ -3883,10 +3899,10 @@ describe("Point Tag Tests", function () {
a
- (
- (
@@ -3992,10 +4008,10 @@ describe("Point Tag Tests", function () {
b
- (
- (
@@ -4105,8 +4121,8 @@ describe("Point Tag Tests", function () {
- $_point1.coords
+ $_point1.constraintUsed
`,
},
"*",
@@ -4230,8 +4246,8 @@ describe("Point Tag Tests", function () {
- $_point1.coords
+ $_point1.constraintUsed
`,
},
"*",
@@ -4324,8 +4340,8 @@ describe("Point Tag Tests", function () {
$_point1.coords
+ $_point1.constraintUsed
`,
},
"*",
@@ -4417,7 +4433,7 @@ describe("Point Tag Tests", function () {
- $_point1.coords
`,
},
"*",
@@ -4500,8 +4516,8 @@ describe("Point Tag Tests", function () {
- $_point1.coords
+ $_point1.constraintUsed
`,
},
"*",
@@ -4631,8 +4647,8 @@ describe("Point Tag Tests", function () {
- $_point1.coords
+ $_point1.constraintUsed
`,
},
@@ -4716,8 +4732,8 @@ describe("Point Tag Tests", function () {
- $_point1.coords
+ $_point1.constraintUsed
`,
},
@@ -4790,18 +4806,18 @@ describe("Point Tag Tests", function () {
-
- $A.coords
+ $A.constraintUsed
+ $B.coords
+ $B.constraintUsed
+ $C.coords
+ $C.constraintUsed
+ $D.coords
+ $D.constraintUsed
`,
},
"*",
@@ -5133,16 +5149,16 @@ describe("Point Tag Tests", function () {
- (
- $original.coords
+ $constrained.coords
+ $follower.coords
+ $original.constraintUsed
+ $constrained.constraintUsed
+ $follower.constraintUsed
`,
},
"*",
@@ -5370,13 +5386,13 @@ describe("Point Tag Tests", function () {
- (
- $original.coords
+ $constrained.coords
+ $follower.coords
`,
},
"*",
@@ -5702,8 +5718,8 @@ describe("Point Tag Tests", function () {
- $_point1.coords
+ $_point1.constraintUsed
`,
},
"*",
@@ -5848,8 +5864,8 @@ describe("Point Tag Tests", function () {
- $_point1.coords
+ $_point1.constraintUsed
`,
},
"*",
@@ -5954,8 +5970,8 @@ describe("Point Tag Tests", function () {
- $_point1.coords
+ $_point1.constraintUsed
`,
},
"*",
@@ -6102,8 +6118,8 @@ describe("Point Tag Tests", function () {
- $_point1.coords
+ $_point1.constraintUsed
`,
@@ -6251,8 +6267,8 @@ describe("Point Tag Tests", function () {
- $_point1.coords
+ $_point1.constraintUsed
`,
},
@@ -6408,7 +6424,7 @@ describe("Point Tag Tests", function () {
- $_point1.coords
`,
},
"*",
@@ -6523,12 +6539,12 @@ describe("Point Tag Tests", function () {
- $_line1
- $_line1
-
a
`,
@@ -6853,15 +6869,15 @@ describe("Point Tag Tests", function () {
-
a
`,
},
@@ -7002,16 +7018,16 @@ describe("Point Tag Tests", function () {
- $_line1
+ $_line2$_line3
+ $_line4
a
`,
},
@@ -7135,9 +7151,9 @@ describe("Point Tag Tests", function () {
- $_line1
+ $_line2$_line3
+ $_line4
@@ -7145,7 +7161,7 @@ describe("Point Tag Tests", function () {
a
`,
},
@@ -7310,18 +7326,18 @@ describe("Point Tag Tests", function () {
-
- $_line1$_line2
+ $_line1$_line3
+ $_line1$_line4
+ $_line2$_line3
+ $_line2$_line4
+ $_line3$_line4
@@ -7603,18 +7619,18 @@ describe("Point Tag Tests", function () {
-
- $_line1$_line2
+ $_line1$_line3
+ $_line1$_line4
+ $_line2$_line3
+ $_line2$_line4
+ $_line3$_line4
@@ -7912,9 +7928,9 @@ describe("Point Tag Tests", function () {
a
(1,2)
- (
+ ($_point1.x2, $_point1.x1)
-
- $p1{name="p4"}
- $p2{name="p6"}
- $p4{name="p8"}
- a
(1,2)
-
- a
-
- (1,2)
-
- a
- $p1a.y{assignNames="p1ay"}
-
- a
-
-
- a
- (
- (
+ ($_point2.y, 7)
+ ($_point1.y, 9)
-
-
- a
- (
- (
+ ($P2a.y, 7)
+ ($P1a.y, 9)
-
- a
- (3, 2
- (2
+ (3, 2$_point1.x+1)
+ (2$_point2.y+1, 3)
- a
-
- (
- a
- $_point1.x, $_point2.x
(3,4)
- $_point1.y, $_point2.y
- Label 1:
- Label 2:
+ Label 1: $_point1.label
+ Label 2: $_point2.label
`,
},
"*",
@@ -1036,17 +1036,17 @@ describe("Point Tag Tests 2", function () {
a
- $_point1.x, $_point2.x
(1,2)
(3,4)
- $_point1.y, $_point2.y
- Label 1:
- Label 2:
+ Label 1: $_point1.label
+ Label 2: $_point2.label
`,
},
"*",
@@ -1264,9 +1264,9 @@ describe("Point Tag Tests 2", function () {
The points
The point:
- The point copied:
- The point copied again:
+ The point copied: $_point1{name="point2"}
+ The point copied again:
From point 1
- Number of dimensions:
- x-coordinate:
- y-coordinate:
- z-coordinate:
- All individual coordinates:
- Coordinates:
+ Number of dimensions:
+ x-coordinate: $_point1.x1{name="point1x1"}
+ y-coordinate: $_point1.x2{name="point1x2"}
+ z-coordinate: $_point1.x3{name="point1x3"}
+ All individual coordinates: $_point1.xs
+ Coordinates:
From point 2
- Number of dimensions:
- x-coordinate:
- y-coordinate:
- z-coordinate:
- All individual coordinates:
- Coordinates:
+ Number of dimensions:
+ x-coordinate: $point2.x1{name="point2x1"}
+ y-coordinate: $point2.x2{name="point2x2"}
+ z-coordinate: $point2.x3{name="point2x3"}
+ All individual coordinates: $point2.xs
+ Coordinates:
From point 3
- Number of dimensions:
- x-coordinate:
- y-coordinate:
- z-coordinate:
- All individual coordinates:
- Coordinates:
+ Number of dimensions:
+ x-coordinate: $point3.x1{name="point3x1"}
+ y-coordinate: $point3.x2{name="point3x2"}
+ z-coordinate: $point3.x3{name="point3x3"}
+ All individual coordinates: $point3.xs
+ Coordinates:
For point 1
@@ -1520,11 +1520,11 @@ describe("Point Tag Tests 2", function () {
Extracting from point 3
- x-coordinate:
- y-coordinate:
- z-coordinate:
- All individual coordinates:
- Coordinates:
+ x-coordinate: $point3
+ y-coordinate: $point3
+ z-coordinate: $point3
+ All individual coordinates: $point3
+ Coordinates: $point3
Specify point coordinates:
The points
- The point:
- The point copied:
- The point copied again:
+ The point:
+ The point copied: $_point1{name="point2"}
+ The point copied again:
-
- 1
@@ -8075,7 +8075,7 @@ describe("Point Tag Tests 2", function () {
expect(stateVariables["/A1"].stateValues.xs).eqls([-1, 2]);
expect(stateVariables["/B1"].stateValues.xs).eqls([3, -2]);
expect(stateVariables["/C1"].stateValues.xs).eqls([1, 1]);
- expect(stateVariables["/C2/C"].stateValues.xs).eqls([3, 0]);
+ expect(stateVariables["/C2"].stateValues.xs).eqls([3, 0]);
expect(stateVariables["/A2"].stateValues.xs).eqls([1, 2, 4]);
expect(stateVariables["/C3"].stateValues.xs).eqls([3, 0, 1]);
expect(stateVariables["/A"].stateValues.label).eq("A");
@@ -8084,7 +8084,7 @@ describe("Point Tag Tests 2", function () {
expect(stateVariables["/B1"].stateValues.label).eq("B");
expect(stateVariables["/C"].stateValues.label).eq("C");
expect(stateVariables["/C1"].stateValues.label).eq("C");
- expect(stateVariables["/C2/C"].stateValues.label).eq("C");
+ expect(stateVariables["/C2"].stateValues.label).eq("C");
});
cy.log("move original points");
@@ -8118,7 +8118,7 @@ describe("Point Tag Tests 2", function () {
expect(stateVariables["/A1"].stateValues.xs).eqls([-1, -7]);
expect(stateVariables["/B1"].stateValues.xs).eqls([5, -2]);
expect(stateVariables["/C1"].stateValues.xs).eqls([-5, -8]);
- expect(stateVariables["/C2/C"].stateValues.xs).eqls([-3, -6]);
+ expect(stateVariables["/C2"].stateValues.xs).eqls([-3, -6]);
expect(stateVariables["/A2"].stateValues.xs).eqls([-2, -7, 4]);
expect(stateVariables["/C3"].stateValues.xs).eqls([-3, -6, 1]);
});
@@ -8153,7 +8153,7 @@ describe("Point Tag Tests 2", function () {
expect(stateVariables["/A1"].stateValues.xs).eqls([8, -5]);
expect(stateVariables["/B1"].stateValues.xs).eqls([-6, 6]);
expect(stateVariables["/C1"].stateValues.xs).eqls([-7, 4]);
- expect(stateVariables["/C2/C"].stateValues.xs).eqls([-5, -8]);
+ expect(stateVariables["/C2"].stateValues.xs).eqls([-5, -8]);
expect(stateVariables["/A2"].stateValues.xs).eqls([-2, -5, 4]);
expect(stateVariables["/C3"].stateValues.xs).eqls([-5, -8, 1]);
});
@@ -8175,14 +8175,14 @@ describe("Point Tag Tests 2", function () {
-
- 1
@@ -8207,7 +8207,7 @@ describe("Point Tag Tests 2", function () {
expect(stateVariables["/A1"].stateValues.xs).eqls([-1, 2]);
expect(stateVariables["/B1"].stateValues.xs).eqls([3, -2]);
expect(stateVariables["/C1"].stateValues.xs).eqls([1, 1]);
- expect(stateVariables["/C2/C"].stateValues.xs).eqls([3, 0]);
+ expect(stateVariables["/C2"].stateValues.xs).eqls([3, 0]);
expect(stateVariables["/A2"].stateValues.xs).eqls([1, 2, 4]);
expect(stateVariables["/C3"].stateValues.xs).eqls([3, 0, 1]);
expect(stateVariables["/A"].stateValues.label).eq("A");
@@ -8216,7 +8216,7 @@ describe("Point Tag Tests 2", function () {
expect(stateVariables["/B1"].stateValues.label).eq("B");
expect(stateVariables["/C"].stateValues.label).eq("C");
expect(stateVariables["/C1"].stateValues.label).eq("C");
- expect(stateVariables["/C2/C"].stateValues.label).eq("C");
+ expect(stateVariables["/C2"].stateValues.label).eq("C");
});
cy.log("move original points");
@@ -8249,7 +8249,7 @@ describe("Point Tag Tests 2", function () {
expect(stateVariables["/A1"].stateValues.xs).eqls([-1, -7]);
expect(stateVariables["/B1"].stateValues.xs).eqls([5, -2]);
expect(stateVariables["/C1"].stateValues.xs).eqls([-5, -8]);
- expect(stateVariables["/C2/C"].stateValues.xs).eqls([-3, -6]);
+ expect(stateVariables["/C2"].stateValues.xs).eqls([-3, -6]);
expect(stateVariables["/A2"].stateValues.xs).eqls([-2, -7, 4]);
expect(stateVariables["/C3"].stateValues.xs).eqls([-3, -6, 1]);
});
@@ -8284,7 +8284,7 @@ describe("Point Tag Tests 2", function () {
expect(stateVariables["/A1"].stateValues.xs).eqls([8, -5]);
expect(stateVariables["/B1"].stateValues.xs).eqls([-6, 6]);
expect(stateVariables["/C1"].stateValues.xs).eqls([-7, 4]);
- expect(stateVariables["/C2/C"].stateValues.xs).eqls([-5, -8]);
+ expect(stateVariables["/C2"].stateValues.xs).eqls([-5, -8]);
expect(stateVariables["/A2"].stateValues.xs).eqls([-2, -5, 4]);
expect(stateVariables["/C3"].stateValues.xs).eqls([-5, -8, 1]);
});
@@ -8306,14 +8306,14 @@ describe("Point Tag Tests 2", function () {
-
- 1
@@ -8338,7 +8338,7 @@ describe("Point Tag Tests 2", function () {
expect(stateVariables["/A1"].stateValues.xs).eqls([-1, 2]);
expect(stateVariables["/B1"].stateValues.xs).eqls([3, -2]);
expect(stateVariables["/C1"].stateValues.xs).eqls([1, 1]);
- expect(stateVariables["/C2/C"].stateValues.xs).eqls([3, 0]);
+ expect(stateVariables["/C2"].stateValues.xs).eqls([3, 0]);
expect(stateVariables["/A2"].stateValues.xs).eqls([1, 2, 4]);
expect(stateVariables["/C3"].stateValues.xs).eqls([3, 0, 1]);
expect(stateVariables["/A"].stateValues.label).eq("A");
@@ -8347,7 +8347,7 @@ describe("Point Tag Tests 2", function () {
expect(stateVariables["/B1"].stateValues.label).eq("B");
expect(stateVariables["/C"].stateValues.label).eq("C");
expect(stateVariables["/C1"].stateValues.label).eq("C");
- expect(stateVariables["/C2/C"].stateValues.label).eq("C");
+ expect(stateVariables["/C2"].stateValues.label).eq("C");
});
cy.log("move original points");
@@ -8380,7 +8380,7 @@ describe("Point Tag Tests 2", function () {
expect(stateVariables["/A1"].stateValues.xs).eqls([-1, -7]);
expect(stateVariables["/B1"].stateValues.xs).eqls([5, -2]);
expect(stateVariables["/C1"].stateValues.xs).eqls([-5, -8]);
- expect(stateVariables["/C2/C"].stateValues.xs).eqls([-3, -6]);
+ expect(stateVariables["/C2"].stateValues.xs).eqls([-3, -6]);
expect(stateVariables["/A2"].stateValues.xs).eqls([-2, -7, 4]);
expect(stateVariables["/C3"].stateValues.xs).eqls([-3, -6, 1]);
});
@@ -8415,7 +8415,7 @@ describe("Point Tag Tests 2", function () {
expect(stateVariables["/A1"].stateValues.xs).eqls([8, -5]);
expect(stateVariables["/B1"].stateValues.xs).eqls([-6, 6]);
expect(stateVariables["/C1"].stateValues.xs).eqls([-7, 4]);
- expect(stateVariables["/C2/C"].stateValues.xs).eqls([-5, -8]);
+ expect(stateVariables["/C2"].stateValues.xs).eqls([-5, -8]);
expect(stateVariables["/A2"].stateValues.xs).eqls([-2, -5, 4]);
expect(stateVariables["/C3"].stateValues.xs).eqls([-5, -8, 1]);
});
@@ -8433,19 +8433,19 @@ describe("Point Tag Tests 2", function () {
-
-
-
- $P
$Q
@@ -8667,11 +8667,11 @@ describe("Point Tag Tests 2", function () {
$Q
$R
- $(P.x)
- $P.x
+ $P.y
- $(P.x)
- $P.x
+ $P.y
`,
@@ -8880,26 +8880,26 @@ describe("Point Tag Tests 2", function () {
(1,2)
- We have x^{
+ We have x^{$P.x} + y^{$P.y}
- No latex: x^
+ No latex: x^$Q.x + y^$Q.y
(3,4)
- $P.label and $R.coords
(5,6)
- $Q.label and $S.coords
(7,8)
- Label for P:
- Label for Q:
- Label for R:
- Label for S:
+ Label for P: $P.label
+ Label for Q: $Q.label
+ Label for R: $R.label
+ Label for S: $S.label
`,
},
"*",
@@ -9044,17 +9044,17 @@ describe("Point Tag Tests 2", function () {
(1,2)
- We have x^{
+ We have x^{$P.x} + y^{$P.y}
- No latex: x^
+ No latex: x^$Q.x + y^$Q.y
- Label for P:
- Label for Q:
+ Label for P: $P.label
+ Label for Q: $Q.label
`,
},
"*",
@@ -9159,26 +9159,26 @@ describe("Point Tag Tests 2", function () {
Revert value 1
- The label 1:
+ The label 1:
Change label 2:
Revert value 2
- The label 2:
+ The label 2:
Change label 3:
Revert value 3
- The label 3:
+ The label 3:
Change label 4:
Revert value 4
- The label 4:
+ The label 4:
`,
},
@@ -10510,7 +10510,7 @@ describe("Point Tag Tests 2", function () {
(1, sqrt(-1))
- $C1{assignNames="C1a"}, $C2{assignNames="C2a"}
+ $C1{name="C1a"}, $C2{name="C2a"}
$C1
$C2
diff --git a/cypress/e2e/DoenetML/tagSpecific/polygon.cy.js b/cypress/e2e/DoenetML/tagSpecific/polygon.cy.js
index 47af7151e4..8ccfabe49e 100644
--- a/cypress/e2e/DoenetML/tagSpecific/polygon.cy.js
+++ b/cypress/e2e/DoenetML/tagSpecific/polygon.cy.js
@@ -155,10 +155,10 @@ describe("Polygon Tag Tests", function () {
-
-
-
-
-
-
$v $(g1/pg.vertices)
`,
},
@@ -403,12 +403,12 @@ describe("Polygon Tag Tests", function () {
-
-
$v $(g1/pg.vertices)
`,
},
@@ -451,12 +451,12 @@ describe("Polygon Tag Tests", function () {
-
-
$v $(g1/pg.vertices)
`,
},
@@ -497,15 +497,15 @@ describe("Polygon Tag Tests", function () {
-
-
$v $(g1/pg.vertices)
-
-
$v $(g1/pg.vertices)
-
-
-
-
-
-
-
-
-
-
-
- $_polygon1
-
- $_polygon1
-
- $p
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
$v $(g1/pg.vertices)
`,
},
@@ -403,12 +403,12 @@ describe("Polyline Tag Tests", function () {
-
-
$v $(g1/pg.vertices)
`,
},
@@ -451,12 +451,12 @@ describe("Polyline Tag Tests", function () {
-
-
$v $(g1/pg.vertices)
`,
},
@@ -497,15 +497,15 @@ describe("Polyline Tag Tests", function () {
-
-
$v $(g1/pg.vertices)
-
-
$v $(g1/pg.vertices)
-
-
-
-
-
-
-
-
-
-
-
- $_polyline1
-
- $_polyline1
-
- $p
-
-
-
-
-
-
- Activity
- Credit achieved for
+ Credit achieved for $_document1.title:
+ $_document1.creditAchieved{name="docCa"}, or $_document1.percentCreditAchieved{name="docPca"}%
Enter u : u
Problem 1
- Credit achieved for
+ Credit achieved for $problem1.title:
+ $problem1.creditAchieved{name="p1Ca"}, or $problem1.percentCreditAchieved{name="p1Pca"}%
Enter x : x
Enter y : y
@@ -27,35 +27,35 @@ describe("Problem Tag Tests", function () {
Problem 2
- Credit achieved for
+ Credit achieved for $problem2.title:
+ $problem2.creditAchieved{name="p2Ca"}, or $problem2.percentCreditAchieved{name="p2Pca"}%
Enter z : z
Problem 2.1
- Credit achieved for
+ Credit achieved for $problem21.title:
+ $problem21.creditAchieved{name="p21Ca"}, or $problem21.percentCreditAchieved{name="p21Pca"}%
Enter v : v
Enter w : w
Problem 2.2
- Credit achieved for
+ Credit achieved for $problem22.title:
+ $problem22.creditAchieved{name="p22Ca"}, or $problem22.percentCreditAchieved{name="p22Pca"}%
Enter q : q
Problem 2.2.1
- Credit achieved for
+ Credit achieved for $problem221.title:
+ $problem221.creditAchieved{name="p221Ca"}, or $problem221.percentCreditAchieved{name="p221Pca"}%
Enter r : r
Problem 2.2.2
- Credit achieved for
+ Credit achieved for $problem222.title:
+ $problem222.creditAchieved{name="p222Ca"}, or $problem222.percentCreditAchieved{name="p222Pca"}%
Enter s : s
@@ -691,14 +691,14 @@ describe("Problem Tag Tests", function () {
{
doenetML: `
Activity
- Credit achieved for
+ Credit achieved for $_document1.title:
+ $_document1.creditAchieved{name="docCa"}, or $_document1.percentCreditAchieved{name="docPca"}%
Enter u : u
Problem 1
- Credit achieved for
+ Credit achieved for $problem1.title:
+ $problem1.creditAchieved{name="p1Ca"}, or $problem1.percentCreditAchieved{name="p1Pca"}%
Enter x : x
Enter y : y
@@ -706,14 +706,14 @@ describe("Problem Tag Tests", function () {
Problem 2
- Credit achieved for
+ Credit achieved for $problem2.title:
+ $problem2.creditAchieved{name="p2Ca"}, or $problem2.percentCreditAchieved{name="p2Pca"}%
Enter z : z
Problem 2.1
- Credit achieved for
+ Credit achieved for $problem21.title:
+ $problem21.creditAchieved{name="p21Ca"}, or $problem21.percentCreditAchieved{name="p21Pca"}%
Enter v : v
@@ -721,21 +721,21 @@ describe("Problem Tag Tests", function () {
Problem 2.2
- Credit achieved for
+ Credit achieved for $problem22.title:
+ $problem22.creditAchieved{name="p22Ca"}, or $problem22.percentCreditAchieved{name="p22Pca"}%
Enter q : q
Problem 2.2.1
- Credit achieved for
+ Credit achieved for $problem221.title:
+ $problem221.creditAchieved{name="p221Ca"}, or $problem221.percentCreditAchieved{name="p221Pca"}%
Enter r : r
Problem 2.2.2
- Credit achieved for
+ Credit achieved for $problem222.title:
+ $problem222.creditAchieved{name="p222Ca"}, or $problem222.percentCreditAchieved{name="p222Pca"}%
Enter s : s
@@ -2655,7 +2655,7 @@ describe("Problem Tag Tests", function () {
yellow
- Enter
Enter $(fruit/name{name="e"}):
$(fruit/name)
@@ -2669,7 +2669,7 @@ describe("Problem Tag Tests", function () {
- Credit achieved:
+ Credit achieved: $_document1.creditAchieved{assignNames="ca"}
`;
cy.get("#testRunner_toggleControls").click();
diff --git a/cypress/e2e/DoenetML/tagSpecific/ray.cy.js b/cypress/e2e/DoenetML/tagSpecific/ray.cy.js
index b8601c8f09..7de09f53b7 100644
--- a/cypress/e2e/DoenetML/tagSpecific/ray.cy.js
+++ b/cypress/e2e/DoenetML/tagSpecific/ray.cy.js
@@ -94,14 +94,14 @@ describe("Ray Tag Tests", function () {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- $_ray1
-
- $_ray1
-
- $l
-
-
@@ -2855,19 +2855,19 @@ describe("Ray Tag Tests", function () {
-
-
-
-
- a
-
-
-
-
-
-
-
-
-
-
-
- A link to [Doenet].
- Repeat url:
- The link address is:
- The text linked is:
+ Repeat url: $_ref1{name="ref2"}.
+ The link address is: $_ref1.uri.
+ The text linked is: $_ref1.linktext.
+ $_ref1.linktext.
+ $_ref1.uri -->
`,
},
"*",
@@ -230,15 +230,10 @@ describe("ref Tag Tests", function () {
.invoke("attr", "href")
.then((href) => expect(href).eq("http://doenet.org"));
- cy.window().then(async (win) => {
- let stateVariables = await win.returnAllStateVariables1();
- cy.get(
- cesc2("#" + stateVariables["/_copy1"].replacements[0].componentName),
- )
- .should("have.text", "Doenet")
- .invoke("attr", "href")
- .then((href) => expect(href).eq("http://doenet.org"));
- });
+ cy.get(cesc2("#/ref2"))
+ .should("have.text", "Doenet")
+ .invoke("attr", "href")
+ .then((href) => expect(href).eq("http://doenet.org"));
cy.get(cesc("#\\/_p3")).should(
"have.text",
diff --git a/cypress/e2e/DoenetML/tagSpecific/sampleprimenumbers.cy.js b/cypress/e2e/DoenetML/tagSpecific/sampleprimenumbers.cy.js
index c05bfa9586..9950cf25b3 100644
--- a/cypress/e2e/DoenetML/tagSpecific/sampleprimenumbers.cy.js
+++ b/cypress/e2e/DoenetML/tagSpecific/sampleprimenumbers.cy.js
@@ -12,18 +12,18 @@ describe("SamplePrimeNumbers Tag Tests", function () {
{
doenetML: `
a
-
+
-
-
+ $_map1
- a
-
+
-
-
+ $_map1
- a
-
+
-
-
+ $_map1
- a
-
+
-
-
+ $_map1
- a
-
+
-
-
+ $samples{name="samples2"}
-
-
`,
},
@@ -502,17 +460,17 @@ describe("SamplePrimeNumbers Tag Tests", function () {
-
-
+ $_map1
+ $_aslist1
-
+ $p6{name="p7"}
+ $p7{name="p8"}
+ $p8{name="p9"}
+ $_mathinput1.value{assignNames="m1"}
`,
},
"*",
@@ -539,40 +497,28 @@ describe("SamplePrimeNumbers Tag Tests", function () {
.activeChildren.length,
).eq(0);
expect(
- stateVariables[
- stateVariables[stateVariables["/p4"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p4"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(0);
expect(
- stateVariables[
- stateVariables[stateVariables["/p5"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p5"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(0);
expect(
- stateVariables[
- stateVariables[stateVariables["/p6"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p6"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(0);
expect(
- stateVariables[
- stateVariables[stateVariables["/p7"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p7"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(0);
expect(
- stateVariables[
- stateVariables[stateVariables["/p8"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p8"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(0);
expect(
- stateVariables[
- stateVariables[stateVariables["/p9"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p9"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(0);
});
@@ -599,40 +545,28 @@ describe("SamplePrimeNumbers Tag Tests", function () {
.activeChildren.length,
).eq(1);
expect(
- stateVariables[
- stateVariables[stateVariables["/p4"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p4"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(1);
expect(
- stateVariables[
- stateVariables[stateVariables["/p5"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p5"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(1);
expect(
- stateVariables[
- stateVariables[stateVariables["/p6"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p6"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(1);
expect(
- stateVariables[
- stateVariables[stateVariables["/p7"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p7"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(1);
expect(
- stateVariables[
- stateVariables[stateVariables["/p8"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p8"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(1);
expect(
- stateVariables[
- stateVariables[stateVariables["/p9"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p9"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(1);
for (let ind = 0; ind < 1; ind++) {
expect(
@@ -659,54 +593,42 @@ describe("SamplePrimeNumbers Tag Tests", function () {
expect(
stateVariables[
stateVariables[
- stateVariables[
- stateVariables["/p4"].replacements[0].componentName
- ].activeChildren[0].componentName
+ stateVariables["/p4"].activeChildren[0].componentName
].activeChildren[ind].componentName
].stateValues.value,
).eq(samplednumbers[ind]);
expect(
stateVariables[
stateVariables[
- stateVariables[
- stateVariables["/p5"].replacements[0].componentName
- ].activeChildren[0].componentName
+ stateVariables["/p5"].activeChildren[0].componentName
].activeChildren[ind].componentName
].stateValues.value,
).eq(samplednumbers[ind]);
expect(
stateVariables[
stateVariables[
- stateVariables[
- stateVariables["/p6"].replacements[0].componentName
- ].activeChildren[0].componentName
+ stateVariables["/p6"].activeChildren[0].componentName
].activeChildren[ind].componentName
].stateValues.value,
).eq(samplednumbers[ind]);
expect(
stateVariables[
stateVariables[
- stateVariables[
- stateVariables["/p7"].replacements[0].componentName
- ].activeChildren[0].componentName
+ stateVariables["/p7"].activeChildren[0].componentName
].activeChildren[ind].componentName
].stateValues.value,
).eq(samplednumbers[ind]);
expect(
stateVariables[
stateVariables[
- stateVariables[
- stateVariables["/p8"].replacements[0].componentName
- ].activeChildren[0].componentName
+ stateVariables["/p8"].activeChildren[0].componentName
].activeChildren[ind].componentName
].stateValues.value,
).eq(samplednumbers[ind]);
expect(
stateVariables[
stateVariables[
- stateVariables[
- stateVariables["/p9"].replacements[0].componentName
- ].activeChildren[0].componentName
+ stateVariables["/p9"].activeChildren[0].componentName
].activeChildren[ind].componentName
].stateValues.value,
).eq(samplednumbers[ind]);
@@ -734,40 +656,28 @@ describe("SamplePrimeNumbers Tag Tests", function () {
.activeChildren.length,
).eq(0);
expect(
- stateVariables[
- stateVariables[stateVariables["/p4"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p4"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(0);
expect(
- stateVariables[
- stateVariables[stateVariables["/p5"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p5"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(0);
expect(
- stateVariables[
- stateVariables[stateVariables["/p6"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p6"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(0);
expect(
- stateVariables[
- stateVariables[stateVariables["/p7"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p7"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(0);
expect(
- stateVariables[
- stateVariables[stateVariables["/p8"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p8"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(0);
expect(
- stateVariables[
- stateVariables[stateVariables["/p9"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p9"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(0);
});
@@ -794,40 +704,28 @@ describe("SamplePrimeNumbers Tag Tests", function () {
.activeChildren.length,
).eq(1);
expect(
- stateVariables[
- stateVariables[stateVariables["/p4"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p4"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(1);
expect(
- stateVariables[
- stateVariables[stateVariables["/p5"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p5"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(1);
expect(
- stateVariables[
- stateVariables[stateVariables["/p6"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p6"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(1);
expect(
- stateVariables[
- stateVariables[stateVariables["/p7"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p7"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(1);
expect(
- stateVariables[
- stateVariables[stateVariables["/p8"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p8"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(1);
expect(
- stateVariables[
- stateVariables[stateVariables["/p9"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p9"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(1);
for (let ind = 0; ind < 1; ind++) {
@@ -855,54 +753,42 @@ describe("SamplePrimeNumbers Tag Tests", function () {
expect(
stateVariables[
stateVariables[
- stateVariables[
- stateVariables["/p4"].replacements[0].componentName
- ].activeChildren[0].componentName
+ stateVariables["/p4"].activeChildren[0].componentName
].activeChildren[ind].componentName
].stateValues.value,
).eq(samplednumbers[ind]);
expect(
stateVariables[
stateVariables[
- stateVariables[
- stateVariables["/p5"].replacements[0].componentName
- ].activeChildren[0].componentName
+ stateVariables["/p5"].activeChildren[0].componentName
].activeChildren[ind].componentName
].stateValues.value,
).eq(samplednumbers[ind]);
expect(
stateVariables[
stateVariables[
- stateVariables[
- stateVariables["/p6"].replacements[0].componentName
- ].activeChildren[0].componentName
+ stateVariables["/p6"].activeChildren[0].componentName
].activeChildren[ind].componentName
].stateValues.value,
).eq(samplednumbers[ind]);
expect(
stateVariables[
stateVariables[
- stateVariables[
- stateVariables["/p7"].replacements[0].componentName
- ].activeChildren[0].componentName
+ stateVariables["/p7"].activeChildren[0].componentName
].activeChildren[ind].componentName
].stateValues.value,
).eq(samplednumbers[ind]);
expect(
stateVariables[
stateVariables[
- stateVariables[
- stateVariables["/p8"].replacements[0].componentName
- ].activeChildren[0].componentName
+ stateVariables["/p8"].activeChildren[0].componentName
].activeChildren[ind].componentName
].stateValues.value,
).eq(samplednumbers[ind]);
expect(
stateVariables[
stateVariables[
- stateVariables[
- stateVariables["/p9"].replacements[0].componentName
- ].activeChildren[0].componentName
+ stateVariables["/p9"].activeChildren[0].componentName
].activeChildren[ind].componentName
].stateValues.value,
).eq(samplednumbers[ind]);
@@ -936,40 +822,28 @@ describe("SamplePrimeNumbers Tag Tests", function () {
.activeChildren.length,
).eq(3);
expect(
- stateVariables[
- stateVariables[stateVariables["/p4"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p4"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(3);
expect(
- stateVariables[
- stateVariables[stateVariables["/p5"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p5"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(3);
expect(
- stateVariables[
- stateVariables[stateVariables["/p6"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p6"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(3);
expect(
- stateVariables[
- stateVariables[stateVariables["/p7"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p7"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(3);
expect(
- stateVariables[
- stateVariables[stateVariables["/p8"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p8"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(3);
expect(
- stateVariables[
- stateVariables[stateVariables["/p9"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p9"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(3);
for (let ind = 0; ind < 3; ind++) {
expect(
@@ -996,54 +870,42 @@ describe("SamplePrimeNumbers Tag Tests", function () {
expect(
stateVariables[
stateVariables[
- stateVariables[
- stateVariables["/p4"].replacements[0].componentName
- ].activeChildren[0].componentName
+ stateVariables["/p4"].activeChildren[0].componentName
].activeChildren[ind].componentName
].stateValues.value,
).eq(samplednumbers[ind]);
expect(
stateVariables[
stateVariables[
- stateVariables[
- stateVariables["/p5"].replacements[0].componentName
- ].activeChildren[0].componentName
+ stateVariables["/p5"].activeChildren[0].componentName
].activeChildren[ind].componentName
].stateValues.value,
).eq(samplednumbers[ind]);
expect(
stateVariables[
stateVariables[
- stateVariables[
- stateVariables["/p6"].replacements[0].componentName
- ].activeChildren[0].componentName
+ stateVariables["/p6"].activeChildren[0].componentName
].activeChildren[ind].componentName
].stateValues.value,
).eq(samplednumbers[ind]);
expect(
stateVariables[
stateVariables[
- stateVariables[
- stateVariables["/p7"].replacements[0].componentName
- ].activeChildren[0].componentName
+ stateVariables["/p7"].activeChildren[0].componentName
].activeChildren[ind].componentName
].stateValues.value,
).eq(samplednumbers[ind]);
expect(
stateVariables[
stateVariables[
- stateVariables[
- stateVariables["/p8"].replacements[0].componentName
- ].activeChildren[0].componentName
+ stateVariables["/p8"].activeChildren[0].componentName
].activeChildren[ind].componentName
].stateValues.value,
).eq(samplednumbers[ind]);
expect(
stateVariables[
stateVariables[
- stateVariables[
- stateVariables["/p9"].replacements[0].componentName
- ].activeChildren[0].componentName
+ stateVariables["/p9"].activeChildren[0].componentName
].activeChildren[ind].componentName
].stateValues.value,
).eq(samplednumbers[ind]);
@@ -1071,40 +933,28 @@ describe("SamplePrimeNumbers Tag Tests", function () {
.activeChildren.length,
).eq(0);
expect(
- stateVariables[
- stateVariables[stateVariables["/p4"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p4"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(0);
expect(
- stateVariables[
- stateVariables[stateVariables["/p5"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p5"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(0);
expect(
- stateVariables[
- stateVariables[stateVariables["/p6"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p6"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(0);
expect(
- stateVariables[
- stateVariables[stateVariables["/p7"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p7"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(0);
expect(
- stateVariables[
- stateVariables[stateVariables["/p8"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p8"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(0);
expect(
- stateVariables[
- stateVariables[stateVariables["/p9"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p9"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(0);
});
@@ -1133,40 +983,28 @@ describe("SamplePrimeNumbers Tag Tests", function () {
.activeChildren.length,
).eq(2);
expect(
- stateVariables[
- stateVariables[stateVariables["/p4"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p4"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(2);
expect(
- stateVariables[
- stateVariables[stateVariables["/p5"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p5"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(2);
expect(
- stateVariables[
- stateVariables[stateVariables["/p6"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p6"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(2);
expect(
- stateVariables[
- stateVariables[stateVariables["/p7"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p7"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(2);
expect(
- stateVariables[
- stateVariables[stateVariables["/p8"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p8"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(2);
expect(
- stateVariables[
- stateVariables[stateVariables["/p9"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p9"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(2);
for (let ind = 0; ind < 2; ind++) {
@@ -1194,54 +1032,42 @@ describe("SamplePrimeNumbers Tag Tests", function () {
expect(
stateVariables[
stateVariables[
- stateVariables[
- stateVariables["/p4"].replacements[0].componentName
- ].activeChildren[0].componentName
+ stateVariables["/p4"].activeChildren[0].componentName
].activeChildren[ind].componentName
].stateValues.value,
).eq(samplednumbers[ind]);
expect(
stateVariables[
stateVariables[
- stateVariables[
- stateVariables["/p5"].replacements[0].componentName
- ].activeChildren[0].componentName
+ stateVariables["/p5"].activeChildren[0].componentName
].activeChildren[ind].componentName
].stateValues.value,
).eq(samplednumbers[ind]);
expect(
stateVariables[
stateVariables[
- stateVariables[
- stateVariables["/p6"].replacements[0].componentName
- ].activeChildren[0].componentName
+ stateVariables["/p6"].activeChildren[0].componentName
].activeChildren[ind].componentName
].stateValues.value,
).eq(samplednumbers[ind]);
expect(
stateVariables[
stateVariables[
- stateVariables[
- stateVariables["/p7"].replacements[0].componentName
- ].activeChildren[0].componentName
+ stateVariables["/p7"].activeChildren[0].componentName
].activeChildren[ind].componentName
].stateValues.value,
).eq(samplednumbers[ind]);
expect(
stateVariables[
stateVariables[
- stateVariables[
- stateVariables["/p8"].replacements[0].componentName
- ].activeChildren[0].componentName
+ stateVariables["/p8"].activeChildren[0].componentName
].activeChildren[ind].componentName
].stateValues.value,
).eq(samplednumbers[ind]);
expect(
stateVariables[
stateVariables[
- stateVariables[
- stateVariables["/p9"].replacements[0].componentName
- ].activeChildren[0].componentName
+ stateVariables["/p9"].activeChildren[0].componentName
].activeChildren[ind].componentName
].stateValues.value,
).eq(samplednumbers[ind]);
@@ -1281,40 +1107,28 @@ describe("SamplePrimeNumbers Tag Tests", function () {
.activeChildren.length,
).eq(6);
expect(
- stateVariables[
- stateVariables[stateVariables["/p4"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p4"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(6);
expect(
- stateVariables[
- stateVariables[stateVariables["/p5"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p5"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(6);
expect(
- stateVariables[
- stateVariables[stateVariables["/p6"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p6"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(6);
expect(
- stateVariables[
- stateVariables[stateVariables["/p7"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p7"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(6);
expect(
- stateVariables[
- stateVariables[stateVariables["/p8"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p8"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(6);
expect(
- stateVariables[
- stateVariables[stateVariables["/p9"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p9"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(6);
for (let ind = 0; ind < 6; ind++) {
expect(
@@ -1341,54 +1155,42 @@ describe("SamplePrimeNumbers Tag Tests", function () {
expect(
stateVariables[
stateVariables[
- stateVariables[
- stateVariables["/p4"].replacements[0].componentName
- ].activeChildren[0].componentName
+ stateVariables["/p4"].activeChildren[0].componentName
].activeChildren[ind].componentName
].stateValues.value,
).eq(samplednumbers[ind]);
expect(
stateVariables[
stateVariables[
- stateVariables[
- stateVariables["/p5"].replacements[0].componentName
- ].activeChildren[0].componentName
+ stateVariables["/p5"].activeChildren[0].componentName
].activeChildren[ind].componentName
].stateValues.value,
).eq(samplednumbers[ind]);
expect(
stateVariables[
stateVariables[
- stateVariables[
- stateVariables["/p6"].replacements[0].componentName
- ].activeChildren[0].componentName
+ stateVariables["/p6"].activeChildren[0].componentName
].activeChildren[ind].componentName
].stateValues.value,
).eq(samplednumbers[ind]);
expect(
stateVariables[
stateVariables[
- stateVariables[
- stateVariables["/p7"].replacements[0].componentName
- ].activeChildren[0].componentName
+ stateVariables["/p7"].activeChildren[0].componentName
].activeChildren[ind].componentName
].stateValues.value,
).eq(samplednumbers[ind]);
expect(
stateVariables[
stateVariables[
- stateVariables[
- stateVariables["/p8"].replacements[0].componentName
- ].activeChildren[0].componentName
+ stateVariables["/p8"].activeChildren[0].componentName
].activeChildren[ind].componentName
].stateValues.value,
).eq(samplednumbers[ind]);
expect(
stateVariables[
stateVariables[
- stateVariables[
- stateVariables["/p9"].replacements[0].componentName
- ].activeChildren[0].componentName
+ stateVariables["/p9"].activeChildren[0].componentName
].activeChildren[ind].componentName
].stateValues.value,
).eq(samplednumbers[ind]);
@@ -1416,40 +1218,28 @@ describe("SamplePrimeNumbers Tag Tests", function () {
.activeChildren.length,
).eq(0);
expect(
- stateVariables[
- stateVariables[stateVariables["/p4"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p4"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(0);
expect(
- stateVariables[
- stateVariables[stateVariables["/p5"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p5"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(0);
expect(
- stateVariables[
- stateVariables[stateVariables["/p6"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p6"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(0);
expect(
- stateVariables[
- stateVariables[stateVariables["/p7"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p7"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(0);
expect(
- stateVariables[
- stateVariables[stateVariables["/p8"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p8"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(0);
expect(
- stateVariables[
- stateVariables[stateVariables["/p9"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p9"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(0);
});
@@ -1486,40 +1276,28 @@ describe("SamplePrimeNumbers Tag Tests", function () {
.activeChildren.length,
).eq(6);
expect(
- stateVariables[
- stateVariables[stateVariables["/p4"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p4"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(6);
expect(
- stateVariables[
- stateVariables[stateVariables["/p5"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p5"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(6);
expect(
- stateVariables[
- stateVariables[stateVariables["/p6"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p6"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(6);
expect(
- stateVariables[
- stateVariables[stateVariables["/p7"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p7"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(6);
expect(
- stateVariables[
- stateVariables[stateVariables["/p8"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p8"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(6);
expect(
- stateVariables[
- stateVariables[stateVariables["/p9"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p9"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(6);
for (let ind = 0; ind < 6; ind++) {
expect(
@@ -1546,54 +1324,42 @@ describe("SamplePrimeNumbers Tag Tests", function () {
expect(
stateVariables[
stateVariables[
- stateVariables[
- stateVariables["/p4"].replacements[0].componentName
- ].activeChildren[0].componentName
+ stateVariables["/p4"].activeChildren[0].componentName
].activeChildren[ind].componentName
].stateValues.value,
).eq(samplednumbers[ind]);
expect(
stateVariables[
stateVariables[
- stateVariables[
- stateVariables["/p5"].replacements[0].componentName
- ].activeChildren[0].componentName
+ stateVariables["/p5"].activeChildren[0].componentName
].activeChildren[ind].componentName
].stateValues.value,
).eq(samplednumbers[ind]);
expect(
stateVariables[
stateVariables[
- stateVariables[
- stateVariables["/p6"].replacements[0].componentName
- ].activeChildren[0].componentName
+ stateVariables["/p6"].activeChildren[0].componentName
].activeChildren[ind].componentName
].stateValues.value,
).eq(samplednumbers[ind]);
expect(
stateVariables[
stateVariables[
- stateVariables[
- stateVariables["/p7"].replacements[0].componentName
- ].activeChildren[0].componentName
+ stateVariables["/p7"].activeChildren[0].componentName
].activeChildren[ind].componentName
].stateValues.value,
).eq(samplednumbers[ind]);
expect(
stateVariables[
stateVariables[
- stateVariables[
- stateVariables["/p8"].replacements[0].componentName
- ].activeChildren[0].componentName
+ stateVariables["/p8"].activeChildren[0].componentName
].activeChildren[ind].componentName
].stateValues.value,
).eq(samplednumbers[ind]);
expect(
stateVariables[
stateVariables[
- stateVariables[
- stateVariables["/p9"].replacements[0].componentName
- ].activeChildren[0].componentName
+ stateVariables["/p9"].activeChildren[0].componentName
].activeChildren[ind].componentName
].stateValues.value,
).eq(samplednumbers[ind]);
@@ -1610,9 +1376,9 @@ describe("SamplePrimeNumbers Tag Tests", function () {
-
-
-
+ $u{name="u2"}
+ $v{name="v2"}
+ $w{name="w2"}
`,
},
"*",
@@ -1653,9 +1419,9 @@ describe("SamplePrimeNumbers Tag Tests", function () {
-
-
-
+ $u{name="u2"}
+ $v{name="v2"}
+ $w{name="w2"}
`,
},
"*",
@@ -1720,9 +1486,9 @@ describe("SamplePrimeNumbers Tag Tests", function () {
-
-
-
+ $(s/u{name="u2"})
+ $(s/v{name="v2"})
+ $(s/w{name="w2"})
`,
},
"*",
@@ -1778,10 +1544,46 @@ describe("SamplePrimeNumbers Tag Tests", function () {
});
});
+ it("asList", () => {
+ cy.window().then(async (win) => {
+ win.postMessage(
+ {
+ doenetML: `
+ a
+
+
+
+ `,
+ },
+ "*",
+ );
+ });
+
+ cy.get(cesc("#\\/_text1")).should("have.text", "a"); //wait for page to load
+
+ let results = [];
+
+ cy.window().then(async (win) => {
+ let stateVariables = await win.returnAllStateVariables1();
+
+ results.push(stateVariables["/u"].stateValues.value);
+ results.push(stateVariables["/v"].stateValues.value);
+ results.push(stateVariables["/w"].stateValues.value);
+ results.push(stateVariables["/x"].stateValues.value);
+ results.push(stateVariables["/y"].stateValues.value);
+
+ for (let num of results) {
+ expect([179, 181, 191, 193, 197, 199].includes(num));
+ }
+ cy.get(cesc2("#/_p1")).should("have.text", results.join(", "));
+ cy.get(cesc2("#/_p2")).should("have.text", results.join(""));
+ });
+ });
+
it(`different numbers when reload page if don't save state`, () => {
let doenetML = `
a
-
+
a
-
+
a
-
+
a
-
+
-
-
+ $_map1
- a
-
+
-
-
+ $_map1
- a
-
+
-
-
+ $_map1
- a
-
+
-
-
+ $_map1
- a
-
+
-
-
+ $_map1
- a
-
+
-
-
+ $_map1
- a
-
+
-
-
+ $_map1
- a
-
+
-
-
+ $_map1
- a
-
+
-
-
+ $_map1
- a
-
+
-
-
+ $_map1
- a
-
+
-
-
+ $_map1
- a
-
+
-
-
+ $_map1
- a
-
+
-
-
+ $_map1
- a
-
+
-
-
+ $_map1
- a
-
+
-
-
+ $_map1
- a
-
+
-
-
+ $_map1
- a
-
+
-
-
+ $_map1
- a
-
+
-
-
+ $_map1
- a
-
+
-
-
+ $_map1
- a
-
+
-
-
+ $_map1
- a
-
+
-
-
+ $_map1
-
-
`,
},
@@ -1959,17 +1713,17 @@ describe("SampleRandomNumbers Tag Tests", function () {
-
-
+ $_map1
+ $_aslist1
-
+ $p4{name="p7"}
+ $p5{name="p8"}
+ $p6{name="p9"}
+ $_mathinput1{name="m1"}
`,
},
"*",
@@ -1983,54 +1737,7 @@ describe("SampleRandomNumbers Tag Tests", function () {
cy.log("initially nothing");
cy.window().then(async (win) => {
let stateVariables = await win.returnAllStateVariables1();
- expect(
- stateVariables[stateVariables["/p1"].activeChildren[0].componentName]
- .activeChildren.length,
- ).eq(0);
- expect(
- stateVariables[stateVariables["/p2"].activeChildren[0].componentName]
- .activeChildren.length,
- ).eq(0);
- expect(
- stateVariables[stateVariables["/p3"].activeChildren[0].componentName]
- .activeChildren.length,
- ).eq(0);
- expect(
- stateVariables[
- stateVariables[stateVariables["/p4"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
- ).eq(0);
- expect(
- stateVariables[
- stateVariables[stateVariables["/p5"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
- ).eq(0);
- expect(
- stateVariables[
- stateVariables[stateVariables["/p6"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
- ).eq(0);
- expect(
- stateVariables[
- stateVariables[stateVariables["/p7"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
- ).eq(0);
- expect(
- stateVariables[
- stateVariables[stateVariables["/p8"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
- ).eq(0);
- expect(
- stateVariables[
- stateVariables[stateVariables["/p9"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
- ).eq(0);
+ checkSampledNumbers(stateVariables, []);
});
cy.log("sample one number");
@@ -2043,131 +1750,8 @@ describe("SampleRandomNumbers Tag Tests", function () {
let stateVariables = await win.returnAllStateVariables1();
let n1 = stateVariables["/a/n"].stateValues.value;
samplednumbers.push(n1);
- expect(
- stateVariables[stateVariables["/p1"].activeChildren[0].componentName]
- .activeChildren.length,
- ).eq(1);
- expect(
- stateVariables[stateVariables["/p2"].activeChildren[0].componentName]
- .activeChildren.length,
- ).eq(1);
- expect(
- stateVariables[stateVariables["/p3"].activeChildren[0].componentName]
- .activeChildren.length,
- ).eq(1);
- expect(
- stateVariables[
- stateVariables[stateVariables["/p4"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
- ).eq(1);
- expect(
- stateVariables[
- stateVariables[stateVariables["/p5"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
- ).eq(1);
- expect(
- stateVariables[
- stateVariables[stateVariables["/p6"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
- ).eq(1);
- expect(
- stateVariables[
- stateVariables[stateVariables["/p7"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
- ).eq(1);
- expect(
- stateVariables[
- stateVariables[stateVariables["/p8"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
- ).eq(1);
- expect(
- stateVariables[
- stateVariables[stateVariables["/p9"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
- ).eq(1);
- for (let ind = 0; ind < 1; ind++) {
- expect(
- stateVariables[
- stateVariables[
- stateVariables["/p1"].activeChildren[0].componentName
- ].activeChildren[ind].componentName
- ].stateValues.value,
- ).eq(samplednumbers[ind]);
- expect(
- stateVariables[
- stateVariables[
- stateVariables["/p2"].activeChildren[0].componentName
- ].activeChildren[ind].componentName
- ].stateValues.value,
- ).eq(samplednumbers[ind]);
- expect(
- stateVariables[
- stateVariables[
- stateVariables["/p3"].activeChildren[0].componentName
- ].activeChildren[ind].componentName
- ].stateValues.value,
- ).eq(samplednumbers[ind]);
- expect(
- stateVariables[
- stateVariables[
- stateVariables[
- stateVariables["/p4"].replacements[0].componentName
- ].activeChildren[0].componentName
- ].activeChildren[ind].componentName
- ].stateValues.value,
- ).eq(samplednumbers[ind]);
- expect(
- stateVariables[
- stateVariables[
- stateVariables[
- stateVariables["/p5"].replacements[0].componentName
- ].activeChildren[0].componentName
- ].activeChildren[ind].componentName
- ].stateValues.value,
- ).eq(samplednumbers[ind]);
- expect(
- stateVariables[
- stateVariables[
- stateVariables[
- stateVariables["/p6"].replacements[0].componentName
- ].activeChildren[0].componentName
- ].activeChildren[ind].componentName
- ].stateValues.value,
- ).eq(samplednumbers[ind]);
- expect(
- stateVariables[
- stateVariables[
- stateVariables[
- stateVariables["/p7"].replacements[0].componentName
- ].activeChildren[0].componentName
- ].activeChildren[ind].componentName
- ].stateValues.value,
- ).eq(samplednumbers[ind]);
- expect(
- stateVariables[
- stateVariables[
- stateVariables[
- stateVariables["/p8"].replacements[0].componentName
- ].activeChildren[0].componentName
- ].activeChildren[ind].componentName
- ].stateValues.value,
- ).eq(samplednumbers[ind]);
- expect(
- stateVariables[
- stateVariables[
- stateVariables[
- stateVariables["/p9"].replacements[0].componentName
- ].activeChildren[0].componentName
- ].activeChildren[ind].componentName
- ].stateValues.value,
- ).eq(samplednumbers[ind]);
- }
+
+ checkSampledNumbers(stateVariables, samplednumbers);
});
cy.log("go back to nothing");
@@ -2178,54 +1762,7 @@ describe("SampleRandomNumbers Tag Tests", function () {
cy.get(cesc("#\\/m1")).should("contain.text", "0");
cy.window().then(async (win) => {
let stateVariables = await win.returnAllStateVariables1();
- expect(
- stateVariables[stateVariables["/p1"].activeChildren[0].componentName]
- .activeChildren.length,
- ).eq(0);
- expect(
- stateVariables[stateVariables["/p2"].activeChildren[0].componentName]
- .activeChildren.length,
- ).eq(0);
- expect(
- stateVariables[stateVariables["/p3"].activeChildren[0].componentName]
- .activeChildren.length,
- ).eq(0);
- expect(
- stateVariables[
- stateVariables[stateVariables["/p4"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
- ).eq(0);
- expect(
- stateVariables[
- stateVariables[stateVariables["/p5"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
- ).eq(0);
- expect(
- stateVariables[
- stateVariables[stateVariables["/p6"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
- ).eq(0);
- expect(
- stateVariables[
- stateVariables[stateVariables["/p7"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
- ).eq(0);
- expect(
- stateVariables[
- stateVariables[stateVariables["/p8"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
- ).eq(0);
- expect(
- stateVariables[
- stateVariables[stateVariables["/p9"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
- ).eq(0);
+ checkSampledNumbers(stateVariables, []);
});
cy.log("get same number back");
@@ -2238,132 +1775,7 @@ describe("SampleRandomNumbers Tag Tests", function () {
let stateVariables = await win.returnAllStateVariables1();
let n1 = stateVariables["/a/n"].stateValues.value;
expect(n1).eq(samplednumbers[0]);
- expect(
- stateVariables[stateVariables["/p1"].activeChildren[0].componentName]
- .activeChildren.length,
- ).eq(1);
- expect(
- stateVariables[stateVariables["/p2"].activeChildren[0].componentName]
- .activeChildren.length,
- ).eq(1);
- expect(
- stateVariables[stateVariables["/p3"].activeChildren[0].componentName]
- .activeChildren.length,
- ).eq(1);
- expect(
- stateVariables[
- stateVariables[stateVariables["/p4"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
- ).eq(1);
- expect(
- stateVariables[
- stateVariables[stateVariables["/p5"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
- ).eq(1);
- expect(
- stateVariables[
- stateVariables[stateVariables["/p6"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
- ).eq(1);
- expect(
- stateVariables[
- stateVariables[stateVariables["/p7"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
- ).eq(1);
- expect(
- stateVariables[
- stateVariables[stateVariables["/p8"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
- ).eq(1);
- expect(
- stateVariables[
- stateVariables[stateVariables["/p9"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
- ).eq(1);
-
- for (let ind = 0; ind < 1; ind++) {
- expect(
- stateVariables[
- stateVariables[
- stateVariables["/p1"].activeChildren[0].componentName
- ].activeChildren[ind].componentName
- ].stateValues.value,
- ).eq(samplednumbers[ind]);
- expect(
- stateVariables[
- stateVariables[
- stateVariables["/p2"].activeChildren[0].componentName
- ].activeChildren[ind].componentName
- ].stateValues.value,
- ).eq(samplednumbers[ind]);
- expect(
- stateVariables[
- stateVariables[
- stateVariables["/p3"].activeChildren[0].componentName
- ].activeChildren[ind].componentName
- ].stateValues.value,
- ).eq(samplednumbers[ind]);
- expect(
- stateVariables[
- stateVariables[
- stateVariables[
- stateVariables["/p4"].replacements[0].componentName
- ].activeChildren[0].componentName
- ].activeChildren[ind].componentName
- ].stateValues.value,
- ).eq(samplednumbers[ind]);
- expect(
- stateVariables[
- stateVariables[
- stateVariables[
- stateVariables["/p5"].replacements[0].componentName
- ].activeChildren[0].componentName
- ].activeChildren[ind].componentName
- ].stateValues.value,
- ).eq(samplednumbers[ind]);
- expect(
- stateVariables[
- stateVariables[
- stateVariables[
- stateVariables["/p6"].replacements[0].componentName
- ].activeChildren[0].componentName
- ].activeChildren[ind].componentName
- ].stateValues.value,
- ).eq(samplednumbers[ind]);
- expect(
- stateVariables[
- stateVariables[
- stateVariables[
- stateVariables["/p7"].replacements[0].componentName
- ].activeChildren[0].componentName
- ].activeChildren[ind].componentName
- ].stateValues.value,
- ).eq(samplednumbers[ind]);
- expect(
- stateVariables[
- stateVariables[
- stateVariables[
- stateVariables["/p8"].replacements[0].componentName
- ].activeChildren[0].componentName
- ].activeChildren[ind].componentName
- ].stateValues.value,
- ).eq(samplednumbers[ind]);
- expect(
- stateVariables[
- stateVariables[
- stateVariables[
- stateVariables["/p9"].replacements[0].componentName
- ].activeChildren[0].componentName
- ].activeChildren[ind].componentName
- ].stateValues.value,
- ).eq(samplednumbers[ind]);
- }
+ checkSampledNumbers(stateVariables, samplednumbers);
});
cy.log("get two more samples");
@@ -2380,131 +1792,7 @@ describe("SampleRandomNumbers Tag Tests", function () {
expect(n1).eq(samplednumbers[0]);
samplednumbers.push(n2);
samplednumbers.push(n3);
- expect(
- stateVariables[stateVariables["/p1"].activeChildren[0].componentName]
- .activeChildren.length,
- ).eq(3);
- expect(
- stateVariables[stateVariables["/p2"].activeChildren[0].componentName]
- .activeChildren.length,
- ).eq(3);
- expect(
- stateVariables[stateVariables["/p3"].activeChildren[0].componentName]
- .activeChildren.length,
- ).eq(3);
- expect(
- stateVariables[
- stateVariables[stateVariables["/p4"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
- ).eq(3);
- expect(
- stateVariables[
- stateVariables[stateVariables["/p5"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
- ).eq(3);
- expect(
- stateVariables[
- stateVariables[stateVariables["/p6"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
- ).eq(3);
- expect(
- stateVariables[
- stateVariables[stateVariables["/p7"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
- ).eq(3);
- expect(
- stateVariables[
- stateVariables[stateVariables["/p8"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
- ).eq(3);
- expect(
- stateVariables[
- stateVariables[stateVariables["/p9"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
- ).eq(3);
- for (let ind = 0; ind < 3; ind++) {
- expect(
- stateVariables[
- stateVariables[
- stateVariables["/p1"].activeChildren[0].componentName
- ].activeChildren[ind].componentName
- ].stateValues.value,
- ).eq(samplednumbers[ind]);
- expect(
- stateVariables[
- stateVariables[
- stateVariables["/p2"].activeChildren[0].componentName
- ].activeChildren[ind].componentName
- ].stateValues.value,
- ).eq(samplednumbers[ind]);
- expect(
- stateVariables[
- stateVariables[
- stateVariables["/p3"].activeChildren[0].componentName
- ].activeChildren[ind].componentName
- ].stateValues.value,
- ).eq(samplednumbers[ind]);
- expect(
- stateVariables[
- stateVariables[
- stateVariables[
- stateVariables["/p4"].replacements[0].componentName
- ].activeChildren[0].componentName
- ].activeChildren[ind].componentName
- ].stateValues.value,
- ).eq(samplednumbers[ind]);
- expect(
- stateVariables[
- stateVariables[
- stateVariables[
- stateVariables["/p5"].replacements[0].componentName
- ].activeChildren[0].componentName
- ].activeChildren[ind].componentName
- ].stateValues.value,
- ).eq(samplednumbers[ind]);
- expect(
- stateVariables[
- stateVariables[
- stateVariables[
- stateVariables["/p6"].replacements[0].componentName
- ].activeChildren[0].componentName
- ].activeChildren[ind].componentName
- ].stateValues.value,
- ).eq(samplednumbers[ind]);
- expect(
- stateVariables[
- stateVariables[
- stateVariables[
- stateVariables["/p7"].replacements[0].componentName
- ].activeChildren[0].componentName
- ].activeChildren[ind].componentName
- ].stateValues.value,
- ).eq(samplednumbers[ind]);
- expect(
- stateVariables[
- stateVariables[
- stateVariables[
- stateVariables["/p8"].replacements[0].componentName
- ].activeChildren[0].componentName
- ].activeChildren[ind].componentName
- ].stateValues.value,
- ).eq(samplednumbers[ind]);
- expect(
- stateVariables[
- stateVariables[
- stateVariables[
- stateVariables["/p9"].replacements[0].componentName
- ].activeChildren[0].componentName
- ].activeChildren[ind].componentName
- ].stateValues.value,
- ).eq(samplednumbers[ind]);
- }
+ checkSampledNumbers(stateVariables, samplednumbers);
});
cy.log("go back to nothing");
@@ -2515,54 +1803,7 @@ describe("SampleRandomNumbers Tag Tests", function () {
cy.get(cesc("#\\/m1")).should("contain.text", "0");
cy.window().then(async (win) => {
let stateVariables = await win.returnAllStateVariables1();
- expect(
- stateVariables[stateVariables["/p1"].activeChildren[0].componentName]
- .activeChildren.length,
- ).eq(0);
- expect(
- stateVariables[stateVariables["/p2"].activeChildren[0].componentName]
- .activeChildren.length,
- ).eq(0);
- expect(
- stateVariables[stateVariables["/p3"].activeChildren[0].componentName]
- .activeChildren.length,
- ).eq(0);
- expect(
- stateVariables[
- stateVariables[stateVariables["/p4"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
- ).eq(0);
- expect(
- stateVariables[
- stateVariables[stateVariables["/p5"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
- ).eq(0);
- expect(
- stateVariables[
- stateVariables[stateVariables["/p6"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
- ).eq(0);
- expect(
- stateVariables[
- stateVariables[stateVariables["/p7"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
- ).eq(0);
- expect(
- stateVariables[
- stateVariables[stateVariables["/p8"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
- ).eq(0);
- expect(
- stateVariables[
- stateVariables[stateVariables["/p9"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
- ).eq(0);
+ checkSampledNumbers(stateVariables, []);
});
cy.log("get first two numbers back");
@@ -2577,132 +1818,7 @@ describe("SampleRandomNumbers Tag Tests", function () {
let n2 = stateVariables["/b/n"].stateValues.value;
expect(n1).eq(samplednumbers[0]);
expect(n2).eq(samplednumbers[1]);
- expect(
- stateVariables[stateVariables["/p1"].activeChildren[0].componentName]
- .activeChildren.length,
- ).eq(2);
- expect(
- stateVariables[stateVariables["/p2"].activeChildren[0].componentName]
- .activeChildren.length,
- ).eq(2);
- expect(
- stateVariables[stateVariables["/p3"].activeChildren[0].componentName]
- .activeChildren.length,
- ).eq(2);
- expect(
- stateVariables[
- stateVariables[stateVariables["/p4"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
- ).eq(2);
- expect(
- stateVariables[
- stateVariables[stateVariables["/p5"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
- ).eq(2);
- expect(
- stateVariables[
- stateVariables[stateVariables["/p6"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
- ).eq(2);
- expect(
- stateVariables[
- stateVariables[stateVariables["/p7"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
- ).eq(2);
- expect(
- stateVariables[
- stateVariables[stateVariables["/p8"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
- ).eq(2);
- expect(
- stateVariables[
- stateVariables[stateVariables["/p9"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
- ).eq(2);
-
- for (let ind = 0; ind < 2; ind++) {
- expect(
- stateVariables[
- stateVariables[
- stateVariables["/p1"].activeChildren[0].componentName
- ].activeChildren[ind].componentName
- ].stateValues.value,
- ).eq(samplednumbers[ind]);
- expect(
- stateVariables[
- stateVariables[
- stateVariables["/p2"].activeChildren[0].componentName
- ].activeChildren[ind].componentName
- ].stateValues.value,
- ).eq(samplednumbers[ind]);
- expect(
- stateVariables[
- stateVariables[
- stateVariables["/p3"].activeChildren[0].componentName
- ].activeChildren[ind].componentName
- ].stateValues.value,
- ).eq(samplednumbers[ind]);
- expect(
- stateVariables[
- stateVariables[
- stateVariables[
- stateVariables["/p4"].replacements[0].componentName
- ].activeChildren[0].componentName
- ].activeChildren[ind].componentName
- ].stateValues.value,
- ).eq(samplednumbers[ind]);
- expect(
- stateVariables[
- stateVariables[
- stateVariables[
- stateVariables["/p5"].replacements[0].componentName
- ].activeChildren[0].componentName
- ].activeChildren[ind].componentName
- ].stateValues.value,
- ).eq(samplednumbers[ind]);
- expect(
- stateVariables[
- stateVariables[
- stateVariables[
- stateVariables["/p6"].replacements[0].componentName
- ].activeChildren[0].componentName
- ].activeChildren[ind].componentName
- ].stateValues.value,
- ).eq(samplednumbers[ind]);
- expect(
- stateVariables[
- stateVariables[
- stateVariables[
- stateVariables["/p7"].replacements[0].componentName
- ].activeChildren[0].componentName
- ].activeChildren[ind].componentName
- ].stateValues.value,
- ).eq(samplednumbers[ind]);
- expect(
- stateVariables[
- stateVariables[
- stateVariables[
- stateVariables["/p8"].replacements[0].componentName
- ].activeChildren[0].componentName
- ].activeChildren[ind].componentName
- ].stateValues.value,
- ).eq(samplednumbers[ind]);
- expect(
- stateVariables[
- stateVariables[
- stateVariables[
- stateVariables["/p9"].replacements[0].componentName
- ].activeChildren[0].componentName
- ].activeChildren[ind].componentName
- ].stateValues.value,
- ).eq(samplednumbers[ind]);
- }
+ checkSampledNumbers(stateVariables, samplednumbers.slice(0, 2));
});
cy.log("get six total samples");
@@ -2725,131 +1841,7 @@ describe("SampleRandomNumbers Tag Tests", function () {
samplednumbers.push(n4);
samplednumbers.push(n5);
samplednumbers.push(n6);
- expect(
- stateVariables[stateVariables["/p1"].activeChildren[0].componentName]
- .activeChildren.length,
- ).eq(6);
- expect(
- stateVariables[stateVariables["/p2"].activeChildren[0].componentName]
- .activeChildren.length,
- ).eq(6);
- expect(
- stateVariables[stateVariables["/p3"].activeChildren[0].componentName]
- .activeChildren.length,
- ).eq(6);
- expect(
- stateVariables[
- stateVariables[stateVariables["/p4"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
- ).eq(6);
- expect(
- stateVariables[
- stateVariables[stateVariables["/p5"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
- ).eq(6);
- expect(
- stateVariables[
- stateVariables[stateVariables["/p6"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
- ).eq(6);
- expect(
- stateVariables[
- stateVariables[stateVariables["/p7"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
- ).eq(6);
- expect(
- stateVariables[
- stateVariables[stateVariables["/p8"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
- ).eq(6);
- expect(
- stateVariables[
- stateVariables[stateVariables["/p9"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
- ).eq(6);
- for (let ind = 0; ind < 6; ind++) {
- expect(
- stateVariables[
- stateVariables[
- stateVariables["/p1"].activeChildren[0].componentName
- ].activeChildren[ind].componentName
- ].stateValues.value,
- ).eq(samplednumbers[ind]);
- expect(
- stateVariables[
- stateVariables[
- stateVariables["/p2"].activeChildren[0].componentName
- ].activeChildren[ind].componentName
- ].stateValues.value,
- ).eq(samplednumbers[ind]);
- expect(
- stateVariables[
- stateVariables[
- stateVariables["/p3"].activeChildren[0].componentName
- ].activeChildren[ind].componentName
- ].stateValues.value,
- ).eq(samplednumbers[ind]);
- expect(
- stateVariables[
- stateVariables[
- stateVariables[
- stateVariables["/p4"].replacements[0].componentName
- ].activeChildren[0].componentName
- ].activeChildren[ind].componentName
- ].stateValues.value,
- ).eq(samplednumbers[ind]);
- expect(
- stateVariables[
- stateVariables[
- stateVariables[
- stateVariables["/p5"].replacements[0].componentName
- ].activeChildren[0].componentName
- ].activeChildren[ind].componentName
- ].stateValues.value,
- ).eq(samplednumbers[ind]);
- expect(
- stateVariables[
- stateVariables[
- stateVariables[
- stateVariables["/p6"].replacements[0].componentName
- ].activeChildren[0].componentName
- ].activeChildren[ind].componentName
- ].stateValues.value,
- ).eq(samplednumbers[ind]);
- expect(
- stateVariables[
- stateVariables[
- stateVariables[
- stateVariables["/p7"].replacements[0].componentName
- ].activeChildren[0].componentName
- ].activeChildren[ind].componentName
- ].stateValues.value,
- ).eq(samplednumbers[ind]);
- expect(
- stateVariables[
- stateVariables[
- stateVariables[
- stateVariables["/p8"].replacements[0].componentName
- ].activeChildren[0].componentName
- ].activeChildren[ind].componentName
- ].stateValues.value,
- ).eq(samplednumbers[ind]);
- expect(
- stateVariables[
- stateVariables[
- stateVariables[
- stateVariables["/p9"].replacements[0].componentName
- ].activeChildren[0].componentName
- ].activeChildren[ind].componentName
- ].stateValues.value,
- ).eq(samplednumbers[ind]);
- }
+ checkSampledNumbers(stateVariables, samplednumbers);
});
cy.log("go back to nothing");
@@ -2860,54 +1852,7 @@ describe("SampleRandomNumbers Tag Tests", function () {
cy.get(cesc("#\\/m1")).should("contain.text", "0");
cy.window().then(async (win) => {
let stateVariables = await win.returnAllStateVariables1();
- expect(
- stateVariables[stateVariables["/p1"].activeChildren[0].componentName]
- .activeChildren.length,
- ).eq(0);
- expect(
- stateVariables[stateVariables["/p2"].activeChildren[0].componentName]
- .activeChildren.length,
- ).eq(0);
- expect(
- stateVariables[stateVariables["/p3"].activeChildren[0].componentName]
- .activeChildren.length,
- ).eq(0);
- expect(
- stateVariables[
- stateVariables[stateVariables["/p4"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
- ).eq(0);
- expect(
- stateVariables[
- stateVariables[stateVariables["/p5"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
- ).eq(0);
- expect(
- stateVariables[
- stateVariables[stateVariables["/p6"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
- ).eq(0);
- expect(
- stateVariables[
- stateVariables[stateVariables["/p7"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
- ).eq(0);
- expect(
- stateVariables[
- stateVariables[stateVariables["/p8"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
- ).eq(0);
- expect(
- stateVariables[
- stateVariables[stateVariables["/p9"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
- ).eq(0);
+ checkSampledNumbers(stateVariables, []);
});
cy.log("get all six back");
@@ -2930,131 +1875,7 @@ describe("SampleRandomNumbers Tag Tests", function () {
expect(n4).eq(samplednumbers[3]);
expect(n5).eq(samplednumbers[4]);
expect(n6).eq(samplednumbers[5]);
- expect(
- stateVariables[stateVariables["/p1"].activeChildren[0].componentName]
- .activeChildren.length,
- ).eq(6);
- expect(
- stateVariables[stateVariables["/p2"].activeChildren[0].componentName]
- .activeChildren.length,
- ).eq(6);
- expect(
- stateVariables[stateVariables["/p3"].activeChildren[0].componentName]
- .activeChildren.length,
- ).eq(6);
- expect(
- stateVariables[
- stateVariables[stateVariables["/p4"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
- ).eq(6);
- expect(
- stateVariables[
- stateVariables[stateVariables["/p5"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
- ).eq(6);
- expect(
- stateVariables[
- stateVariables[stateVariables["/p6"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
- ).eq(6);
- expect(
- stateVariables[
- stateVariables[stateVariables["/p7"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
- ).eq(6);
- expect(
- stateVariables[
- stateVariables[stateVariables["/p8"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
- ).eq(6);
- expect(
- stateVariables[
- stateVariables[stateVariables["/p9"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
- ).eq(6);
- for (let ind = 0; ind < 6; ind++) {
- expect(
- stateVariables[
- stateVariables[
- stateVariables["/p1"].activeChildren[0].componentName
- ].activeChildren[ind].componentName
- ].stateValues.value,
- ).eq(samplednumbers[ind]);
- expect(
- stateVariables[
- stateVariables[
- stateVariables["/p2"].activeChildren[0].componentName
- ].activeChildren[ind].componentName
- ].stateValues.value,
- ).eq(samplednumbers[ind]);
- expect(
- stateVariables[
- stateVariables[
- stateVariables["/p3"].activeChildren[0].componentName
- ].activeChildren[ind].componentName
- ].stateValues.value,
- ).eq(samplednumbers[ind]);
- expect(
- stateVariables[
- stateVariables[
- stateVariables[
- stateVariables["/p4"].replacements[0].componentName
- ].activeChildren[0].componentName
- ].activeChildren[ind].componentName
- ].stateValues.value,
- ).eq(samplednumbers[ind]);
- expect(
- stateVariables[
- stateVariables[
- stateVariables[
- stateVariables["/p5"].replacements[0].componentName
- ].activeChildren[0].componentName
- ].activeChildren[ind].componentName
- ].stateValues.value,
- ).eq(samplednumbers[ind]);
- expect(
- stateVariables[
- stateVariables[
- stateVariables[
- stateVariables["/p6"].replacements[0].componentName
- ].activeChildren[0].componentName
- ].activeChildren[ind].componentName
- ].stateValues.value,
- ).eq(samplednumbers[ind]);
- expect(
- stateVariables[
- stateVariables[
- stateVariables[
- stateVariables["/p7"].replacements[0].componentName
- ].activeChildren[0].componentName
- ].activeChildren[ind].componentName
- ].stateValues.value,
- ).eq(samplednumbers[ind]);
- expect(
- stateVariables[
- stateVariables[
- stateVariables[
- stateVariables["/p8"].replacements[0].componentName
- ].activeChildren[0].componentName
- ].activeChildren[ind].componentName
- ].stateValues.value,
- ).eq(samplednumbers[ind]);
- expect(
- stateVariables[
- stateVariables[
- stateVariables[
- stateVariables["/p9"].replacements[0].componentName
- ].activeChildren[0].componentName
- ].activeChildren[ind].componentName
- ].stateValues.value,
- ).eq(samplednumbers[ind]);
- }
+ checkSampledNumbers(stateVariables, samplednumbers);
});
});
@@ -3067,9 +1888,9 @@ describe("SampleRandomNumbers Tag Tests", function () {
-
-
-
+ $u{name="u2"}
+ $v{name="v2"}
+ $w{name="w2"}
`,
},
"*",
@@ -3110,9 +1931,9 @@ describe("SampleRandomNumbers Tag Tests", function () {
-
-
-
+ $u{name="u2"}
+ $v{name="v2"}
+ $w{name="w2"}
`,
},
"*",
@@ -3178,9 +1999,9 @@ describe("SampleRandomNumbers Tag Tests", function () {
-
-
-
+ $(s/u{name="u2"})
+ $(s/v{name="v2"})
+ $(s/w{name="w2"})
`,
},
"*",
@@ -3237,6 +2058,44 @@ describe("SampleRandomNumbers Tag Tests", function () {
});
});
+ it("asList", () => {
+ cy.window().then(async (win) => {
+ win.postMessage(
+ {
+ doenetML: `
+ a
+
+
+
+ `,
+ },
+ "*",
+ );
+ });
+
+ cy.get(cesc("#\\/_text1")).should("have.text", "a"); //wait for page to load
+
+ let results = [];
+
+ cy.window().then(async (win) => {
+ let stateVariables = await win.returnAllStateVariables1();
+
+ results.push(stateVariables["/u"].stateValues.value);
+ results.push(stateVariables["/v"].stateValues.value);
+ results.push(stateVariables["/w"].stateValues.value);
+ results.push(stateVariables["/x"].stateValues.value);
+ results.push(stateVariables["/y"].stateValues.value);
+
+ for (let num of results) {
+ expect(num).gte(175).lte(205);
+ }
+
+ let roundedResults = results.map((x) => Math.round(x * 100) / 100);
+ cy.get(cesc2("#/_p1")).should("have.text", roundedResults.join(", "));
+ cy.get(cesc2("#/_p2")).should("have.text", roundedResults.join(""));
+ });
+ });
+
it("copying parameters", () => {
cy.window().then(async (win) => {
win.postMessage(
@@ -3250,35 +2109,35 @@ describe("SampleRandomNumbers Tag Tests", function () {
Specified from
Specified to
Specified step
- Actual type:
- Actual from:
- Actual to:
- Actual step:
- Expected mean:
- Expected variance:
- Expected standard deviation:
+ Actual type: $samples.type{obtainPropFromComposite assignNames="actualType"}
+ Actual from: $samples.from{obtainPropFromComposite assignNames="actualFrom"}
+ Actual to: $samples.to{obtainPropFromComposite assignNames="actualTo"}
+ Actual step: $samples.step{obtainPropFromComposite assignNames="actualStep"}
+ Expected mean: $samples.mean{obtainPropFromComposite assignNames="expectedMean" displayDigits="10"}
+ Expected variance: $samples.variance{obtainPropFromComposite assignNames="expectedVariance" displayDigits="10"}
+ Expected standard deviation: $samples.standardDeviation{obtainPropFromComposite assignNames="expectedStandardDeviation" displayDigits="10"}
Resulting mean: $samples
Resulting variance: $samples
Resulting standard deviation: $samples
-
-
+ $samples
+ $_aslist1
-
-
`,
},
@@ -4143,4 +3002,100 @@ describe("SampleRandomNumbers Tag Tests", function () {
expect(rn3c).not.eq(rn3);
});
});
+
+ function checkSampledNumbers(stateVariables, samplednumbers) {
+ let n = samplednumbers.length;
+ expect(
+ stateVariables[stateVariables["/p1"].activeChildren[0].componentName]
+ .activeChildren.length,
+ ).eq(n);
+ expect(
+ stateVariables[stateVariables["/p2"].activeChildren[0].componentName]
+ .activeChildren.length,
+ ).eq(n);
+ expect(
+ stateVariables[stateVariables["/p3"].activeChildren[0].componentName]
+ .activeChildren.length,
+ ).eq(n);
+ expect(
+ stateVariables[stateVariables["/p4"].activeChildren[0].componentName]
+ .activeChildren.length,
+ ).eq(n);
+ expect(
+ stateVariables[stateVariables["/p5"].activeChildren[0].componentName]
+ .activeChildren.length,
+ ).eq(n);
+ expect(
+ stateVariables[stateVariables["/p6"].activeChildren[0].componentName]
+ .activeChildren.length,
+ ).eq(n);
+ expect(
+ stateVariables[stateVariables["/p7"].activeChildren[0].componentName]
+ .activeChildren.length,
+ ).eq(n);
+ expect(
+ stateVariables[stateVariables["/p8"].activeChildren[0].componentName]
+ .activeChildren.length,
+ ).eq(n);
+ expect(
+ stateVariables[stateVariables["/p9"].activeChildren[0].componentName]
+ .activeChildren.length,
+ ).eq(n);
+ for (let ind = 0; ind < n; ind++) {
+ expect(
+ stateVariables[
+ stateVariables[stateVariables["/p1"].activeChildren[0].componentName]
+ .activeChildren[ind].componentName
+ ].stateValues.value,
+ ).eq(samplednumbers[ind]);
+ expect(
+ stateVariables[
+ stateVariables[stateVariables["/p2"].activeChildren[0].componentName]
+ .activeChildren[ind].componentName
+ ].stateValues.value,
+ ).eq(samplednumbers[ind]);
+ expect(
+ stateVariables[
+ stateVariables[stateVariables["/p3"].activeChildren[0].componentName]
+ .activeChildren[ind].componentName
+ ].stateValues.value,
+ ).eq(samplednumbers[ind]);
+ expect(
+ stateVariables[
+ stateVariables[stateVariables["/p4"].activeChildren[0].componentName]
+ .activeChildren[ind].componentName
+ ].stateValues.value,
+ ).eq(samplednumbers[ind]);
+ expect(
+ stateVariables[
+ stateVariables[stateVariables["/p5"].activeChildren[0].componentName]
+ .activeChildren[ind].componentName
+ ].stateValues.value,
+ ).eq(samplednumbers[ind]);
+ expect(
+ stateVariables[
+ stateVariables[stateVariables["/p6"].activeChildren[0].componentName]
+ .activeChildren[ind].componentName
+ ].stateValues.value,
+ ).eq(samplednumbers[ind]);
+ expect(
+ stateVariables[
+ stateVariables[stateVariables["/p7"].activeChildren[0].componentName]
+ .activeChildren[ind].componentName
+ ].stateValues.value,
+ ).eq(samplednumbers[ind]);
+ expect(
+ stateVariables[
+ stateVariables[stateVariables["/p8"].activeChildren[0].componentName]
+ .activeChildren[ind].componentName
+ ].stateValues.value,
+ ).eq(samplednumbers[ind]);
+ expect(
+ stateVariables[
+ stateVariables[stateVariables["/p9"].activeChildren[0].componentName]
+ .activeChildren[ind].componentName
+ ].stateValues.value,
+ ).eq(samplednumbers[ind]);
+ }
+ }
});
diff --git a/cypress/e2e/DoenetML/tagSpecific/sectioning.cy.js b/cypress/e2e/DoenetML/tagSpecific/sectioning.cy.js
index 811bc84ed1..7d77363a5c 100644
--- a/cypress/e2e/DoenetML/tagSpecific/sectioning.cy.js
+++ b/cypress/e2e/DoenetML/tagSpecific/sectioning.cy.js
@@ -12,14 +12,14 @@ describe("Sectioning Tag Tests", function () {
{
doenetML: `
Activity
- Credit achieved for
+ Credit achieved for $_document1.title:
+ $_document1.creditAchieved{name="docCa"}, or $_document1.percentCreditAchieved{name="docPca"}%
Enter u : u
Section 1
- Credit achieved for
+ Credit achieved for $section1.title:
+ $section1.creditAchieved{name="s1Ca"}, or $section1.percentCreditAchieved{name="s1Pca"}%
Enter x : x
Enter y : y
@@ -27,14 +27,14 @@ describe("Sectioning Tag Tests", function () {
Section 2
- Credit achieved for
+ Credit achieved for $section2.title:
+ $section2.creditAchieved{name="s2Ca"}, or $section2.percentCreditAchieved{name="s2Pca"}%
Enter z : z
Section 2.1
- Credit achieved for
+ Credit achieved for $section21.title:
+ $section21.creditAchieved{name="s21Ca"}, or $section21.percentCreditAchieved{name="s21Pca"}%
Enter v : v
@@ -42,21 +42,21 @@ describe("Sectioning Tag Tests", function () {
Section 2.2
- Credit achieved for
+ Credit achieved for $section22.title:
+ $section22.creditAchieved{name="s22Ca"}, or $section22.percentCreditAchieved{name="s22Pca"}%
Enter q : q
Section 2.2.1
- Credit achieved for
+ Credit achieved for $section221.title:
+ $section221.creditAchieved{name="s221Ca"}, or $section221.percentCreditAchieved{name="s221Pca"}%
Enter r : r
Section 2.2.2
- Credit achieved for
+ Credit achieved for $section222.title:
+ $section222.creditAchieved{name="s222Ca"}, or $section222.percentCreditAchieved{name="s222Pca"}%
Enter s : s
@@ -509,14 +509,14 @@ describe("Sectioning Tag Tests", function () {
{
doenetML: `
Activity
- Credit achieved for
+ Credit achieved for $_document1.title:
+ $_document1.creditAchieved{name="docCa"}, or $_document1.percentCreditAchieved{name="docPca"}%
Enter u : u
Section 1
- Credit achieved for
+ Credit achieved for $section1.title:
+ $section1.creditAchieved{name="s1Ca"}, or $section1.percentCreditAchieved{name="s1Pca"}%
Enter x : x
Enter y : y
@@ -524,14 +524,14 @@ describe("Sectioning Tag Tests", function () {
Section 2
- Credit achieved for
+ Credit achieved for $section2.title:
+ $section2.creditAchieved{name="s2Ca"}, or $section2.percentCreditAchieved{name="s2Pca"}%
Enter z : z
Section 2.1
- Credit achieved for
+ Credit achieved for $section21.title:
+ $section21.creditAchieved{name="s21Ca"}, or $section21.percentCreditAchieved{name="s21Pca"}%
Enter v : v
@@ -539,21 +539,21 @@ describe("Sectioning Tag Tests", function () {
Section 2.2
- Credit achieved for
+ Credit achieved for $section22.title:
+ $section22.creditAchieved{name="s22Ca"}, or $section22.percentCreditAchieved{name="s22Pca"}%
Enter q : q
Section 2.2.1
- Credit achieved for
+ Credit achieved for $section221.title:
+ $section221.creditAchieved{name="s221Ca"}, or $section221.percentCreditAchieved{name="s221Pca"}%
Enter r : r
Section 2.2.2
- Credit achieved for
+ Credit achieved for $section222.title:
+ $section222.creditAchieved{name="s222Ca"}, or $section222.percentCreditAchieved{name="s222Pca"}%
Enter s : s
@@ -1153,14 +1153,14 @@ describe("Sectioning Tag Tests", function () {
{
doenetML: `
Activity
- Credit achieved for
+ Credit achieved for $_document1.title:
+ $_document1.creditAchieved{name="docCa"}, or $_document1.percentCreditAchieved{name="docPca"}%
Enter u : u
Section 1
- Credit achieved for
+ Credit achieved for $section1.title:
+ $section1.creditAchieved{name="s1Ca"}, or $section1.percentCreditAchieved{name="s1Pca"}%
Enter x : x
Enter y : y
@@ -1168,14 +1168,14 @@ describe("Sectioning Tag Tests", function () {
Section 2
- Credit achieved for
+ Credit achieved for $section2.title:
+ $section2.creditAchieved{name="s2Ca"}, or $section2.percentCreditAchieved{name="s2Pca"}%
Enter z : z
Section 2.1
- Credit achieved for
+ Credit achieved for $section21.title:
+ $section21.creditAchieved{name="s21Ca"}, or $section21.percentCreditAchieved{name="s21Pca"}%
Enter v : v
@@ -1183,21 +1183,21 @@ describe("Sectioning Tag Tests", function () {
Section 2.2
- Credit achieved for
+ Credit achieved for $section22.title:
+ $section22.creditAchieved{name="s22Ca"}, or $section22.percentCreditAchieved{name="s22Pca"}%
Enter q : q
Section 2.2.1
- Credit achieved for
+ Credit achieved for $section221.title:
+ $section221.creditAchieved{name="s221Ca"}, or $section221.percentCreditAchieved{name="s221Pca"}%
Enter r : r
Section 2.2.2
- Credit achieved for
+ Credit achieved for $section222.title:
+ $section222.creditAchieved{name="s222Ca"}, or $section222.percentCreditAchieved{name="s222Pca"}%
Enter s : s
@@ -1909,16 +1909,16 @@ describe("Sectioning Tag Tests", function () {
Starting closed
An expression:
- The value of the expression is
+ The value of the expression is $expr1.value{assignNames="expr1a"}
Starting open
An expression:
- The value of the expression is
+ The value of the expression is $expr2.value{assignNames="expr2a"}
- The first expression is
- The second expression is
+ The first expression is $expr1.value{assignNames="expr1b"}
+ The second expression is $expr2.value{assignNames="expr2b"}
`,
},
@@ -3464,7 +3464,7 @@ describe("Sectioning Tag Tests", function () {
Work hard
- $aProb{assignNames='aProbb'}
+ $aProb{name='aProbb'}
`,
@@ -3530,7 +3530,7 @@ describe("Sectioning Tag Tests", function () {
Work hard
- $aProb{assignNames='aProbb'}
+ $aProb{name='aProbb'}
- $n2+$num2
+ $n3+$num3
+ $num3{name="n3"}
1
`,
},
@@ -434,6 +434,65 @@ describe("Select Tag Tests", function () {
});
});
+ it("asList", () => {
+ cy.window().then(async (win) => {
+ win.postMessage(
+ {
+ doenetML: `
+ a
+
175 176 177 178 179 180 181
+
+ `,
+ },
+ "*",
+ );
+ });
+
+ cy.get(cesc("#\\/_text1")).should("have.text", "a"); //wait for page to load
+
+ let results = [];
+
+ cy.window().then(async (win) => {
+ let stateVariables = await win.returnAllStateVariables1();
+
+ results.push(stateVariables["/u"].stateValues.value);
+ results.push(stateVariables["/v"].stateValues.value);
+ results.push(stateVariables["/w"].stateValues.value);
+ results.push(stateVariables["/x"].stateValues.value);
+ results.push(stateVariables["/y"].stateValues.value);
+
+ for (let num of results) {
+ expect(num).gte(175).lte(181);
+ }
+
+ let roundedResults = results.map((x) => Math.round(x * 100) / 100);
+ cy.get(cesc2("#/_p1")).should("have.text", roundedResults.join(", "));
+ cy.get(cesc2("#/_p2")).should("have.text", roundedResults.join(""));
+ });
+ });
+
+ it("not list if have ps", () => {
+ cy.window().then(async (win) => {
+ win.postMessage(
+ {
+ doenetML: `
+ a
+
+ `,
+ },
+ "*",
+ );
+ });
+
+ cy.get(cesc2("#/_text1")).should("have.text", "a"); //wait for page to load
+ cy.get(cesc2("#/_section1")).should("not.contain.text", ",");
+ });
+
it("copies don't resample", () => {
cy.window().then(async (win) => {
win.postMessage(
@@ -463,23 +522,23 @@ describe("Select Tag Tests", function () {
-
-
-
-
Selected choices:
- $x.value
+ $y.value
+ $z.value
- Selected choices:
+ Selected choices:
-
+ $z.value{assignNames="z2"}
`,
},
@@ -806,17 +849,17 @@ describe("Select Tag Tests", function () {
-
-
+ $_map1
+ $_aslist1
-
+ $p4{name="p7"}
+ $p5{name="p8"}
+ $p6{name="p9"}
+ $_mathinput1.value{assignNames="m1"}
`,
},
"*",
@@ -843,40 +886,28 @@ describe("Select Tag Tests", function () {
.activeChildren.length,
).eq(0);
expect(
- stateVariables[
- stateVariables[stateVariables["/p4"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p4"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(0);
expect(
- stateVariables[
- stateVariables[stateVariables["/p5"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p5"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(0);
expect(
- stateVariables[
- stateVariables[stateVariables["/p6"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p6"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(0);
expect(
- stateVariables[
- stateVariables[stateVariables["/p7"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p7"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(0);
expect(
- stateVariables[
- stateVariables[stateVariables["/p8"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p8"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(0);
expect(
- stateVariables[
- stateVariables[stateVariables["/p9"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p9"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(0);
});
@@ -903,40 +934,28 @@ describe("Select Tag Tests", function () {
.activeChildren.length,
).eq(1);
expect(
- stateVariables[
- stateVariables[stateVariables["/p4"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p4"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(1);
expect(
- stateVariables[
- stateVariables[stateVariables["/p5"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p5"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(1);
expect(
- stateVariables[
- stateVariables[stateVariables["/p6"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p6"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(1);
expect(
- stateVariables[
- stateVariables[stateVariables["/p7"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p7"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(1);
expect(
- stateVariables[
- stateVariables[stateVariables["/p8"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p8"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(1);
expect(
- stateVariables[
- stateVariables[stateVariables["/p9"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p9"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(1);
for (let ind = 0; ind < 1; ind++) {
expect(
@@ -963,54 +982,42 @@ describe("Select Tag Tests", function () {
expect(
stateVariables[
stateVariables[
- stateVariables[
- stateVariables["/p4"].replacements[0].componentName
- ].activeChildren[0].componentName
+ stateVariables["/p4"].activeChildren[0].componentName
].activeChildren[ind].componentName
].stateValues.value,
).eq(sampledvariables[ind]);
expect(
stateVariables[
stateVariables[
- stateVariables[
- stateVariables["/p5"].replacements[0].componentName
- ].activeChildren[0].componentName
+ stateVariables["/p5"].activeChildren[0].componentName
].activeChildren[ind].componentName
].stateValues.value,
).eq(sampledvariables[ind]);
expect(
stateVariables[
stateVariables[
- stateVariables[
- stateVariables["/p6"].replacements[0].componentName
- ].activeChildren[0].componentName
+ stateVariables["/p6"].activeChildren[0].componentName
].activeChildren[ind].componentName
].stateValues.value,
).eq(sampledvariables[ind]);
expect(
stateVariables[
stateVariables[
- stateVariables[
- stateVariables["/p7"].replacements[0].componentName
- ].activeChildren[0].componentName
+ stateVariables["/p7"].activeChildren[0].componentName
].activeChildren[ind].componentName
].stateValues.value,
).eq(sampledvariables[ind]);
expect(
stateVariables[
stateVariables[
- stateVariables[
- stateVariables["/p8"].replacements[0].componentName
- ].activeChildren[0].componentName
+ stateVariables["/p8"].activeChildren[0].componentName
].activeChildren[ind].componentName
].stateValues.value,
).eq(sampledvariables[ind]);
expect(
stateVariables[
stateVariables[
- stateVariables[
- stateVariables["/p9"].replacements[0].componentName
- ].activeChildren[0].componentName
+ stateVariables["/p9"].activeChildren[0].componentName
].activeChildren[ind].componentName
].stateValues.value,
).eq(sampledvariables[ind]);
@@ -1038,40 +1045,28 @@ describe("Select Tag Tests", function () {
.activeChildren.length,
).eq(0);
expect(
- stateVariables[
- stateVariables[stateVariables["/p4"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p4"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(0);
expect(
- stateVariables[
- stateVariables[stateVariables["/p5"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p5"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(0);
expect(
- stateVariables[
- stateVariables[stateVariables["/p6"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p6"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(0);
expect(
- stateVariables[
- stateVariables[stateVariables["/p7"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p7"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(0);
expect(
- stateVariables[
- stateVariables[stateVariables["/p8"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p8"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(0);
expect(
- stateVariables[
- stateVariables[stateVariables["/p9"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p9"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(0);
});
@@ -1098,40 +1093,28 @@ describe("Select Tag Tests", function () {
.activeChildren.length,
).eq(1);
expect(
- stateVariables[
- stateVariables[stateVariables["/p4"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p4"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(1);
expect(
- stateVariables[
- stateVariables[stateVariables["/p5"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p5"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(1);
expect(
- stateVariables[
- stateVariables[stateVariables["/p6"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p6"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(1);
expect(
- stateVariables[
- stateVariables[stateVariables["/p7"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p7"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(1);
expect(
- stateVariables[
- stateVariables[stateVariables["/p8"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p8"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(1);
expect(
- stateVariables[
- stateVariables[stateVariables["/p9"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p9"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(1);
for (let ind = 0; ind < 1; ind++) {
@@ -1159,54 +1142,42 @@ describe("Select Tag Tests", function () {
expect(
stateVariables[
stateVariables[
- stateVariables[
- stateVariables["/p4"].replacements[0].componentName
- ].activeChildren[0].componentName
+ stateVariables["/p4"].activeChildren[0].componentName
].activeChildren[ind].componentName
].stateValues.value,
).eq(sampledvariables[ind]);
expect(
stateVariables[
stateVariables[
- stateVariables[
- stateVariables["/p5"].replacements[0].componentName
- ].activeChildren[0].componentName
+ stateVariables["/p5"].activeChildren[0].componentName
].activeChildren[ind].componentName
].stateValues.value,
).eq(sampledvariables[ind]);
expect(
stateVariables[
stateVariables[
- stateVariables[
- stateVariables["/p6"].replacements[0].componentName
- ].activeChildren[0].componentName
+ stateVariables["/p6"].activeChildren[0].componentName
].activeChildren[ind].componentName
].stateValues.value,
).eq(sampledvariables[ind]);
expect(
stateVariables[
stateVariables[
- stateVariables[
- stateVariables["/p7"].replacements[0].componentName
- ].activeChildren[0].componentName
+ stateVariables["/p7"].activeChildren[0].componentName
].activeChildren[ind].componentName
].stateValues.value,
).eq(sampledvariables[ind]);
expect(
stateVariables[
stateVariables[
- stateVariables[
- stateVariables["/p8"].replacements[0].componentName
- ].activeChildren[0].componentName
+ stateVariables["/p8"].activeChildren[0].componentName
].activeChildren[ind].componentName
].stateValues.value,
).eq(sampledvariables[ind]);
expect(
stateVariables[
stateVariables[
- stateVariables[
- stateVariables["/p9"].replacements[0].componentName
- ].activeChildren[0].componentName
+ stateVariables["/p9"].activeChildren[0].componentName
].activeChildren[ind].componentName
].stateValues.value,
).eq(sampledvariables[ind]);
@@ -1240,40 +1211,28 @@ describe("Select Tag Tests", function () {
.activeChildren.length,
).eq(3);
expect(
- stateVariables[
- stateVariables[stateVariables["/p4"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p4"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(3);
expect(
- stateVariables[
- stateVariables[stateVariables["/p5"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p5"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(3);
expect(
- stateVariables[
- stateVariables[stateVariables["/p6"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p6"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(3);
expect(
- stateVariables[
- stateVariables[stateVariables["/p7"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p7"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(3);
expect(
- stateVariables[
- stateVariables[stateVariables["/p8"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p8"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(3);
expect(
- stateVariables[
- stateVariables[stateVariables["/p9"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p9"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(3);
for (let ind = 0; ind < 3; ind++) {
expect(
@@ -1300,54 +1259,42 @@ describe("Select Tag Tests", function () {
expect(
stateVariables[
stateVariables[
- stateVariables[
- stateVariables["/p4"].replacements[0].componentName
- ].activeChildren[0].componentName
+ stateVariables["/p4"].activeChildren[0].componentName
].activeChildren[ind].componentName
].stateValues.value,
).eq(sampledvariables[ind]);
expect(
stateVariables[
stateVariables[
- stateVariables[
- stateVariables["/p5"].replacements[0].componentName
- ].activeChildren[0].componentName
+ stateVariables["/p5"].activeChildren[0].componentName
].activeChildren[ind].componentName
].stateValues.value,
).eq(sampledvariables[ind]);
expect(
stateVariables[
stateVariables[
- stateVariables[
- stateVariables["/p6"].replacements[0].componentName
- ].activeChildren[0].componentName
+ stateVariables["/p6"].activeChildren[0].componentName
].activeChildren[ind].componentName
].stateValues.value,
).eq(sampledvariables[ind]);
expect(
stateVariables[
stateVariables[
- stateVariables[
- stateVariables["/p7"].replacements[0].componentName
- ].activeChildren[0].componentName
+ stateVariables["/p7"].activeChildren[0].componentName
].activeChildren[ind].componentName
].stateValues.value,
).eq(sampledvariables[ind]);
expect(
stateVariables[
stateVariables[
- stateVariables[
- stateVariables["/p8"].replacements[0].componentName
- ].activeChildren[0].componentName
+ stateVariables["/p8"].activeChildren[0].componentName
].activeChildren[ind].componentName
].stateValues.value,
).eq(sampledvariables[ind]);
expect(
stateVariables[
stateVariables[
- stateVariables[
- stateVariables["/p9"].replacements[0].componentName
- ].activeChildren[0].componentName
+ stateVariables["/p9"].activeChildren[0].componentName
].activeChildren[ind].componentName
].stateValues.value,
).eq(sampledvariables[ind]);
@@ -1375,40 +1322,28 @@ describe("Select Tag Tests", function () {
.activeChildren.length,
).eq(0);
expect(
- stateVariables[
- stateVariables[stateVariables["/p4"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p4"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(0);
expect(
- stateVariables[
- stateVariables[stateVariables["/p5"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p5"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(0);
expect(
- stateVariables[
- stateVariables[stateVariables["/p6"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p6"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(0);
expect(
- stateVariables[
- stateVariables[stateVariables["/p7"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p7"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(0);
expect(
- stateVariables[
- stateVariables[stateVariables["/p8"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p8"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(0);
expect(
- stateVariables[
- stateVariables[stateVariables["/p9"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p9"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(0);
});
@@ -1437,40 +1372,28 @@ describe("Select Tag Tests", function () {
.activeChildren.length,
).eq(2);
expect(
- stateVariables[
- stateVariables[stateVariables["/p4"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p4"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(2);
expect(
- stateVariables[
- stateVariables[stateVariables["/p5"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p5"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(2);
expect(
- stateVariables[
- stateVariables[stateVariables["/p6"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p6"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(2);
expect(
- stateVariables[
- stateVariables[stateVariables["/p7"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p7"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(2);
expect(
- stateVariables[
- stateVariables[stateVariables["/p8"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p8"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(2);
expect(
- stateVariables[
- stateVariables[stateVariables["/p9"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p9"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(2);
for (let ind = 0; ind < 2; ind++) {
@@ -1498,54 +1421,42 @@ describe("Select Tag Tests", function () {
expect(
stateVariables[
stateVariables[
- stateVariables[
- stateVariables["/p4"].replacements[0].componentName
- ].activeChildren[0].componentName
+ stateVariables["/p4"].activeChildren[0].componentName
].activeChildren[ind].componentName
].stateValues.value,
).eq(sampledvariables[ind]);
expect(
stateVariables[
stateVariables[
- stateVariables[
- stateVariables["/p5"].replacements[0].componentName
- ].activeChildren[0].componentName
+ stateVariables["/p5"].activeChildren[0].componentName
].activeChildren[ind].componentName
].stateValues.value,
).eq(sampledvariables[ind]);
expect(
stateVariables[
stateVariables[
- stateVariables[
- stateVariables["/p6"].replacements[0].componentName
- ].activeChildren[0].componentName
+ stateVariables["/p6"].activeChildren[0].componentName
].activeChildren[ind].componentName
].stateValues.value,
).eq(sampledvariables[ind]);
expect(
stateVariables[
stateVariables[
- stateVariables[
- stateVariables["/p7"].replacements[0].componentName
- ].activeChildren[0].componentName
+ stateVariables["/p7"].activeChildren[0].componentName
].activeChildren[ind].componentName
].stateValues.value,
).eq(sampledvariables[ind]);
expect(
stateVariables[
stateVariables[
- stateVariables[
- stateVariables["/p8"].replacements[0].componentName
- ].activeChildren[0].componentName
+ stateVariables["/p8"].activeChildren[0].componentName
].activeChildren[ind].componentName
].stateValues.value,
).eq(sampledvariables[ind]);
expect(
stateVariables[
stateVariables[
- stateVariables[
- stateVariables["/p9"].replacements[0].componentName
- ].activeChildren[0].componentName
+ stateVariables["/p9"].activeChildren[0].componentName
].activeChildren[ind].componentName
].stateValues.value,
).eq(sampledvariables[ind]);
@@ -1585,40 +1496,28 @@ describe("Select Tag Tests", function () {
.activeChildren.length,
).eq(6);
expect(
- stateVariables[
- stateVariables[stateVariables["/p4"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p4"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(6);
expect(
- stateVariables[
- stateVariables[stateVariables["/p5"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p5"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(6);
expect(
- stateVariables[
- stateVariables[stateVariables["/p6"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p6"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(6);
expect(
- stateVariables[
- stateVariables[stateVariables["/p7"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p7"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(6);
expect(
- stateVariables[
- stateVariables[stateVariables["/p8"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p8"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(6);
expect(
- stateVariables[
- stateVariables[stateVariables["/p9"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p9"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(6);
for (let ind = 0; ind < 6; ind++) {
expect(
@@ -1645,54 +1544,42 @@ describe("Select Tag Tests", function () {
expect(
stateVariables[
stateVariables[
- stateVariables[
- stateVariables["/p4"].replacements[0].componentName
- ].activeChildren[0].componentName
+ stateVariables["/p4"].activeChildren[0].componentName
].activeChildren[ind].componentName
].stateValues.value,
).eq(sampledvariables[ind]);
expect(
stateVariables[
stateVariables[
- stateVariables[
- stateVariables["/p5"].replacements[0].componentName
- ].activeChildren[0].componentName
+ stateVariables["/p5"].activeChildren[0].componentName
].activeChildren[ind].componentName
].stateValues.value,
).eq(sampledvariables[ind]);
expect(
stateVariables[
stateVariables[
- stateVariables[
- stateVariables["/p6"].replacements[0].componentName
- ].activeChildren[0].componentName
+ stateVariables["/p6"].activeChildren[0].componentName
].activeChildren[ind].componentName
].stateValues.value,
).eq(sampledvariables[ind]);
expect(
stateVariables[
stateVariables[
- stateVariables[
- stateVariables["/p7"].replacements[0].componentName
- ].activeChildren[0].componentName
+ stateVariables["/p7"].activeChildren[0].componentName
].activeChildren[ind].componentName
].stateValues.value,
).eq(sampledvariables[ind]);
expect(
stateVariables[
stateVariables[
- stateVariables[
- stateVariables["/p8"].replacements[0].componentName
- ].activeChildren[0].componentName
+ stateVariables["/p8"].activeChildren[0].componentName
].activeChildren[ind].componentName
].stateValues.value,
).eq(sampledvariables[ind]);
expect(
stateVariables[
stateVariables[
- stateVariables[
- stateVariables["/p9"].replacements[0].componentName
- ].activeChildren[0].componentName
+ stateVariables["/p9"].activeChildren[0].componentName
].activeChildren[ind].componentName
].stateValues.value,
).eq(sampledvariables[ind]);
@@ -1720,40 +1607,28 @@ describe("Select Tag Tests", function () {
.activeChildren.length,
).eq(0);
expect(
- stateVariables[
- stateVariables[stateVariables["/p4"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p4"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(0);
expect(
- stateVariables[
- stateVariables[stateVariables["/p5"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p5"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(0);
expect(
- stateVariables[
- stateVariables[stateVariables["/p6"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p6"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(0);
expect(
- stateVariables[
- stateVariables[stateVariables["/p7"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p7"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(0);
expect(
- stateVariables[
- stateVariables[stateVariables["/p8"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p8"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(0);
expect(
- stateVariables[
- stateVariables[stateVariables["/p9"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p9"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(0);
});
@@ -1790,40 +1665,28 @@ describe("Select Tag Tests", function () {
.activeChildren.length,
).eq(6);
expect(
- stateVariables[
- stateVariables[stateVariables["/p4"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p4"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(6);
expect(
- stateVariables[
- stateVariables[stateVariables["/p5"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p5"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(6);
expect(
- stateVariables[
- stateVariables[stateVariables["/p6"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p6"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(6);
expect(
- stateVariables[
- stateVariables[stateVariables["/p7"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p7"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(6);
expect(
- stateVariables[
- stateVariables[stateVariables["/p8"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p8"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(6);
expect(
- stateVariables[
- stateVariables[stateVariables["/p9"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p9"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(6);
for (let ind = 0; ind < 6; ind++) {
expect(
@@ -1850,54 +1713,42 @@ describe("Select Tag Tests", function () {
expect(
stateVariables[
stateVariables[
- stateVariables[
- stateVariables["/p4"].replacements[0].componentName
- ].activeChildren[0].componentName
+ stateVariables["/p4"].activeChildren[0].componentName
].activeChildren[ind].componentName
].stateValues.value,
).eq(sampledvariables[ind]);
expect(
stateVariables[
stateVariables[
- stateVariables[
- stateVariables["/p5"].replacements[0].componentName
- ].activeChildren[0].componentName
+ stateVariables["/p5"].activeChildren[0].componentName
].activeChildren[ind].componentName
].stateValues.value,
).eq(sampledvariables[ind]);
expect(
stateVariables[
stateVariables[
- stateVariables[
- stateVariables["/p6"].replacements[0].componentName
- ].activeChildren[0].componentName
+ stateVariables["/p6"].activeChildren[0].componentName
].activeChildren[ind].componentName
].stateValues.value,
).eq(sampledvariables[ind]);
expect(
stateVariables[
stateVariables[
- stateVariables[
- stateVariables["/p7"].replacements[0].componentName
- ].activeChildren[0].componentName
+ stateVariables["/p7"].activeChildren[0].componentName
].activeChildren[ind].componentName
].stateValues.value,
).eq(sampledvariables[ind]);
expect(
stateVariables[
stateVariables[
- stateVariables[
- stateVariables["/p8"].replacements[0].componentName
- ].activeChildren[0].componentName
+ stateVariables["/p8"].activeChildren[0].componentName
].activeChildren[ind].componentName
].stateValues.value,
).eq(sampledvariables[ind]);
expect(
stateVariables[
stateVariables[
- stateVariables[
- stateVariables["/p9"].replacements[0].componentName
- ].activeChildren[0].componentName
+ stateVariables["/p9"].activeChildren[0].componentName
].activeChildren[ind].componentName
].stateValues.value,
).eq(sampledvariables[ind]);
@@ -1929,9 +1780,9 @@ describe("Select Tag Tests", function () {
a b c q r s
-
-
-
+ $x1$y1$z1
+ $x2$y2$z2
+ $x3$y3$z3
`,
},
"*",
@@ -2027,9 +1878,9 @@ describe("Select Tag Tests", function () {
a b c q r s
-
-
-
+ $(s1/x)$(s1/y)$(s1/z)
+ $(s2/x)$(s2/y)$(s2/z)
+ $(s3/x)$(s3/y)$(s3/z)
`,
},
@@ -2117,9 +1968,9 @@ describe("Select Tag Tests", function () {
-
`,
},
@@ -2197,9 +2048,9 @@ describe("Select Tag Tests", function () {
z
- Option 1: 3
Option 2: 4
Option 3: 5
Option 1: 3$(../x1)$(../y1)
Option 2: 4$(../x2)$(../y2)
Option 3: 5$(../x3)$(../y3)
a
@@ -2207,11 +2058,11 @@ describe("Select Tag Tests", function () {
c
Selected options repeated
- z
- Option 1: 3
Option 2: 4
Option 3: 5
Option 1: 3$x1$y1
Option 2: 4$x2$y2
Option 3: 5$x3$y3
a
@@ -2314,11 +2155,11 @@ describe("Select Tag Tests", function () {
c
Selected options repeated
- a
- Option 1: 3x + a +
Option 2: 4y + b +
Option 3: 5z + c +
Option 1: 3x + a + $x^2$z1^3
Option 2: 4y + b + $x^2$z2^3
Option 3: 5z + c + $x^2$z3^3
Selected options repeated
- Copy x from within selection options
-
-
-
-
-
+ $(q/x{name="qx"})
+ $(r/x{name="rx"})
+ $(s/x{name="sx"})
+ $(t/x{name="tx"})
+ $(u/x{name="ux"})
Copy select itself
-
+
`,
},
@@ -2455,18 +2286,14 @@ describe("Select Tag Tests", function () {
let stateVariables = await win.returnAllStateVariables1();
let q2 =
- stateVariables[
- stateVariables[stateVariables["/q2"].replacements[0].componentName]
- .replacements[0].componentName
- ].activeChildren;
+ stateVariables[stateVariables["/q2"].replacements[0].componentName]
+ .activeChildren;
let q2string = q2[0];
let q2math = me.fromAst(
stateVariables[q2[1].componentName].stateValues.value,
);
expect(q2math.equals(option[q2string])).eq(true);
- let qx =
- stateVariables[stateVariables["/qx"].replacements[0].componentName]
- .stateValues.value;
+ let qx = stateVariables["/qx"].stateValues.value;
expect(qx).eq(xoption[q2string]);
let repeatqmath = me.fromAst(
stateVariables[
@@ -2478,18 +2305,14 @@ describe("Select Tag Tests", function () {
expect(repeatqmath.equals(option[q2string])).eq(true);
let r2 =
- stateVariables[
- stateVariables[stateVariables["/r2"].replacements[0].componentName]
- .replacements[0].componentName
- ].activeChildren;
+ stateVariables[stateVariables["/r2"].replacements[0].componentName]
+ .activeChildren;
let r2string = r2[0];
let r2math = me.fromAst(
stateVariables[r2[1].componentName].stateValues.value,
);
expect(r2math.equals(option[r2string])).eq(true);
- let rx =
- stateVariables[stateVariables["/rx"].replacements[0].componentName]
- .stateValues.value;
+ let rx = stateVariables["/rx"].stateValues.value;
expect(rx).eq(xoption[r2string]);
let repeatrmath = me.fromAst(
stateVariables[
@@ -2501,18 +2324,14 @@ describe("Select Tag Tests", function () {
expect(repeatrmath.equals(option[r2string])).eq(true);
let s2 =
- stateVariables[
- stateVariables[stateVariables["/s2"].replacements[0].componentName]
- .replacements[0].componentName
- ].activeChildren;
+ stateVariables[stateVariables["/s2"].replacements[0].componentName]
+ .activeChildren;
let s2string = s2[0];
let s2math = me.fromAst(
stateVariables[s2[1].componentName].stateValues.value,
);
expect(s2math.equals(option[s2string])).eq(true);
- let sx =
- stateVariables[stateVariables["/sx"].replacements[0].componentName]
- .stateValues.value;
+ let sx = stateVariables["/sx"].stateValues.value;
expect(sx).eq(xoption[s2string]);
let repeatsmath = me.fromAst(
stateVariables[
@@ -2524,18 +2343,14 @@ describe("Select Tag Tests", function () {
expect(repeatsmath.equals(option[s2string])).eq(true);
let t2 =
- stateVariables[
- stateVariables[stateVariables["/t2"].replacements[0].componentName]
- .replacements[0].componentName
- ].activeChildren;
+ stateVariables[stateVariables["/t2"].replacements[0].componentName]
+ .activeChildren;
let t2string = t2[0];
let t2math = me.fromAst(
stateVariables[t2[1].componentName].stateValues.value,
);
expect(t2math.equals(option[t2string])).eq(true);
- let tx =
- stateVariables[stateVariables["/tx"].replacements[0].componentName]
- .stateValues.value;
+ let tx = stateVariables["/tx"].stateValues.value;
expect(tx).eq(xoption[t2string]);
let repeattmath = me.fromAst(
stateVariables[
@@ -2547,18 +2362,14 @@ describe("Select Tag Tests", function () {
expect(repeattmath.equals(option[t2string])).eq(true);
let u2 =
- stateVariables[
- stateVariables[stateVariables["/u2"].replacements[0].componentName]
- .replacements[0].componentName
- ].activeChildren;
+ stateVariables[stateVariables["/u2"].replacements[0].componentName]
+ .activeChildren;
let u2string = u2[0];
let u2math = me.fromAst(
stateVariables[u2[1].componentName].stateValues.value,
);
expect(u2math.equals(option[u2string])).eq(true);
- let ux =
- stateVariables[stateVariables["/ux"].replacements[0].componentName]
- .stateValues.value;
+ let ux = stateVariables["/ux"].stateValues.value;
expect(ux).eq(xoption[u2string]);
let repeatumath = me.fromAst(
stateVariables[
@@ -2579,20 +2390,20 @@ describe("Select Tag Tests", function () {
a
- Option 1: 3x + a +
Option 2: 4y + b +
Option 3: 5z + c +
Option 1: 3x + a + $x^2$z1^3
Option 2: 4y + b + $y^2$z2^3
Option 3: 5z + c + $z^2$z3^3
Selected options repeated
- Copy select itself
-
+
`,
},
@@ -2619,10 +2430,8 @@ describe("Select Tag Tests", function () {
let stateVariables = await win.returnAllStateVariables1();
let q2 =
- stateVariables[
- stateVariables[stateVariables["/q2"].replacements[0].componentName]
- .replacements[0].componentName
- ].activeChildren;
+ stateVariables[stateVariables["/q2"].replacements[0].componentName]
+ .activeChildren;
let q2string = q2[0];
let q2math = me.fromAst(
stateVariables[q2[1].componentName].stateValues.value,
@@ -2638,10 +2447,8 @@ describe("Select Tag Tests", function () {
expect(repeatqmath.equals(option[q2string])).eq(true);
let r2 =
- stateVariables[
- stateVariables[stateVariables["/r2"].replacements[0].componentName]
- .replacements[0].componentName
- ].activeChildren;
+ stateVariables[stateVariables["/r2"].replacements[0].componentName]
+ .activeChildren;
let r2string = r2[0];
let r2math = me.fromAst(
stateVariables[r2[1].componentName].stateValues.value,
@@ -2657,10 +2464,8 @@ describe("Select Tag Tests", function () {
expect(repeatrmath.equals(option[r2string])).eq(true);
let s2 =
- stateVariables[
- stateVariables[stateVariables["/s2"].replacements[0].componentName]
- .replacements[0].componentName
- ].activeChildren;
+ stateVariables[stateVariables["/s2"].replacements[0].componentName]
+ .activeChildren;
let s2string = s2[0];
let s2math = me.fromAst(
stateVariables[s2[1].componentName].stateValues.value,
@@ -2676,10 +2481,8 @@ describe("Select Tag Tests", function () {
expect(repeatsmath.equals(option[s2string])).eq(true);
let t2 =
- stateVariables[
- stateVariables[stateVariables["/t2"].replacements[0].componentName]
- .replacements[0].componentName
- ].activeChildren;
+ stateVariables[stateVariables["/t2"].replacements[0].componentName]
+ .activeChildren;
let t2string = t2[0];
let t2math = me.fromAst(
stateVariables[t2[1].componentName].stateValues.value,
@@ -2695,10 +2498,8 @@ describe("Select Tag Tests", function () {
expect(repeattmath.equals(option[t2string])).eq(true);
let u2 =
- stateVariables[
- stateVariables[stateVariables["/u2"].replacements[0].componentName]
- .replacements[0].componentName
- ].activeChildren;
+ stateVariables[stateVariables["/u2"].replacements[0].componentName]
+ .activeChildren;
let u2string = u2[0];
let u2math = me.fromAst(
stateVariables[u2[1].componentName].stateValues.value,
@@ -2733,8 +2534,8 @@ describe("Select Tag Tests", function () {
- Selected variable repeated:
- Selected variable repeated again:
+ Selected variable repeated: $x{name="x2"}
+ Selected variable repeated again: $_select1{name="x3"}
`,
requestedVariantIndex: 2,
},
@@ -2764,9 +2565,7 @@ describe("Select Tag Tests", function () {
].stateValues.value;
expect(xorig).eq(expectedx);
- let x2 =
- stateVariables[stateVariables["/x2"].replacements[0].componentName]
- .stateValues.value;
+ let x2 = stateVariables["/x2"].stateValues.value;
expect(x2).eq(expectedx);
let x3 =
@@ -2798,10 +2597,10 @@ describe("Select Tag Tests", function () {
- Selected first variable:
- Selected second variable:
- Selected third variable:
- Selected variables repeated:
+ Selected first variable: $x{name="x2"}
+ Selected second variable: $y{name="y2"}
+ Selected third variable: $z{name="z2"}
+ Selected variables repeated: $_select1{name="s2"}
`,
requestedVariantIndex: 3,
@@ -2862,17 +2661,11 @@ describe("Select Tag Tests", function () {
].stateValues.value;
expect(zorig).eq(z);
- let x2 =
- stateVariables[stateVariables["/x2"].replacements[0].componentName]
- .stateValues.value;
+ let x2 = stateVariables["/x2"].stateValues.value;
expect(x2).eq(x);
- let y2 =
- stateVariables[stateVariables["/y2"].replacements[0].componentName]
- .stateValues.value;
+ let y2 = stateVariables["/y2"].stateValues.value;
expect(y2).eq(y);
- let z2 =
- stateVariables[stateVariables["/z2"].replacements[0].componentName]
- .stateValues.value;
+ let z2 = stateVariables["/z2"].stateValues.value;
expect(z2).eq(z);
let x3 =
@@ -3543,29 +3336,29 @@ describe("Select Tag Tests", function () {
a
- a e i o u
z
q r
a e i o u $q{name="q2"}$r{name="r2"}
z
q r $q{name="q2"}$r{name="r2"}
Selected options repeated
- Copy q and r and their copies from within selected options
-
-
-
-
-
-
-
+ $(q/q{name="qq"})$(q/r{name="qr"})$(q/q2{name="qq2"})$(q/r2{name="qr2"})
+ $(r/q{name="rq"})$(r/r{name="rr"})$(r/q2{name="rq2"})$(r/r2{name="rr2"})
+ $(s/q{name="sq"})$(s/r{name="sr"})$(s/q2{name="sq2"})$(s/r2{name="sr2"})
+ $(t/q{name="tq"})$(t/r{name="tr"})$(t/q2{name="tq2"})$(t/r2{name="tr2"})
+ $(u/q{name="uq"})$(u/r{name="ur"})$(u/q2{name="uq2"})$(u/r2{name="ur2"})
+ $(v/q{name="vq"})$(v/r{name="vr"})$(v/q2{name="vq2"})$(v/r2{name="vr2"})
+ $(w/q{name="wq"})$(w/r{name="wr"})$(w/q2{name="wq2"})$(w/r2{name="wr2"})
`,
},
@@ -3600,39 +3393,25 @@ describe("Select Tag Tests", function () {
(x) => stateVariables[x.componentName].stateValues.value,
);
- let q2s = stateVariables[
- stateVariables["/q2"].replacements[0].componentName
- ].activeChildren.map(
+ let q2s = stateVariables["/q2"].activeChildren.map(
(x) => stateVariables[x.componentName].stateValues.value,
);
- let r2s = stateVariables[
- stateVariables["/r2"].replacements[0].componentName
- ].activeChildren.map(
+ let r2s = stateVariables["/r2"].activeChildren.map(
(x) => stateVariables[x.componentName].stateValues.value,
);
- let s2s = stateVariables[
- stateVariables["/s2"].replacements[0].componentName
- ].activeChildren.map(
+ let s2s = stateVariables["/s2"].activeChildren.map(
(x) => stateVariables[x.componentName].stateValues.value,
);
- let t2s = stateVariables[
- stateVariables["/t2"].replacements[0].componentName
- ].activeChildren.map(
+ let t2s = stateVariables["/t2"].activeChildren.map(
(x) => stateVariables[x.componentName].stateValues.value,
);
- let u2s = stateVariables[
- stateVariables["/u2"].replacements[0].componentName
- ].activeChildren.map(
+ let u2s = stateVariables["/u2"].activeChildren.map(
(x) => stateVariables[x.componentName].stateValues.value,
);
- let v2s = stateVariables[
- stateVariables["/v2"].replacements[0].componentName
- ].activeChildren.map(
+ let v2s = stateVariables["/v2"].activeChildren.map(
(x) => stateVariables[x.componentName].stateValues.value,
);
- let w2s = stateVariables[
- stateVariables["/w2"].replacements[0].componentName
- ].activeChildren.map(
+ let w2s = stateVariables["/w2"].activeChildren.map(
(x) => stateVariables[x.componentName].stateValues.value,
);
@@ -3645,74 +3424,46 @@ describe("Select Tag Tests", function () {
expect(w2s).eqls(ws);
let q3s = [
- stateVariables[stateVariables["/qq"].replacements[0].componentName]
- .stateValues.value,
- stateVariables[stateVariables["/qr"].replacements[0].componentName]
- .stateValues.value,
- stateVariables[stateVariables["/qq2"].replacements[0].componentName]
- .stateValues.value,
- stateVariables[stateVariables["/qr2"].replacements[0].componentName]
- .stateValues.value,
+ stateVariables["/qq"].stateValues.value,
+ stateVariables["/qr"].stateValues.value,
+ stateVariables["/qq2"].stateValues.value,
+ stateVariables["/qr2"].stateValues.value,
];
let r3s = [
- stateVariables[stateVariables["/rq"].replacements[0].componentName]
- .stateValues.value,
- stateVariables[stateVariables["/rr"].replacements[0].componentName]
- .stateValues.value,
- stateVariables[stateVariables["/rq2"].replacements[0].componentName]
- .stateValues.value,
- stateVariables[stateVariables["/rr2"].replacements[0].componentName]
- .stateValues.value,
+ stateVariables["/rq"].stateValues.value,
+ stateVariables["/rr"].stateValues.value,
+ stateVariables["/rq2"].stateValues.value,
+ stateVariables["/rr2"].stateValues.value,
];
let s3s = [
- stateVariables[stateVariables["/sq"].replacements[0].componentName]
- .stateValues.value,
- stateVariables[stateVariables["/sr"].replacements[0].componentName]
- .stateValues.value,
- stateVariables[stateVariables["/sq2"].replacements[0].componentName]
- .stateValues.value,
- stateVariables[stateVariables["/sr2"].replacements[0].componentName]
- .stateValues.value,
+ stateVariables["/sq"].stateValues.value,
+ stateVariables["/sr"].stateValues.value,
+ stateVariables["/sq2"].stateValues.value,
+ stateVariables["/sr2"].stateValues.value,
];
let t3s = [
- stateVariables[stateVariables["/tq"].replacements[0].componentName]
- .stateValues.value,
- stateVariables[stateVariables["/tr"].replacements[0].componentName]
- .stateValues.value,
- stateVariables[stateVariables["/tq2"].replacements[0].componentName]
- .stateValues.value,
- stateVariables[stateVariables["/tr2"].replacements[0].componentName]
- .stateValues.value,
+ stateVariables["/tq"].stateValues.value,
+ stateVariables["/tr"].stateValues.value,
+ stateVariables["/tq2"].stateValues.value,
+ stateVariables["/tr2"].stateValues.value,
];
let u3s = [
- stateVariables[stateVariables["/uq"].replacements[0].componentName]
- .stateValues.value,
- stateVariables[stateVariables["/ur"].replacements[0].componentName]
- .stateValues.value,
- stateVariables[stateVariables["/uq2"].replacements[0].componentName]
- .stateValues.value,
- stateVariables[stateVariables["/ur2"].replacements[0].componentName]
- .stateValues.value,
+ stateVariables["/uq"].stateValues.value,
+ stateVariables["/ur"].stateValues.value,
+ stateVariables["/uq2"].stateValues.value,
+ stateVariables["/ur2"].stateValues.value,
];
let v3s = [
- stateVariables[stateVariables["/vq"].replacements[0].componentName]
- .stateValues.value,
- stateVariables[stateVariables["/vr"].replacements[0].componentName]
- .stateValues.value,
- stateVariables[stateVariables["/vq2"].replacements[0].componentName]
- .stateValues.value,
- stateVariables[stateVariables["/vr2"].replacements[0].componentName]
- .stateValues.value,
+ stateVariables["/vq"].stateValues.value,
+ stateVariables["/vr"].stateValues.value,
+ stateVariables["/vq2"].stateValues.value,
+ stateVariables["/vr2"].stateValues.value,
];
let w3s = [
- stateVariables[stateVariables["/wq"].replacements[0].componentName]
- .stateValues.value,
- stateVariables[stateVariables["/wr"].replacements[0].componentName]
- .stateValues.value,
- stateVariables[stateVariables["/wq2"].replacements[0].componentName]
- .stateValues.value,
- stateVariables[stateVariables["/wr2"].replacements[0].componentName]
- .stateValues.value,
+ stateVariables["/wq"].stateValues.value,
+ stateVariables["/wr"].stateValues.value,
+ stateVariables["/wq2"].stateValues.value,
+ stateVariables["/wr2"].stateValues.value,
];
expect(q3s).eqls(qs);
@@ -3732,37 +3483,37 @@ describe("Select Tag Tests", function () {
doenetML: `
a
- a e i o u
a e i o u $(s/q{name="q2"})$(s/r{name="r2"})
Selected options repeated
- Selected options repeated, no p
-
-
-
-
-
-
-
+ $(q/s{name="q3"})
+ $(r/s{name="r3"})
+ $(s/s{name="s3"})
+ $(t/s{name="t3"})
+ $(u/s{name="u3"})
+ $(v/s{name="v3"})
+ $(w/s{name="w3"})
Copy q and r from within selected options
-
-
-
-
-
-
-
+ $(q/s/q{name="qq"})$(q/s/r{name="qr"})$(q/q2{name="qq2"})$(q/r2{name="qr2"})
+ $(r/s/q{name="rq"})$(r/s/r{name="rr"})$(r/q2{name="rq2"})$(r/r2{name="rr2"})
+ $(s/s/q{name="sq"})$(s/s/r{name="sr"})$(s/q2{name="sq2"})$(s/r2{name="sr2"})
+ $(t/s/q{name="tq"})$(t/s/r{name="tr"})$(t/q2{name="tq2"})$(t/r2{name="tr2"})
+ $(u/s/q{name="uq"})$(u/s/r{name="ur"})$(u/q2{name="uq2"})$(u/r2{name="ur2"})
+ $(v/s/q{name="vq"})$(v/s/r{name="vr"})$(v/q2{name="vq2"})$(v/r2{name="vr2"})
+ $(w/s/q{name="wq"})$(w/s/r{name="wr"})$(w/q2{name="wq2"})$(w/r2{name="wr2"})
`,
},
@@ -3797,39 +3548,25 @@ describe("Select Tag Tests", function () {
(x) => stateVariables[x.componentName].stateValues.value,
);
- let q2s = stateVariables[
- stateVariables["/q2"].replacements[0].componentName
- ].activeChildren.map(
+ let q2s = stateVariables["/q2"].activeChildren.map(
(x) => stateVariables[x.componentName].stateValues.value,
);
- let r2s = stateVariables[
- stateVariables["/r2"].replacements[0].componentName
- ].activeChildren.map(
+ let r2s = stateVariables["/r2"].activeChildren.map(
(x) => stateVariables[x.componentName].stateValues.value,
);
- let s2s = stateVariables[
- stateVariables["/s2"].replacements[0].componentName
- ].activeChildren.map(
+ let s2s = stateVariables["/s2"].activeChildren.map(
(x) => stateVariables[x.componentName].stateValues.value,
);
- let t2s = stateVariables[
- stateVariables["/t2"].replacements[0].componentName
- ].activeChildren.map(
+ let t2s = stateVariables["/t2"].activeChildren.map(
(x) => stateVariables[x.componentName].stateValues.value,
);
- let u2s = stateVariables[
- stateVariables["/u2"].replacements[0].componentName
- ].activeChildren.map(
+ let u2s = stateVariables["/u2"].activeChildren.map(
(x) => stateVariables[x.componentName].stateValues.value,
);
- let v2s = stateVariables[
- stateVariables["/v2"].replacements[0].componentName
- ].activeChildren.map(
+ let v2s = stateVariables["/v2"].activeChildren.map(
(x) => stateVariables[x.componentName].stateValues.value,
);
- let w2s = stateVariables[
- stateVariables["/w2"].replacements[0].componentName
- ].activeChildren.map(
+ let w2s = stateVariables["/w2"].activeChildren.map(
(x) => stateVariables[x.componentName].stateValues.value,
);
@@ -3900,74 +3637,46 @@ describe("Select Tag Tests", function () {
expect(w3s).eqls(ws.slice(0, 2));
let q4s = [
- stateVariables[stateVariables["/qq"].replacements[0].componentName]
- .stateValues.value,
- stateVariables[stateVariables["/qr"].replacements[0].componentName]
- .stateValues.value,
- stateVariables[stateVariables["/qq2"].replacements[0].componentName]
- .stateValues.value,
- stateVariables[stateVariables["/qr2"].replacements[0].componentName]
- .stateValues.value,
+ stateVariables["/qq"].stateValues.value,
+ stateVariables["/qr"].stateValues.value,
+ stateVariables["/qq2"].stateValues.value,
+ stateVariables["/qr2"].stateValues.value,
];
let r4s = [
- stateVariables[stateVariables["/rq"].replacements[0].componentName]
- .stateValues.value,
- stateVariables[stateVariables["/rr"].replacements[0].componentName]
- .stateValues.value,
- stateVariables[stateVariables["/rq2"].replacements[0].componentName]
- .stateValues.value,
- stateVariables[stateVariables["/rr2"].replacements[0].componentName]
- .stateValues.value,
+ stateVariables["/rq"].stateValues.value,
+ stateVariables["/rr"].stateValues.value,
+ stateVariables["/rq2"].stateValues.value,
+ stateVariables["/rr2"].stateValues.value,
];
let s4s = [
- stateVariables[stateVariables["/sq"].replacements[0].componentName]
- .stateValues.value,
- stateVariables[stateVariables["/sr"].replacements[0].componentName]
- .stateValues.value,
- stateVariables[stateVariables["/sq2"].replacements[0].componentName]
- .stateValues.value,
- stateVariables[stateVariables["/sr2"].replacements[0].componentName]
- .stateValues.value,
+ stateVariables["/sq"].stateValues.value,
+ stateVariables["/sr"].stateValues.value,
+ stateVariables["/sq2"].stateValues.value,
+ stateVariables["/sr2"].stateValues.value,
];
let t4s = [
- stateVariables[stateVariables["/tq"].replacements[0].componentName]
- .stateValues.value,
- stateVariables[stateVariables["/tr"].replacements[0].componentName]
- .stateValues.value,
- stateVariables[stateVariables["/tq2"].replacements[0].componentName]
- .stateValues.value,
- stateVariables[stateVariables["/tr2"].replacements[0].componentName]
- .stateValues.value,
+ stateVariables["/tq"].stateValues.value,
+ stateVariables["/tr"].stateValues.value,
+ stateVariables["/tq2"].stateValues.value,
+ stateVariables["/tr2"].stateValues.value,
];
let u4s = [
- stateVariables[stateVariables["/uq"].replacements[0].componentName]
- .stateValues.value,
- stateVariables[stateVariables["/ur"].replacements[0].componentName]
- .stateValues.value,
- stateVariables[stateVariables["/uq2"].replacements[0].componentName]
- .stateValues.value,
- stateVariables[stateVariables["/ur2"].replacements[0].componentName]
- .stateValues.value,
+ stateVariables["/uq"].stateValues.value,
+ stateVariables["/ur"].stateValues.value,
+ stateVariables["/uq2"].stateValues.value,
+ stateVariables["/ur2"].stateValues.value,
];
let v4s = [
- stateVariables[stateVariables["/vq"].replacements[0].componentName]
- .stateValues.value,
- stateVariables[stateVariables["/vr"].replacements[0].componentName]
- .stateValues.value,
- stateVariables[stateVariables["/vq2"].replacements[0].componentName]
- .stateValues.value,
- stateVariables[stateVariables["/vr2"].replacements[0].componentName]
- .stateValues.value,
+ stateVariables["/vq"].stateValues.value,
+ stateVariables["/vr"].stateValues.value,
+ stateVariables["/vq2"].stateValues.value,
+ stateVariables["/vr2"].stateValues.value,
];
let w4s = [
- stateVariables[stateVariables["/wq"].replacements[0].componentName]
- .stateValues.value,
- stateVariables[stateVariables["/wr"].replacements[0].componentName]
- .stateValues.value,
- stateVariables[stateVariables["/wq2"].replacements[0].componentName]
- .stateValues.value,
- stateVariables[stateVariables["/wr2"].replacements[0].componentName]
- .stateValues.value,
+ stateVariables["/wq"].stateValues.value,
+ stateVariables["/wr"].stateValues.value,
+ stateVariables["/wq2"].stateValues.value,
+ stateVariables["/wr2"].stateValues.value,
];
expect(q4s).eqls(qs);
@@ -3988,23 +3697,23 @@ describe("Select Tag Tests", function () {
doenetML: `
1
- a e i o u
- a z
+ a e i o u $q{name="q2"}$r{name="r2"}
+ a z $q{name="q2"}$r{name="r2"}
Selected options repeated
-
-
-
-
-
+ $q{name="q2"}
+ $r{name="r2"}
+ $s{name="s2"}
+ $t{name="t2"}
+ $u{name="u2"}
Copy x/q and x/r and their copies from within selected options
-
-
-
-
-
+ $(q/q{name="qq2"})$(q/r{name="qr2"})$qq{name="qq3"}$qr{name="qr3"}
+ $(r/q{name="rq2"})$(r/r{name="rr2"})$rq{name="rq3"}$rr{name="rr3"}
+ $(s/q{name="sq2"})$(s/r{name="sr2"})$sq{name="sq3"}$sr{name="sr3"}
+ $(t/q{name="tq2"})$(t/r{name="tr2"})$tq{name="tq3"}$tr{name="tr3"}
+ $(u/q{name="uq2"})$(u/r{name="ur2"})$uq{name="uq3"}$ur{name="ur3"}
`,
},
@@ -4148,23 +3857,23 @@ describe("Select Tag Tests", function () {
doenetML: `
1
- a e i o u
- a z
+ a e i o u $(a/q{name="q2"})$(a/r{name="r2"})
+ a z $(b/q{name="q2"})$(b/r{name="r2"})
Selected options repeated
-
-
-
-
-
+ $q{name="q2"}
+ $r{name="r2"}
+ $s{name="s2"}
+ $t{name="t2"}
+ $u{name="u2"}
Copy x/q and x/r and their copies from within selected options
-
-
-
-
-
+ $(q/q{name="qq2"})$(q/r{name="qr2"})$qq{name="qq3"}$qr{name="qr3"}
+ $(r/q{name="rq2"})$(r/r{name="rr2"})$rq{name="rq3"}$rr{name="rr3"}
+ $(s/q{name="sq2"})$(s/r{name="sr2"})$sq{name="sq3"}$sr{name="sr3"}
+ $(t/q{name="tq2"})$(t/r{name="tr2"})$tq{name="tq3"}$tr{name="tr3"}
+ $(u/q{name="uq2"})$(u/r{name="ur2"})$uq{name="uq3"}$ur{name="ur3"}
`,
@@ -4313,18 +4022,18 @@ describe("Select Tag Tests", function () {
Selected options repeated
-
-
-
-
-
+ $q{name="q2"}
+ $r{name="r2"}
+ $s{name="s2"}
+ $t{name="t2"}
+ $u{name="u2"}
Copy x/q and x/r
-
-
-
-
-
+ $(q/q{name="qq"})$(q/r{name="qr"})
+ $(r/q{name="rq"})$(r/r{name="rr"})
+ $(s/q{name="sq"})$(s/r{name="sr"})
+ $(t/q{name="tq"})$(t/r{name="tr"})
+ $(u/q{name="uq"})$(u/r{name="ur"})
`,
},
@@ -4416,34 +4125,24 @@ describe("Select Tag Tests", function () {
expect(u2s).eqls(us);
let q3s = [
- stateVariables[stateVariables["/qq"].replacements[0].componentName]
- .stateValues.value,
- stateVariables[stateVariables["/qr"].replacements[0].componentName]
- .stateValues.value,
+ stateVariables["/qq"].stateValues.value,
+ stateVariables["/qr"].stateValues.value,
];
let r3s = [
- stateVariables[stateVariables["/rq"].replacements[0].componentName]
- .stateValues.value,
- stateVariables[stateVariables["/rr"].replacements[0].componentName]
- .stateValues.value,
+ stateVariables["/rq"].stateValues.value,
+ stateVariables["/rr"].stateValues.value,
];
let s3s = [
- stateVariables[stateVariables["/sq"].replacements[0].componentName]
- .stateValues.value,
- stateVariables[stateVariables["/sr"].replacements[0].componentName]
- .stateValues.value,
+ stateVariables["/sq"].stateValues.value,
+ stateVariables["/sr"].stateValues.value,
];
let t3s = [
- stateVariables[stateVariables["/tq"].replacements[0].componentName]
- .stateValues.value,
- stateVariables[stateVariables["/tr"].replacements[0].componentName]
- .stateValues.value,
+ stateVariables["/tq"].stateValues.value,
+ stateVariables["/tr"].stateValues.value,
];
let u3s = [
- stateVariables[stateVariables["/uq"].replacements[0].componentName]
- .stateValues.value,
- stateVariables[stateVariables["/ur"].replacements[0].componentName]
- .stateValues.value,
+ stateVariables["/uq"].stateValues.value,
+ stateVariables["/ur"].stateValues.value,
];
expect(q3s).eqls(qs);
@@ -4475,19 +4174,19 @@ describe("Select Tag Tests", function () {
Selected options repeated
-
-
-
+ $q{name="q2"}
+ $r{name="r2"}
+ $s{name="s2"}
Copy x/q, x/r, x/s
-
-
-
+ $(q/q{name="qq"})$(q/r{name="qr"})$(q/s{name="qs"})
+ $(r/q{name="rq"})$(r/r{name="rr"})$(r/s{name="rs"})
+ $(s/q{name="sq"})$(s/r{name="sr"})$(s/s{name="ss"})
Copy x/x/q, x/x/r
-
-
-
+ $(q/q/q{name="qqq"})$(q/q/r{name="qqr"})$(q/r/q{name="qrq"})$(q/r/r{name="qrr"})$(q/s/q{name="qsq"})$(q/s/r{name="qsr"})
+ $(r/q/q{name="rqq"})$(r/q/r{name="rqr"})$(r/r/q{name="rrq"})$(r/r/r{name="rrr"})$(r/s/q{name="rsq"})$(r/s/r{name="rsr"})
+ $(s/q/q{name="sqq"})$(s/q/r{name="sqr"})$(s/r/q{name="srq"})$(s/r/r{name="srr"})$(s/s/q{name="ssq"})$(s/s/r{name="ssr"})
`,
},
@@ -4522,17 +4221,53 @@ describe("Select Tag Tests", function () {
: stateVariables[x].stateValues.value,
);
- cy.get(cesc("#\\/pq2")).should("have.text", qs.join(""));
- cy.get(cesc("#\\/pr2")).should("have.text", rs.join(""));
- cy.get(cesc("#\\/ps2")).should("have.text", ss.join(""));
-
- cy.get(cesc("#\\/pq3")).should("have.text", qs.join(""));
- cy.get(cesc("#\\/pr3")).should("have.text", rs.join(""));
- cy.get(cesc("#\\/ps3")).should("have.text", ss.join(""));
-
- cy.get(cesc("#\\/pq4")).should("have.text", qs.join(""));
- cy.get(cesc("#\\/pr4")).should("have.text", rs.join(""));
- cy.get(cesc("#\\/ps4")).should("have.text", ss.join(""));
+ cy.get(cesc("#\\/pq2"))
+ .invoke("text")
+ .then((text) => {
+ expect(text.replace(/, /g, "")).eq(qs.join(""));
+ });
+ cy.get(cesc("#\\/pr2"))
+ .invoke("text")
+ .then((text) => {
+ expect(text.replace(/, /g, "")).eq(rs.join(""));
+ });
+ cy.get(cesc("#\\/ps2"))
+ .invoke("text")
+ .then((text) => {
+ expect(text.replace(/, /g, "")).eq(ss.join(""));
+ });
+
+ cy.get(cesc("#\\/pq3"))
+ .invoke("text")
+ .then((text) => {
+ expect(text.replace(/, /g, "")).eq(qs.join(""));
+ });
+ cy.get(cesc("#\\/pr3"))
+ .invoke("text")
+ .then((text) => {
+ expect(text.replace(/, /g, "")).eq(rs.join(""));
+ });
+ cy.get(cesc("#\\/ps3"))
+ .invoke("text")
+ .then((text) => {
+ expect(text.replace(/, /g, "")).eq(ss.join(""));
+ });
+
+ cy.get(cesc("#\\/pq4"))
+ .invoke("text")
+ .then((text) => {
+ expect(text.replace(/, /g, "")).eq(qs.join(""));
+ });
+ cy.get(cesc("#\\/pr4"))
+ .invoke("text")
+ .then((text) => {
+ expect(text.replace(/, /g, "")).eq(rs.join(""));
+ });
+ cy.get(cesc("#\\/ps4"))
+ .invoke("text")
+ .then((text) => {
+ expect(text.replace(/, /g, "")).eq(ss.join(""));
+ });
});
});
@@ -4557,19 +4292,19 @@ describe("Select Tag Tests", function () {
Selected options repeated
-
-
-
+ $(a/q{name="q2"})
+ $(a/r{name="r2"})
+ $(a/s{name="s2"})
Copy x/q, x/r, x/s
-
-
-
+ $(a/q/q{name="qq"})$(a/q/r{name="qr"})$(a/q/s{name="qs"})
+ $(a/r/q{name="rq"})$(a/r/r{name="rr"})$(a/r/s{name="rs"})
+ $(a/s/q{name="sq"})$(a/s/r{name="sr"})$(a/s/s{name="ss"})
Copy x/x/q, x/x/r
-
-
-
+ $(a/q/q/q{name="qqq"})$(a/q/q/r{name="qqr"})$(a/q/r/q{name="qrq"})$(a/q/r/r{name="qrr"})$(a/q/s/q{name="qsq"})$(a/q/s/r{name="qsr"})
+ $(a/r/q/q{name="rqq"})$(a/r/q/r{name="rqr"})$(a/r/r/q{name="rrq"})$(a/r/r/r{name="rrr"})$(a/r/s/q{name="rsq"})$(a/r/s/r{name="rsr"})
+ $(a/s/q/q{name="sqq"})$(a/s/q/r{name="sqr"})$(a/s/r/q{name="srq"})$(a/s/r/r{name="srr"})$(a/s/s/q{name="ssq"})$(a/s/s/r{name="ssr"})
`,
},
@@ -4622,17 +4357,53 @@ describe("Select Tag Tests", function () {
: stateVariables[x].stateValues.value,
);
- cy.get(cesc("#\\/pq2")).should("have.text", qs.join(""));
- cy.get(cesc("#\\/pr2")).should("have.text", rs.join(""));
- cy.get(cesc("#\\/ps2")).should("have.text", ss.join(""));
-
- cy.get(cesc("#\\/pq3")).should("have.text", qs.join(""));
- cy.get(cesc("#\\/pr3")).should("have.text", rs.join(""));
- cy.get(cesc("#\\/ps3")).should("have.text", ss.join(""));
-
- cy.get(cesc("#\\/pq4")).should("have.text", qs.join(""));
- cy.get(cesc("#\\/pr4")).should("have.text", rs.join(""));
- cy.get(cesc("#\\/ps4")).should("have.text", ss.join(""));
+ cy.get(cesc("#\\/pq2"))
+ .invoke("text")
+ .then((text) => {
+ expect(text.replace(/, /g, "")).eq(qs.join(""));
+ });
+ cy.get(cesc("#\\/pr2"))
+ .invoke("text")
+ .then((text) => {
+ expect(text.replace(/, /g, "")).eq(rs.join(""));
+ });
+ cy.get(cesc("#\\/ps2"))
+ .invoke("text")
+ .then((text) => {
+ expect(text.replace(/, /g, "")).eq(ss.join(""));
+ });
+
+ cy.get(cesc("#\\/pq3"))
+ .invoke("text")
+ .then((text) => {
+ expect(text.replace(/, /g, "")).eq(qs.join(""));
+ });
+ cy.get(cesc("#\\/pr3"))
+ .invoke("text")
+ .then((text) => {
+ expect(text.replace(/, /g, "")).eq(rs.join(""));
+ });
+ cy.get(cesc("#\\/ps3"))
+ .invoke("text")
+ .then((text) => {
+ expect(text.replace(/, /g, "")).eq(ss.join(""));
+ });
+
+ cy.get(cesc("#\\/pq4"))
+ .invoke("text")
+ .then((text) => {
+ expect(text.replace(/, /g, "")).eq(qs.join(""));
+ });
+ cy.get(cesc("#\\/pr4"))
+ .invoke("text")
+ .then((text) => {
+ expect(text.replace(/, /g, "")).eq(rs.join(""));
+ });
+ cy.get(cesc("#\\/ps4"))
+ .invoke("text")
+ .then((text) => {
+ expect(text.replace(/, /g, "")).eq(ss.join(""));
+ });
});
});
@@ -4645,27 +4416,27 @@ describe("Select Tag Tests", function () {
x y z + 2z + 2$q{name="v"}
u v t + 2t + 2$q{name="v"}
Copy grandchidren
-
-
-
-
+ $a{name="a2"}
+ $b{name="b2"}
+ $c{name="c2"}
+ $d{name="d2"}
Copy named children of grandchild
-
-
+ $(a/w{name="w2"})
+ $(b/v{name="v2"})
`,
},
@@ -4721,42 +4492,12 @@ describe("Select Tag Tests", function () {
option.d,
);
- let a2 = me
- .fromAst(
- stateVariables[stateVariables["/a2"].replacements[0].componentName]
- .stateValues.value,
- )
- .toString();
- let b2 = me
- .fromAst(
- stateVariables[stateVariables["/b2"].replacements[0].componentName]
- .stateValues.value,
- )
- .toString();
- let c2 = me
- .fromAst(
- stateVariables[stateVariables["/c2"].replacements[0].componentName]
- .stateValues.value,
- )
- .toString();
- let d2 = me
- .fromAst(
- stateVariables[stateVariables["/d2"].replacements[0].componentName]
- .stateValues.value,
- )
- .toString();
- let v2 = me
- .fromAst(
- stateVariables[stateVariables["/v2"].replacements[0].componentName]
- .stateValues.value,
- )
- .toString();
- let w2 = me
- .fromAst(
- stateVariables[stateVariables["/w2"].replacements[0].componentName]
- .stateValues.value,
- )
- .toString();
+ let a2 = me.fromAst(stateVariables["/a2"].stateValues.value).toString();
+ let b2 = me.fromAst(stateVariables["/b2"].stateValues.value).toString();
+ let c2 = me.fromAst(stateVariables["/c2"].stateValues.value).toString();
+ let d2 = me.fromAst(stateVariables["/d2"].stateValues.value).toString();
+ let v2 = me.fromAst(stateVariables["/v2"].stateValues.value).toString();
+ let w2 = me.fromAst(stateVariables["/w2"].stateValues.value).toString();
expect(a2).eq(option.a);
expect(b2).eq(option.b);
@@ -4805,20 +4546,20 @@ describe("Select Tag Tests", function () {
Copy whole select again
-
+ $_select1{name="s2"}
Copy individual selections
-
Copy individual pieces
-
`,
},
@@ -4851,13 +4592,7 @@ describe("Select Tag Tests", function () {
expect(theList3).eqls(theList1);
let theList4 = [...Array(24).keys()].map((i) =>
- me
- .fromAst(
- stateVariables[
- stateVariables["/p" + (i + 1)].replacements[0].componentName
- ].stateValues.value,
- )
- .toString(),
+ me.fromAst(stateVariables["/p" + (i + 1)].stateValues.value).toString(),
);
expect(theList4).eqls(theList1);
@@ -4902,20 +4637,20 @@ describe("Select Tag Tests", function () {
Copy whole select again
-
+ $s{name="s2"}
Copy individual selections
-
Copy individual pieces
-
`,
},
@@ -4948,13 +4683,7 @@ describe("Select Tag Tests", function () {
expect(theList3).eqls(theList1);
let theList4 = [...Array(24).keys()].map((i) =>
- me
- .fromAst(
- stateVariables[
- stateVariables["/p" + (i + 1)].replacements[0].componentName
- ].stateValues.value,
- )
- .toString(),
+ me.fromAst(stateVariables["/p" + (i + 1)].stateValues.value).toString(),
);
expect(theList4).eqls(theList1);
@@ -4980,7 +4709,7 @@ describe("Select Tag Tests", function () {
d e
-
+ $c, $d
`,
},
"*",
@@ -5033,7 +4762,7 @@ describe("Select Tag Tests", function () {
f
-
+ $a,
`,
},
"*",
@@ -5087,7 +4816,7 @@ describe("Select Tag Tests", function () {
d e
-
+ $c, $d
`,
},
"*",
@@ -5137,12 +4866,14 @@ describe("Select Tag Tests", function () {
The $animal2 $verb2.
- a1:
+ a1: $a{assignNames="a11 a12 a13 a14"}
- pieces:
+ pieces:
- b1:
- c1:
+ b1: $b{name="b1"}
+ c1: $c{name="c1"}
+ d1: $d{name="d1"}
+ e1: $e{name="e1"}
`,
@@ -5182,13 +4913,19 @@ describe("Select Tag Tests", function () {
"have.text",
`pieces: The ${option.animal} ${option.verb}.`,
);
- cy.get(cesc("#\\/pb1")).should("have.text", `b1: ${option.animal}`);
- cy.get(cesc("#\\/pc1")).should("have.text", `c1: ${option.verb}`);
-
- cy.get(cesc("#\\/a11")).should("have.text", `${option.animal}`);
- cy.get(cesc("#\\/a12")).should("have.text", `${option.verb}`);
- cy.get(cesc("#\\/b1")).should("have.text", `${option.animal}`);
- cy.get(cesc("#\\/c1")).should("have.text", `${option.verb}`);
+ cy.get(cesc("#\\/pb1")).should("have.text", `b1: `);
+ cy.get(cesc("#\\/pc1")).should("have.text", `c1: ${option.animal}`);
+ cy.get(cesc("#\\/pd1")).should("have.text", `d1: ${option.verb}`);
+ cy.get(cesc("#\\/pe1")).should("have.text", `e1: `);
+
+ cy.get(cesc("#\\/a11")).should("not.exist");
+ cy.get(cesc("#\\/a12")).should("have.text", `${option.animal}`);
+ cy.get(cesc("#\\/a13")).should("have.text", `${option.verb}`);
+ cy.get(cesc("#\\/a14")).should("not.exist");
+ cy.get(cesc("#\\/b1")).should("not.exist");
+ cy.get(cesc("#\\/c1")).should("have.text", `${option.animal}`);
+ cy.get(cesc("#\\/d1")).should("have.text", `${option.verb}`);
+ cy.get(cesc("#\\/e1")).should("not.exist");
});
});
diff --git a/cypress/e2e/DoenetML/tagSpecific/selectfromsequence.cy.js b/cypress/e2e/DoenetML/tagSpecific/selectfromsequence.cy.js
index 8329a7a698..0d126cf92c 100644
--- a/cypress/e2e/DoenetML/tagSpecific/selectfromsequence.cy.js
+++ b/cypress/e2e/DoenetML/tagSpecific/selectfromsequence.cy.js
@@ -1099,11 +1099,11 @@ describe("SelectFromSequence Tag Tests", function () {
$n2+$num2+2
+ $n3+$num3
+ $num3{name="n3"}
1
`,
},
@@ -1145,6 +1145,42 @@ describe("SelectFromSequence Tag Tests", function () {
});
});
+ it("asList", () => {
+ cy.window().then(async (win) => {
+ win.postMessage(
+ {
+ doenetML: `
+ a
+
+
+
+ `,
+ },
+ "*",
+ );
+ });
+
+ cy.get(cesc("#\\/_text1")).should("have.text", "a"); //wait for page to load
+
+ let results = [];
+
+ cy.window().then(async (win) => {
+ let stateVariables = await win.returnAllStateVariables1();
+
+ results.push(stateVariables["/u"].stateValues.value);
+ results.push(stateVariables["/v"].stateValues.value);
+ results.push(stateVariables["/w"].stateValues.value);
+ results.push(stateVariables["/x"].stateValues.value);
+ results.push(stateVariables["/y"].stateValues.value);
+
+ for (let num of results) {
+ expect(num).gte(175).lte(205);
+ }
+ cy.get(cesc2("#/_p1")).should("have.text", results.join(", "));
+ cy.get(cesc2("#/_p2")).should("have.text", results.join(""));
+ });
+ });
+
it("copies don't resample", () => {
cy.window().then(async (win) => {
win.postMessage(
@@ -1157,18 +1193,18 @@ describe("SelectFromSequence Tag Tests", function () {
-
-
+ $_aslist1{name="noresamplelist"}
-
+ $noresamplelist{name="noreresamplelist"}
-
-
+ $maxnum2.value{assignNames="maxnum2a"}
`,
},
"*",
@@ -1391,17 +1411,17 @@ describe("SelectFromSequence Tag Tests", function () {
-
-
+ $_map1
+ $_aslist1
-
+ $p4{name="p7"}
+ $p5{name="p8"}
+ $p6{name="p9"}
+ $_mathinput1.value{assignNames="m1"}
`,
},
"*",
@@ -1429,40 +1449,28 @@ describe("SelectFromSequence Tag Tests", function () {
.activeChildren.length,
).eq(0);
expect(
- stateVariables[
- stateVariables[stateVariables["/p4"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p4"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(0);
expect(
- stateVariables[
- stateVariables[stateVariables["/p5"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p5"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(0);
expect(
- stateVariables[
- stateVariables[stateVariables["/p6"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p6"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(0);
expect(
- stateVariables[
- stateVariables[stateVariables["/p7"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p7"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(0);
expect(
- stateVariables[
- stateVariables[stateVariables["/p8"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p8"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(0);
expect(
- stateVariables[
- stateVariables[stateVariables["/p9"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p9"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(0);
});
@@ -1489,40 +1497,28 @@ describe("SelectFromSequence Tag Tests", function () {
.activeChildren.length,
).eq(1);
expect(
- stateVariables[
- stateVariables[stateVariables["/p4"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p4"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(1);
expect(
- stateVariables[
- stateVariables[stateVariables["/p5"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p5"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(1);
expect(
- stateVariables[
- stateVariables[stateVariables["/p6"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p6"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(1);
expect(
- stateVariables[
- stateVariables[stateVariables["/p7"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p7"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(1);
expect(
- stateVariables[
- stateVariables[stateVariables["/p8"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p8"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(1);
expect(
- stateVariables[
- stateVariables[stateVariables["/p9"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p9"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(1);
for (let ind = 0; ind < 1; ind++) {
expect(
@@ -1549,54 +1545,42 @@ describe("SelectFromSequence Tag Tests", function () {
expect(
stateVariables[
stateVariables[
- stateVariables[
- stateVariables["/p4"].replacements[0].componentName
- ].activeChildren[0].componentName
+ stateVariables["/p4"].activeChildren[0].componentName
].activeChildren[ind].componentName
].stateValues.value,
).eq(samplednumbers[ind]);
expect(
stateVariables[
stateVariables[
- stateVariables[
- stateVariables["/p5"].replacements[0].componentName
- ].activeChildren[0].componentName
+ stateVariables["/p5"].activeChildren[0].componentName
].activeChildren[ind].componentName
].stateValues.value,
).eq(samplednumbers[ind]);
expect(
stateVariables[
stateVariables[
- stateVariables[
- stateVariables["/p6"].replacements[0].componentName
- ].activeChildren[0].componentName
+ stateVariables["/p6"].activeChildren[0].componentName
].activeChildren[ind].componentName
].stateValues.value,
).eq(samplednumbers[ind]);
expect(
stateVariables[
stateVariables[
- stateVariables[
- stateVariables["/p7"].replacements[0].componentName
- ].activeChildren[0].componentName
+ stateVariables["/p7"].activeChildren[0].componentName
].activeChildren[ind].componentName
].stateValues.value,
).eq(samplednumbers[ind]);
expect(
stateVariables[
stateVariables[
- stateVariables[
- stateVariables["/p8"].replacements[0].componentName
- ].activeChildren[0].componentName
+ stateVariables["/p8"].activeChildren[0].componentName
].activeChildren[ind].componentName
].stateValues.value,
).eq(samplednumbers[ind]);
expect(
stateVariables[
stateVariables[
- stateVariables[
- stateVariables["/p9"].replacements[0].componentName
- ].activeChildren[0].componentName
+ stateVariables["/p9"].activeChildren[0].componentName
].activeChildren[ind].componentName
].stateValues.value,
).eq(samplednumbers[ind]);
@@ -1624,40 +1608,28 @@ describe("SelectFromSequence Tag Tests", function () {
.activeChildren.length,
).eq(0);
expect(
- stateVariables[
- stateVariables[stateVariables["/p4"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p4"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(0);
expect(
- stateVariables[
- stateVariables[stateVariables["/p5"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p5"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(0);
expect(
- stateVariables[
- stateVariables[stateVariables["/p6"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p6"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(0);
expect(
- stateVariables[
- stateVariables[stateVariables["/p7"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p7"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(0);
expect(
- stateVariables[
- stateVariables[stateVariables["/p8"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p8"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(0);
expect(
- stateVariables[
- stateVariables[stateVariables["/p9"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p9"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(0);
});
@@ -1684,40 +1656,28 @@ describe("SelectFromSequence Tag Tests", function () {
.activeChildren.length,
).eq(1);
expect(
- stateVariables[
- stateVariables[stateVariables["/p4"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p4"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(1);
expect(
- stateVariables[
- stateVariables[stateVariables["/p5"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p5"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(1);
expect(
- stateVariables[
- stateVariables[stateVariables["/p6"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p6"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(1);
expect(
- stateVariables[
- stateVariables[stateVariables["/p7"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p7"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(1);
expect(
- stateVariables[
- stateVariables[stateVariables["/p8"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p8"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(1);
expect(
- stateVariables[
- stateVariables[stateVariables["/p9"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p9"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(1);
for (let ind = 0; ind < 1; ind++) {
@@ -1745,54 +1705,42 @@ describe("SelectFromSequence Tag Tests", function () {
expect(
stateVariables[
stateVariables[
- stateVariables[
- stateVariables["/p4"].replacements[0].componentName
- ].activeChildren[0].componentName
+ stateVariables["/p4"].activeChildren[0].componentName
].activeChildren[ind].componentName
].stateValues.value,
).eq(samplednumbers[ind]);
expect(
stateVariables[
stateVariables[
- stateVariables[
- stateVariables["/p5"].replacements[0].componentName
- ].activeChildren[0].componentName
+ stateVariables["/p5"].activeChildren[0].componentName
].activeChildren[ind].componentName
].stateValues.value,
).eq(samplednumbers[ind]);
expect(
stateVariables[
stateVariables[
- stateVariables[
- stateVariables["/p6"].replacements[0].componentName
- ].activeChildren[0].componentName
+ stateVariables["/p6"].activeChildren[0].componentName
].activeChildren[ind].componentName
].stateValues.value,
).eq(samplednumbers[ind]);
expect(
stateVariables[
stateVariables[
- stateVariables[
- stateVariables["/p7"].replacements[0].componentName
- ].activeChildren[0].componentName
+ stateVariables["/p7"].activeChildren[0].componentName
].activeChildren[ind].componentName
].stateValues.value,
).eq(samplednumbers[ind]);
expect(
stateVariables[
stateVariables[
- stateVariables[
- stateVariables["/p8"].replacements[0].componentName
- ].activeChildren[0].componentName
+ stateVariables["/p8"].activeChildren[0].componentName
].activeChildren[ind].componentName
].stateValues.value,
).eq(samplednumbers[ind]);
expect(
stateVariables[
stateVariables[
- stateVariables[
- stateVariables["/p9"].replacements[0].componentName
- ].activeChildren[0].componentName
+ stateVariables["/p9"].activeChildren[0].componentName
].activeChildren[ind].componentName
].stateValues.value,
).eq(samplednumbers[ind]);
@@ -1826,40 +1774,28 @@ describe("SelectFromSequence Tag Tests", function () {
.activeChildren.length,
).eq(3);
expect(
- stateVariables[
- stateVariables[stateVariables["/p4"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p4"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(3);
expect(
- stateVariables[
- stateVariables[stateVariables["/p5"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p5"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(3);
expect(
- stateVariables[
- stateVariables[stateVariables["/p6"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p6"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(3);
expect(
- stateVariables[
- stateVariables[stateVariables["/p7"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p7"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(3);
expect(
- stateVariables[
- stateVariables[stateVariables["/p8"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p8"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(3);
expect(
- stateVariables[
- stateVariables[stateVariables["/p9"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p9"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(3);
for (let ind = 0; ind < 3; ind++) {
expect(
@@ -1886,54 +1822,42 @@ describe("SelectFromSequence Tag Tests", function () {
expect(
stateVariables[
stateVariables[
- stateVariables[
- stateVariables["/p4"].replacements[0].componentName
- ].activeChildren[0].componentName
+ stateVariables["/p4"].activeChildren[0].componentName
].activeChildren[ind].componentName
].stateValues.value,
).eq(samplednumbers[ind]);
expect(
stateVariables[
stateVariables[
- stateVariables[
- stateVariables["/p5"].replacements[0].componentName
- ].activeChildren[0].componentName
+ stateVariables["/p5"].activeChildren[0].componentName
].activeChildren[ind].componentName
].stateValues.value,
).eq(samplednumbers[ind]);
expect(
stateVariables[
stateVariables[
- stateVariables[
- stateVariables["/p6"].replacements[0].componentName
- ].activeChildren[0].componentName
+ stateVariables["/p6"].activeChildren[0].componentName
].activeChildren[ind].componentName
].stateValues.value,
).eq(samplednumbers[ind]);
expect(
stateVariables[
stateVariables[
- stateVariables[
- stateVariables["/p7"].replacements[0].componentName
- ].activeChildren[0].componentName
+ stateVariables["/p7"].activeChildren[0].componentName
].activeChildren[ind].componentName
].stateValues.value,
).eq(samplednumbers[ind]);
expect(
stateVariables[
stateVariables[
- stateVariables[
- stateVariables["/p8"].replacements[0].componentName
- ].activeChildren[0].componentName
+ stateVariables["/p8"].activeChildren[0].componentName
].activeChildren[ind].componentName
].stateValues.value,
).eq(samplednumbers[ind]);
expect(
stateVariables[
stateVariables[
- stateVariables[
- stateVariables["/p9"].replacements[0].componentName
- ].activeChildren[0].componentName
+ stateVariables["/p9"].activeChildren[0].componentName
].activeChildren[ind].componentName
].stateValues.value,
).eq(samplednumbers[ind]);
@@ -1961,40 +1885,28 @@ describe("SelectFromSequence Tag Tests", function () {
.activeChildren.length,
).eq(0);
expect(
- stateVariables[
- stateVariables[stateVariables["/p4"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p4"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(0);
expect(
- stateVariables[
- stateVariables[stateVariables["/p5"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p5"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(0);
expect(
- stateVariables[
- stateVariables[stateVariables["/p6"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p6"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(0);
expect(
- stateVariables[
- stateVariables[stateVariables["/p7"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p7"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(0);
expect(
- stateVariables[
- stateVariables[stateVariables["/p8"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p8"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(0);
expect(
- stateVariables[
- stateVariables[stateVariables["/p9"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p9"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(0);
});
@@ -2023,40 +1935,28 @@ describe("SelectFromSequence Tag Tests", function () {
.activeChildren.length,
).eq(2);
expect(
- stateVariables[
- stateVariables[stateVariables["/p4"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p4"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(2);
expect(
- stateVariables[
- stateVariables[stateVariables["/p5"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p5"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(2);
expect(
- stateVariables[
- stateVariables[stateVariables["/p6"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p6"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(2);
expect(
- stateVariables[
- stateVariables[stateVariables["/p7"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p7"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(2);
expect(
- stateVariables[
- stateVariables[stateVariables["/p8"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p8"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(2);
expect(
- stateVariables[
- stateVariables[stateVariables["/p9"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p9"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(2);
for (let ind = 0; ind < 2; ind++) {
@@ -2084,54 +1984,42 @@ describe("SelectFromSequence Tag Tests", function () {
expect(
stateVariables[
stateVariables[
- stateVariables[
- stateVariables["/p4"].replacements[0].componentName
- ].activeChildren[0].componentName
+ stateVariables["/p4"].activeChildren[0].componentName
].activeChildren[ind].componentName
].stateValues.value,
).eq(samplednumbers[ind]);
expect(
stateVariables[
stateVariables[
- stateVariables[
- stateVariables["/p5"].replacements[0].componentName
- ].activeChildren[0].componentName
+ stateVariables["/p5"].activeChildren[0].componentName
].activeChildren[ind].componentName
].stateValues.value,
).eq(samplednumbers[ind]);
expect(
stateVariables[
stateVariables[
- stateVariables[
- stateVariables["/p6"].replacements[0].componentName
- ].activeChildren[0].componentName
+ stateVariables["/p6"].activeChildren[0].componentName
].activeChildren[ind].componentName
].stateValues.value,
).eq(samplednumbers[ind]);
expect(
stateVariables[
stateVariables[
- stateVariables[
- stateVariables["/p7"].replacements[0].componentName
- ].activeChildren[0].componentName
+ stateVariables["/p7"].activeChildren[0].componentName
].activeChildren[ind].componentName
].stateValues.value,
).eq(samplednumbers[ind]);
expect(
stateVariables[
stateVariables[
- stateVariables[
- stateVariables["/p8"].replacements[0].componentName
- ].activeChildren[0].componentName
+ stateVariables["/p8"].activeChildren[0].componentName
].activeChildren[ind].componentName
].stateValues.value,
).eq(samplednumbers[ind]);
expect(
stateVariables[
stateVariables[
- stateVariables[
- stateVariables["/p9"].replacements[0].componentName
- ].activeChildren[0].componentName
+ stateVariables["/p9"].activeChildren[0].componentName
].activeChildren[ind].componentName
].stateValues.value,
).eq(samplednumbers[ind]);
@@ -2171,40 +2059,28 @@ describe("SelectFromSequence Tag Tests", function () {
.activeChildren.length,
).eq(6);
expect(
- stateVariables[
- stateVariables[stateVariables["/p4"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p4"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(6);
expect(
- stateVariables[
- stateVariables[stateVariables["/p5"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p5"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(6);
expect(
- stateVariables[
- stateVariables[stateVariables["/p6"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p6"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(6);
expect(
- stateVariables[
- stateVariables[stateVariables["/p7"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p7"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(6);
expect(
- stateVariables[
- stateVariables[stateVariables["/p8"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p8"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(6);
expect(
- stateVariables[
- stateVariables[stateVariables["/p9"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p9"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(6);
for (let ind = 0; ind < 6; ind++) {
expect(
@@ -2231,54 +2107,42 @@ describe("SelectFromSequence Tag Tests", function () {
expect(
stateVariables[
stateVariables[
- stateVariables[
- stateVariables["/p4"].replacements[0].componentName
- ].activeChildren[0].componentName
+ stateVariables["/p4"].activeChildren[0].componentName
].activeChildren[ind].componentName
].stateValues.value,
).eq(samplednumbers[ind]);
expect(
stateVariables[
stateVariables[
- stateVariables[
- stateVariables["/p5"].replacements[0].componentName
- ].activeChildren[0].componentName
+ stateVariables["/p5"].activeChildren[0].componentName
].activeChildren[ind].componentName
].stateValues.value,
).eq(samplednumbers[ind]);
expect(
stateVariables[
stateVariables[
- stateVariables[
- stateVariables["/p6"].replacements[0].componentName
- ].activeChildren[0].componentName
+ stateVariables["/p6"].activeChildren[0].componentName
].activeChildren[ind].componentName
].stateValues.value,
).eq(samplednumbers[ind]);
expect(
stateVariables[
stateVariables[
- stateVariables[
- stateVariables["/p7"].replacements[0].componentName
- ].activeChildren[0].componentName
+ stateVariables["/p7"].activeChildren[0].componentName
].activeChildren[ind].componentName
].stateValues.value,
).eq(samplednumbers[ind]);
expect(
stateVariables[
stateVariables[
- stateVariables[
- stateVariables["/p8"].replacements[0].componentName
- ].activeChildren[0].componentName
+ stateVariables["/p8"].activeChildren[0].componentName
].activeChildren[ind].componentName
].stateValues.value,
).eq(samplednumbers[ind]);
expect(
stateVariables[
stateVariables[
- stateVariables[
- stateVariables["/p9"].replacements[0].componentName
- ].activeChildren[0].componentName
+ stateVariables["/p9"].activeChildren[0].componentName
].activeChildren[ind].componentName
].stateValues.value,
).eq(samplednumbers[ind]);
@@ -2306,40 +2170,28 @@ describe("SelectFromSequence Tag Tests", function () {
.activeChildren.length,
).eq(0);
expect(
- stateVariables[
- stateVariables[stateVariables["/p4"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p4"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(0);
expect(
- stateVariables[
- stateVariables[stateVariables["/p5"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p5"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(0);
expect(
- stateVariables[
- stateVariables[stateVariables["/p6"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p6"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(0);
expect(
- stateVariables[
- stateVariables[stateVariables["/p7"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p7"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(0);
expect(
- stateVariables[
- stateVariables[stateVariables["/p8"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p8"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(0);
expect(
- stateVariables[
- stateVariables[stateVariables["/p9"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p9"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(0);
});
@@ -2376,40 +2228,28 @@ describe("SelectFromSequence Tag Tests", function () {
.activeChildren.length,
).eq(6);
expect(
- stateVariables[
- stateVariables[stateVariables["/p4"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p4"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(6);
expect(
- stateVariables[
- stateVariables[stateVariables["/p5"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p5"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(6);
expect(
- stateVariables[
- stateVariables[stateVariables["/p6"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p6"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(6);
expect(
- stateVariables[
- stateVariables[stateVariables["/p7"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p7"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(6);
expect(
- stateVariables[
- stateVariables[stateVariables["/p8"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p8"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(6);
expect(
- stateVariables[
- stateVariables[stateVariables["/p9"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p9"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(6);
for (let ind = 0; ind < 6; ind++) {
expect(
@@ -2436,54 +2276,42 @@ describe("SelectFromSequence Tag Tests", function () {
expect(
stateVariables[
stateVariables[
- stateVariables[
- stateVariables["/p4"].replacements[0].componentName
- ].activeChildren[0].componentName
+ stateVariables["/p4"].activeChildren[0].componentName
].activeChildren[ind].componentName
].stateValues.value,
).eq(samplednumbers[ind]);
expect(
stateVariables[
stateVariables[
- stateVariables[
- stateVariables["/p5"].replacements[0].componentName
- ].activeChildren[0].componentName
+ stateVariables["/p5"].activeChildren[0].componentName
].activeChildren[ind].componentName
].stateValues.value,
).eq(samplednumbers[ind]);
expect(
stateVariables[
stateVariables[
- stateVariables[
- stateVariables["/p6"].replacements[0].componentName
- ].activeChildren[0].componentName
+ stateVariables["/p6"].activeChildren[0].componentName
].activeChildren[ind].componentName
].stateValues.value,
).eq(samplednumbers[ind]);
expect(
stateVariables[
stateVariables[
- stateVariables[
- stateVariables["/p7"].replacements[0].componentName
- ].activeChildren[0].componentName
+ stateVariables["/p7"].activeChildren[0].componentName
].activeChildren[ind].componentName
].stateValues.value,
).eq(samplednumbers[ind]);
expect(
stateVariables[
stateVariables[
- stateVariables[
- stateVariables["/p8"].replacements[0].componentName
- ].activeChildren[0].componentName
+ stateVariables["/p8"].activeChildren[0].componentName
].activeChildren[ind].componentName
].stateValues.value,
).eq(samplednumbers[ind]);
expect(
stateVariables[
stateVariables[
- stateVariables[
- stateVariables["/p9"].replacements[0].componentName
- ].activeChildren[0].componentName
+ stateVariables["/p9"].activeChildren[0].componentName
].activeChildren[ind].componentName
].stateValues.value,
).eq(samplednumbers[ind]);
@@ -2500,9 +2328,9 @@ describe("SelectFromSequence Tag Tests", function () {
-
-
-
+ $u{name="u2"}
+ $v{name="v2"}
+ $w{name="w2"}
`,
},
"*",
@@ -2518,8 +2346,7 @@ describe("SelectFromSequence Tag Tests", function () {
let stateVariables = await win.returnAllStateVariables1();
let u = stateVariables["/u"];
- let u2 =
- stateVariables[stateVariables["/u2"].replacements[0].componentName];
+ let u2 = stateVariables["/u2"];
let comparisons = options.map((el) =>
el.equals(me.fromAst(u.stateValues.value)),
);
@@ -2527,8 +2354,7 @@ describe("SelectFromSequence Tag Tests", function () {
expect(u.stateValues.value).eqls(u2.stateValues.value);
let v = stateVariables["/v"];
- let v2 =
- stateVariables[stateVariables["/v2"].replacements[0].componentName];
+ let v2 = stateVariables["/v2"];
comparisons = options.map((el) =>
el.equals(me.fromAst(v.stateValues.value)),
);
@@ -2536,8 +2362,7 @@ describe("SelectFromSequence Tag Tests", function () {
expect(v.stateValues.value).eqls(v2.stateValues.value);
let w = stateVariables["/w"];
- let w2 =
- stateVariables[stateVariables["/w2"].replacements[0].componentName];
+ let w2 = stateVariables["/w2"];
comparisons = options.map((el) =>
el.equals(me.fromAst(w.stateValues.value)),
);
@@ -2555,9 +2380,9 @@ describe("SelectFromSequence Tag Tests", function () {
-
-
-
+ $u{name="u2"}
+ $v{name="v2"}
+ $w{name="w2"}
`,
},
"*",
@@ -2578,8 +2403,7 @@ describe("SelectFromSequence Tag Tests", function () {
let stateVariables = await win.returnAllStateVariables1();
let u = stateVariables["/u"];
- let u2 =
- stateVariables[stateVariables["/u2"].replacements[0].componentName];
+ let u2 = stateVariables["/u2"];
let comparisons = options.map((el) =>
el.equals(me.fromAst(u.stateValues.value)),
);
@@ -2587,8 +2411,7 @@ describe("SelectFromSequence Tag Tests", function () {
expect(u.stateValues.value).eqls(u2.stateValues.value);
let v = stateVariables["/v"];
- let v2 =
- stateVariables[stateVariables["/v2"].replacements[0].componentName];
+ let v2 = stateVariables["/v2"];
comparisons = options.map((el) =>
el.equals(me.fromAst(v.stateValues.value)),
);
@@ -2596,8 +2419,7 @@ describe("SelectFromSequence Tag Tests", function () {
expect(v.stateValues.value).eqls(v2.stateValues.value);
let w = stateVariables["/w"];
- let w2 =
- stateVariables[stateVariables["/w2"].replacements[0].componentName];
+ let w2 = stateVariables["/w2"];
comparisons = options.map((el) =>
el.equals(me.fromAst(w.stateValues.value)),
);
@@ -2624,9 +2446,9 @@ describe("SelectFromSequence Tag Tests", function () {
-
-
-
+ $(s/u{name="u2"})
+ $(s/v{name="v2"})
+ $(s/w{name="w2"})
`,
},
"*",
@@ -2647,8 +2469,7 @@ describe("SelectFromSequence Tag Tests", function () {
let stateVariables = await win.returnAllStateVariables1();
let u = stateVariables["/s/u"];
- let u2 =
- stateVariables[stateVariables["/u2"].replacements[0].componentName];
+ let u2 = stateVariables["/u2"];
let comparisons = options.map((el) =>
el.equals(me.fromAst(u.stateValues.value)),
);
@@ -2656,8 +2477,7 @@ describe("SelectFromSequence Tag Tests", function () {
expect(u.stateValues.value).eqls(u2.stateValues.value);
let v = stateVariables["/s/v"];
- let v2 =
- stateVariables[stateVariables["/v2"].replacements[0].componentName];
+ let v2 = stateVariables["/v2"];
comparisons = options.map((el) =>
el.equals(me.fromAst(v.stateValues.value)),
);
@@ -2665,8 +2485,7 @@ describe("SelectFromSequence Tag Tests", function () {
expect(v.stateValues.value).eqls(v2.stateValues.value);
let w = stateVariables["/s/w"];
- let w2 =
- stateVariables[stateVariables["/w2"].replacements[0].componentName];
+ let w2 = stateVariables["/w2"];
comparisons = options.map((el) =>
el.equals(me.fromAst(w.stateValues.value)),
);
@@ -2691,7 +2510,7 @@ describe("SelectFromSequence Tag Tests", function () {
doenetML: `
Selectfromsequences and hide
-
+ $c,
`,
},
"*",
@@ -3243,8 +3062,8 @@ describe("SelectFromSequence Tag Tests", function () {
a
-
- $_aslist1{name="aslist2"}
+ $_p1{name="p3"}
`,
},
"*",
@@ -3261,12 +3080,11 @@ describe("SelectFromSequence Tag Tests", function () {
let originalnumbers = stateVariables[
"/_selectfromsequence1"
].replacements.map((x) => stateVariables[x.componentName]);
- let secondnumbers = stateVariables[
- stateVariables["/_copy1"].replacements[0].componentName
- ].activeChildren.map((x) => stateVariables[x.componentName]);
+ let secondnumbers = stateVariables["/aslist2"].activeChildren.map(
+ (x) => stateVariables[x.componentName],
+ );
let thirdnumbers = stateVariables[
- stateVariables[stateVariables["/_copy2"].replacements[0].componentName]
- .activeChildren[0].componentName
+ stateVariables["/p3"].activeChildren[0].componentName
].activeChildren.map((x) => stateVariables[x.componentName]);
for (let i = 0; i < 20; i++) {
let newnumber = originalnumbers[i].stateValues.value;
@@ -3286,8 +3104,8 @@ describe("SelectFromSequence Tag Tests", function () {
a
-
- $_aslist1{name="aslist2"}
+ $_p1{name="p3"}
`,
},
"*",
@@ -3304,12 +3122,11 @@ describe("SelectFromSequence Tag Tests", function () {
let originalletters = stateVariables[
"/_selectfromsequence1"
].replacements.map((x) => stateVariables[x.componentName]);
- let secondletters = stateVariables[
- stateVariables["/_copy1"].replacements[0].componentName
- ].activeChildren.map((x) => stateVariables[x.componentName]);
+ let secondletters = stateVariables["/aslist2"].activeChildren.map(
+ (x) => stateVariables[x.componentName],
+ );
let thirdletters = stateVariables[
- stateVariables[stateVariables["/_copy2"].replacements[0].componentName]
- .activeChildren[0].componentName
+ stateVariables["/p3"].activeChildren[0].componentName
].activeChildren.map((x) => stateVariables[x.componentName]);
for (let i = 0; i < 20; i++) {
let newletter = originalletters[i].stateValues.value;
@@ -3337,7 +3154,7 @@ describe("SelectFromSequence Tag Tests", function () {
Hide second select
-
+ $c, $d
`,
},
"*",
@@ -3389,9 +3206,9 @@ describe("SelectFromSequence Tag Tests", function () {
-
-
-
`,
},
diff --git a/cypress/e2e/DoenetML/tagSpecific/selectprimenumbers.cy.js b/cypress/e2e/DoenetML/tagSpecific/selectprimenumbers.cy.js
index 83776f8d93..cbd3bfe7f1 100644
--- a/cypress/e2e/DoenetML/tagSpecific/selectprimenumbers.cy.js
+++ b/cypress/e2e/DoenetML/tagSpecific/selectprimenumbers.cy.js
@@ -1,4 +1,4 @@
-import { cesc } from "../../../../src/_utils/url";
+import { cesc, cesc2 } from "../../../../src/_utils/url";
describe("SelecPrimeNumbers Tag Tests", function () {
beforeEach(() => {
@@ -962,11 +962,11 @@ describe("SelecPrimeNumbers Tag Tests", function () {
$n2+$num2+2
+ $n3+$num3
+ $num3{name="n3"}
1
`,
},
@@ -1054,6 +1054,42 @@ describe("SelecPrimeNumbers Tag Tests", function () {
});
});
+ it("asList", () => {
+ cy.window().then(async (win) => {
+ win.postMessage(
+ {
+ doenetML: `
+ a
+
+
+
+ `,
+ },
+ "*",
+ );
+ });
+
+ cy.get(cesc("#\\/_text1")).should("have.text", "a"); //wait for page to load
+
+ let results = [];
+
+ cy.window().then(async (win) => {
+ let stateVariables = await win.returnAllStateVariables1();
+
+ results.push(stateVariables["/u"].stateValues.value);
+ results.push(stateVariables["/v"].stateValues.value);
+ results.push(stateVariables["/w"].stateValues.value);
+ results.push(stateVariables["/x"].stateValues.value);
+ results.push(stateVariables["/y"].stateValues.value);
+
+ for (let num of results) {
+ expect([179, 181, 191, 193, 197, 199].includes(num));
+ }
+ cy.get(cesc2("#/_p1")).should("have.text", results.join(", "));
+ cy.get(cesc2("#/_p2")).should("have.text", results.join(""));
+ });
+ });
+
it("copies don't resample", () => {
cy.window().then(async (win) => {
win.postMessage(
@@ -1066,18 +1102,18 @@ describe("SelecPrimeNumbers Tag Tests", function () {
-
-
+ $_aslist1{name="noresamplelist"}
-
+ $noresamplelist{name="noreresamplelist"}
-
-
+ $maxnum2.value{assignNames="maxnum2a"}
`,
},
"*",
@@ -1308,17 +1328,17 @@ describe("SelecPrimeNumbers Tag Tests", function () {
-
-
+ $_map1
+ $_aslist1
-
+ $p4{name="p7"}
+ $p5{name="p8"}
+ $p6{name="p9"}
+ $_mathinput1.value{assignNames="m1"}
`,
},
"*",
@@ -1346,40 +1366,28 @@ describe("SelecPrimeNumbers Tag Tests", function () {
.activeChildren.length,
).eq(0);
expect(
- stateVariables[
- stateVariables[stateVariables["/p4"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p4"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(0);
expect(
- stateVariables[
- stateVariables[stateVariables["/p5"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p5"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(0);
expect(
- stateVariables[
- stateVariables[stateVariables["/p6"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p6"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(0);
expect(
- stateVariables[
- stateVariables[stateVariables["/p7"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p7"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(0);
expect(
- stateVariables[
- stateVariables[stateVariables["/p8"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p8"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(0);
expect(
- stateVariables[
- stateVariables[stateVariables["/p9"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p9"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(0);
});
@@ -1406,40 +1414,28 @@ describe("SelecPrimeNumbers Tag Tests", function () {
.activeChildren.length,
).eq(1);
expect(
- stateVariables[
- stateVariables[stateVariables["/p4"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p4"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(1);
expect(
- stateVariables[
- stateVariables[stateVariables["/p5"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p5"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(1);
expect(
- stateVariables[
- stateVariables[stateVariables["/p6"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p6"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(1);
expect(
- stateVariables[
- stateVariables[stateVariables["/p7"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p7"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(1);
expect(
- stateVariables[
- stateVariables[stateVariables["/p8"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p8"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(1);
expect(
- stateVariables[
- stateVariables[stateVariables["/p9"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p9"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(1);
for (let ind = 0; ind < 1; ind++) {
expect(
@@ -1466,54 +1462,42 @@ describe("SelecPrimeNumbers Tag Tests", function () {
expect(
stateVariables[
stateVariables[
- stateVariables[
- stateVariables["/p4"].replacements[0].componentName
- ].activeChildren[0].componentName
+ stateVariables["/p4"].activeChildren[0].componentName
].activeChildren[ind].componentName
].stateValues.value,
).eq(samplednumbers[ind]);
expect(
stateVariables[
stateVariables[
- stateVariables[
- stateVariables["/p5"].replacements[0].componentName
- ].activeChildren[0].componentName
+ stateVariables["/p5"].activeChildren[0].componentName
].activeChildren[ind].componentName
].stateValues.value,
).eq(samplednumbers[ind]);
expect(
stateVariables[
stateVariables[
- stateVariables[
- stateVariables["/p6"].replacements[0].componentName
- ].activeChildren[0].componentName
+ stateVariables["/p6"].activeChildren[0].componentName
].activeChildren[ind].componentName
].stateValues.value,
).eq(samplednumbers[ind]);
expect(
stateVariables[
stateVariables[
- stateVariables[
- stateVariables["/p7"].replacements[0].componentName
- ].activeChildren[0].componentName
+ stateVariables["/p7"].activeChildren[0].componentName
].activeChildren[ind].componentName
].stateValues.value,
).eq(samplednumbers[ind]);
expect(
stateVariables[
stateVariables[
- stateVariables[
- stateVariables["/p8"].replacements[0].componentName
- ].activeChildren[0].componentName
+ stateVariables["/p8"].activeChildren[0].componentName
].activeChildren[ind].componentName
].stateValues.value,
).eq(samplednumbers[ind]);
expect(
stateVariables[
stateVariables[
- stateVariables[
- stateVariables["/p9"].replacements[0].componentName
- ].activeChildren[0].componentName
+ stateVariables["/p9"].activeChildren[0].componentName
].activeChildren[ind].componentName
].stateValues.value,
).eq(samplednumbers[ind]);
@@ -1541,40 +1525,28 @@ describe("SelecPrimeNumbers Tag Tests", function () {
.activeChildren.length,
).eq(0);
expect(
- stateVariables[
- stateVariables[stateVariables["/p4"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p4"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(0);
expect(
- stateVariables[
- stateVariables[stateVariables["/p5"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p5"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(0);
expect(
- stateVariables[
- stateVariables[stateVariables["/p6"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p6"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(0);
expect(
- stateVariables[
- stateVariables[stateVariables["/p7"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p7"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(0);
expect(
- stateVariables[
- stateVariables[stateVariables["/p8"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p8"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(0);
expect(
- stateVariables[
- stateVariables[stateVariables["/p9"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p9"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(0);
});
@@ -1601,40 +1573,28 @@ describe("SelecPrimeNumbers Tag Tests", function () {
.activeChildren.length,
).eq(1);
expect(
- stateVariables[
- stateVariables[stateVariables["/p4"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p4"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(1);
expect(
- stateVariables[
- stateVariables[stateVariables["/p5"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p5"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(1);
expect(
- stateVariables[
- stateVariables[stateVariables["/p6"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p6"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(1);
expect(
- stateVariables[
- stateVariables[stateVariables["/p7"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p7"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(1);
expect(
- stateVariables[
- stateVariables[stateVariables["/p8"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p8"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(1);
expect(
- stateVariables[
- stateVariables[stateVariables["/p9"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p9"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(1);
for (let ind = 0; ind < 1; ind++) {
@@ -1662,54 +1622,42 @@ describe("SelecPrimeNumbers Tag Tests", function () {
expect(
stateVariables[
stateVariables[
- stateVariables[
- stateVariables["/p4"].replacements[0].componentName
- ].activeChildren[0].componentName
+ stateVariables["/p4"].activeChildren[0].componentName
].activeChildren[ind].componentName
].stateValues.value,
).eq(samplednumbers[ind]);
expect(
stateVariables[
stateVariables[
- stateVariables[
- stateVariables["/p5"].replacements[0].componentName
- ].activeChildren[0].componentName
+ stateVariables["/p5"].activeChildren[0].componentName
].activeChildren[ind].componentName
].stateValues.value,
).eq(samplednumbers[ind]);
expect(
stateVariables[
stateVariables[
- stateVariables[
- stateVariables["/p6"].replacements[0].componentName
- ].activeChildren[0].componentName
+ stateVariables["/p6"].activeChildren[0].componentName
].activeChildren[ind].componentName
].stateValues.value,
).eq(samplednumbers[ind]);
expect(
stateVariables[
stateVariables[
- stateVariables[
- stateVariables["/p7"].replacements[0].componentName
- ].activeChildren[0].componentName
+ stateVariables["/p7"].activeChildren[0].componentName
].activeChildren[ind].componentName
].stateValues.value,
).eq(samplednumbers[ind]);
expect(
stateVariables[
stateVariables[
- stateVariables[
- stateVariables["/p8"].replacements[0].componentName
- ].activeChildren[0].componentName
+ stateVariables["/p8"].activeChildren[0].componentName
].activeChildren[ind].componentName
].stateValues.value,
).eq(samplednumbers[ind]);
expect(
stateVariables[
stateVariables[
- stateVariables[
- stateVariables["/p9"].replacements[0].componentName
- ].activeChildren[0].componentName
+ stateVariables["/p9"].activeChildren[0].componentName
].activeChildren[ind].componentName
].stateValues.value,
).eq(samplednumbers[ind]);
@@ -1743,40 +1691,28 @@ describe("SelecPrimeNumbers Tag Tests", function () {
.activeChildren.length,
).eq(3);
expect(
- stateVariables[
- stateVariables[stateVariables["/p4"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p4"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(3);
expect(
- stateVariables[
- stateVariables[stateVariables["/p5"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p5"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(3);
expect(
- stateVariables[
- stateVariables[stateVariables["/p6"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p6"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(3);
expect(
- stateVariables[
- stateVariables[stateVariables["/p7"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p7"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(3);
expect(
- stateVariables[
- stateVariables[stateVariables["/p8"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p8"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(3);
expect(
- stateVariables[
- stateVariables[stateVariables["/p9"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p9"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(3);
for (let ind = 0; ind < 3; ind++) {
expect(
@@ -1803,54 +1739,42 @@ describe("SelecPrimeNumbers Tag Tests", function () {
expect(
stateVariables[
stateVariables[
- stateVariables[
- stateVariables["/p4"].replacements[0].componentName
- ].activeChildren[0].componentName
+ stateVariables["/p4"].activeChildren[0].componentName
].activeChildren[ind].componentName
].stateValues.value,
).eq(samplednumbers[ind]);
expect(
stateVariables[
stateVariables[
- stateVariables[
- stateVariables["/p5"].replacements[0].componentName
- ].activeChildren[0].componentName
+ stateVariables["/p5"].activeChildren[0].componentName
].activeChildren[ind].componentName
].stateValues.value,
).eq(samplednumbers[ind]);
expect(
stateVariables[
stateVariables[
- stateVariables[
- stateVariables["/p6"].replacements[0].componentName
- ].activeChildren[0].componentName
+ stateVariables["/p6"].activeChildren[0].componentName
].activeChildren[ind].componentName
].stateValues.value,
).eq(samplednumbers[ind]);
expect(
stateVariables[
stateVariables[
- stateVariables[
- stateVariables["/p7"].replacements[0].componentName
- ].activeChildren[0].componentName
+ stateVariables["/p7"].activeChildren[0].componentName
].activeChildren[ind].componentName
].stateValues.value,
).eq(samplednumbers[ind]);
expect(
stateVariables[
stateVariables[
- stateVariables[
- stateVariables["/p8"].replacements[0].componentName
- ].activeChildren[0].componentName
+ stateVariables["/p8"].activeChildren[0].componentName
].activeChildren[ind].componentName
].stateValues.value,
).eq(samplednumbers[ind]);
expect(
stateVariables[
stateVariables[
- stateVariables[
- stateVariables["/p9"].replacements[0].componentName
- ].activeChildren[0].componentName
+ stateVariables["/p9"].activeChildren[0].componentName
].activeChildren[ind].componentName
].stateValues.value,
).eq(samplednumbers[ind]);
@@ -1878,40 +1802,28 @@ describe("SelecPrimeNumbers Tag Tests", function () {
.activeChildren.length,
).eq(0);
expect(
- stateVariables[
- stateVariables[stateVariables["/p4"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p4"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(0);
expect(
- stateVariables[
- stateVariables[stateVariables["/p5"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p5"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(0);
expect(
- stateVariables[
- stateVariables[stateVariables["/p6"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p6"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(0);
expect(
- stateVariables[
- stateVariables[stateVariables["/p7"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p7"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(0);
expect(
- stateVariables[
- stateVariables[stateVariables["/p8"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p8"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(0);
expect(
- stateVariables[
- stateVariables[stateVariables["/p9"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p9"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(0);
});
@@ -1940,40 +1852,28 @@ describe("SelecPrimeNumbers Tag Tests", function () {
.activeChildren.length,
).eq(2);
expect(
- stateVariables[
- stateVariables[stateVariables["/p4"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p4"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(2);
expect(
- stateVariables[
- stateVariables[stateVariables["/p5"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p5"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(2);
expect(
- stateVariables[
- stateVariables[stateVariables["/p6"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p6"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(2);
expect(
- stateVariables[
- stateVariables[stateVariables["/p7"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p7"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(2);
expect(
- stateVariables[
- stateVariables[stateVariables["/p8"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p8"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(2);
expect(
- stateVariables[
- stateVariables[stateVariables["/p9"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p9"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(2);
for (let ind = 0; ind < 2; ind++) {
@@ -2001,54 +1901,42 @@ describe("SelecPrimeNumbers Tag Tests", function () {
expect(
stateVariables[
stateVariables[
- stateVariables[
- stateVariables["/p4"].replacements[0].componentName
- ].activeChildren[0].componentName
+ stateVariables["/p4"].activeChildren[0].componentName
].activeChildren[ind].componentName
].stateValues.value,
).eq(samplednumbers[ind]);
expect(
stateVariables[
stateVariables[
- stateVariables[
- stateVariables["/p5"].replacements[0].componentName
- ].activeChildren[0].componentName
+ stateVariables["/p5"].activeChildren[0].componentName
].activeChildren[ind].componentName
].stateValues.value,
).eq(samplednumbers[ind]);
expect(
stateVariables[
stateVariables[
- stateVariables[
- stateVariables["/p6"].replacements[0].componentName
- ].activeChildren[0].componentName
+ stateVariables["/p6"].activeChildren[0].componentName
].activeChildren[ind].componentName
].stateValues.value,
).eq(samplednumbers[ind]);
expect(
stateVariables[
stateVariables[
- stateVariables[
- stateVariables["/p7"].replacements[0].componentName
- ].activeChildren[0].componentName
+ stateVariables["/p7"].activeChildren[0].componentName
].activeChildren[ind].componentName
].stateValues.value,
).eq(samplednumbers[ind]);
expect(
stateVariables[
stateVariables[
- stateVariables[
- stateVariables["/p8"].replacements[0].componentName
- ].activeChildren[0].componentName
+ stateVariables["/p8"].activeChildren[0].componentName
].activeChildren[ind].componentName
].stateValues.value,
).eq(samplednumbers[ind]);
expect(
stateVariables[
stateVariables[
- stateVariables[
- stateVariables["/p9"].replacements[0].componentName
- ].activeChildren[0].componentName
+ stateVariables["/p9"].activeChildren[0].componentName
].activeChildren[ind].componentName
].stateValues.value,
).eq(samplednumbers[ind]);
@@ -2088,40 +1976,28 @@ describe("SelecPrimeNumbers Tag Tests", function () {
.activeChildren.length,
).eq(6);
expect(
- stateVariables[
- stateVariables[stateVariables["/p4"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p4"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(6);
expect(
- stateVariables[
- stateVariables[stateVariables["/p5"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p5"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(6);
expect(
- stateVariables[
- stateVariables[stateVariables["/p6"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p6"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(6);
expect(
- stateVariables[
- stateVariables[stateVariables["/p7"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p7"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(6);
expect(
- stateVariables[
- stateVariables[stateVariables["/p8"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p8"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(6);
expect(
- stateVariables[
- stateVariables[stateVariables["/p9"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p9"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(6);
for (let ind = 0; ind < 6; ind++) {
expect(
@@ -2148,54 +2024,42 @@ describe("SelecPrimeNumbers Tag Tests", function () {
expect(
stateVariables[
stateVariables[
- stateVariables[
- stateVariables["/p4"].replacements[0].componentName
- ].activeChildren[0].componentName
+ stateVariables["/p4"].activeChildren[0].componentName
].activeChildren[ind].componentName
].stateValues.value,
).eq(samplednumbers[ind]);
expect(
stateVariables[
stateVariables[
- stateVariables[
- stateVariables["/p5"].replacements[0].componentName
- ].activeChildren[0].componentName
+ stateVariables["/p5"].activeChildren[0].componentName
].activeChildren[ind].componentName
].stateValues.value,
).eq(samplednumbers[ind]);
expect(
stateVariables[
stateVariables[
- stateVariables[
- stateVariables["/p6"].replacements[0].componentName
- ].activeChildren[0].componentName
+ stateVariables["/p6"].activeChildren[0].componentName
].activeChildren[ind].componentName
].stateValues.value,
).eq(samplednumbers[ind]);
expect(
stateVariables[
stateVariables[
- stateVariables[
- stateVariables["/p7"].replacements[0].componentName
- ].activeChildren[0].componentName
+ stateVariables["/p7"].activeChildren[0].componentName
].activeChildren[ind].componentName
].stateValues.value,
).eq(samplednumbers[ind]);
expect(
stateVariables[
stateVariables[
- stateVariables[
- stateVariables["/p8"].replacements[0].componentName
- ].activeChildren[0].componentName
+ stateVariables["/p8"].activeChildren[0].componentName
].activeChildren[ind].componentName
].stateValues.value,
).eq(samplednumbers[ind]);
expect(
stateVariables[
stateVariables[
- stateVariables[
- stateVariables["/p9"].replacements[0].componentName
- ].activeChildren[0].componentName
+ stateVariables["/p9"].activeChildren[0].componentName
].activeChildren[ind].componentName
].stateValues.value,
).eq(samplednumbers[ind]);
@@ -2223,40 +2087,28 @@ describe("SelecPrimeNumbers Tag Tests", function () {
.activeChildren.length,
).eq(0);
expect(
- stateVariables[
- stateVariables[stateVariables["/p4"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p4"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(0);
expect(
- stateVariables[
- stateVariables[stateVariables["/p5"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p5"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(0);
expect(
- stateVariables[
- stateVariables[stateVariables["/p6"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p6"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(0);
expect(
- stateVariables[
- stateVariables[stateVariables["/p7"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p7"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(0);
expect(
- stateVariables[
- stateVariables[stateVariables["/p8"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p8"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(0);
expect(
- stateVariables[
- stateVariables[stateVariables["/p9"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p9"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(0);
});
@@ -2293,40 +2145,28 @@ describe("SelecPrimeNumbers Tag Tests", function () {
.activeChildren.length,
).eq(6);
expect(
- stateVariables[
- stateVariables[stateVariables["/p4"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p4"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(6);
expect(
- stateVariables[
- stateVariables[stateVariables["/p5"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p5"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(6);
expect(
- stateVariables[
- stateVariables[stateVariables["/p6"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p6"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(6);
expect(
- stateVariables[
- stateVariables[stateVariables["/p7"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p7"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(6);
expect(
- stateVariables[
- stateVariables[stateVariables["/p8"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p8"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(6);
expect(
- stateVariables[
- stateVariables[stateVariables["/p9"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p9"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(6);
for (let ind = 0; ind < 6; ind++) {
expect(
@@ -2353,54 +2193,42 @@ describe("SelecPrimeNumbers Tag Tests", function () {
expect(
stateVariables[
stateVariables[
- stateVariables[
- stateVariables["/p4"].replacements[0].componentName
- ].activeChildren[0].componentName
+ stateVariables["/p4"].activeChildren[0].componentName
].activeChildren[ind].componentName
].stateValues.value,
).eq(samplednumbers[ind]);
expect(
stateVariables[
stateVariables[
- stateVariables[
- stateVariables["/p5"].replacements[0].componentName
- ].activeChildren[0].componentName
+ stateVariables["/p5"].activeChildren[0].componentName
].activeChildren[ind].componentName
].stateValues.value,
).eq(samplednumbers[ind]);
expect(
stateVariables[
stateVariables[
- stateVariables[
- stateVariables["/p6"].replacements[0].componentName
- ].activeChildren[0].componentName
+ stateVariables["/p6"].activeChildren[0].componentName
].activeChildren[ind].componentName
].stateValues.value,
).eq(samplednumbers[ind]);
expect(
stateVariables[
stateVariables[
- stateVariables[
- stateVariables["/p7"].replacements[0].componentName
- ].activeChildren[0].componentName
+ stateVariables["/p7"].activeChildren[0].componentName
].activeChildren[ind].componentName
].stateValues.value,
).eq(samplednumbers[ind]);
expect(
stateVariables[
stateVariables[
- stateVariables[
- stateVariables["/p8"].replacements[0].componentName
- ].activeChildren[0].componentName
+ stateVariables["/p8"].activeChildren[0].componentName
].activeChildren[ind].componentName
].stateValues.value,
).eq(samplednumbers[ind]);
expect(
stateVariables[
stateVariables[
- stateVariables[
- stateVariables["/p9"].replacements[0].componentName
- ].activeChildren[0].componentName
+ stateVariables["/p9"].activeChildren[0].componentName
].activeChildren[ind].componentName
].stateValues.value,
).eq(samplednumbers[ind]);
@@ -2416,8 +2244,8 @@ describe("SelecPrimeNumbers Tag Tests", function () {
a
-
- $_aslist1{name="aslist2"}
+ $_p1{name="p3"}
`,
},
"*",
@@ -2434,12 +2262,11 @@ describe("SelecPrimeNumbers Tag Tests", function () {
let originalnumbers = stateVariables[
"/_selectprimenumbers1"
].replacements.map((x) => stateVariables[x.componentName]);
- let secondnumbers = stateVariables[
- stateVariables["/_copy1"].replacements[0].componentName
- ].activeChildren.map((x) => stateVariables[x.componentName]);
+ let secondnumbers = stateVariables["/aslist2"].activeChildren.map(
+ (x) => stateVariables[x.componentName],
+ );
let thirdnumbers = stateVariables[
- stateVariables[stateVariables["/_copy2"].replacements[0].componentName]
- .activeChildren[0].componentName
+ stateVariables["/p3"].activeChildren[0].componentName
].activeChildren.map((x) => stateVariables[x.componentName]);
for (let i = 0; i < 20; i++) {
let newnumber = originalnumbers[i].stateValues.value;
@@ -2462,8 +2289,8 @@ describe("SelecPrimeNumbers Tag Tests", function () {
a
-
- $_aslist1{name="aslist2"}
+ $_p1{name="p3"}
`,
},
"*",
@@ -2480,12 +2307,11 @@ describe("SelecPrimeNumbers Tag Tests", function () {
let originalnumbers = stateVariables[
"/_selectprimenumbers1"
].replacements.map((x) => stateVariables[x.componentName]);
- let secondnumbers = stateVariables[
- stateVariables["/_copy1"].replacements[0].componentName
- ].activeChildren.map((x) => stateVariables[x.componentName]);
+ let secondnumbers = stateVariables["/aslist2"].activeChildren.map(
+ (x) => stateVariables[x.componentName],
+ );
let thirdnumbers = stateVariables[
- stateVariables[stateVariables["/_copy2"].replacements[0].componentName]
- .activeChildren[0].componentName
+ stateVariables["/p3"].activeChildren[0].componentName
].activeChildren.map((x) => stateVariables[x.componentName]);
for (let i = 0; i < 3; i++) {
let newnumber = originalnumbers[i].stateValues.value;
@@ -2511,7 +2337,7 @@ describe("SelecPrimeNumbers Tag Tests", function () {
Hide second select
-
+ $c, $d
`,
},
"*",
diff --git a/cypress/e2e/DoenetML/tagSpecific/selectrandomnumbers.cy.js b/cypress/e2e/DoenetML/tagSpecific/selectrandomnumbers.cy.js
index caf6ac2269..be85a5117f 100644
--- a/cypress/e2e/DoenetML/tagSpecific/selectrandomnumbers.cy.js
+++ b/cypress/e2e/DoenetML/tagSpecific/selectrandomnumbers.cy.js
@@ -1,5 +1,5 @@
import me from "math-expressions";
-import { cesc } from "../../../../src/_utils/url";
+import { cesc, cesc2 } from "../../../../src/_utils/url";
describe("SelectRandomNumbers Tag Tests", function () {
beforeEach(() => {
@@ -21,10 +21,10 @@ describe("SelectRandomNumbers Tag Tests", function () {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- a
+
+
+
+ `,
+ },
+ "*",
+ );
+ });
+
+ cy.get(cesc("#\\/_text1")).should("have.text", "a"); //wait for page to load
+
+ let results = [];
+
+ cy.window().then(async (win) => {
+ let stateVariables = await win.returnAllStateVariables1();
+
+ results.push(stateVariables["/u"].stateValues.value);
+ results.push(stateVariables["/v"].stateValues.value);
+ results.push(stateVariables["/w"].stateValues.value);
+ results.push(stateVariables["/x"].stateValues.value);
+ results.push(stateVariables["/y"].stateValues.value);
+
+ for (let num of results) {
+ expect(num).gte(175).lte(205);
+ }
+
+ let roundedResults = results.map((x) => Math.round(x * 100) / 100);
+ cy.get(cesc2("#/_p1")).should("have.text", roundedResults.join(", "));
+ cy.get(cesc2("#/_p2")).should("have.text", roundedResults.join(""));
+ });
+ });
+
it("selected number doesn't change dynamically", () => {
cy.window().then(async (win) => {
win.postMessage(
@@ -1373,7 +1411,7 @@ describe("SelectRandomNumbers Tag Tests", function () {
-
+ $maxnum2{name="maxnum2a"}
`,
},
"*",
@@ -1461,17 +1499,17 @@ describe("SelectRandomNumbers Tag Tests", function () {
-
-
+ $_map1{name="map2"}
+ $_aslist1
-
+ $p4{name="p7"}
+ $p5{name="p8"}
+ $p6{name="p9"}
+ $_mathinput1{name="m1"}
`,
},
"*",
@@ -1498,40 +1536,28 @@ describe("SelectRandomNumbers Tag Tests", function () {
.activeChildren.length,
).eq(0);
expect(
- stateVariables[
- stateVariables[stateVariables["/p4"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p4"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(0);
expect(
- stateVariables[
- stateVariables[stateVariables["/p5"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p5"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(0);
expect(
- stateVariables[
- stateVariables[stateVariables["/p6"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p6"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(0);
expect(
- stateVariables[
- stateVariables[stateVariables["/p7"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p7"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(0);
expect(
- stateVariables[
- stateVariables[stateVariables["/p8"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p8"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(0);
expect(
- stateVariables[
- stateVariables[stateVariables["/p9"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p9"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(0);
});
@@ -1558,40 +1584,28 @@ describe("SelectRandomNumbers Tag Tests", function () {
.activeChildren.length,
).eq(1);
expect(
- stateVariables[
- stateVariables[stateVariables["/p4"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p4"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(1);
expect(
- stateVariables[
- stateVariables[stateVariables["/p5"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p5"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(1);
expect(
- stateVariables[
- stateVariables[stateVariables["/p6"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p6"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(1);
expect(
- stateVariables[
- stateVariables[stateVariables["/p7"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p7"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(1);
expect(
- stateVariables[
- stateVariables[stateVariables["/p8"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p8"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(1);
expect(
- stateVariables[
- stateVariables[stateVariables["/p9"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p9"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(1);
for (let ind = 0; ind < 1; ind++) {
expect(
@@ -1618,54 +1632,42 @@ describe("SelectRandomNumbers Tag Tests", function () {
expect(
stateVariables[
stateVariables[
- stateVariables[
- stateVariables["/p4"].replacements[0].componentName
- ].activeChildren[0].componentName
+ stateVariables["/p4"].activeChildren[0].componentName
].activeChildren[ind].componentName
].stateValues.value,
).eq(samplednumbers[ind]);
expect(
stateVariables[
stateVariables[
- stateVariables[
- stateVariables["/p5"].replacements[0].componentName
- ].activeChildren[0].componentName
+ stateVariables["/p5"].activeChildren[0].componentName
].activeChildren[ind].componentName
].stateValues.value,
).eq(samplednumbers[ind]);
expect(
stateVariables[
stateVariables[
- stateVariables[
- stateVariables["/p6"].replacements[0].componentName
- ].activeChildren[0].componentName
+ stateVariables["/p6"].activeChildren[0].componentName
].activeChildren[ind].componentName
].stateValues.value,
).eq(samplednumbers[ind]);
expect(
stateVariables[
stateVariables[
- stateVariables[
- stateVariables["/p7"].replacements[0].componentName
- ].activeChildren[0].componentName
+ stateVariables["/p7"].activeChildren[0].componentName
].activeChildren[ind].componentName
].stateValues.value,
).eq(samplednumbers[ind]);
expect(
stateVariables[
stateVariables[
- stateVariables[
- stateVariables["/p8"].replacements[0].componentName
- ].activeChildren[0].componentName
+ stateVariables["/p8"].activeChildren[0].componentName
].activeChildren[ind].componentName
].stateValues.value,
).eq(samplednumbers[ind]);
expect(
stateVariables[
stateVariables[
- stateVariables[
- stateVariables["/p9"].replacements[0].componentName
- ].activeChildren[0].componentName
+ stateVariables["/p9"].activeChildren[0].componentName
].activeChildren[ind].componentName
].stateValues.value,
).eq(samplednumbers[ind]);
@@ -1693,40 +1695,28 @@ describe("SelectRandomNumbers Tag Tests", function () {
.activeChildren.length,
).eq(0);
expect(
- stateVariables[
- stateVariables[stateVariables["/p4"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p4"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(0);
expect(
- stateVariables[
- stateVariables[stateVariables["/p5"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p5"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(0);
expect(
- stateVariables[
- stateVariables[stateVariables["/p6"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p6"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(0);
expect(
- stateVariables[
- stateVariables[stateVariables["/p7"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p7"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(0);
expect(
- stateVariables[
- stateVariables[stateVariables["/p8"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p8"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(0);
expect(
- stateVariables[
- stateVariables[stateVariables["/p9"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p9"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(0);
});
@@ -1753,40 +1743,28 @@ describe("SelectRandomNumbers Tag Tests", function () {
.activeChildren.length,
).eq(1);
expect(
- stateVariables[
- stateVariables[stateVariables["/p4"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p4"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(1);
expect(
- stateVariables[
- stateVariables[stateVariables["/p5"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p5"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(1);
expect(
- stateVariables[
- stateVariables[stateVariables["/p6"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p6"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(1);
expect(
- stateVariables[
- stateVariables[stateVariables["/p7"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p7"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(1);
expect(
- stateVariables[
- stateVariables[stateVariables["/p8"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p8"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(1);
expect(
- stateVariables[
- stateVariables[stateVariables["/p9"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p9"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(1);
for (let ind = 0; ind < 1; ind++) {
@@ -1814,54 +1792,42 @@ describe("SelectRandomNumbers Tag Tests", function () {
expect(
stateVariables[
stateVariables[
- stateVariables[
- stateVariables["/p4"].replacements[0].componentName
- ].activeChildren[0].componentName
+ stateVariables["/p4"].activeChildren[0].componentName
].activeChildren[ind].componentName
].stateValues.value,
).eq(samplednumbers[ind]);
expect(
stateVariables[
stateVariables[
- stateVariables[
- stateVariables["/p5"].replacements[0].componentName
- ].activeChildren[0].componentName
+ stateVariables["/p5"].activeChildren[0].componentName
].activeChildren[ind].componentName
].stateValues.value,
).eq(samplednumbers[ind]);
expect(
stateVariables[
stateVariables[
- stateVariables[
- stateVariables["/p6"].replacements[0].componentName
- ].activeChildren[0].componentName
+ stateVariables["/p6"].activeChildren[0].componentName
].activeChildren[ind].componentName
].stateValues.value,
).eq(samplednumbers[ind]);
expect(
stateVariables[
stateVariables[
- stateVariables[
- stateVariables["/p7"].replacements[0].componentName
- ].activeChildren[0].componentName
+ stateVariables["/p7"].activeChildren[0].componentName
].activeChildren[ind].componentName
].stateValues.value,
).eq(samplednumbers[ind]);
expect(
stateVariables[
stateVariables[
- stateVariables[
- stateVariables["/p8"].replacements[0].componentName
- ].activeChildren[0].componentName
+ stateVariables["/p8"].activeChildren[0].componentName
].activeChildren[ind].componentName
].stateValues.value,
).eq(samplednumbers[ind]);
expect(
stateVariables[
stateVariables[
- stateVariables[
- stateVariables["/p9"].replacements[0].componentName
- ].activeChildren[0].componentName
+ stateVariables["/p9"].activeChildren[0].componentName
].activeChildren[ind].componentName
].stateValues.value,
).eq(samplednumbers[ind]);
@@ -1895,40 +1861,28 @@ describe("SelectRandomNumbers Tag Tests", function () {
.activeChildren.length,
).eq(3);
expect(
- stateVariables[
- stateVariables[stateVariables["/p4"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p4"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(3);
expect(
- stateVariables[
- stateVariables[stateVariables["/p5"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p5"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(3);
expect(
- stateVariables[
- stateVariables[stateVariables["/p6"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p6"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(3);
expect(
- stateVariables[
- stateVariables[stateVariables["/p7"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p7"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(3);
expect(
- stateVariables[
- stateVariables[stateVariables["/p8"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p8"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(3);
expect(
- stateVariables[
- stateVariables[stateVariables["/p9"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p9"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(3);
for (let ind = 0; ind < 3; ind++) {
expect(
@@ -1955,54 +1909,42 @@ describe("SelectRandomNumbers Tag Tests", function () {
expect(
stateVariables[
stateVariables[
- stateVariables[
- stateVariables["/p4"].replacements[0].componentName
- ].activeChildren[0].componentName
+ stateVariables["/p4"].activeChildren[0].componentName
].activeChildren[ind].componentName
].stateValues.value,
).eq(samplednumbers[ind]);
expect(
stateVariables[
stateVariables[
- stateVariables[
- stateVariables["/p5"].replacements[0].componentName
- ].activeChildren[0].componentName
+ stateVariables["/p5"].activeChildren[0].componentName
].activeChildren[ind].componentName
].stateValues.value,
).eq(samplednumbers[ind]);
expect(
stateVariables[
stateVariables[
- stateVariables[
- stateVariables["/p6"].replacements[0].componentName
- ].activeChildren[0].componentName
+ stateVariables["/p6"].activeChildren[0].componentName
].activeChildren[ind].componentName
].stateValues.value,
).eq(samplednumbers[ind]);
expect(
stateVariables[
stateVariables[
- stateVariables[
- stateVariables["/p7"].replacements[0].componentName
- ].activeChildren[0].componentName
+ stateVariables["/p7"].activeChildren[0].componentName
].activeChildren[ind].componentName
].stateValues.value,
).eq(samplednumbers[ind]);
expect(
stateVariables[
stateVariables[
- stateVariables[
- stateVariables["/p8"].replacements[0].componentName
- ].activeChildren[0].componentName
+ stateVariables["/p8"].activeChildren[0].componentName
].activeChildren[ind].componentName
].stateValues.value,
).eq(samplednumbers[ind]);
expect(
stateVariables[
stateVariables[
- stateVariables[
- stateVariables["/p9"].replacements[0].componentName
- ].activeChildren[0].componentName
+ stateVariables["/p9"].activeChildren[0].componentName
].activeChildren[ind].componentName
].stateValues.value,
).eq(samplednumbers[ind]);
@@ -2030,40 +1972,28 @@ describe("SelectRandomNumbers Tag Tests", function () {
.activeChildren.length,
).eq(0);
expect(
- stateVariables[
- stateVariables[stateVariables["/p4"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p4"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(0);
expect(
- stateVariables[
- stateVariables[stateVariables["/p5"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p5"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(0);
expect(
- stateVariables[
- stateVariables[stateVariables["/p6"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p6"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(0);
expect(
- stateVariables[
- stateVariables[stateVariables["/p7"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p7"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(0);
expect(
- stateVariables[
- stateVariables[stateVariables["/p8"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p8"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(0);
expect(
- stateVariables[
- stateVariables[stateVariables["/p9"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p9"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(0);
});
@@ -2092,40 +2022,28 @@ describe("SelectRandomNumbers Tag Tests", function () {
.activeChildren.length,
).eq(2);
expect(
- stateVariables[
- stateVariables[stateVariables["/p4"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p4"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(2);
expect(
- stateVariables[
- stateVariables[stateVariables["/p5"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p5"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(2);
expect(
- stateVariables[
- stateVariables[stateVariables["/p6"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p6"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(2);
expect(
- stateVariables[
- stateVariables[stateVariables["/p7"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p7"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(2);
expect(
- stateVariables[
- stateVariables[stateVariables["/p8"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p8"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(2);
expect(
- stateVariables[
- stateVariables[stateVariables["/p9"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p9"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(2);
for (let ind = 0; ind < 2; ind++) {
@@ -2153,54 +2071,42 @@ describe("SelectRandomNumbers Tag Tests", function () {
expect(
stateVariables[
stateVariables[
- stateVariables[
- stateVariables["/p4"].replacements[0].componentName
- ].activeChildren[0].componentName
+ stateVariables["/p4"].activeChildren[0].componentName
].activeChildren[ind].componentName
].stateValues.value,
).eq(samplednumbers[ind]);
expect(
stateVariables[
stateVariables[
- stateVariables[
- stateVariables["/p5"].replacements[0].componentName
- ].activeChildren[0].componentName
+ stateVariables["/p5"].activeChildren[0].componentName
].activeChildren[ind].componentName
].stateValues.value,
).eq(samplednumbers[ind]);
expect(
stateVariables[
stateVariables[
- stateVariables[
- stateVariables["/p6"].replacements[0].componentName
- ].activeChildren[0].componentName
+ stateVariables["/p6"].activeChildren[0].componentName
].activeChildren[ind].componentName
].stateValues.value,
).eq(samplednumbers[ind]);
expect(
stateVariables[
stateVariables[
- stateVariables[
- stateVariables["/p7"].replacements[0].componentName
- ].activeChildren[0].componentName
+ stateVariables["/p7"].activeChildren[0].componentName
].activeChildren[ind].componentName
].stateValues.value,
).eq(samplednumbers[ind]);
expect(
stateVariables[
stateVariables[
- stateVariables[
- stateVariables["/p8"].replacements[0].componentName
- ].activeChildren[0].componentName
+ stateVariables["/p8"].activeChildren[0].componentName
].activeChildren[ind].componentName
].stateValues.value,
).eq(samplednumbers[ind]);
expect(
stateVariables[
stateVariables[
- stateVariables[
- stateVariables["/p9"].replacements[0].componentName
- ].activeChildren[0].componentName
+ stateVariables["/p9"].activeChildren[0].componentName
].activeChildren[ind].componentName
].stateValues.value,
).eq(samplednumbers[ind]);
@@ -2240,40 +2146,28 @@ describe("SelectRandomNumbers Tag Tests", function () {
.activeChildren.length,
).eq(6);
expect(
- stateVariables[
- stateVariables[stateVariables["/p4"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p4"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(6);
expect(
- stateVariables[
- stateVariables[stateVariables["/p5"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p5"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(6);
expect(
- stateVariables[
- stateVariables[stateVariables["/p6"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p6"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(6);
expect(
- stateVariables[
- stateVariables[stateVariables["/p7"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p7"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(6);
expect(
- stateVariables[
- stateVariables[stateVariables["/p8"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p8"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(6);
expect(
- stateVariables[
- stateVariables[stateVariables["/p9"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p9"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(6);
for (let ind = 0; ind < 6; ind++) {
expect(
@@ -2300,54 +2194,42 @@ describe("SelectRandomNumbers Tag Tests", function () {
expect(
stateVariables[
stateVariables[
- stateVariables[
- stateVariables["/p4"].replacements[0].componentName
- ].activeChildren[0].componentName
+ stateVariables["/p4"].activeChildren[0].componentName
].activeChildren[ind].componentName
].stateValues.value,
).eq(samplednumbers[ind]);
expect(
stateVariables[
stateVariables[
- stateVariables[
- stateVariables["/p5"].replacements[0].componentName
- ].activeChildren[0].componentName
+ stateVariables["/p5"].activeChildren[0].componentName
].activeChildren[ind].componentName
].stateValues.value,
).eq(samplednumbers[ind]);
expect(
stateVariables[
stateVariables[
- stateVariables[
- stateVariables["/p6"].replacements[0].componentName
- ].activeChildren[0].componentName
+ stateVariables["/p6"].activeChildren[0].componentName
].activeChildren[ind].componentName
].stateValues.value,
).eq(samplednumbers[ind]);
expect(
stateVariables[
stateVariables[
- stateVariables[
- stateVariables["/p7"].replacements[0].componentName
- ].activeChildren[0].componentName
+ stateVariables["/p7"].activeChildren[0].componentName
].activeChildren[ind].componentName
].stateValues.value,
).eq(samplednumbers[ind]);
expect(
stateVariables[
stateVariables[
- stateVariables[
- stateVariables["/p8"].replacements[0].componentName
- ].activeChildren[0].componentName
+ stateVariables["/p8"].activeChildren[0].componentName
].activeChildren[ind].componentName
].stateValues.value,
).eq(samplednumbers[ind]);
expect(
stateVariables[
stateVariables[
- stateVariables[
- stateVariables["/p9"].replacements[0].componentName
- ].activeChildren[0].componentName
+ stateVariables["/p9"].activeChildren[0].componentName
].activeChildren[ind].componentName
].stateValues.value,
).eq(samplednumbers[ind]);
@@ -2375,40 +2257,28 @@ describe("SelectRandomNumbers Tag Tests", function () {
.activeChildren.length,
).eq(0);
expect(
- stateVariables[
- stateVariables[stateVariables["/p4"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p4"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(0);
expect(
- stateVariables[
- stateVariables[stateVariables["/p5"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p5"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(0);
expect(
- stateVariables[
- stateVariables[stateVariables["/p6"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p6"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(0);
expect(
- stateVariables[
- stateVariables[stateVariables["/p7"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p7"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(0);
expect(
- stateVariables[
- stateVariables[stateVariables["/p8"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p8"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(0);
expect(
- stateVariables[
- stateVariables[stateVariables["/p9"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p9"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(0);
});
@@ -2445,40 +2315,28 @@ describe("SelectRandomNumbers Tag Tests", function () {
.activeChildren.length,
).eq(6);
expect(
- stateVariables[
- stateVariables[stateVariables["/p4"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p4"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(6);
expect(
- stateVariables[
- stateVariables[stateVariables["/p5"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p5"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(6);
expect(
- stateVariables[
- stateVariables[stateVariables["/p6"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p6"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(6);
expect(
- stateVariables[
- stateVariables[stateVariables["/p7"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p7"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(6);
expect(
- stateVariables[
- stateVariables[stateVariables["/p8"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p8"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(6);
expect(
- stateVariables[
- stateVariables[stateVariables["/p9"].replacements[0].componentName]
- .activeChildren[0].componentName
- ].activeChildren.length,
+ stateVariables[stateVariables["/p9"].activeChildren[0].componentName]
+ .activeChildren.length,
).eq(6);
for (let ind = 0; ind < 6; ind++) {
expect(
@@ -2505,54 +2363,42 @@ describe("SelectRandomNumbers Tag Tests", function () {
expect(
stateVariables[
stateVariables[
- stateVariables[
- stateVariables["/p4"].replacements[0].componentName
- ].activeChildren[0].componentName
+ stateVariables["/p4"].activeChildren[0].componentName
].activeChildren[ind].componentName
].stateValues.value,
).eq(samplednumbers[ind]);
expect(
stateVariables[
stateVariables[
- stateVariables[
- stateVariables["/p5"].replacements[0].componentName
- ].activeChildren[0].componentName
+ stateVariables["/p5"].activeChildren[0].componentName
].activeChildren[ind].componentName
].stateValues.value,
).eq(samplednumbers[ind]);
expect(
stateVariables[
stateVariables[
- stateVariables[
- stateVariables["/p6"].replacements[0].componentName
- ].activeChildren[0].componentName
+ stateVariables["/p6"].activeChildren[0].componentName
].activeChildren[ind].componentName
].stateValues.value,
).eq(samplednumbers[ind]);
expect(
stateVariables[
stateVariables[
- stateVariables[
- stateVariables["/p7"].replacements[0].componentName
- ].activeChildren[0].componentName
+ stateVariables["/p7"].activeChildren[0].componentName
].activeChildren[ind].componentName
].stateValues.value,
).eq(samplednumbers[ind]);
expect(
stateVariables[
stateVariables[
- stateVariables[
- stateVariables["/p8"].replacements[0].componentName
- ].activeChildren[0].componentName
+ stateVariables["/p8"].activeChildren[0].componentName
].activeChildren[ind].componentName
].stateValues.value,
).eq(samplednumbers[ind]);
expect(
stateVariables[
stateVariables[
- stateVariables[
- stateVariables["/p9"].replacements[0].componentName
- ].activeChildren[0].componentName
+ stateVariables["/p9"].activeChildren[0].componentName
].activeChildren[ind].componentName
].stateValues.value,
).eq(samplednumbers[ind]);
@@ -2569,9 +2415,9 @@ describe("SelectRandomNumbers Tag Tests", function () {
-
-
-
+ $u{name="u2"}
+ $v{name="v2"}
+ $w{name="w2"}
`,
},
"*",
@@ -2612,9 +2458,9 @@ describe("SelectRandomNumbers Tag Tests", function () {
-
-
-
+ $u{name="u2"}
+ $v{name="v2"}
+ $w{name="w2"}
`,
},
"*",
@@ -2680,9 +2526,9 @@ describe("SelectRandomNumbers Tag Tests", function () {
-
-
-
+ $(s/u{name="u2"})
+ $(s/v{name="v2"})
+ $(s/w{name="w2"})
`,
},
"*",
diff --git a/cypress/e2e/DoenetML/tagSpecific/sequence.cy.js b/cypress/e2e/DoenetML/tagSpecific/sequence.cy.js
index 8351700c61..127afc100f 100644
--- a/cypress/e2e/DoenetML/tagSpecific/sequence.cy.js
+++ b/cypress/e2e/DoenetML/tagSpecific/sequence.cy.js
@@ -801,7 +801,7 @@ describe("Sequence Tag Tests", function () {
Also exclude:
-
+ $exclude2.value{assignNames="exclude2a"}
`,
},
"*",
@@ -977,7 +977,7 @@ describe("Sequence Tag Tests", function () {
Also exclude:
-
+ $e.value{assignNames="ea"}
`,
},
"*",
@@ -1108,7 +1108,7 @@ describe("Sequence Tag Tests", function () {
Also exclude:
-
+ $e.value{assignNames="ea"}
`,
},
"*",
@@ -1353,10 +1353,10 @@ describe("Sequence Tag Tests", function () {
- 11 $n11
- 11 $m+3 11
`,
},
@@ -1396,7 +1396,7 @@ describe("Sequence Tag Tests", function () {
a
+ $n.value{assignNames="n2"}
`,
},
"*",
@@ -1495,7 +1495,7 @@ describe("Sequence Tag Tests", function () {
cy.get(cesc("#\\/_text1")).should("have.text", "a"); // to wait for page to load
- cy.get(cesc("#\\/s1")).should("have.text", "sequence 1: 1234");
+ cy.get(cesc("#\\/s1")).should("have.text", "sequence 1: 1, 2, 3, 4");
cy.get(cesc("#\\/s2")).should("have.text", "sequence 2: ");
cy.get(cesc("#\\/n1") + " textarea").type("{end}{backspace}6{enter}", {
@@ -1505,14 +1505,14 @@ describe("Sequence Tag Tests", function () {
force: true,
});
- cy.get(cesc("#\\/s1")).should("have.text", "sequence 1: 123456");
+ cy.get(cesc("#\\/s1")).should("have.text", "sequence 1: 1, 2, 3, 4, 5, 6");
cy.get(cesc("#\\/s2")).should("have.text", "sequence 2: ");
cy.get(cesc("#\\/h1")).click();
cy.get(cesc("#\\/h2")).click();
cy.get(cesc("#\\/s1")).should("have.text", "sequence 1: ");
- cy.get(cesc("#\\/s2")).should("have.text", "sequence 2: 123456");
+ cy.get(cesc("#\\/s2")).should("have.text", "sequence 2: 1, 2, 3, 4, 5, 6");
cy.get(cesc("#\\/n1") + " textarea").type("{end}{backspace}8{enter}", {
force: true,
@@ -1522,12 +1522,18 @@ describe("Sequence Tag Tests", function () {
});
cy.get(cesc("#\\/s1")).should("have.text", "sequence 1: ");
- cy.get(cesc("#\\/s2")).should("have.text", "sequence 2: 12345678");
+ cy.get(cesc("#\\/s2")).should(
+ "have.text",
+ "sequence 2: 1, 2, 3, 4, 5, 6, 7, 8",
+ );
cy.get(cesc("#\\/h1")).click();
cy.get(cesc("#\\/h2")).click();
- cy.get(cesc("#\\/s1")).should("have.text", "sequence 1: 12345678");
+ cy.get(cesc("#\\/s1")).should(
+ "have.text",
+ "sequence 1: 1, 2, 3, 4, 5, 6, 7, 8",
+ );
cy.get(cesc("#\\/s2")).should("have.text", "sequence 2: ");
cy.get(cesc("#\\/n1") + " textarea").type("{end}{backspace}3{enter}", {
@@ -1537,14 +1543,14 @@ describe("Sequence Tag Tests", function () {
force: true,
});
- cy.get(cesc("#\\/s1")).should("have.text", "sequence 1: 123");
+ cy.get(cesc("#\\/s1")).should("have.text", "sequence 1: 1, 2, 3");
cy.get(cesc("#\\/s2")).should("have.text", "sequence 2: ");
cy.get(cesc("#\\/h1")).click();
cy.get(cesc("#\\/h2")).click();
cy.get(cesc("#\\/s1")).should("have.text", "sequence 1: ");
- cy.get(cesc("#\\/s2")).should("have.text", "sequence 2: 123");
+ cy.get(cesc("#\\/s2")).should("have.text", "sequence 2: 1, 2, 3");
cy.get(cesc("#\\/n1") + " textarea").type("{end}{backspace}4{enter}", {
force: true,
@@ -1554,7 +1560,7 @@ describe("Sequence Tag Tests", function () {
});
cy.get(cesc("#\\/s1")).should("have.text", "sequence 1: ");
- cy.get(cesc("#\\/s2")).should("have.text", "sequence 2: 1234");
+ cy.get(cesc("#\\/s2")).should("have.text", "sequence 2: 1, 2, 3, 4");
});
it("sequence fixed by default", () => {
@@ -1733,8 +1739,8 @@ describe("Sequence Tag Tests", function () {
Change first:
Change second:
- Copy of a2:
- Copy of b2:
+ Copy of a2: $a2{name="a3"}
+ Copy of b2: $b2{name="b3"}
`,
},
@@ -1814,13 +1820,13 @@ describe("Sequence Tag Tests", function () {
});
cy.get(cesc("#\\/thelist")).should("have.text", "4");
cy.get(cesc(`#\\/a2`) + ` .mq-editable-field`).should("have.text", "8");
- cy.get(cesc(`#\\/b2`) + ` .mq-editable-field`).should("have.text", "");
+ cy.get(cesc(`#\\/b2`) + ` .mq-editable-field`).should("have.text", "0");
cy.get(cesc("#\\/a3") + " .mjx-mrow")
.eq(0)
.should("have.text", "8");
cy.get(cesc("#\\/b3") + " .mjx-mrow")
.eq(0)
- .should("have.text", "\uff3f");
+ .should("have.text", "0");
cy.get(cesc("#\\/a2") + " textarea")
.type("{end}{backspace}9{enter}", { force: true })
@@ -1828,16 +1834,16 @@ describe("Sequence Tag Tests", function () {
cy.get(cesc("#\\/a3") + " .mjx-mrow").should("contain.text", "9");
cy.get(cesc("#\\/thelist")).should("have.text", "4");
cy.get(cesc(`#\\/a2`) + ` .mq-editable-field`).should("have.text", "9");
- cy.get(cesc(`#\\/b2`) + ` .mq-editable-field`).should("have.text", "");
+ cy.get(cesc(`#\\/b2`) + ` .mq-editable-field`).should("have.text", "0");
cy.get(cesc("#\\/a3") + " .mjx-mrow")
.eq(0)
.should("have.text", "9");
cy.get(cesc("#\\/b3") + " .mjx-mrow")
.eq(0)
- .should("have.text", "\uff3f");
+ .should("have.text", "0");
cy.get(cesc("#\\/b2") + " textarea")
- .type("2{enter}", { force: true })
+ .type("{end}{backspace}2{enter}", { force: true })
.blur();
cy.get(cesc("#\\/b3") + " .mjx-mrow").should("contain.text", "2");
cy.get(cesc("#\\/thelist")).should("have.text", "4");
@@ -1854,11 +1860,11 @@ describe("Sequence Tag Tests", function () {
force: true,
});
cy.get(cesc("#\\/thelist")).should("have.text", "");
- cy.get(cesc(`#\\/a2`) + ` .mq-editable-field`).should("have.text", "");
+ cy.get(cesc(`#\\/a2`) + ` .mq-editable-field`).should("have.text", "9");
cy.get(cesc(`#\\/b2`) + ` .mq-editable-field`).should("have.text", "2");
cy.get(cesc("#\\/a3") + " .mjx-mrow")
.eq(0)
- .should("have.text", "\uff3f");
+ .should("have.text", "9");
cy.get(cesc("#\\/b3") + " .mjx-mrow")
.eq(0)
.should("have.text", "2");
@@ -1884,14 +1890,14 @@ describe("Sequence Tag Tests", function () {
force: true,
});
cy.get(cesc("#\\/thelist")).should("have.text", "0, 3, 6");
- cy.get(cesc(`#\\/a2`) + ` .mq-editable-field`).should("have.text", "0");
- cy.get(cesc(`#\\/b2`) + ` .mq-editable-field`).should("have.text", "3");
+ cy.get(cesc(`#\\/a2`) + ` .mq-editable-field`).should("have.text", "3");
+ cy.get(cesc(`#\\/b2`) + ` .mq-editable-field`).should("have.text", "2");
cy.get(cesc("#\\/a3") + " .mjx-mrow")
.eq(0)
- .should("have.text", "0");
+ .should("have.text", "3");
cy.get(cesc("#\\/b3") + " .mjx-mrow")
.eq(0)
- .should("have.text", "3");
+ .should("have.text", "2");
cy.get(cesc("#\\/a2") + " textarea")
.type("{end}{backspace}8{enter}", { force: true })
@@ -1899,13 +1905,13 @@ describe("Sequence Tag Tests", function () {
cy.get(cesc("#\\/a3") + " .mjx-mrow").should("contain.text", "8");
cy.get(cesc("#\\/thelist")).should("have.text", "0, 3, 6");
cy.get(cesc(`#\\/a2`) + ` .mq-editable-field`).should("have.text", "8");
- cy.get(cesc(`#\\/b2`) + ` .mq-editable-field`).should("have.text", "3");
+ cy.get(cesc(`#\\/b2`) + ` .mq-editable-field`).should("have.text", "2");
cy.get(cesc("#\\/a3") + " .mjx-mrow")
.eq(0)
.should("have.text", "8");
cy.get(cesc("#\\/b3") + " .mjx-mrow")
.eq(0)
- .should("have.text", "3");
+ .should("have.text", "2");
cy.get(cesc("#\\/b2") + " textarea")
.type("{end}{backspace}7{enter}", { force: true })
@@ -2095,6 +2101,114 @@ describe("Sequence Tag Tests", function () {
});
});
+ it("sequence displays as list by default", () => {
+ cy.window().then(async (win) => {
+ win.postMessage(
+ {
+ doenetML: `
+
+
+
+ $default
+ $nocommas
+ $withcommas
+ $default{asList="false"}
+ $withcommas{asList="false"}
+ $nocommas{asList="true"}
+
+
+
+
+
+
+
+
+
+
+ `,
+ },
+ "*",
+ );
+ });
+
+ cy.get(cesc2("#/default")).should(
+ "have.text",
+ "1, 2, 3, 4, 5, 6, 7, 8, 9, 10",
+ );
+ cy.get(cesc2("#/pdefault2")).should(
+ "have.text",
+ "1, 2, 3, 4, 5, 6, 7, 8, 9, 10",
+ );
+ cy.get(cesc2("#/pdefault4")).should(
+ "have.text",
+ "1, 2, 3, 4, 5, 6, 7, 8, 9, 10",
+ );
+ cy.get(cesc2("#/pdefault5")).should(
+ "have.text",
+ "1, 2, 3, 4, 5, 6, 7, 8, 9, 10",
+ );
+
+ cy.get(cesc2("#/nocommas")).should("have.text", "12345678910");
+ cy.get(cesc2("#/pnocommas2")).should("have.text", "12345678910");
+ cy.get(cesc2("#/pnocommas3")).should("have.text", "12345678910");
+ cy.get(cesc2("#/pnocommas3a")).should("have.text", "12345678910");
+ cy.get(cesc2("#/pnocommas4")).should("have.text", "12345678910");
+ cy.get(cesc2("#/pnocommas5")).should("have.text", "12345678910");
+ cy.get(cesc2("#/pnocommas6")).should("have.text", "12345678910");
+ cy.get(cesc2("#/pnocommas6a")).should("have.text", "12345678910");
+
+ cy.get(cesc2("#/withcommas")).should(
+ "have.text",
+ "1, 2, 3, 4, 5, 6, 7, 8, 9, 10",
+ );
+ cy.get(cesc2("#/pwithcommas2")).should(
+ "have.text",
+ "1, 2, 3, 4, 5, 6, 7, 8, 9, 10",
+ );
+
+ cy.window().then(async (win) => {
+ let stateVariables = await win.returnAllStateVariables1();
+ expect(stateVariables["/pdefault"].stateValues.text).eq(
+ "1, 2, 3, 4, 5, 6, 7, 8, 9, 10",
+ );
+ expect(stateVariables["/pdefault2"].stateValues.text).eq(
+ "1, 2, 3, 4, 5, 6, 7, 8, 9, 10",
+ );
+ expect(stateVariables["/pdefault4"].stateValues.text).eq(
+ "1, 2, 3, 4, 5, 6, 7, 8, 9, 10",
+ );
+ expect(stateVariables["/pdefault5"].stateValues.text).eq(
+ "1, 2, 3, 4, 5, 6, 7, 8, 9, 10",
+ );
+ expect(stateVariables["/pnocommas"].stateValues.text).eq("12345678910");
+ expect(stateVariables["/pnocommas2"].stateValues.text).eq("12345678910");
+ expect(stateVariables["/pnocommas3"].stateValues.text).eq("12345678910");
+ expect(stateVariables["/pnocommas3a"].stateValues.text).eq("12345678910");
+ expect(stateVariables["/pnocommas4"].stateValues.text).eq("12345678910");
+ expect(stateVariables["/pnocommas5"].stateValues.text).eq("12345678910");
+ expect(stateVariables["/pnocommas6"].stateValues.text).eq("12345678910");
+ expect(stateVariables["/pnocommas6a"].stateValues.text).eq("12345678910");
+ expect(stateVariables["/pwithcommas"].stateValues.text).eq(
+ "1, 2, 3, 4, 5, 6, 7, 8, 9, 10",
+ );
+ expect(stateVariables["/pwithcommas2"].stateValues.text).eq(
+ "1, 2, 3, 4, 5, 6, 7, 8, 9, 10",
+ );
+ expect(stateVariables["/pwithcommas3"].stateValues.text).eq(
+ "1, 2, 3, 4, 5, 6, 7, 8, 9, 10",
+ );
+ expect(stateVariables["/pwithcommas4"].stateValues.text).eq(
+ "1, 2, 3, 4, 5, 6, 7, 8, 9, 10",
+ );
+ expect(stateVariables["/pwithcommas5"].stateValues.text).eq(
+ "1, 2, 3, 4, 5, 6, 7, 8, 9, 10",
+ );
+ expect(stateVariables["/pwithcommas6"].stateValues.text).eq(
+ "1, 2, 3, 4, 5, 6, 7, 8, 9, 10",
+ );
+ });
+ });
+
it("rounding", () => {
cy.window().then(async (win) => {
win.postMessage(
diff --git a/cypress/e2e/DoenetML/tagSpecific/shuffle.cy.js b/cypress/e2e/DoenetML/tagSpecific/shuffle.cy.js
index 9e9711aefc..1a8a8030c0 100644
--- a/cypress/e2e/DoenetML/tagSpecific/shuffle.cy.js
+++ b/cypress/e2e/DoenetML/tagSpecific/shuffle.cy.js
@@ -487,4 +487,115 @@ describe("Shuffle Tag Tests", function () {
cy.get(cesc("#\\/pList")).should("have.text", orderedOptions.join(", "));
});
});
+
+ it("shuffle sugar type math", () => {
+ cy.window().then(async (win) => {
+ win.postMessage(
+ {
+ doenetML: `
+ a
+
+ a b c x y z
+
+
+ `,
+ },
+ "*",
+ );
+ });
+
+ cy.get(cesc("#\\/_text1")).should("have.text", "a");
+
+ let options = ["a", "b", "c", "x", "y", "z"];
+
+ cy.window().then(async (win) => {
+ let stateVariables = await win.returnAllStateVariables1();
+ let componentOrder = stateVariables["/sh"].stateValues.componentOrder;
+
+ expect([...componentOrder].sort((a, b) => a - b)).eqls(
+ [...Array(6).keys()].map((x) => x + 1),
+ );
+
+ let orderedOptions = componentOrder.map(
+ (x) => options[x - 1] + options[x - 1] + options[x - 1],
+ );
+
+ cy.get(cesc("#\\/pList")).should("have.text", orderedOptions.join(", "));
+ cy.get(cesc("#\\/pNoList")).should("have.text", orderedOptions.join(""));
+ });
+ });
+
+ it("shuffle sugar type number", () => {
+ cy.window().then(async (win) => {
+ win.postMessage(
+ {
+ doenetML: `
+ a
+
+ 101 542 817 527 51 234 801
+
+
+ `,
+ },
+ "*",
+ );
+ });
+
+ cy.get(cesc("#\\/_text1")).should("have.text", "a");
+
+ let options = [101, 542, 817, 527, 51, 234, 801];
+
+ cy.window().then(async (win) => {
+ let stateVariables = await win.returnAllStateVariables1();
+ let componentOrder = stateVariables["/sh"].stateValues.componentOrder;
+
+ expect([...componentOrder].sort((a, b) => a - b)).eqls(
+ [...Array(7).keys()].map((x) => x + 1),
+ );
+
+ let orderedOptions = componentOrder.map((x) => options[x - 1]);
+
+ cy.get(cesc("#\\/pList")).should("have.text", orderedOptions.join(", "));
+ cy.get(cesc("#\\/pNoList")).should("have.text", orderedOptions.join(""));
+ });
+ });
+
+ it("shuffle sugar type text", () => {
+ cy.window().then(async (win) => {
+ win.postMessage(
+ {
+ doenetML: `
+ a
+
+ apple
+ banana
+ orange
+ almost
+ above
+
+
+ `,
+ },
+ "*",
+ );
+ });
+
+ cy.get(cesc("#\\/_text1")).should("have.text", "a");
+
+ let options = ["apple", "banana", "orange", "almost", "above"];
+
+ cy.window().then(async (win) => {
+ let stateVariables = await win.returnAllStateVariables1();
+ let componentOrder = stateVariables["/sh"].stateValues.componentOrder;
+
+ expect([...componentOrder].sort((a, b) => a - b)).eqls(
+ [...Array(5).keys()].map((x) => x + 1),
+ );
+
+ let orderedOptions = componentOrder.map((x) => options[x - 1]);
+
+ cy.get(cesc("#\\/pList")).should("have.text", orderedOptions.join(", "));
+ cy.get(cesc("#\\/pNoList")).should("have.text", orderedOptions.join(""));
+ });
+ });
});
diff --git a/cypress/e2e/DoenetML/tagSpecific/sidebyside.cy.js b/cypress/e2e/DoenetML/tagSpecific/sidebyside.cy.js
index 856c8675b0..692c5ec33f 100644
--- a/cypress/e2e/DoenetML/tagSpecific/sidebyside.cy.js
+++ b/cypress/e2e/DoenetML/tagSpecific/sidebyside.cy.js
@@ -658,14 +658,14 @@ describe("SideBySide Tag Tests", function () {
-
`,
},
@@ -903,14 +903,14 @@ describe("SideBySide Tag Tests", function () {
-
`,
},
@@ -1047,14 +1047,14 @@ describe("SideBySide Tag Tests", function () {
-
`,
},
@@ -1178,14 +1178,14 @@ describe("SideBySide Tag Tests", function () {
-
`,
},
@@ -1305,14 +1305,14 @@ describe("SideBySide Tag Tests", function () {
-
`,
},
@@ -1438,16 +1438,16 @@ describe("SideBySide Tag Tests", function () {
-
`,
},
@@ -1738,16 +1738,16 @@ describe("SideBySide Tag Tests", function () {
-
`,
},
@@ -1891,16 +1891,16 @@ describe("SideBySide Tag Tests", function () {
-
`,
},
@@ -2062,16 +2062,16 @@ describe("SideBySide Tag Tests", function () {
-
`,
},
@@ -2233,16 +2233,16 @@ describe("SideBySide Tag Tests", function () {
-
`,
},
@@ -2440,20 +2440,20 @@ describe("SideBySide Tag Tests", function () {
-
`,
},
@@ -2713,20 +2713,20 @@ describe("SideBySide Tag Tests", function () {
-
`,
},
@@ -2842,20 +2842,20 @@ describe("SideBySide Tag Tests", function () {
-
`,
},
@@ -2977,9 +2977,9 @@ describe("SideBySide Tag Tests", function () {
-
`,
},
@@ -4008,28 +4008,28 @@ describe("SideBySide Tag Tests", function () {
-
`,
},
@@ -5050,28 +5050,28 @@ describe("SideBySide Tag Tests", function () {
-
`,
},
@@ -6141,28 +6141,28 @@ describe("SideBySide Tag Tests", function () {
-
`,
},
@@ -7367,9 +7367,9 @@ describe("SideBySide Tag Tests", function () {
-
-
`,
},
@@ -7858,16 +7858,16 @@ describe("SideBySide Tag Tests", function () {
-
`,
},
diff --git a/cypress/e2e/DoenetML/tagSpecific/slider.cy.js b/cypress/e2e/DoenetML/tagSpecific/slider.cy.js
index 99f6961deb..faeb7a08df 100644
--- a/cypress/e2e/DoenetML/tagSpecific/slider.cy.js
+++ b/cypress/e2e/DoenetML/tagSpecific/slider.cy.js
@@ -84,7 +84,7 @@ describe("Slider Tag Tests", function () {
Change value:
`,
},
diff --git a/cypress/e2e/DoenetML/tagSpecific/solveequations.cy.js b/cypress/e2e/DoenetML/tagSpecific/solveequations.cy.js
index bf739995ba..d127ff3be4 100644
--- a/cypress/e2e/DoenetML/tagSpecific/solveequations.cy.js
+++ b/cypress/e2e/DoenetML/tagSpecific/solveequations.cy.js
@@ -15,7 +15,7 @@ describe("SolveEquations Tag Tests", function () {
variable:
equation:
$equation
- Number of solutions:
+ Number of solutions: $solve.numSolutions{assignNames="num"}
Solutions:
`,
},
@@ -366,13 +366,13 @@ describe("SolveEquations Tag Tests", function () {
maxvar:
equation:
$equation
- Number of solutions:
+ Number of solutions: $solve.numSolutions{assignNames="num"}
Solutions:
-
`,
},
diff --git a/cypress/e2e/DoenetML/tagSpecific/sort.cy.js b/cypress/e2e/DoenetML/tagSpecific/sort.cy.js
index 4866137d7e..409b64d776 100644
--- a/cypress/e2e/DoenetML/tagSpecific/sort.cy.js
+++ b/cypress/e2e/DoenetML/tagSpecific/sort.cy.js
@@ -1682,4 +1682,80 @@ describe("Sort Tag Tests", function () {
expect(stateVariables["/x13"].stateValues.value).eq("z");
});
});
+
+ it("sort sugar type math", () => {
+ cy.window().then(async (win) => {
+ win.postMessage(
+ {
+ doenetML: `
+ a
+
+ z b a x y c
+
+
+ `,
+ },
+ "*",
+ );
+ });
+
+ cy.get(cesc("#\\/_text1")).should("have.text", "a");
+
+ let sorted = ["aaa", "bbb", "ccc", "xxx", "yyy", "zzz"];
+
+ cy.get(cesc("#\\/pList")).should("have.text", sorted.join(", "));
+ cy.get(cesc("#\\/pNoList")).should("have.text", sorted.join(""));
+ });
+
+ it("sort sugar type number", () => {
+ cy.window().then(async (win) => {
+ win.postMessage(
+ {
+ doenetML: `
+ a
+
+ 101 542 817 527 51 234 801
+
+
+ `,
+ },
+ "*",
+ );
+ });
+
+ cy.get(cesc("#\\/_text1")).should("have.text", "a");
+
+ let sorted = [51, 101, 234, 527, 542, 801, 817];
+
+ cy.get(cesc("#\\/pList")).should("have.text", sorted.join(", "));
+ cy.get(cesc("#\\/pNoList")).should("have.text", sorted.join(""));
+ });
+
+ it("sort sugar type text", () => {
+ cy.window().then(async (win) => {
+ win.postMessage(
+ {
+ doenetML: `
+ a
+
+ orange
+ apple
+ banana
+ almost
+ above
+
+
+ `,
+ },
+ "*",
+ );
+ });
+
+ cy.get(cesc("#\\/_text1")).should("have.text", "a");
+
+ let sorted = ["above", "almost", "apple", "banana", "orange"];
+
+ cy.get(cesc("#\\/pList")).should("have.text", sorted.join(", "));
+ cy.get(cesc("#\\/pNoList")).should("have.text", sorted.join(""));
+ });
});
diff --git a/cypress/e2e/DoenetML/tagSpecific/spreadsheet.cy.js b/cypress/e2e/DoenetML/tagSpecific/spreadsheet.cy.js
index a98c97f1e4..816028287e 100644
--- a/cypress/e2e/DoenetML/tagSpecific/spreadsheet.cy.js
+++ b/cypress/e2e/DoenetML/tagSpecific/spreadsheet.cy.js
@@ -41,9 +41,9 @@ describe("Spreadsheet Tag Tests", function () {
a
-
`,
},
@@ -253,11 +253,11 @@ describe("Spreadsheet Tag Tests", function () {
win.postMessage(
{
doenetML: `
- $_spreadsheet1.cellA1
+ $_spreadsheet2.cellA3
+ $ss1a.cellD3
+ $ss2a.cellD4
+ $ss1b.cellB1
| first |
@@ -268,17 +268,17 @@ describe("Spreadsheet Tag Tests", function () {
- |
+ $_cell3{name="c3a"}
+ |
+ |
- $_spreadsheet1.cellA1
+ $_spreadsheet2.cellA3
+ $ss1a.cellD3
+ $ss2a.cellD4
+ $ss1b.cellB1
| first |
@@ -513,17 +513,17 @@ describe("Spreadsheet Tag Tests", function () {
- |
+ |
+ |
+ |
+ |
-
-
@@ -4426,8 +4426,8 @@ describe("Spreadsheet Tag Tests", function () {
1 | 2 |
-
diff --git a/cypress/e2e/DoenetML/tagSpecific/subsetofreals.cy.js b/cypress/e2e/DoenetML/tagSpecific/subsetofreals.cy.js
index 6a3acdbe96..bd2537f400 100644
--- a/cypress/e2e/DoenetML/tagSpecific/subsetofreals.cy.js
+++ b/cypress/e2e/DoenetML/tagSpecific/subsetofreals.cy.js
@@ -2459,12 +2459,12 @@ describe("SubsetOfReals Tag Tests", function () {
a
Enter subset:
Subset 1: $input0
- Subset 2:
- Subset 3:
- Subset 4:
- Subset 5:
- Subset 6:
- Subset 7:
+ Subset 2: $s1{name="s2"}
+ Subset 3: $s1.value{assignNames="s3"}
+ Subset 4: $s2{name="s4"}
+ Subset 5: $s2.value{assignNames="s5"}
+ Subset 6: $s3{name="s6"}
+ Subset 7: $s3.value{assignNames="s7"}
Subset 8: $s1
Subset 9: $(s1.value)
Modify subset 1:
diff --git a/cypress/e2e/DoenetML/tagSpecific/substitute.cy.js b/cypress/e2e/DoenetML/tagSpecific/substitute.cy.js
index 15131b0b27..a81579fefd 100644
--- a/cypress/e2e/DoenetML/tagSpecific/substitute.cy.js
+++ b/cypress/e2e/DoenetML/tagSpecific/substitute.cy.js
@@ -1499,7 +1499,7 @@ describe("Substitute Tag Tests", function () {
Substituted 2:
-
+ $matchCase.value{assignNames="matchCase2"}
`,
},
"*",
diff --git a/cypress/e2e/DoenetML/tagSpecific/text.cy.js b/cypress/e2e/DoenetML/tagSpecific/text.cy.js
index 634e4b7cdb..ce2013c7e8 100644
--- a/cypress/e2e/DoenetML/tagSpecific/text.cy.js
+++ b/cypress/e2e/DoenetML/tagSpecific/text.cy.js
@@ -13,7 +13,7 @@ describe("Text Tag Tests", function () {
doenetML: `
Hello there !
- We could be
+ We could be $_text2.
`,
},
"*",
@@ -105,7 +105,7 @@ describe("Text Tag Tests", function () {
doenetML: `
Hello, said the cow . Bye, came the reply . The text attribute of text or text (or text ?) doesn't do much .
-
+ $orig.text{assignNames="t"}
Hello, said the cow . Bye, came the reply . The text attribute of text or text (or text ?) doesn't do much .
`,
@@ -137,7 +137,7 @@ describe("Text Tag Tests", function () {
doenetML: `
Pick a
-
+ $orig.text{assignNames="t"}
Pick a
`,
diff --git a/cypress/e2e/DoenetML/tagSpecific/textinput.cy.js b/cypress/e2e/DoenetML/tagSpecific/textinput.cy.js
index adff5cba77..0fc52e7086 100644
--- a/cypress/e2e/DoenetML/tagSpecific/textinput.cy.js
+++ b/cypress/e2e/DoenetML/tagSpecific/textinput.cy.js
@@ -22,14 +22,14 @@ describe("TextInput Tag Tests", function () {
doenetML: `
a
Original text: can't update me
textinput based on text:
- immediate value:
+ immediate value: $_textinput1.immediateValue{assignNames="iv"}
`,
},
"*",
@@ -838,7 +838,7 @@ describe("TextInput Tag Tests", function () {
doenetML: `
Original text: update
textinput based on text: can't $_text1 me
- immediate value:
+ immediate value: $_textinput1.immediateValue{assignNames="iv"}
`,
},
"*",
@@ -916,10 +916,10 @@ describe("TextInput Tag Tests", function () {
doenetML: `
Original textinput:
textinput based on textinput:
- Immediate value of original:
- Value of original:
- Immediate value of second:
- Value of second:
+ Immediate value of original: $_textinput1.immediateValue
+ Value of original: $_textinput1.value
+ Immediate value of second: $_textinput2.immediateValue
+ Value of second: $_textinput2.value
`,
},
"*",
@@ -1058,10 +1058,10 @@ describe("TextInput Tag Tests", function () {
doenetML: `
Original textinput:
textinput based on textinput:
- Immediate value of original:
- Value of original:
- Immediate value of second:
- Value of second:
+ Immediate value of original: $_textinput1.immediateValue
+ Value of original: $_textinput1.value
+ Immediate value of second: $_textinput2.immediateValue
+ Value of second: $_textinput2.value
`,
},
@@ -1194,7 +1194,7 @@ describe("TextInput Tag Tests", function () {
doenetML: `
a
hello
a b c
-
+
-
+
hello
- bye
-
-
+
-
+ $textlist2.text
`,
},
@@ -199,12 +199,12 @@ describe("TextList Tag Tests", function () {
doenetML: `
a
a b c d e
-
-
+
+
a b c d e
-
-
+
+
`,
},
@@ -266,7 +266,7 @@ describe("TextList Tag Tests", function () {
doenetML: `
a
a b c d e
-
+
Maximum number 1:
Maximum number 2:
diff --git a/cypress/e2e/DoenetML/tagSpecific/triangle.cy.js b/cypress/e2e/DoenetML/tagSpecific/triangle.cy.js
index 608bffdcb8..df0d1f2294 100644
--- a/cypress/e2e/DoenetML/tagSpecific/triangle.cy.js
+++ b/cypress/e2e/DoenetML/tagSpecific/triangle.cy.js
@@ -15,9 +15,9 @@ describe("Triangle Tag Tests", function () {
a
`,
},
@@ -150,9 +150,9 @@ describe("Triangle Tag Tests", function () {
a
`,
},
@@ -284,9 +284,9 @@ describe("Triangle Tag Tests", function () {
a
`,
},
@@ -418,9 +418,9 @@ describe("Triangle Tag Tests", function () {
a
`,
},
@@ -552,9 +552,9 @@ describe("Triangle Tag Tests", function () {
a
`,
},
@@ -690,18 +690,18 @@ describe("Triangle Tag Tests", function () {
-
-
-
-
- $_triangle1
@@ -1367,8 +1367,8 @@ describe("Triangle Tag Tests", function () {
- ($_triangle1.vertex3 ,
+ $_triangle1.vertex3 )
`,
@@ -1514,8 +1514,8 @@ describe("Triangle Tag Tests", function () {
- ($_triangle1.vertex3 ,
+ $_triangle1.vertex3 )
`,
@@ -1657,8 +1657,8 @@ describe("Triangle Tag Tests", function () {
a
- (
(3,5)
(-5,2)
diff --git a/cypress/e2e/DoenetML/tagSpecific/updatevalue.cy.js b/cypress/e2e/DoenetML/tagSpecific/updatevalue.cy.js
index 885b499782..43b8fa0d8c 100644
--- a/cypress/e2e/DoenetML/tagSpecific/updatevalue.cy.js
+++ b/cypress/e2e/DoenetML/tagSpecific/updatevalue.cy.js
@@ -13,7 +13,7 @@ describe("UpdateValue Tag Tests", function () {
{
doenetML: `
a
- 20/
+ 20/$count
2
@@ -384,7 +384,7 @@ describe("UpdateValue Tag Tests", function () {
+
`,
},
"*",
@@ -537,16 +537,16 @@ describe("UpdateValue Tag Tests", function () {
a
(3,2)
- skip me
+ ignore me
(1,5)
- skip me too
+ ignore me too
(7,0)
-
+
`,
},
"*",
@@ -751,7 +751,7 @@ describe("UpdateValue Tag Tests", function () {
+
`,
},
"*",
@@ -1586,7 +1586,7 @@ describe("UpdateValue Tag Tests", function () {
$P
- $P{assignNames="P2"}
+ $P{name="P2"}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- (-4,2)
-
-
-
\\vec{v}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- $_vector1
-
- $_vector1
-
- $l
-
-
- x coordinate of u is
- y coordinate of u is
- x1 coordinate of u is
- x2 coordinate of u is
+ x coordinate of u is $u.x{assignNames="ux"}
+ y coordinate of u is $u.y{assignNames="uy"}
+ x1 coordinate of u is $u.x1{assignNames="ux1"}
+ x2 coordinate of u is $u.x2{assignNames="ux2"}
x coordinate of v is
- y coordinate of v is
- z coordinate of v is
- x1 coordinate of v is
- x2 coordinate of v is
- x3 coordinate of v is
+ x coordinate of v is $v.x{assignNames="vx"}
+ y coordinate of v is $v.y{assignNames="vy"}
+ z coordinate of v is $v.z{assignNames="vz"}
+ x1 coordinate of v is $v.x1{assignNames="vx1"}
+ x2 coordinate of v is $v.x2{assignNames="vx2"}
+ x3 coordinate of v is $v.x3{assignNames="vx3"}
`,
},
"*",
@@ -7416,11 +7416,11 @@ describe("Vector Tag Tests", function () {
a
- a
(
-
,
-
)
- a
-
-
-
-
- a
- $_vector1
@@ -14295,12 +14295,12 @@ describe("Vector Tag Tests", function () {
a
@@ -14628,7 +14628,7 @@ describe("Vector Tag Tests", function () {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 1
-
- a
-
-
-
-
@@ -19784,14 +19784,14 @@ describe("Vector Tag Tests", function () {
-
-
-
-
An introduction to Doenet.
State:
- Time:
- Duration:
+ State: $v.state{assignNames="state"}
+ Time: $v.time{assignNames="time"}
+ Duration: $v.duration{assignNames="duration"}
Seconds watched:
Fraction watched:
@@ -399,9 +399,9 @@ describe("Video Tag Tests", function () {
An introduction to Doenet.
State:
- Time:
- Duration:
+ State: $v.state{assignNames="state"}
+ Time: $v.time{assignNames="time"}
+ Duration: $v.duration{assignNames="duration"}
Seconds watched:
Change time:
diff --git a/cypress/e2e/DoenetML/tagSpecific/when.cy.js b/cypress/e2e/DoenetML/tagSpecific/when.cy.js
index f8ec525220..0c6469cad9 100644
--- a/cypress/e2e/DoenetML/tagSpecific/when.cy.js
+++ b/cypress/e2e/DoenetML/tagSpecific/when.cy.js
@@ -17,9 +17,9 @@ describe("When Tag Tests", function () {
$n > 0 and $n > 1
- Value:
- Condition satisfied:
- Fraction satisfied:
+ Value: $w.value{assignNames="v"}
+ Condition satisfied: $w.conditionSatisfied{assignNames="cs"}
+ Fraction satisfied: $w.fractionSatisfied{assignNames="fs"}
`,
},
diff --git a/cypress/e2e/DoenetML/variants/specifysinglevariant.cy.js b/cypress/e2e/DoenetML/variants/specifysinglevariant.cy.js
index 9a6fdfca9d..24e6caa50f 100644
--- a/cypress/e2e/DoenetML/variants/specifysinglevariant.cy.js
+++ b/cypress/e2e/DoenetML/variants/specifysinglevariant.cy.js
@@ -1156,8 +1156,8 @@ describe("Specifying single variant document tests", function () {
b
- Selected variable repeated:
- Selected variable repeated again:
+ Selected variable repeated: $x{name="x2"}
+ Selected variable repeated again: $_select1{name="x3"}
`,
requestedVariantIndex: 1,
},
@@ -1180,9 +1180,7 @@ describe("Specifying single variant document tests", function () {
].replacements[0].componentName
].stateValues.value;
expect(xorig).eq(expectedx);
- let x2 =
- stateVariables[stateVariables["/x2"].replacements[0].componentName]
- .stateValues.value;
+ let x2 = stateVariables["/x2"].stateValues.value;
expect(x2).eq(expectedx);
let x3 =
stateVariables[
@@ -1230,8 +1228,8 @@ describe("Specifying single variant document tests", function () {
b Selected variable repeated:
- Selected variable repeated again:
+ Selected variable repeated: $x{name="x2"}
+ Selected variable repeated again: $_select1{name="x3"}
`,
requestedVariantIndex: 3,
},
@@ -1254,9 +1252,7 @@ describe("Specifying single variant document tests", function () {
].replacements[0].componentName
].stateValues.value;
expect(xorig).eq(expectedx);
- let x2 =
- stateVariables[stateVariables["/x2"].replacements[0].componentName]
- .stateValues.value;
+ let x2 = stateVariables["/x2"].stateValues.value;
expect(x2).eq(expectedx);
let x3 =
stateVariables[
@@ -1301,8 +1297,8 @@ describe("Specifying single variant document tests", function () {
// b Selected variable repeated:
- // Selected variable repeated again:
+ // Selected variable repeated:
+ // Selected variable repeated again:
// `,
// requestedVariant: { name: 'bRoccoli' },
// }, "*");
@@ -1355,8 +1351,8 @@ describe("Specifying single variant document tests", function () {
// b Selected variable repeated:
- // Selected variable repeated again:
+ // Selected variable repeated:
+ // Selected variable repeated again:
// `,
// requestedVariant: generatedVariantInfo,
// }, "*");
@@ -1408,8 +1404,8 @@ describe("Specifying single variant document tests", function () {
// b Selected variable repeated:
- // Selected variable repeated again:
+ // Selected variable repeated:
+ // Selected variable repeated again:
// `,
// requestedVariant: { name: 'dill' },
// }, "*");
@@ -1462,8 +1458,8 @@ describe("Specifying single variant document tests", function () {
b Selected variable repeated:
- Selected variable repeated again:
+ Selected variable repeated: $x{name="x2"}
+ Selected variable repeated again: $_select1{name="x3"}
`,
requestedVariantIndex: 20582310,
},
@@ -1486,9 +1482,7 @@ describe("Specifying single variant document tests", function () {
].replacements[0].componentName
].stateValues.value;
expect(xorig).eq(expectedx);
- let x2 =
- stateVariables[stateVariables["/x2"].replacements[0].componentName]
- .stateValues.value;
+ let x2 = stateVariables["/x2"].stateValues.value;
expect(x2).eq(expectedx);
let x3 =
stateVariables[
@@ -1533,8 +1527,8 @@ describe("Specifying single variant document tests", function () {
b Selected variable repeated:
- Selected variable repeated again:
+ Selected variable repeated: $x{name="x2"}
+ Selected variable repeated again: $_select1{name="x3"}
`,
requestedVariantIndex: "-20582308",
},
@@ -1557,9 +1551,7 @@ describe("Specifying single variant document tests", function () {
].replacements[0].componentName
].stateValues.value;
expect(xorig).eq(expectedx);
- let x2 =
- stateVariables[stateVariables["/x2"].replacements[0].componentName]
- .stateValues.value;
+ let x2 = stateVariables["/x2"].stateValues.value;
expect(x2).eq(expectedx);
let x3 =
stateVariables[
@@ -1604,8 +1596,8 @@ describe("Specifying single variant document tests", function () {
b Selected variable repeated:
- Selected variable repeated again:
+ Selected variable repeated: $x{name="x2"}
+ Selected variable repeated again: $_select1{name="x3"}
`,
requestedVariantIndex: "wrong",
},
@@ -1628,9 +1620,7 @@ describe("Specifying single variant document tests", function () {
].replacements[0].componentName
].stateValues.value;
expect(xorig).eq(expectedx);
- let x2 =
- stateVariables[stateVariables["/x2"].replacements[0].componentName]
- .stateValues.value;
+ let x2 = stateVariables["/x2"].stateValues.value;
expect(x2).eq(expectedx);
let x3 =
stateVariables[
@@ -1674,8 +1664,8 @@ describe("Specifying single variant document tests", function () {
// b Selected variable repeated:
- // Selected variable repeated again:
+ // Selected variable repeated:
+ // Selected variable repeated again:
// `,
// requestedVariant: { name: 'rotten' },
// }, "*");
@@ -1728,8 +1718,8 @@ describe("Specifying single variant document tests", function () {
b Selected variable repeated:
- Selected variable repeated again:
+ Selected variable repeated: $x{name="x2"}
+ Selected variable repeated again: $_select1{name="x3"}
`,
requestedVariantIndex: 4.5,
},
@@ -1752,9 +1742,7 @@ describe("Specifying single variant document tests", function () {
].replacements[0].componentName
].stateValues.value;
expect(xorig).eq(expectedx);
- let x2 =
- stateVariables[stateVariables["/x2"].replacements[0].componentName]
- .stateValues.value;
+ let x2 = stateVariables["/x2"].stateValues.value;
expect(x2).eq(expectedx);
let x3 =
stateVariables[
@@ -4549,7 +4537,7 @@ describe("Specifying single variant document tests", function () {
+ $c1.selectedValue{assignNames="c1v"}
`;
// let generatedVariantInfo;
@@ -4969,9 +4957,9 @@ describe("Specifying single variant document tests", function () {
Enter $n
- Enter $m
`;
diff --git a/cypress/e2e/Events/videoEvents.cy.js b/cypress/e2e/Events/videoEvents.cy.js
index 33ccf33220..ad0739dcbc 100644
--- a/cypress/e2e/Events/videoEvents.cy.js
+++ b/cypress/e2e/Events/videoEvents.cy.js
@@ -40,8 +40,8 @@ describe("video events test", function () {
const doenetML = `
State:
- Time:
+ State: $v.state{assignNames="state"}
+ Time: $v.time{assignNames="time"}
Change time:
diff --git a/src/Core/Core.js b/src/Core/Core.js
index f8ed8467d7..6900263f4d 100644
--- a/src/Core/Core.js
+++ b/src/Core/Core.js
@@ -916,6 +916,11 @@ export default class Core {
}
}
+ if (component.compositeReplacementActiveRange) {
+ stateValuesForRenderer._compositeReplacementActiveRange =
+ component.compositeReplacementActiveRange;
+ }
+
let newRendererState = {
componentName,
stateValues: stateValuesForRenderer,
@@ -989,6 +994,11 @@ export default class Core {
}
}
+ if (component.compositeReplacementActiveRange) {
+ stateValuesForRenderer._compositeReplacementActiveRange =
+ component.compositeReplacementActiveRange;
+ }
+
if (alwaysUpdate) {
stateValuesForRendererAlwaysUpdate = stateValuesForRenderer;
}
@@ -1651,23 +1661,35 @@ export default class Core {
let attribute = serializedComponent.attributes[attrName];
if (attribute.component) {
- let attrResult = await this.createIsolatedComponentsSub({
- serializedComponents: [
- serializedComponent.attributes[attrName].component,
- ],
- ancestors: ancestorsForChildren,
- shadow,
- namespaceForUnamed,
- componentsReplacementOf,
- createNameContext: `attribute|${attrName}`,
- });
+ try {
+ let attrResult = await this.createIsolatedComponentsSub({
+ serializedComponents: [
+ serializedComponent.attributes[attrName].component,
+ ],
+ ancestors: ancestorsForChildren,
+ shadow,
+ namespaceForUnamed,
+ componentsReplacementOf,
+ createNameContext: `attribute|${attrName}`,
+ });
- if (attrResult.lastErrorMessage) {
- lastErrorMessage = attrResult.lastErrorMessage;
- lastErrorMessageFromAttribute = attrResult.lastErrorMessage;
- }
+ if (attrResult.lastErrorMessage) {
+ lastErrorMessage = attrResult.lastErrorMessage;
+ lastErrorMessageFromAttribute = attrResult.lastErrorMessage;
+ }
- attributes[attrName] = { component: attrResult.components[0] };
+ attributes[attrName] = { component: attrResult.components[0] };
+ } catch (e) {
+ if (e.message.includes("Circular dependency")) {
+ throw Error(
+ this.dependencies.getCircularDependencyMessage([
+ serializedComponent,
+ ]),
+ );
+ } else {
+ throw e;
+ }
+ }
} else {
attributes[attrName] = serializedComponent.attributes[attrName];
}
@@ -1711,12 +1733,11 @@ export default class Core {
prescribedDependencies[name] =
serializedComponent.downstreamDependencies[name];
} else {
- let message = this.dependencies.getCircularDependencyMessage([
- serializedComponent,
- ]);
-
- message = "Possible c" + message.substring(1);
- throw Error(message);
+ throw Error(
+ this.dependencies.getCircularDependencyMessage([
+ serializedComponent,
+ ]),
+ );
}
}
}
@@ -1774,6 +1795,10 @@ export default class Core {
// newComponent.shadows = new Proxy(shadowInfo, readOnlyProxyHandler);
newComponent.shadows = shadowInfo;
+ if (dep.firstLevelReplacement) {
+ newComponent.firstLevelReplacement = true;
+ }
+
let shadowedComponent = this._components[name];
if (!shadowedComponent.shadowedBy) {
shadowedComponent.shadowedBy = [];
@@ -2450,7 +2475,14 @@ export default class Core {
}
}
- if (component.shadows) {
+ if (
+ component.shadows
+ //&&
+ // this.componentInfoObjects.isCompositeComponent({
+ // componentType: component.componentType,
+ // includeNonStandard: false,
+ // })
+ ) {
return await this.expandShadowingComposite(component);
}
@@ -2559,7 +2591,7 @@ export default class Core {
}
async expandShadowingComposite(component) {
- // console.log(`expand shadowing composite, ${component.componentName}`)
+ // console.log(`expand shadowing composite, ${component.componentName}`);
if (
this.updateInfo.compositesBeingExpanded.includes(
@@ -2606,7 +2638,7 @@ export default class Core {
if (typeof repl === "object") {
serializedReplacements.push(
await repl.serialize({
- sourceAttributesToIgnore,
+ primitiveSourceAttributesToIgnore: sourceAttributesToIgnore,
}),
);
} else {
@@ -2626,6 +2658,8 @@ export default class Core {
(component.replacementsWorkspace.uniqueIdentifiersUsed = []);
let nameOfCompositeMediatingTheShadow = component.shadows.compositeName;
+ let compositeMediatingTheShadow =
+ this.components[nameOfCompositeMediatingTheShadow];
serializedReplacements = postProcessCopy({
serializedComponents: serializedReplacements,
componentName: nameOfCompositeMediatingTheShadow,
@@ -2634,38 +2668,71 @@ export default class Core {
let newNamespace = component.attributes.newNamespace?.primitive;
- // TODO: is isResponse the only attribute to convert?
+ let compositeAttributesObj =
+ compositeMediatingTheShadow.constructor.createAttributesObject();
+
+ let attributesToConvert = {};
if (component.attributes.isResponse) {
- let compositeAttributesObj =
- component.constructor.createAttributesObject();
+ // We include a special case of copying isResponse from
+ // the shadowing composite.
+ // Rationale: when we serialize a component to copy it,
+ // we set primitiveSourceAttributesToIgnore=sourceAttributesToIgnore, above,
+ // which by default is ["isResponse"]
+ // so that isResponse, is not, in general copied.
+ // (We don't want copies of responses to be responses.)
+ // However, if an award has sourcesAreResponses set, then we want
+ // copies of the award to also set those sources to be responses.
+ // The award accomplishes this through preprocessSerializedChildren,
+ // which adds isResponse to copies of those targets.
+ // Those copies are the shadowing composites, and we want those
+ // isResponse attributes to be added to their replacements.
+ // TODO: Is this too confusing?
+ // Can/should we give up this functionality for the sake of simplicity?
+ // A test that fails without this intervention is
+ // "full answer tag, copied in awards, shorter form" from answer.cy.js
+ attributesToConvert.isResponse = component.attributes.isResponse;
+ }
+
+ // // if the shadowing component is a first level replacement of compositeMediatingTheShadow,
+ // // then the attributes of compositeMediatingTheShadow should be passed on
+ // if (component.firstLevelReplacement) {
+ // Object.assign(
+ // attributesToConvert,
+ // compositeMediatingTheShadow.attributes,
+ // );
+ // }
- for (let repl of serializedReplacements) {
- if (typeof repl !== "object") {
- continue;
- }
+ // console.log(component.attributes);
+ // console.log(compositeMediatingTheShadow.attributes);
+ // console.log("attributesToConvert:", Object.keys(attributesToConvert));
- // add attributes
- if (!repl.attributes) {
- repl.attributes = {};
- }
- let attributesFromComposite = convertAttributesForComponentType({
- attributes: { isResponse: component.attributes.isResponse },
- componentType: repl.componentType,
- componentInfoObjects: this.componentInfoObjects,
- compositeAttributesObj,
- compositeCreatesNewNamespace: newNamespace,
- });
- Object.assign(repl.attributes, attributesFromComposite);
+ for (let repl of serializedReplacements) {
+ if (typeof repl !== "object") {
+ continue;
+ }
+
+ // add attributes
+ if (!repl.attributes) {
+ repl.attributes = {};
}
+ let attributesFromComposite = convertAttributesForComponentType({
+ attributes: attributesToConvert,
+ componentType: repl.componentType,
+ componentInfoObjects: this.componentInfoObjects,
+ compositeAttributesObj,
+ compositeCreatesNewNamespace: newNamespace,
+ });
+ Object.assign(repl.attributes, attributesFromComposite);
}
- // console.log('--------------')
- // console.log(`name of composite mediating shadow: ${nameOfCompositeMediatingTheShadow}`)
- // console.log(`name of composite shadowing: ${component.componentName}`)
- // console.log(`name of shadowed composite: ${shadowedComposite.componentName}`)
-
- let compositeMediatingTheShadow =
- this.components[nameOfCompositeMediatingTheShadow];
+ // console.log("--------------");
+ // console.log(
+ // `name of composite mediating shadow: ${nameOfCompositeMediatingTheShadow}`,
+ // );
+ // console.log(`name of composite shadowing: ${component.componentName}`);
+ // console.log(
+ // `name of shadowed composite: ${shadowedComposite.componentName}`,
+ // );
// If shadowed composite mediates the shadow of compositeMediatingTheShadow,
// then we have a circular reference.
@@ -2716,69 +2783,51 @@ export default class Core {
}
if (component.constructor.assignNamesToReplacements) {
- let mediatingNewNamespace =
- compositeMediatingTheShadow.attributes.newNamespace?.primitive;
- let mediatingAssignNames =
- compositeMediatingTheShadow.doenetAttributes.assignNames;
- let mediatingSubAssignNames = mediatingAssignNames?.some(Array.isArray);
- let assignNewNamespaces =
- compositeMediatingTheShadow.attributes.assignNewNamespaces?.primitive;
+ let originalNamesAreConsistent =
+ this.determineOriginalNamesConsistentForShadowingComposite(component);
+
let target =
this._components[
compositeMediatingTheShadow.doenetAttributes.targetComponentName
];
- let nonCompositeTargetWithNewNamespace;
- if (target) {
- nonCompositeTargetWithNewNamespace =
- !this.componentInfoObjects.isCompositeComponent({
- componentType: target.componentType,
- includeNonStandard: false,
- }) && target.attributes.newNamespace?.primitive;
- }
-
- // Note: originalNamesAreConsistent means that processAssignNames should leave
- // the original names in the serializedComponents as is
- // (unless their names are assigned or have been marked to create unique)
- // If originalNamesAreConsistent is false, then all components
- // that don't have names assigned will be renamed to random names
-
- // We set originalNamesAreConsistent to true if we can be sure
- // that we won't create any duplicate names.
- // If the component shadowing (or the original non-composite target) has a newNamespace,
- // or the composite mediating the shadow is assigning new namespaces,
- // or we get a new namespace from the composite mediating the shadow,
- // that will, in most cases, be enough to prevent name collisions.
-
- // One edge case is when the composite mediating the shadow also assigns names,
- // in which case the assigned names could collide with the original names
- // even if it makes a new namespace,
- // so we can't keep the original names.
-
- // Another edge case is when the composite mediating the shadow
- // assign names to sub-replacements.
- // In that case, all bets are off and we cannot determine if those names
- // could collide with existing names, so we can't keep the original names.
-
- let originalNamesAreConsistent =
- !mediatingSubAssignNames &&
- (newNamespace ||
- nonCompositeTargetWithNewNamespace ||
- (mediatingNewNamespace && !mediatingAssignNames) ||
- assignNewNamespaces);
let assignNames = component.doenetAttributes.assignNames;
if (assignNames && (await component.stateValues.addLevelToAssignNames)) {
assignNames = assignNames.map((x) => [x]);
}
+ let parentName = component.componentName;
+ let parentCreatesNewNamespace = newNamespace;
+ if (component.doenetAttributes.parentNameForAssignNames) {
+ parentName = component.doenetAttributes.parentNameForAssignNames;
+ parentCreatesNewNamespace =
+ this._components[parentName].attributes.newNamespace?.primitive;
+ }
+
+ // If we added a level to assignNames, that means that this composite won't be assigning names
+ // but that we are delegating that to the next composite.
+ // But, we want to use the current parent name for assigning name
+ // (which is particularly relevant when parentCreatesNewNamespace, as parent name becomes the new namespace).
+ // We set compositesParentNameForAssignNames to the current parent name.
+ // Since we've added a level to assignNames, each name will be an array
+ // and processAssignNames will set parentNameForAssignNames to be compositesParentNameForAssignNames
+ let compositesParentNameForAssignNames;
+ if (await component.stateValues.addLevelToAssignNames) {
+ compositesParentNameForAssignNames = parentName;
+ }
+
let processResult = serializeFunctions.processAssignNames({
assignNames,
+ assignNamesForCompositeReplacement:
+ component.doenetAttributes.assignNamesForCompositeReplacement,
serializedComponents: serializedReplacements,
- parentName: component.componentName,
- parentCreatesNewNamespace: newNamespace,
+ parentName,
+ parentNameForUniqueNames: component.componentName,
+ parentCreatesNewNamespace,
componentInfoObjects: this.componentInfoObjects,
originalNamesAreConsistent,
shadowingComposite: true,
+ compositesParentNameForAssignNames,
});
let doenetMLrange = compositeMediatingTheShadow.doenetMLrange;
@@ -2812,13 +2861,15 @@ export default class Core {
let processResult = serializeFunctions.processAssignNames({
assignNames,
serializedComponents: newReplacements,
- parentName: component.componentName,
+ parentName,
+ parentNameForUniqueNames: component.componentName,
parentCreatesNewNamespace:
compositeMediatingTheShadow.attributes.assignNewNamespaces
?.primitive,
indOffset: serializedReplacements.length,
componentInfoObjects: this.componentInfoObjects,
originalNamesAreConsistent: true,
+ compositesParentNameForAssignNames,
});
let doenetMLrange = compositeMediatingTheShadow.doenetMLrange;
@@ -2864,7 +2915,6 @@ export default class Core {
assignNames: component.doenetAttributes.assignNames,
componentInfoObjects: this.componentInfoObjects,
compositeAttributesObj: component.constructor.createAttributesObject(),
- flags: this.flags,
components: this._components,
publicCaseInsensitiveAliasSubstitutions:
this.publicCaseInsensitiveAliasSubstitutions.bind(this),
@@ -2882,7 +2932,9 @@ export default class Core {
serializedReplacements = verificationResult.replacements;
}
- // console.log(`serialized replacements for ${component.componentName} who is shadowing ${shadowedComposite.componentName}`);
+ // console.log(
+ // `serialized replacements for ${component.componentName} who is shadowing ${shadowedComposite.componentName}`,
+ // );
// console.log(deepClone(serializedReplacements));
await this.createAndSetReplacements({
@@ -2911,6 +2963,87 @@ export default class Core {
return { success: true, compositesExpanded };
}
+ determineOriginalNamesConsistentForShadowingComposite(shadowingComposite) {
+ // originalNamesAreConsistent means that processAssignNames should leave
+ // the original names in the serializedComponents as is
+ // (unless their names are assigned or have been marked to create unique)
+ // If originalNamesAreConsistent is false, then all components
+ // that don't have names assigned will be renamed to random names
+
+ // We set originalNamesAreConsistent to true if we can be sure (with an exception, see below)
+ // that we won't create any duplicate names.
+ // If the component shadowing has a newNamespace,
+ // or the composite mediating the shadow has a new namespace or assigns a new namespaces,
+ // or the namespace of the composite shadowing was due to the composite mediating the shadow
+ // that will, in most cases, be enough to prevent name collisions.
+
+ // If the composite mediating the shadow also assign names (or subnames)
+ // it is possible that those names will collide with the original names
+ // but we don't protect against that.
+
+ let compositeMediatingTheShadow =
+ this.components[shadowingComposite.shadows.compositeName];
+
+ let newNamespace = shadowingComposite.attributes.newNamespace?.primitive;
+ let mediatingNewNamespace =
+ compositeMediatingTheShadow.attributes.newNamespace?.primitive;
+ let assignNewNamespaces =
+ compositeMediatingTheShadow.attributes.assignNewNamespaces?.primitive;
+
+ // check if the component that created the namespace for the shadowing composite
+ // is a replacement of the composite mediating the shadow
+ let lastSlash = shadowingComposite.componentName.lastIndexOf("/");
+ let nameForNamespaceOfShadowing = shadowingComposite.componentName.slice(
+ 0,
+ lastSlash,
+ );
+ let componentCreatingNamespace =
+ this._components[nameForNamespaceOfShadowing];
+
+ let checkIfReplacementOfMediating = (comp) => {
+ if (!comp) {
+ return false;
+ }
+ let replacementOf = comp.replacementOf;
+ if (replacementOf) {
+ if (
+ replacementOf.componentName ===
+ compositeMediatingTheShadow.componentName
+ ) {
+ return true;
+ }
+ if (checkIfReplacementOfMediating(replacementOf)) {
+ return true;
+ }
+ }
+ if (checkIfReplacementOfMediating(this._components[comp.parentName])) {
+ return true;
+ }
+
+ return false;
+ };
+
+ let namespaceFromReplacementOfMediating = checkIfReplacementOfMediating(
+ componentCreatingNamespace,
+ );
+
+ let originalNamesAreConsistent =
+ newNamespace ||
+ namespaceFromReplacementOfMediating ||
+ mediatingNewNamespace ||
+ assignNewNamespaces;
+
+ // console.log(`for shadowing composite: ${shadowingComposite.componentName}`);
+ // console.log({
+ // newNamespace,
+ // namespaceFromReplacementOfMediating,
+ // mediatingNewNamespace,
+ // assignNewNamespaces,
+ // originalNamesAreConsistent,
+ // });
+ return originalNamesAreConsistent;
+ }
+
async createAndSetReplacements({ component, serializedReplacements }) {
this.parameterStack.push(component.sharedParameters, false);
@@ -3059,9 +3192,30 @@ export default class Core {
parent.compositeReplacementActiveRange = [];
}
+ // Record whether or not each component can be considered an element of a list.
+ // If this composite or a containing composite has asList set,
+ // then it may be turned into a list if all the components can be list elements.
+
+ // All inline components and any components with canBeInList set
+ // are considered potential components for a list.
+ let replacementsCanBeInList = replacements.map(
+ (repl) =>
+ typeof repl !== "object" ||
+ this.componentInfoObjects.isInheritedComponentType({
+ inheritedComponentType: repl.componentType,
+ baseComponentType: "_inline",
+ }) ||
+ repl.constructor.canBeInList,
+ );
+
for (let otherCompositeObject of parent.compositeReplacementActiveRange) {
if (otherCompositeObject.lastInd >= childInd) {
otherCompositeObject.lastInd += replacements.length - 1;
+ otherCompositeObject.potentialListComponents.splice(
+ childInd,
+ 1,
+ ...replacementsCanBeInList,
+ );
}
}
@@ -3087,11 +3241,17 @@ export default class Core {
undisplayableErrorChildren.push(...errorReplacements);
}
+ // compositeReplacementActiveRange will be used
+ // - in renderers to determined if they should add commas
+ // - in child dependencies, where they will be translated for matched children
+ // and used in some components to determine if thsoe children can be formed into a list
parent.compositeReplacementActiveRange.push({
compositeName: child.componentName,
target: await child.stateValues.target,
firstInd: childInd,
lastInd: childInd + replacements.length - 1,
+ asList: await child.stateValues.asList,
+ potentialListComponents: replacementsCanBeInList,
});
parent.activeChildren.splice(childInd, 1, ...replacements);
@@ -3304,7 +3464,7 @@ export default class Core {
targetName: name,
compositeName: dep.compositeName,
propVariable: dep.propVariable,
- fromPlainMacro: dep.fromPlainMacro,
+ fromImplicitProp: dep.fromImplicitProp,
arrayStateVariable: dep.arrayStateVariable,
arrayKey: dep.arrayKey,
ignorePrimaryStateVariable: dep.ignorePrimaryStateVariable,
@@ -4213,8 +4373,8 @@ export default class Core {
let shadowStandardVariables = false;
let stateVariablesToShadow = [];
- if (targetComponent.constructor.plainMacroReturnsSameType) {
- if (redefineDependencies.fromPlainMacro) {
+ if (targetComponent.constructor.implicitPropReturnsSameType) {
+ if (redefineDependencies.fromImplicitProp) {
shadowStandardVariables = true;
}
@@ -4228,13 +4388,18 @@ export default class Core {
}
if (redefineDependencies.additionalStateVariableShadowing) {
- let differentStateVariablesInTarget = [];
+ // since using parallel arrays, start with empty array to match next indices
+ let differentStateVariablesInTarget = Array(
+ stateVariablesToShadow.length,
+ );
for (let varName in redefineDependencies.additionalStateVariableShadowing) {
- stateVariablesToShadow.push(varName);
- differentStateVariablesInTarget.push(
- redefineDependencies.additionalStateVariableShadowing[varName]
- .stateVariableToShadow,
- );
+ if (!stateVariablesToShadow.includes(varName)) {
+ stateVariablesToShadow.push(varName);
+ differentStateVariablesInTarget.push(
+ redefineDependencies.additionalStateVariableShadowing[varName]
+ .stateVariableToShadow,
+ );
+ }
}
this.modifyStateDefsToBeShadows({
@@ -8192,7 +8357,19 @@ export default class Core {
for (let childName in component.allChildren) {
let unproxiedChild = this._components[childName];
- this.setAncestors(unproxiedChild, ancestorsForChildren);
+ // Note: when add and deleting replacements of shadowed composites,
+ // it is possible that we end up processing the defining children of ancestors of the composite
+ // while we were delaying processing the defining children of the composite's parent,
+ // which could lead to an attempt to set the ancestors of that composite's parent's children
+ // while the booking variable allChildren is in an inconsistent state.
+ // To avoid an error, we don't set ancestors in the case
+ // (See test "references to internal and external components, inconsistent new namespaces"
+ // from conditionalcontent.cy.js for an example that triggered the need for this check.)
+ // TODO: can we avoid the need for this check by preventing the algorithm from
+ // attempting to set ancestors in this case?
+ if (unproxiedChild) {
+ this.setAncestors(unproxiedChild, ancestorsForChildren);
+ }
}
for (let attrName in component.attributes) {
@@ -8241,7 +8418,7 @@ export default class Core {
if (typeof child === "object") {
shadowingSerializeChildren.push(
await child.serialize({
- sourceAttributesToIgnore,
+ primitiveSourceAttributesToIgnore: sourceAttributesToIgnore,
}),
);
} else {
@@ -8762,6 +8939,18 @@ export default class Core {
namespaceForUnamed = getNamespaceFromName(component.componentName);
}
+ let doenetMLrange =
+ this.components[component.componentName].doenetMLrange;
+ let overwriteDoenetMLRange = component.componentType === "copy";
+
+ this.gatherErrorsAndAssignDoenetMLRange({
+ components: serializedReplacements,
+ errors: [],
+ warnings: [],
+ doenetMLrange,
+ overwriteDoenetMLRange,
+ });
+
try {
let createResult = await this.createIsolatedComponentsSub({
serializedComponents: serializedReplacements,
@@ -9290,7 +9479,7 @@ export default class Core {
if (typeof repl === "object") {
newSerializedReplacements.push(
await repl.serialize({
- sourceAttributesToIgnore,
+ primitiveSourceAttributesToIgnore: sourceAttributesToIgnore,
}),
);
} else {
@@ -9337,14 +9526,10 @@ export default class Core {
let compositeMediatingTheShadow =
this.components[nameOfCompositeMediatingTheShadow];
if (shadowingComponent.constructor.assignNamesToReplacements) {
- let mediatingNewNamespace =
- compositeMediatingTheShadow.attributes.newNamespace?.primitive;
- let mediatingAssignNames =
- compositeMediatingTheShadow.doenetAttributes.assignNames;
-
let originalNamesAreConsistent =
- shadowingNewNamespace ||
- (mediatingNewNamespace && !mediatingAssignNames);
+ this.determineOriginalNamesConsistentForShadowingComposite(
+ shadowingComponent,
+ );
let assignNames = shadowingComponent.doenetAttributes.assignNames;
if (
@@ -9354,14 +9539,38 @@ export default class Core {
assignNames = assignNames.map((x) => [x]);
}
+ let parentName = shadowingComponent.componentName;
+ let parentCreatesNewNamespace = shadowingNewNamespace;
+ if (shadowingComponent.doenetAttributes.parentNameForAssignNames) {
+ parentName =
+ shadowingComponent.doenetAttributes.parentNameForAssignNames;
+ parentCreatesNewNamespace =
+ this._components[parentName].attributes.newNamespace?.primitive;
+ }
+
+ // If we added a level to assignNames, that means that this composite won't be assigning names
+ // but that we are delegating that to the next composite.
+ // But, we want to use the current parent name for assigning name
+ // (which is particularly relevant when parentCreatesNewNamespace, as parent name becomes the new namespace).
+ // We set compositesParentNameForAssignNames to the current parent name.
+ // Since we've added a level to assignNames, each name will be an array
+ // and processAssignNames will set parentNameForAssignNames to be compositesParentNameForAssignNames
+ let compositesParentNameForAssignNames;
+ if (await shadowingComponent.stateValues.addLevelToAssignNames) {
+ compositesParentNameForAssignNames = parentName;
+ }
let processResult = serializeFunctions.processAssignNames({
assignNames,
+ assignNamesForCompositeReplacement:
+ shadowingComponent.doenetAttributes
+ .assignNamesForCompositeReplacement,
indOffset: assignNamesOffset,
serializedComponents: newSerializedReplacements,
- parentName: shadowingComponent.componentName,
- parentCreatesNewNamespace: shadowingNewNamespace,
+ parentName,
+ parentCreatesNewNamespace,
componentInfoObjects: this.componentInfoObjects,
originalNamesAreConsistent,
+ compositesParentNameForAssignNames,
});
let doenetMLrange = compositeMediatingTheShadow.doenetMLrange;
@@ -11287,14 +11496,14 @@ export default class Core {
// We find the original component and the recurse on all the components
// that shadow it.
// Don't include shadows due to propVariable
- // unless it is a plain macro marked as returning the same type
+ // unless it is a plain copy marked as returning the same type
let baseComponent = component;
while (
baseComponent.shadows &&
(baseComponent.shadows.propVariable === undefined ||
- (baseComponent.doenetAttributes.fromPlainMacro &&
+ (baseComponent.doenetAttributes.fromImplicitProp &&
this._components[baseComponent.shadows.componentName]
- .constructor.plainMacroReturnsSameType))
+ .constructor.implicitPropReturnsSameType))
) {
baseComponent =
this._components[baseComponent.shadows.componentName];
@@ -11663,11 +11872,11 @@ export default class Core {
if (recurseToShadows && component.shadowedBy) {
for (let shadow of component.shadowedBy) {
// Don't include shadows due to propVariable
- // unless it is a plain macro marked as returning the same type
+ // unless it is a plain copy marked as returning the same type
if (
shadow.shadows.propVariable === undefined ||
- (shadow.doenetAttributes.fromPlainMacro &&
- component.constructor.plainMacroReturnsSameType)
+ (shadow.doenetAttributes.fromImplicitProp &&
+ component.constructor.implicitPropReturnsSameType)
) {
this.calculateEssentialVariableChanges({
component: shadow,
diff --git a/src/Core/CoreWorker.js b/src/Core/CoreWorker.js
index 1c09346adf..2e8e2a63ee 100644
--- a/src/Core/CoreWorker.js
+++ b/src/Core/CoreWorker.js
@@ -123,6 +123,9 @@ async function returnAllStateVariables(core) {
compObj.replacementsToWithhold = component.replacementsToWithhold;
}
}
+ if (component.replacementOf) {
+ compObj.replacementOf = component.replacementOf.componentName;
+ }
compObj.sharedParameters = removeFunctionsMathExpressionClass(
component.sharedParameters,
);
diff --git a/src/Core/Dependencies.js b/src/Core/Dependencies.js
index 7626766ad3..ed7d0f51c5 100644
--- a/src/Core/Dependencies.js
+++ b/src/Core/Dependencies.js
@@ -2405,7 +2405,9 @@ export class DependencyHandler {
relativeName = comp.doenetAttributes?.prescribedName;
}
uniqueComponentNames = [relativeName];
- componentTypesForUniqueNames = [this.components[name].componentType];
+ // TODO: which of these two options to use or do we need to test for both?
+ componentTypesForUniqueNames = [comp.componentType];
+ // componentTypesForUniqueNames = [this.components[name].componentType];
}
let message = "";
@@ -4227,7 +4229,7 @@ class AttributeComponentDependency extends Dependency {
while (comp.shadows) {
let shadows = comp.shadows;
let propVariable = comp.shadows.propVariable;
- let fromPlainMacro = comp.doenetAttributes.fromPlainMacro;
+ let fromImplicitProp = comp.doenetAttributes.fromImplicitProp;
if (
this.dontRecurseToShadowsIfHaveAttribute &&
@@ -4241,12 +4243,12 @@ class AttributeComponentDependency extends Dependency {
break;
}
- // if a prop variable was created from a plain macro that is marked as returning the same type
+ // if a prop variable was created from a plain copy that is marked as returning the same type
// then treat it like a regular copy (as if there was no prop variable)
// and shadow all attributes
if (
propVariable &&
- !(fromPlainMacro && comp.constructor.plainMacroReturnsSameType)
+ !(fromImplicitProp && comp.constructor.implicitPropReturnsSameType)
) {
if (
!(
@@ -4629,53 +4631,52 @@ class ChildDependency extends Dependency {
} else {
// translate parent.compositeReplacementActiveRange
// so that indices refer to index from activeChildrenMatched
- // and that only first composite is included
if (
parent.compositeReplacementActiveRange &&
activeChildrenMatched.length > 0
) {
- let ind = 0;
- while (ind < activeChildrenIndices.length) {
- let activeInd = activeChildrenIndices[ind];
- for (let compositeInfo of parent.compositeReplacementActiveRange) {
- if (
- compositeInfo.firstInd <= activeInd &&
- compositeInfo.lastInd >= activeInd
- ) {
- let firstInd = ind;
- let lastInd = ind;
- while (
- compositeInfo.lastInd > activeInd &&
- ind < activeChildrenIndices.length - 1
- ) {
- ind++;
- activeInd = activeChildrenIndices[ind];
- if (compositeInfo.lastInd >= activeInd) {
- lastInd = ind;
- } else {
- break;
- }
- }
+ for (let compositeInfo of parent.compositeReplacementActiveRange) {
+ let translatedFirstInd, translatedLastInd;
- this.compositeReplacementRange.push({
- compositeName: compositeInfo.compositeName,
- target: compositeInfo.target,
- firstInd,
- lastInd,
- });
+ let translatedPotentialListComponents = [];
- ind++;
+ for (let [ind, activeInd] of activeChildrenIndices.entries()) {
+ if (compositeInfo.firstInd > activeInd) {
+ continue;
+ }
+ if (compositeInfo.lastInd < activeInd) {
+ break;
+ }
- if (ind === activeChildrenIndices.length) {
- break;
- }
+ // activeInd is matched by compositeInfo
- activeInd = activeChildrenIndices[ind];
+ if (translatedFirstInd === undefined) {
+ // this is the first activeInd to match, so translate first ind
+ // to the index of activeInd
+ translatedFirstInd = ind;
}
+
+ // last one to match will be picked
+ translatedLastInd = ind;
+
+ translatedPotentialListComponents.push(
+ compositeInfo.potentialListComponents[
+ activeInd - compositeInfo.firstInd
+ ],
+ );
}
- ind++;
+ if (translatedLastInd !== undefined) {
+ this.compositeReplacementRange.push({
+ compositeName: compositeInfo.compositeName,
+ target: compositeInfo.target,
+ firstInd: translatedFirstInd,
+ lastInd: translatedLastInd,
+ asList: compositeInfo.asList,
+ potentialListComponents: translatedPotentialListComponents,
+ });
+ }
}
}
@@ -5914,6 +5915,7 @@ class ReplacementDependency extends Dependency {
this.targetSubnames = this.definition.targetSubnames;
}
+ // Note: it appears that targetSubnamesComponentIndex is not yet implemented
if (this.definition.targetSubnamesComponentIndex) {
if (
this.definition.targetSubnamesComponentIndex.every(Number.isInteger)
@@ -6109,11 +6111,16 @@ class ReplacementDependency extends Dependency {
}
if (this.componentIndex !== undefined) {
- let nonStringReplacements = replacements.filter(
- (x) => typeof x !== "string",
+ // Note: strings that are not blank do take up a slot for component index.
+ // However, this non-blank strings that do take up a slot
+ // will not be returned as a replacement (instead the replacement will be empty).
+ // Rationale: we do not have a mechanism for linking a string to its replacement source,
+ // so returning the string would it unlinked and inconsistent with other cases.
+ let nonBlankStringReplacements = replacements.filter(
+ (x) => typeof x !== "string" || x.trim() !== "",
);
- let theReplacement = nonStringReplacements[this.componentIndex - 1];
- if (theReplacement) {
+ let theReplacement = nonBlankStringReplacements[this.componentIndex - 1];
+ if (theReplacement && typeof theReplacement !== "string") {
replacements = [theReplacement];
} else {
replacements = [];
@@ -6152,36 +6159,15 @@ class ReplacementDependency extends Dependency {
dependenciesMissingComponent.push(dep);
}
} else {
- if (
- dep.dependencyHandler.componentInfoObjects.isInheritedComponentType(
- {
- inheritedComponentType: newComp.componentType,
- baseComponentType: "_composite",
- },
- )
- ) {
- // TODO: recurse to more composites
- dep.dependencyHandler.core.errorWarnings.warnings.push({
- message:
- "Have not yet implemented recursing subnames to multiple levels of composites",
- doenetMLrange:
- dep.dependencyHandler._components[dep.upstreamComponentName]
- .doenetMLrange,
- level: 1,
- });
- } else {
- // don't have a composite
- // so add only if there are no more subnames and either no more component indices
- // or just one index of 1 left
- if (
- remainingSubnames.length === 0 &&
- (subNamesComponentIndex?.length ||
- 0 === 0 ||
- (subNamesComponentIndex.lenght === 1 &&
- subNamesComponentIndex[0] === 1))
- ) {
- newComponents.push(newComp);
- }
+ // TODO: implement subNamesComponentIndex and additional subNames
+ // (as well as allowing componentIndex/subNamesComponentIndex to be multi-dimensional).
+ // These additional levels would involve recursing to the replacements
+ // of additional composites.
+
+ // For now, we return newComponet only if we don't have additional subNames
+ // and we ignore subNamesComponentIndex
+ if (remainingSubnames.length === 0) {
+ newComponents.push(newComp);
}
}
}
diff --git a/src/Core/components/Angle.js b/src/Core/components/Angle.js
index cce3fd6c6c..7450a35b99 100644
--- a/src/Core/components/Angle.js
+++ b/src/Core/components/Angle.js
@@ -11,6 +11,8 @@ import { returnWrapNonLabelsSugarFunction } from "../utils/label";
export default class Angle extends GraphicalComponent {
static componentType = "angle";
+ static canBeInList = true;
+
static createAttributesObject() {
let attributes = super.createAttributesObject();
attributes.radius = {
diff --git a/src/Core/components/Answer.js b/src/Core/components/Answer.js
index 00706661ed..8454c39a16 100644
--- a/src/Core/components/Answer.js
+++ b/src/Core/components/Answer.js
@@ -35,8 +35,7 @@ export default class Answer extends InlineComponent {
static renderChildren = true;
- static variableForPlainMacro = "submittedResponses";
- static variableForPlainCopy = "submittedResponses";
+ static variableForImplicitProp = "submittedResponses";
static includeBlankStringChildren = true;
static removeBlankStringChildrenPostSugar = true;
diff --git a/src/Core/components/AsList.js b/src/Core/components/AsList.js
index ba958c7d60..5cecae9f17 100644
--- a/src/Core/components/AsList.js
+++ b/src/Core/components/AsList.js
@@ -1,3 +1,4 @@
+import { textFromComponent } from "../utils/text";
import InlineComponent from "./abstract/InlineComponent";
export default class AsList extends InlineComponent {
@@ -35,16 +36,8 @@ export default class AsList extends InlineComponent {
},
}),
definition: function ({ dependencyValues }) {
- let textpieces = [];
- for (let child of dependencyValues.inlineChildren) {
- if (typeof child !== "object") {
- textpieces.push(child.toString());
- } else if (typeof child.stateValues.text === "string") {
- textpieces.push(child.stateValues.text);
- } else {
- textpieces.push("");
- }
- }
+ let textpieces = dependencyValues.inlineChildren.map(textFromComponent);
+
let text = textpieces.join(", ");
return { setValue: { text } };
diff --git a/src/Core/components/Award.js b/src/Core/components/Award.js
index 48f4f77aa5..70f8f66649 100644
--- a/src/Core/components/Award.js
+++ b/src/Core/components/Award.js
@@ -10,8 +10,7 @@ export default class Award extends BaseComponent {
static includeBlankStringChildren = true;
static removeBlankStringChildrenPostSugar = true;
- static variableForPlainMacro = "awarded";
- static variableForPlainCopy = "awarded";
+ static variableForImplicitProp = "awarded";
static createAttributesObject() {
let attributes = super.createAttributesObject();
diff --git a/src/Core/components/Boolean.js b/src/Core/components/Boolean.js
index 1189309c1d..196676761b 100644
--- a/src/Core/components/Boolean.js
+++ b/src/Core/components/Boolean.js
@@ -4,8 +4,8 @@ import { evaluateLogic, buildParsedExpression } from "../utils/booleanLogic";
export default class BooleanComponent extends InlineComponent {
static componentType = "boolean";
- static variableForPlainMacro = "value";
- static plainMacroReturnsSameType = true;
+ static variableForImplicitProp = "value";
+ static implicitPropReturnsSameType = true;
static descendantCompositesMustHaveAReplacement = true;
static descendantCompositesDefaultReplacementType = "math";
diff --git a/src/Core/components/BooleanInput.js b/src/Core/components/BooleanInput.js
index 5076bad983..89058c41d7 100644
--- a/src/Core/components/BooleanInput.js
+++ b/src/Core/components/BooleanInput.js
@@ -38,8 +38,7 @@ export default class BooleanInput extends Input {
}
static componentType = "booleanInput";
- static variableForPlainMacro = "value";
- static variableForPlainCopy = "value";
+ static variableForImplicitProp = "value";
static createAttributesObject() {
let attributes = super.createAttributesObject();
diff --git a/src/Core/components/Caption.js b/src/Core/components/Caption.js
index 9794a6f2c4..38d9a7b8f8 100644
--- a/src/Core/components/Caption.js
+++ b/src/Core/components/Caption.js
@@ -1,3 +1,4 @@
+import { textFromChildren } from "../utils/text";
import BlockComponent from "./abstract/BlockComponent";
export default class Caption extends BlockComponent {
@@ -46,16 +47,7 @@ export default class Caption extends BlockComponent {
},
}),
definition: function ({ dependencyValues }) {
- let text = "";
- for (let child of dependencyValues.inlineChildren) {
- if (typeof child !== "object") {
- text += child.toString();
- } else if (typeof child.stateValues.text === "string") {
- text += child.stateValues.text;
- } else {
- text += " ";
- }
- }
+ let text = textFromChildren(dependencyValues.inlineChildren);
return { setValue: { text } };
},
diff --git a/src/Core/components/Cell.js b/src/Core/components/Cell.js
index 97fc0e1686..49c7f14db6 100644
--- a/src/Core/components/Cell.js
+++ b/src/Core/components/Cell.js
@@ -1,6 +1,7 @@
import BaseComponent from "./abstract/BaseComponent";
import me from "math-expressions";
import { preprocessMathInverseDefinition, textToAst } from "../utils/math";
+import { textFromChildren } from "../utils/text";
export default class Cell extends BaseComponent {
static componentType = "cell";
@@ -273,16 +274,7 @@ export default class Cell extends BaseComponent {
},
};
}
- let text = "";
- for (let child of dependencyValues.children) {
- if (typeof child === "object") {
- if (child.stateValues.text) {
- text += child.stateValues.text;
- }
- } else {
- text += child.toString();
- }
- }
+ let text = textFromChildren(dependencyValues.children);
return { setValue: { text } };
},
diff --git a/src/Core/components/Choice.js b/src/Core/components/Choice.js
index 7b8b328950..7afe42647b 100644
--- a/src/Core/components/Choice.js
+++ b/src/Core/components/Choice.js
@@ -1,3 +1,4 @@
+import { textFromChildren } from "../utils/text";
import InlineComponent from "./abstract/InlineComponent";
import me from "math-expressions";
@@ -6,8 +7,7 @@ export default class Choice extends InlineComponent {
static rendererType = "containerInline";
static renderChildren = true;
- static variableForPlainMacro = "submitted";
- static variableForPlainCopy = "submitted";
+ static variableForImplicitProp = "submitted";
static createAttributesObject() {
let attributes = super.createAttributesObject();
@@ -65,14 +65,8 @@ export default class Choice extends InlineComponent {
},
}),
definition: function ({ dependencyValues }) {
- let text = "";
- for (let child of dependencyValues.inlineChildren) {
- if (typeof child !== "object") {
- text += child.toString();
- } else if (typeof child.stateValues.text === "string") {
- text += child.stateValues.text;
- }
- }
+ let text = textFromChildren(dependencyValues.inlineChildren);
+
return { setValue: { text } };
},
};
diff --git a/src/Core/components/ChoiceInput.js b/src/Core/components/ChoiceInput.js
index f14c664536..bf1a5d02ae 100644
--- a/src/Core/components/ChoiceInput.js
+++ b/src/Core/components/ChoiceInput.js
@@ -39,8 +39,7 @@ export default class Choiceinput extends Input {
static renderChildren = true;
- static variableForPlainMacro = "selectedValues";
- static variableForPlainCopy = "selectedValues";
+ static variableForImplicitProp = "selectedValues";
static createsVariants = true;
diff --git a/src/Core/components/CodeEditor.js b/src/Core/components/CodeEditor.js
index 3bf23645c4..bf3a630e63 100644
--- a/src/Core/components/CodeEditor.js
+++ b/src/Core/components/CodeEditor.js
@@ -13,8 +13,7 @@ export default class CodeEditor extends BlockComponent {
}
static componentType = "codeEditor";
- static variableForPlainMacro = "value";
- static variableForPlainCopy = "value";
+ static variableForImplicitProp = "value";
static renderChildren = true;
diff --git a/src/Core/components/Collect.js b/src/Core/components/Collect.js
index 04aa0c12f5..14dc5c257b 100644
--- a/src/Core/components/Collect.js
+++ b/src/Core/components/Collect.js
@@ -69,6 +69,12 @@ export default class Collect extends CompositeComponent {
createComponentOfType: "textList",
};
+ attributes.asList = {
+ createPrimitiveOfType: "boolean",
+ createStateVariable: "asList",
+ defaultValue: true,
+ };
+
return attributes;
}
@@ -345,7 +351,6 @@ export default class Collect extends CompositeComponent {
componentInfoObjects,
numComponentsForSource,
publicCaseInsensitiveAliasSubstitutions,
- flags,
}) {
// console.log(`create serialized replacements for ${component.componentName}`)
// console.log(await component.stateValues.collectedComponents)
@@ -391,7 +396,6 @@ export default class Collect extends CompositeComponent {
compositeAttributesObj,
numComponentsForSource,
publicCaseInsensitiveAliasSubstitutions,
- flags,
});
errors.push(...results.errors);
warnings.push(...results.warnings);
@@ -429,7 +433,6 @@ export default class Collect extends CompositeComponent {
compositeAttributesObj,
numComponentsForSource,
publicCaseInsensitiveAliasSubstitutions,
- flags,
}) {
// console.log(`create replacement for collected ${collectedNum}, ${numReplacementsSoFar}`)
@@ -488,7 +491,7 @@ export default class Collect extends CompositeComponent {
let serializedCopy = [
await collectedComponent.serialize({
- sourceAttributesToIgnore,
+ primitiveSourceAttributesToIgnore: sourceAttributesToIgnore,
}),
];
@@ -510,7 +513,6 @@ export default class Collect extends CompositeComponent {
componentInfoObjects,
compositeAttributesObj,
compositeCreatesNewNamespace: newNamespace,
- flags,
});
Object.assign(repl.attributes, attributesFromComposite);
}
@@ -545,7 +547,6 @@ export default class Collect extends CompositeComponent {
componentInfoObjects,
numComponentsForSource,
publicCaseInsensitiveAliasSubstitutions,
- flags,
}) {
// console.log("Calculating replacement changes for " + component.componentName);
// console.log((await component.stateValues.collectedComponents).map(x => x.componentName))
@@ -684,7 +685,6 @@ export default class Collect extends CompositeComponent {
compositeAttributesObj,
numComponentsForSource,
publicCaseInsensitiveAliasSubstitutions,
- flags,
});
errors.push(...results.errors);
warnings.push(...results.warnings);
@@ -757,7 +757,6 @@ export default class Collect extends CompositeComponent {
compositeAttributesObj,
numComponentsForSource,
publicCaseInsensitiveAliasSubstitutions,
- flags,
});
errors.push(...results.errors);
warnings.push(...results.warnings);
@@ -851,7 +850,6 @@ export default class Collect extends CompositeComponent {
compositeAttributesObj,
numComponentsForSource,
publicCaseInsensitiveAliasSubstitutions,
- flags,
}) {
let errors = [];
let warnings = [];
@@ -866,7 +864,6 @@ export default class Collect extends CompositeComponent {
compositeAttributesObj,
numComponentsForSource,
publicCaseInsensitiveAliasSubstitutions,
- flags,
});
errors.push(...results.errors);
warnings.push(...results.warnings);
diff --git a/src/Core/components/Copy.js b/src/Core/components/Copy.js
index 783de84693..c7efbba793 100644
--- a/src/Core/components/Copy.js
+++ b/src/Core/components/Copy.js
@@ -108,6 +108,13 @@ export default class Copy extends CompositeComponent {
createStateVariable: "removeEmptyArrayEntries",
defaultValue: false,
};
+
+ attributes.asList = {
+ createPrimitiveOfType: "boolean",
+ createStateVariable: "asList",
+ defaultValue: true,
+ };
+
return attributes;
}
@@ -392,140 +399,6 @@ export default class Copy extends CompositeComponent {
},
};
- stateVariableDefinitions.isPlainMacro = {
- returnDependencies: () => ({
- isPlainMacro: {
- dependencyType: "doenetAttribute",
- attributeName: "isPlainMacro",
- },
- targetComponent: {
- dependencyType: "stateVariable",
- variableName: "targetComponent",
- },
- typeAttr: {
- dependencyType: "attributePrimitive",
- attributeName: "createComponentOfType",
- },
- targetSubnames: {
- dependencyType: "stateVariable",
- variableName: "targetSubnames",
- },
- }),
- definition: function ({ dependencyValues, componentInfoObjects }) {
- let isPlainMacro =
- dependencyValues.isPlainMacro &&
- (!componentInfoObjects.isCompositeComponent({
- componentType: dependencyValues.targetComponent?.componentType,
- }) ||
- dependencyValues.targetSubnames);
-
- if (isPlainMacro && dependencyValues.typeAttr) {
- // typically, if specify createComponentOfType (i.e., typeAttr is defined)
- // then we wouldn't have a plain macro
- // However, if we specified a different componentType
- // and the variable for the plain macro is that componentType (or its undefined)
- // then we'll keep it as a plain macro
-
- isPlainMacro = false;
-
- let componentTypeFromAttr =
- componentInfoObjects.componentTypeLowerCaseMapping[
- dependencyValues.typeAttr.toLowerCase()
- ];
-
- let targetClass =
- componentInfoObjects.allComponentClasses[
- dependencyValues.targetComponent?.componentType
- ];
-
- if (targetClass) {
- let varInfo =
- componentInfoObjects.publicStateVariableInfo[
- targetClass.componentType
- ].stateVariableDescriptions[targetClass.variableForPlainMacro];
-
- if (
- componentTypeFromAttr !== targetClass.componentType &&
- varInfo &&
- (varInfo.createComponentOfType === undefined ||
- varInfo.createComponentOfType === componentTypeFromAttr)
- ) {
- isPlainMacro = true;
- }
- }
- }
-
- return { setValue: { isPlainMacro } };
- },
- };
-
- stateVariableDefinitions.isPlainCopy = {
- returnDependencies: () => ({
- isPlainCopy: {
- dependencyType: "doenetAttribute",
- attributeName: "isPlainCopy",
- },
- targetComponent: {
- dependencyType: "stateVariable",
- variableName: "targetComponent",
- },
- typeAttr: {
- dependencyType: "attributePrimitive",
- attributeName: "createComponentOfType",
- },
- targetSubnames: {
- dependencyType: "stateVariable",
- variableName: "targetSubnames",
- },
- }),
- definition: function ({ dependencyValues, componentInfoObjects }) {
- let isPlainCopy =
- dependencyValues.isPlainCopy &&
- (!componentInfoObjects.isCompositeComponent({
- componentType: dependencyValues.targetComponent?.componentType,
- }) ||
- dependencyValues.targetSubnames);
-
- if (isPlainCopy && dependencyValues.typeAttr) {
- // typically, if specify createComponentOfType (i.e., typeAttr is defined)
- // then we wouldn't have a plain copy
- // However, if we specified a different componentType
- // and the variable for the plain copy is that componentType (or its undefined)
- // then we'll keep it as a plain copy
-
- isPlainCopy = false;
-
- let componentTypeFromAttr =
- componentInfoObjects.componentTypeLowerCaseMapping[
- dependencyValues.typeAttr.toLowerCase()
- ];
-
- let targetClass =
- componentInfoObjects.allComponentClasses[
- dependencyValues.targetComponent?.componentType
- ];
-
- if (targetClass) {
- let varInfo =
- componentInfoObjects.publicStateVariableInfo[
- targetClass.componentType
- ].stateVariableDescriptions[targetClass.variableForPlainCopy];
-
- if (
- componentTypeFromAttr !== targetClass.componentType &&
- varInfo &&
- (varInfo.createComponentOfType === undefined ||
- varInfo.createComponentOfType === componentTypeFromAttr)
- ) {
- isPlainCopy = true;
- }
- }
- }
-
- return { setValue: { isPlainCopy } };
- },
- };
-
stateVariableDefinitions.linkAttrForDetermineDeps = {
returnDependencies: () => ({
linkAttr: {
@@ -563,21 +436,37 @@ export default class Copy extends CompositeComponent {
let useReplacements = false;
if (stateValues.targetComponent !== null) {
+ dependencies.targetComponentNewNamespace = {
+ dependencyType: "attributePrimitive",
+ parentName: stateValues.targetComponent.componentName,
+ attributeName: "newNamespace",
+ };
+
if (
+ stateValues.targetComponent.componentType === "copy" ||
+ stateValues.targetComponent.componentType === "extract" ||
(componentInfoObjects.isCompositeComponent({
componentType: stateValues.targetComponent.componentType,
- includeNonStandard: false,
- }) ||
- (componentInfoObjects.isCompositeComponent({
- componentType: stateValues.targetComponent.componentType,
- includeNonStandard: true,
- }) &&
- stateValues.componentIndex !== null)) &&
- !(stateValues.propName && stateValues.obtainPropFromComposite)
+ includeNonStandard: true,
+ }) &&
+ (stateValues.componentIndex !== null ||
+ (stateValues.propName && !stateValues.obtainPropFromComposite)))
) {
+ // If the target is a copy or extract (no matter what),
+ // then we'll use replacements (if link attribute is not set to false),
+ // which means we cannot obtainPropFromComposite for a copy.
+ // For any other composite, we'll use replacements (if link attribute is not set to false)
+ // only if we're getting a component index or a prop that is not from the composite.
+ // If link attribute was set to false, then we don't use replacements, but add a level to assignNames
+ // so that assignNames acts the same way as the linked case
+ // (i.e., assignNames skips the composite we're not bypassing).
+ // TODO: the behavior of unlinked needs more investigation and documentation,
+ // including why linkAttrForDetermineDeps,
+ // which is used only here, is different from the link state variable
+ // that is adjusted for modules/external content, below
+
if (stateValues.linkAttrForDetermineDeps) {
useReplacements = true;
-
let targetSubnamesComponentIndex =
stateValues.targetSubnamesComponentIndex;
if (targetSubnamesComponentIndex) {
@@ -585,6 +474,9 @@ export default class Copy extends CompositeComponent {
...targetSubnamesComponentIndex,
];
}
+
+ // Note: it is possible that we have more than one target
+ // for the case where we have a prop and a composite target
dependencies.targets = {
dependencyType: "replacement",
compositeName: stateValues.targetComponent.componentName,
@@ -626,6 +518,7 @@ export default class Copy extends CompositeComponent {
replacementSourceIdentities = [replacementSourceIdentities];
}
}
+
return {
setValue: {
replacementSourceIdentities,
@@ -635,19 +528,149 @@ export default class Copy extends CompositeComponent {
},
};
- // only reason for replacementSources state variable
- // is to create any array entry state variables from prop
- // when resolve determineDependencies
+ // In some cases, we will add an implicit prop to a copy that does
+ // not already have a prop.
+ // The potential implicit prop is given by state variableForImplicitProp
+ // variable on a component class.
+ // There are two reasons for adding an implicit prop:
+ // 1. To automatically create a different component type than the source type
+ // such as a mathinput automatically giving a math based on its value.
+ // One must specify the createComponentOfType attribute to counteract this.
+ // 2. To make an more efficient copy that does not copy all the children
+ // (and hence cause the component to recalculate state variables from children).
+ // For example, when copying a , if we know the children aren't needed,
+ // then we want to avoid reparsing the children to create the math
+ // and just copy the source's value state variable.
+ stateVariableDefinitions.implicitProp = {
+ stateVariablesDeterminingDependencies: [
+ "replacementSourceIdentities",
+ "propName",
+ ],
+ returnDependencies({ stateValues }) {
+ let dependencies = {
+ propName: {
+ dependencyType: "stateVariable",
+ variableName: "propName",
+ },
+ };
+
+ if (!stateValues.propName) {
+ dependencies.replacementSourceIdentities = {
+ dependencyType: "stateVariable",
+ variableName: "replacementSourceIdentities",
+ };
+ dependencies.typeAttr = {
+ dependencyType: "attributePrimitive",
+ attributeName: "createComponentOfType",
+ };
+ dependencies.noAttributesOrProp = {
+ dependencyType: "doenetAttribute",
+ attributeName: "noAttributesOrProp",
+ };
+ if (stateValues.replacementSourceIdentities?.length > 0) {
+ // since know we don't have a propName, then there can be only one source
+ let source = stateValues.replacementSourceIdentities[0];
+ dependencies[`newNamespaceSource`] = {
+ dependencyType: "attributePrimitive",
+ parentName: source.componentName,
+ attributeName: "newNamespace",
+ };
+ }
+ }
+
+ return dependencies;
+ },
+ definition({ dependencyValues, componentInfoObjects }) {
+ if (
+ dependencyValues.propName ||
+ !(dependencyValues.replacementSourceIdentities?.length > 0)
+ ) {
+ return { setValue: { implicitProp: null } };
+ }
+
+ let source = dependencyValues.replacementSourceIdentities[0];
+
+ let variableForImplicitProp =
+ componentInfoObjects.allComponentClasses[source.componentType]
+ .variableForImplicitProp;
+
+ if (!variableForImplicitProp) {
+ return { setValue: { implicitProp: null } };
+ }
+
+ if (dependencyValues.typeAttr) {
+ // if specify createComponentOfType (which can occur either through
+ // specifying the createComponentOfType attribute directly or using the copySource form)
+ // and the variableForImplicitProp doesn't match that componentType
+ // then we won't create an implicit type.
+ // (Exception: if the componentType of variableForImplicitProp is undefined, we allow an implicit type)
+
+ let componentTypeFromAttr =
+ componentInfoObjects.componentTypeLowerCaseMapping[
+ dependencyValues.typeAttr.toLowerCase()
+ ];
+
+ // if createComponentOfType matches the source's componentType,
+ // we'll allow implicit prop only if implicitPropReturnsSameType is set
+ if (componentTypeFromAttr === source.componentType) {
+ if (
+ !componentInfoObjects.allComponentClasses[source.componentType]
+ .implicitPropReturnsSameType
+ ) {
+ return { setValue: { implicitProp: null } };
+ }
+ }
+
+ let varInfo =
+ componentInfoObjects.publicStateVariableInfo[source.componentType]
+ .stateVariableDescriptions[variableForImplicitProp];
+
+ if (
+ varInfo.createComponentOfType !== undefined &&
+ varInfo.createComponentOfType !== componentTypeFromAttr
+ ) {
+ return { setValue: { implicitProp: null } };
+ }
+ }
+
+ // We have a variableForImplicitProp and no typeAttr
+
+ let implicitPropReturnsSameType =
+ componentInfoObjects.allComponentClasses[source.componentType]
+ .implicitPropReturnsSameType;
+
+ // if the plain copy is returning the same type,
+ // then we shouldn't take the shortut of using the implicit prop
+ // if the source has a newNamespace or the copy has attributes.
+ // If either of those are true, then the state variables could
+ // need to be recalculated from the children using new attributes
+ // or another component could reference one of the copied children by name,
+ // so we should include the children in the copy
+ // (i.e., not use an implicitProp)
+ if (
+ implicitPropReturnsSameType &&
+ (dependencyValues.newNamespaceSource ||
+ !dependencyValues.noAttributesOrProp)
+ ) {
+ return { setValue: { implicitProp: null } };
+ }
+
+ return { setValue: { implicitProp: variableForImplicitProp } };
+ },
+ };
+
+ // replacementSources adds the value of the state variable from prop
+ // to the replacement sources.
+ // It also adds the implicit prop if it is specified.
stateVariableDefinitions.replacementSources = {
stateVariablesDeterminingDependencies: [
"replacementSourceIdentities",
"propName",
"propIndex",
- "isPlainMacro",
- "isPlainCopy",
+ "implicitProp",
],
additionalStateVariablesDefined: ["effectivePropNameBySource"],
- returnDependencies: function ({ stateValues, componentInfoObjects }) {
+ returnDependencies: function ({ stateValues }) {
let dependencies = {
replacementSourceIdentities: {
dependencyType: "stateVariable",
@@ -672,14 +695,8 @@ export default class Copy extends CompositeComponent {
] of stateValues.replacementSourceIdentities.entries()) {
let thisPropName = stateValues.propName;
- if (stateValues.isPlainMacro) {
- thisPropName =
- componentInfoObjects.allComponentClasses[source.componentType]
- .variableForPlainMacro;
- } else if (stateValues.isPlainCopy) {
- thisPropName =
- componentInfoObjects.allComponentClasses[source.componentType]
- .variableForPlainCopy;
+ if (stateValues.implicitProp) {
+ thisPropName = stateValues.implicitProp;
}
let thisTarget;
@@ -1038,7 +1055,7 @@ export default class Copy extends CompositeComponent {
components,
workspace,
componentInfoObjects,
- flags,
+
resolveItem,
publicCaseInsensitiveAliasSubstitutions,
}) {
@@ -1114,7 +1131,6 @@ export default class Copy extends CompositeComponent {
componentInfoObjects,
compositeAttributesObj,
compositeCreatesNewNamespace: newNamespace,
- flags,
});
for (let attrName in attributesFromComposite) {
@@ -1141,7 +1157,6 @@ export default class Copy extends CompositeComponent {
componentInfoObjects,
compositeAttributesObj,
compositeCreatesNewNamespace: newNamespace,
- flags,
});
for (let attrName in attributesFromComposite) {
@@ -1162,6 +1177,8 @@ export default class Copy extends CompositeComponent {
assignNames,
assignNewNamespaces:
component.attributes.assignNewNamespaces?.primitive,
+ assignNamesForCompositeReplacement:
+ component.doenetAttributes.assignNamesForCompositeReplacement,
serializedComponents: replacements,
parentName: component.componentName,
parentCreatesNewNamespace: newNamespace,
@@ -1195,7 +1212,7 @@ export default class Copy extends CompositeComponent {
workspace,
componentInfoObjects,
compositeAttributesObj,
- flags,
+
components,
publicCaseInsensitiveAliasSubstitutions,
});
@@ -1219,7 +1236,6 @@ export default class Copy extends CompositeComponent {
componentInfoObjects,
compositeAttributesObj,
compositeCreatesNewNamespace: newNamespace,
- flags,
});
let replacements = [
@@ -1232,6 +1248,8 @@ export default class Copy extends CompositeComponent {
let processResult = serializeFunctions.processAssignNames({
assignNames,
+ assignNamesForCompositeReplacement:
+ component.doenetAttributes.assignNamesForCompositeReplacement,
serializedComponents: replacements,
parentName: component.componentName,
parentCreatesNewNamespace: newNamespace,
@@ -1247,7 +1265,7 @@ export default class Copy extends CompositeComponent {
workspace,
componentInfoObjects,
compositeAttributesObj,
- flags,
+
components,
publicCaseInsensitiveAliasSubstitutions,
});
@@ -1288,7 +1306,6 @@ export default class Copy extends CompositeComponent {
componentInfoObjects,
compositeAttributesObj,
compositeCreatesNewNamespace: newNamespace,
- flags,
});
workspace.uniqueIdentifiersUsedBySource[0] = [];
@@ -1321,6 +1338,8 @@ export default class Copy extends CompositeComponent {
let processResult = serializeFunctions.processAssignNames({
assignNames,
+ assignNamesForCompositeReplacement:
+ component.doenetAttributes.assignNamesForCompositeReplacement,
serializedComponents: replacements,
parentName: component.componentName,
componentInfoObjects,
@@ -1396,6 +1415,75 @@ export default class Copy extends CompositeComponent {
}
}
+ if (!component.doenetAttributes.sourceIsProp) {
+ let targetComponent =
+ components[(await component.stateValues.targetComponent).componentName];
+ let componentIndex = await component.stateValues.componentIndex;
+ let targetSubnames = await component.stateValues.targetSubnames;
+ if (
+ targetComponent.doenetAttributes.sourceIsProp &&
+ !componentIndex &&
+ !targetSubnames
+ ) {
+ // We are copying a copy/extract of a prop (or a recursive copy of it).
+ // Since we are a currently unable to consistently identify this case
+ // when processing serialized state,
+ // we (incorrectly) converted the name to be assignNames so that it applies to the replacement
+ // rather than the copy itself, and then we gave this copy a randomly generated name.
+ // Now that we have identified the targetComponent and see that it has sourceIsProp,
+ // we implement a workaround of creating an extra copy component
+ // that will act like this copy would have if we didn't convert the name and assignNames.
+ // We add the sourceIsProp doenetAttribute to that copy both to prevent this
+ // workaround from being applied again to that copy
+ // and to trigger this workaround in case that copy is copied.
+
+ // Copy all primitive attributes to make the extra copy behave like this copy
+ let attributesForExtraCopy = {};
+ for (let attrName in component.attributes) {
+ if (!component.attributes[attrName].component) {
+ attributesForExtraCopy[attrName] = JSON.parse(
+ JSON.stringify(component.attributes[attrName]),
+ );
+ }
+ }
+
+ // The extra copy inherit's this copy's target (and will actually use it).
+ let doenetAttributesForExtraCopy = {
+ target: component.doenetAttributes.target,
+ targetComponentName: component.doenetAttributes.targetComponentName,
+ sourceIsProp: true,
+ convertedAssignNames: true,
+ };
+
+ let substituteSerializedReplacements = [
+ {
+ componentType: "copy",
+ attributes: attributesForExtraCopy,
+ doenetAttributes: doenetAttributesForExtraCopy,
+ },
+ ];
+
+ // processAssignNames will set the assignNames of the extra copy
+ // to the original assignNames (before it was incorrectly converted)
+ // and name the copy the original name
+ // (that was converted to assignNamesForCompositeReplacement)
+ let processResult = serializeFunctions.processAssignNames({
+ assignNames,
+ assignNamesForCompositeReplacement:
+ component.doenetAttributes.assignNamesForCompositeReplacement,
+ serializedComponents: substituteSerializedReplacements,
+ parentName: component.componentName,
+ componentInfoObjects,
+ });
+
+ return {
+ replacements: processResult.serializedComponents,
+ errors,
+ warnings,
+ };
+ }
+ }
+
let replacements = [];
let numReplacementsBySource = [];
@@ -1434,7 +1522,7 @@ export default class Copy extends CompositeComponent {
componentInfoObjects,
numComponentsForSource,
publicCaseInsensitiveAliasSubstitutions,
- flags,
+
fromCopyTarget:
Number(sourceNum) === 0 && component.doenetAttributes.fromCopyTarget,
});
@@ -1469,15 +1557,15 @@ export default class Copy extends CompositeComponent {
workspace,
componentInfoObjects,
compositeAttributesObj,
- flags,
+
components,
publicCaseInsensitiveAliasSubstitutions,
});
errors.push(...verificationResult.errors);
warnings.push(...verificationResult.warnings);
- // console.log(`serialized replacements for ${component.componentName}`)
- // console.log(JSON.parse(JSON.stringify(verificationResult.replacements)))
+ // console.log(`serialized replacements for ${component.componentName}`);
+ // console.log(JSON.parse(JSON.stringify(verificationResult.replacements)));
return { replacements: verificationResult.replacements, errors, warnings };
}
@@ -1493,11 +1581,13 @@ export default class Copy extends CompositeComponent {
componentInfoObjects,
numComponentsForSource,
publicCaseInsensitiveAliasSubstitutions,
- flags,
+
fromCopyTarget,
}) {
- // console.log(`create replacement for sourceNum ${sourceNum}`)
- // console.log(`propName: ${component.stateValues.effectivePropNameBySource[sourceNum]}`)
+ // console.log(`create replacement for sourceNum ${sourceNum}`);
+ // console.log(
+ // `propName: ${component.stateValues.effectivePropNameBySource[sourceNum]}`,
+ // );
let errors = [];
let warnings = [];
@@ -1506,7 +1596,16 @@ export default class Copy extends CompositeComponent {
await component.stateValues.replacementSourceIdentities
)[sourceNum];
if (typeof replacementSource !== "object") {
- return { serializedReplacements: [replacementSource], errors, warnings };
+ if (component.stateValues.effectivePropNameBySource[sourceNum]) {
+ // Cannot get a prop off a non-object (e.g., off a string component)
+ return { serializedReplacements: [], errors, warnings };
+ } else {
+ return {
+ serializedReplacements: [replacementSource],
+ errors,
+ warnings,
+ };
+ }
}
let replacementSourceComponent =
components[replacementSource.componentName];
@@ -1543,13 +1642,14 @@ export default class Copy extends CompositeComponent {
componentInfoObjects,
numComponentsForSource,
publicCaseInsensitiveAliasSubstitutions,
- flags,
});
errors.push(...results.errors);
warnings.push(...results.warnings);
let processResult = serializeFunctions.processAssignNames({
assignNames,
+ assignNamesForCompositeReplacement:
+ component.doenetAttributes.assignNamesForCompositeReplacement,
serializedComponents: results.serializedReplacements,
parentName: component.componentName,
parentCreatesNewNamespace: newNamespace,
@@ -1615,7 +1715,7 @@ export default class Copy extends CompositeComponent {
await replacementSourceComponent.serialize({
copyAll: !link,
copyVariants: !link,
- sourceAttributesToIgnore,
+ primitiveSourceAttributesToIgnore: sourceAttributesToIgnore,
copyPrimaryEssential,
errorIfEncounterComponent: [component.componentName],
}),
@@ -1674,8 +1774,8 @@ export default class Copy extends CompositeComponent {
componentType: repl.componentType,
componentInfoObjects,
compositeAttributesObj,
+ dontSkipAttributes: ["asList"],
compositeCreatesNewNamespace: newNamespace,
- flags,
});
Object.assign(repl.attributes, attributesFromComposite);
}
@@ -1687,15 +1787,29 @@ export default class Copy extends CompositeComponent {
serializedReplacements[0].doenetAttributes.haveNewNamespaceOnlyFromShadow = true;
}
+ let parentName = component.componentName;
+
+ if (component.doenetAttributes.parentNameForAssignNames) {
+ parentName = component.doenetAttributes.parentNameForAssignNames;
+ }
+
+ let compositesParentNameForAssignNames;
+ if (await component.stateValues.addLevelToAssignNames) {
+ compositesParentNameForAssignNames = parentName;
+ }
+
let processResult = serializeFunctions.processAssignNames({
assignNames,
assignNewNamespaces: component.attributes.assignNewNamespaces?.primitive,
+ assignNamesForCompositeReplacement:
+ component.doenetAttributes.assignNamesForCompositeReplacement,
serializedComponents: serializedReplacements,
- parentName: component.componentName,
+ parentName,
parentCreatesNewNamespace: newNamespace,
indOffset: numNonStringReplacementsSoFar,
componentInfoObjects,
- originalNamesAreConsistent: newNamespace && !assignNames,
+ originalNamesAreConsistent: newNamespace, // && !assignNames,
+ compositesParentNameForAssignNames,
});
errors.push(...processResult.errors);
warnings.push(...processResult.warnings);
@@ -1804,11 +1918,13 @@ export default class Copy extends CompositeComponent {
components,
workspace,
componentInfoObjects,
- flags,
+
resolveItem,
publicCaseInsensitiveAliasSubstitutions,
}) {
- // console.log("Calculating replacement changes for " + component.componentName);
+ // console.log(
+ // "Calculating replacement changes for " + component.componentName,
+ // );
// TODO: don't yet have a way to return errors and warnings!
let errors = [];
@@ -1824,6 +1940,10 @@ export default class Copy extends CompositeComponent {
return [];
}
+ if ((await component.stateValues.link) === false) {
+ return [];
+ }
+
let compositeAttributesObj = this.createAttributesObject();
let assignNames = await component.stateValues.effectiveAssignNames;
@@ -1867,7 +1987,7 @@ export default class Copy extends CompositeComponent {
workspace,
componentInfoObjects,
compositeAttributesObj,
- flags,
+
components,
publicCaseInsensitiveAliasSubstitutions,
});
@@ -1908,7 +2028,7 @@ export default class Copy extends CompositeComponent {
workspace,
componentInfoObjects,
compositeAttributesObj,
- flags,
+
components,
publicCaseInsensitiveAliasSubstitutions,
});
@@ -1961,6 +2081,23 @@ export default class Copy extends CompositeComponent {
}
}
+ if (!component.doenetAttributes.sourceIsProp) {
+ let targetComponent =
+ components[(await component.stateValues.targetComponent).componentName];
+ let componentIndex = await component.stateValues.componentIndex;
+ let targetSubnames = await component.stateValues.targetSubnames;
+ if (
+ targetComponent.doenetAttributes.sourceIsProp &&
+ !componentIndex &&
+ !targetSubnames
+ ) {
+ // The case where we added an extra copy as a workaround for sourceIsProp.
+ // Any replacement changes will be handled by that copy,
+ // so we ignored changes here.
+ return [];
+ }
+ }
+
let replacementChanges = [];
if (component.replacementsToWithhold > 0) {
@@ -2070,8 +2207,7 @@ export default class Copy extends CompositeComponent {
break;
} else if (
!effectivePropNameBySource[sourceNum] &&
- currentReplacement.shadows &&
- currentReplacement.shadows.componentName !==
+ currentReplacement.shadows?.componentName !==
replacementSourceIdentities[sourceNum].componentName
) {
needToRecreate = true;
@@ -2107,7 +2243,6 @@ export default class Copy extends CompositeComponent {
componentInfoObjects,
numComponentsForSource,
publicCaseInsensitiveAliasSubstitutions,
- flags,
});
errors.push(...results.errors);
warnings.push(...results.warnings);
@@ -2190,7 +2325,6 @@ export default class Copy extends CompositeComponent {
componentInfoObjects,
numComponentsForSource,
publicCaseInsensitiveAliasSubstitutions,
- flags,
fromCopyTarget:
Number(sourceNum) === 0 && component.doenetAttributes.fromCopyTarget,
});
@@ -2326,7 +2460,7 @@ export default class Copy extends CompositeComponent {
workspace,
componentInfoObjects,
compositeAttributesObj,
- flags,
+
components,
publicCaseInsensitiveAliasSubstitutions,
});
@@ -2361,7 +2495,6 @@ export default class Copy extends CompositeComponent {
componentInfoObjects,
numComponentsForSource,
publicCaseInsensitiveAliasSubstitutions,
- flags,
}) {
let errors = [];
let warnings = [];
@@ -2377,7 +2510,6 @@ export default class Copy extends CompositeComponent {
componentInfoObjects,
numComponentsForSource,
publicCaseInsensitiveAliasSubstitutions,
- flags,
fromCopyTarget:
Number(sourceNum) === 0 && component.doenetAttributes.fromCopyTarget,
});
@@ -2389,25 +2521,36 @@ export default class Copy extends CompositeComponent {
let newSerializedChildren = results.serializedReplacements;
- let replacementInstruction = {
- changeType: "add",
- changeTopLevelReplacements: true,
- firstReplacementInd: numReplacementsSoFar,
- numberReplacementsToReplace: numReplacementsToDelete,
- serializedReplacements: newSerializedChildren,
- assignNamesOffset: numNonStringReplacementsSoFar,
- };
+ if (newSerializedChildren.length > 0 || numReplacementsToDelete > 0) {
+ let replacementInstruction = {
+ changeType: "add",
+ changeTopLevelReplacements: true,
+ firstReplacementInd: numReplacementsSoFar,
+ numberReplacementsToReplace: numReplacementsToDelete,
+ serializedReplacements: newSerializedChildren,
+ assignNamesOffset: numNonStringReplacementsSoFar,
+ };
- return {
- numReplacements: newSerializedChildren.length,
- numNonStringReplacements: newSerializedChildren.filter(
- (x) => typeof x !== "string",
- ).length,
- propVariablesCopiedByReplacement,
- replacementInstruction,
- errors,
- warnings,
- };
+ return {
+ numReplacements: newSerializedChildren.length,
+ numNonStringReplacements: newSerializedChildren.filter(
+ (x) => typeof x !== "string",
+ ).length,
+ propVariablesCopiedByReplacement,
+ replacementInstruction,
+ errors,
+ warnings,
+ };
+ } else {
+ return {
+ numReplacements: 0,
+ numNonStringReplacements: 0,
+ propVariablesCopiedByReplacement,
+ replacementInstruction: [],
+ errors,
+ warnings,
+ };
+ }
}
}
@@ -2422,7 +2565,6 @@ export async function replacementFromProp({
componentInfoObjects,
numComponentsForSource,
publicCaseInsensitiveAliasSubstitutions,
- flags,
}) {
// console.log(`replacement from prop for ${component.componentName}`)
// console.log(replacementSource)
@@ -2607,7 +2749,6 @@ export async function replacementFromProp({
componentInfoObjects,
compositeAttributesObj,
compositeCreatesNewNamespace: newNamespace,
- flags,
});
let attributeComponentsShadowingStateVariables;
@@ -2748,7 +2889,6 @@ export async function replacementFromProp({
attributes: additionalAttributes,
componentType: createComponentOfType,
componentInfoObjects,
- flags,
});
if (stateVarObj.shadowingInstructions.attributesToShadow) {
@@ -3018,7 +3158,6 @@ export async function replacementFromProp({
attributes: additionalAttributes,
componentType: createComponentOfType,
componentInfoObjects,
- flags,
},
);
@@ -3225,7 +3364,6 @@ export async function replacementFromProp({
attributes: additionalAttributes,
componentType: piece.componentType,
componentInfoObjects,
- flags,
});
Object.assign(attributesForReplacement, additionalAttributes);
@@ -3264,7 +3402,6 @@ export async function replacementFromProp({
componentInfoObjects,
compositeAttributesObj,
compositeCreatesNewNamespace: newNamespace,
- flags,
});
Object.assign(replacement.attributes, attributesFromComposite);
@@ -3394,7 +3531,6 @@ export async function replacementFromProp({
componentInfoObjects,
compositeAttributesObj,
compositeCreatesNewNamespace: newNamespace,
- flags,
});
if (link) {
@@ -3497,7 +3633,6 @@ export async function replacementFromProp({
componentType:
stateVarObj.shadowingInstructions.createComponentOfType,
componentInfoObjects,
- flags,
});
if (stateVarObj.shadowingInstructions.attributesToShadow) {
@@ -3552,28 +3687,16 @@ export async function replacementFromProp({
}
}
- if (await component.stateValues.isPlainMacro) {
- for (let repl of serializedReplacements) {
- if (!repl.doenetAttributes) {
- repl.doenetAttributes = {};
- }
- repl.doenetAttributes.fromPlainMacro = true;
- if (repl.downstreamDependencies?.[target.componentName]?.[0]) {
- repl.downstreamDependencies[
- target.componentName
- ][0].fromPlainMacro = true;
- }
- }
- } else if (await component.stateValues.isPlainCopy) {
+ if (await component.stateValues.implicitProp) {
for (let repl of serializedReplacements) {
if (!repl.doenetAttributes) {
repl.doenetAttributes = {};
}
- repl.doenetAttributes.fromPlainCopy = true;
+ repl.doenetAttributes.fromImplicitProp = true;
if (repl.downstreamDependencies?.[target.componentName]?.[0]) {
repl.downstreamDependencies[
target.componentName
- ][0].fromPlainCopy = true;
+ ][0].fromImplicitProp = true;
}
}
}
diff --git a/src/Core/components/Evaluate.js b/src/Core/components/Evaluate.js
index 9dd69e349c..6afb12f1f6 100644
--- a/src/Core/components/Evaluate.js
+++ b/src/Core/components/Evaluate.js
@@ -13,9 +13,9 @@ export default class Evaluate extends MathComponent {
static componentType = "evaluate";
static rendererType = "math";
- // remove variableForPlainMacro so that an evaluate copied into a function via a macro
+ // remove variableForImplicitProp so that an evaluate copied into a function
// behaves like an evaluate (not just the value property) and can be reevaluated
- static variableForPlainMacro = undefined;
+ static variableForImplicitProp = undefined;
static createAttributesObject() {
let attributes = super.createAttributesObject();
diff --git a/src/Core/components/Extract.js b/src/Core/components/Extract.js
index 00256a2f75..16eecf0fe2 100644
--- a/src/Core/components/Extract.js
+++ b/src/Core/components/Extract.js
@@ -52,6 +52,12 @@ export default class Extract extends CompositeComponent {
public: true,
excludeFromSchema: true,
};
+
+ attributes.asList = {
+ createPrimitiveOfType: "boolean",
+ createStateVariable: "asList",
+ defaultValue: true,
+ };
return attributes;
}
@@ -362,8 +368,10 @@ export default class Extract extends CompositeComponent {
let newNamespace = component.attributes.newNamespace?.primitive;
+ let assignNames = component.doenetAttributes.assignNames;
+
let processResult = processAssignNames({
- assignNames: component.doenetAttributes.assignNames,
+ assignNames,
serializedComponents: serializedReplacements,
parentName: component.componentName,
indOffset: numReplacementsSoFar,
diff --git a/src/Core/components/Footnote.js b/src/Core/components/Footnote.js
index deb850705c..716398983c 100644
--- a/src/Core/components/Footnote.js
+++ b/src/Core/components/Footnote.js
@@ -1,3 +1,4 @@
+import { textFromChildren } from "../utils/text";
import InlineComponent from "./abstract/InlineComponent";
export default class Footnote extends InlineComponent {
@@ -33,16 +34,7 @@ export default class Footnote extends InlineComponent {
},
}),
definition: function ({ dependencyValues }) {
- let text = "";
- for (let child of dependencyValues.inlineChildren) {
- if (typeof child !== "object") {
- text += child.toString();
- } else if (typeof child.stateValues.text === "string") {
- text += child.stateValues.text;
- } else {
- text += " ";
- }
- }
+ let text = textFromChildren(dependencyValues.inlineChildren);
return { setValue: { text } };
},
diff --git a/src/Core/components/Group.js b/src/Core/components/Group.js
index 7043e3293e..da7098c7c4 100644
--- a/src/Core/components/Group.js
+++ b/src/Core/components/Group.js
@@ -50,6 +50,13 @@ export default class Group extends CompositeComponent {
attributes.numComponents = {
createPrimitiveOfType: "number",
};
+
+ attributes.asList = {
+ createPrimitiveOfType: "boolean",
+ createStateVariable: "asList",
+ defaultValue: false,
+ };
+
return attributes;
}
@@ -208,7 +215,7 @@ export default class Group extends CompositeComponent {
component,
components,
componentInfoObjects,
- flags,
+
publicCaseInsensitiveAliasSubstitutions,
}) {
let errors = [];
@@ -239,7 +246,6 @@ export default class Group extends CompositeComponent {
componentType: repl.componentType,
componentInfoObjects,
compositeCreatesNewNamespace: newNamespace,
- flags,
});
if (!repl.attributes) {
repl.attributes = {};
@@ -278,7 +284,7 @@ export default class Group extends CompositeComponent {
assignNames: component.doenetAttributes.assignNames,
componentInfoObjects,
compositeAttributesObj: this.createAttributesObject(),
- flags,
+
components,
publicCaseInsensitiveAliasSubstitutions,
});
@@ -299,7 +305,6 @@ export default class Group extends CompositeComponent {
static async calculateReplacementChanges({
component,
componentInfoObjects,
- flags,
}) {
// TODO: don't yet have a way to return errors and warnings!
let errors = [];
@@ -334,7 +339,6 @@ export default class Group extends CompositeComponent {
let createResult = await this.createSerializedReplacements({
component,
componentInfoObjects,
- flags,
});
let replacements = createResult.replacements;
diff --git a/src/Core/components/Intersection.js b/src/Core/components/Intersection.js
index 63a0eea62a..594bc3bc9e 100644
--- a/src/Core/components/Intersection.js
+++ b/src/Core/components/Intersection.js
@@ -23,6 +23,12 @@ export default class Intersection extends CompositeComponent {
leaveRaw: true,
};
+ attributes.asList = {
+ createPrimitiveOfType: "boolean",
+ createStateVariable: "asList",
+ defaultValue: true,
+ };
+
return attributes;
}
@@ -135,7 +141,6 @@ export default class Intersection extends CompositeComponent {
static async createSerializedReplacements({
component,
componentInfoObjects,
- flags,
}) {
let errors = [];
let warnings = [];
@@ -214,7 +219,6 @@ export default class Intersection extends CompositeComponent {
componentType: repl.componentType,
componentInfoObjects,
compositeCreatesNewNamespace: newNamespace,
- flags,
});
if (!repl.attributes) {
@@ -243,7 +247,6 @@ export default class Intersection extends CompositeComponent {
component,
components,
componentInfoObjects,
- flags,
}) {
// TODO: don't yet have a way to return errors and warnings!
let errors = [];
@@ -255,7 +258,6 @@ export default class Intersection extends CompositeComponent {
component,
components,
componentInfoObjects,
- flags,
});
let serializedIntersections = replacementResults.replacements;
diff --git a/src/Core/components/Label.js b/src/Core/components/Label.js
index fe8166b6b2..df1c7aab6e 100644
--- a/src/Core/components/Label.js
+++ b/src/Core/components/Label.js
@@ -9,6 +9,7 @@ import {
returnAnchorAttributes,
returnAnchorStateVariableDefinition,
} from "../utils/graphical";
+import { textFromChildren } from "../utils/text";
export default class Label extends InlineComponent {
constructor(args) {
@@ -28,8 +29,8 @@ export default class Label extends InlineComponent {
// used when creating new component via adapter or copy prop
static primaryStateVariableForDefinition = "valueShadow";
- static variableForPlainMacro = "value";
- static plainMacroReturnsSameType = true;
+ static variableForImplicitProp = "value";
+ static implicitPropReturnsSameType = true;
static createAttributesObject() {
let attributes = super.createAttributesObject();
@@ -220,13 +221,9 @@ export default class Label extends InlineComponent {
return { setValue: { text, latex: text, value } };
}
- let text = "";
- let value = "";
- for (let comp of dependencyValues.inlineChildren) {
+ let textFromComponentConverter = function (comp, getValue = true) {
if (typeof comp !== "object") {
- let s = comp.toString();
- text += s;
- value += s;
+ return comp.toString();
} else if (
typeof comp.stateValues.hasLatex === "boolean" &&
typeof comp.stateValues.value === "string" &&
@@ -234,9 +231,8 @@ export default class Label extends InlineComponent {
) {
// if component has a boolean hasLatex state variable
// and value and text are strings
- // then use value, text, and hasLatex directly
- text += comp.stateValues.text;
- value += comp.stateValues.value;
+ // then use value and text directly
+ return getValue ? comp.stateValues.value : comp.stateValues.text;
} else if (
typeof comp.stateValues.renderAsMath === "boolean" &&
typeof comp.stateValues.latex === "string" &&
@@ -245,20 +241,27 @@ export default class Label extends InlineComponent {
// if have both latex and string,
// use render as math, if exists, to decide which to use
if (comp.stateValues.renderAsMath) {
- text += comp.stateValues.latex;
- value += "\\(" + comp.stateValues.latex + "\\)";
+ return getValue
+ ? "\\(" + comp.stateValues.latex + "\\)"
+ : comp.stateValues.latex;
} else {
- text += comp.stateValues.text;
- value += comp.stateValues.text;
+ return comp.stateValues.text;
}
} else if (typeof comp.stateValues.latex === "string") {
- text += comp.stateValues.latex;
- value += "\\(" + comp.stateValues.latex + "\\)";
+ return getValue
+ ? "\\(" + comp.stateValues.latex + "\\)"
+ : comp.stateValues.latex;
} else if (typeof comp.stateValues.text === "string") {
- text += comp.stateValues.text;
- value += comp.stateValues.text;
+ return comp.stateValues.text;
}
- }
+ };
+
+ let value = textFromChildren(dependencyValues.inlineChildren, (x) =>
+ textFromComponentConverter(x, true),
+ );
+ let text = textFromChildren(dependencyValues.inlineChildren, (x) =>
+ textFromComponentConverter(x, false),
+ );
return { setValue: { text, latex: text, value } };
},
diff --git a/src/Core/components/Line.js b/src/Core/components/Line.js
index 5f89a5011a..26681bc927 100644
--- a/src/Core/components/Line.js
+++ b/src/Core/components/Line.js
@@ -25,6 +25,7 @@ export default class Line extends GraphicalComponent {
});
}
static componentType = "line";
+ static canBeInList = true;
static createAttributesObject() {
let attributes = super.createAttributesObject();
diff --git a/src/Core/components/Map.js b/src/Core/components/Map.js
index 746db1a0b2..97aa9685a9 100644
--- a/src/Core/components/Map.js
+++ b/src/Core/components/Map.js
@@ -38,6 +38,12 @@ export default class Map extends CompositeComponent {
leaveRaw: true,
};
+ attributes.asList = {
+ createPrimitiveOfType: "boolean",
+ createStateVariable: "asList",
+ defaultValue: true,
+ };
+
return attributes;
}
@@ -118,7 +124,7 @@ export default class Map extends CompositeComponent {
templateChild: {
dependencyType: "child",
childGroups: ["templates"],
- variableNames: ["serializedChildren", "newNamespace"],
+ variableNames: ["serializedChildren", "newNamespace", "asList"],
},
}),
definition: function ({ dependencyValues }) {
@@ -134,9 +140,13 @@ export default class Map extends CompositeComponent {
state: { rendered: true },
children: childrenOfTemplate,
originalName: templateChild.componentName,
+ attributes: {},
};
if (templateChild.stateValues.newNamespace) {
- template.attributes = { newNamespace: { primitive: true } };
+ template.attributes.newNamespace = { primitive: true };
+ }
+ if (templateChild.stateValues.asList) {
+ template.attributes.asList = { primitive: true };
}
return {
setValue: {
@@ -264,7 +274,6 @@ export default class Map extends CompositeComponent {
component,
workspace,
componentInfoObjects,
- flags,
}) {
// console.log(`create serialized replacements for ${component.componentName}`);
@@ -304,7 +313,6 @@ export default class Map extends CompositeComponent {
component,
iter,
componentInfoObjects,
- flags,
});
replacements.push(...res.replacements);
errors.push(...res.errors);
@@ -319,7 +327,6 @@ export default class Map extends CompositeComponent {
sourcesNumber: 0,
iterateNumber: -1,
componentInfoObjects,
- flags,
});
replacements = results.replacements;
errors.push(...results.errors);
@@ -331,37 +338,32 @@ export default class Map extends CompositeComponent {
return { replacements, errors, warnings };
}
- static async parallelReplacement({
- component,
- iter,
- componentInfoObjects,
- flags,
- }) {
+ static async parallelReplacement({ component, iter, componentInfoObjects }) {
let errors = [];
let warnings = [];
let replacements = [deepClone(await component.stateValues.template)];
let newNamespace = component.attributes.newNamespace?.primitive;
+ let compositeAttributesObj = this.createAttributesObject();
- if ("isResponse" in component.attributes) {
- // pass isResponse to replacements
-
- let attributesFromComposite = convertAttributesForComponentType({
- attributes: { isResponse: component.attributes.isResponse },
- componentType: replacements[0].componentType,
- componentInfoObjects,
- compositeCreatesNewNamespace: newNamespace,
- flags,
- });
- if (!replacements[0].attributes) {
- replacements[0].attributes = {};
- }
+ // pass isResponse to replacements
+ // (only isResponse will be copied, as it is only attribute with leaveRaw)
- Object.assign(replacements[0].attributes, attributesFromComposite);
+ let attributesFromComposite = convertAttributesForComponentType({
+ attributes: component.attributes,
+ componentType: replacements[0].componentType,
+ componentInfoObjects,
+ compositeAttributesObj,
+ compositeCreatesNewNamespace: newNamespace,
+ });
+ if (!replacements[0].attributes) {
+ replacements[0].attributes = {};
}
+ Object.assign(replacements[0].attributes, attributesFromComposite);
+
if (
- !replacements[0].attributes?.newNamespace?.primitive &&
+ !replacements[0].attributes.newNamespace?.primitive &&
replacements[0].children
) {
markToCreateAllUniqueNames(replacements[0].children);
@@ -395,7 +397,6 @@ export default class Map extends CompositeComponent {
childnumberArray = [],
iterateNumber,
componentInfoObjects,
- flags,
}) {
let errors = [];
let warnings = [];
@@ -417,7 +418,7 @@ export default class Map extends CompositeComponent {
let serializedComponents = [deepClone(template)];
- // pass isResponse to template
+ // pass isResponse to replacements
// (only isResponse will be copied, as it is only attribute with leaveRaw)
let attributesFromComposite = {};
@@ -428,7 +429,6 @@ export default class Map extends CompositeComponent {
componentInfoObjects,
compositeAttributesObj,
compositeCreatesNewNamespace: newNamespace,
- flags,
});
if (!serializedComponents[0].attributes) {
@@ -470,7 +470,6 @@ export default class Map extends CompositeComponent {
childnumberArray: newChildnumberArray,
iterateNumber,
componentInfoObjects,
- flags,
});
replacements.push(...results.replacements);
iterateNumber = results.iterateNumber;
@@ -487,7 +486,6 @@ export default class Map extends CompositeComponent {
components,
workspace,
componentInfoObjects,
- flags,
}) {
// console.log(`calculate replacement changes for ${component.componentName}`)
@@ -599,7 +597,6 @@ export default class Map extends CompositeComponent {
component,
workspace,
componentInfoObjects,
- flags,
});
let newSerializedReplacements = replacementResults.replacements;
@@ -749,7 +746,6 @@ export default class Map extends CompositeComponent {
component,
iter,
componentInfoObjects,
- flags,
});
replacements.push(...res.replacements);
errors.push(...res.errors);
diff --git a/src/Core/components/Math.js b/src/Core/components/Math.js
index 1dea4ba5f1..7d2ec9f1f0 100644
--- a/src/Core/components/Math.js
+++ b/src/Core/components/Math.js
@@ -49,8 +49,8 @@ export default class MathComponent extends InlineComponent {
// make sure it doesn't use the essential state variable unnormalizedValue
static primaryEssentialStateVariable = "value";
- static variableForPlainMacro = "value";
- static plainMacroReturnsSameType = true;
+ static variableForImplicitProp = "value";
+ static implicitPropReturnsSameType = true;
static descendantCompositesMustHaveAReplacement = true;
static descendantCompositesDefaultReplacementType = "math";
@@ -138,12 +138,6 @@ export default class MathComponent extends InlineComponent {
fallBackToParentStateVariable: "parseScientificNotation",
};
- attributes.groupCompositeReplacements = {
- createPrimitiveOfType: "boolean",
- createStateVariable: "groupCompositeReplacements",
- defaultValue: true,
- };
-
attributes.displayBlanks = {
createComponentOfType: "boolean",
createStateVariable: "displayBlanks",
@@ -388,10 +382,6 @@ export default class MathComponent extends InlineComponent {
dependencyType: "stateVariable",
variableName: "parseScientificNotation",
},
- groupCompositeReplacements: {
- dependencyType: "stateVariable",
- variableName: "groupCompositeReplacements",
- },
}),
set: (x) => (x === null ? null : convertValueToMathExpression(x)),
definition: calculateExpressionWithCodes,
@@ -1740,152 +1730,11 @@ function calculateExpressionWithCodes({ dependencyValues, changes }) {
}
}
- let inputString = "";
- let mathInd = 0;
- let compositeGroupString = "";
-
- let compositeReplacementRange =
- dependencyValues.stringMathChildren.compositeReplacementRange;
- let currentCompositeInd = undefined;
- let currentCompositeLastChildInd = undefined;
- let nextCompositeInd = undefined;
- let nextCompositeChildInd = undefined;
- if (
- dependencyValues.groupCompositeReplacements &&
- compositeReplacementRange.length > 0
- ) {
- nextCompositeInd = 0;
- nextCompositeChildInd =
- compositeReplacementRange[nextCompositeInd].firstInd;
- }
-
- for (let [childInd, child] of dependencyValues.stringMathChildren.entries()) {
- if (
- currentCompositeInd === undefined &&
- childInd === nextCompositeChildInd
- ) {
- // we are grouping composite replacements
- // and we found the beginning of children that are composite replacements
-
- currentCompositeInd = nextCompositeInd;
- currentCompositeLastChildInd =
- compositeReplacementRange[nextCompositeInd].lastInd;
- compositeGroupString = "";
-
- // if composite has only one replacement or has a string replacement,
- // then we don't group
-
- let dontGroup = currentCompositeLastChildInd === childInd;
- if (!dontGroup) {
- for (let ind = childInd; ind <= currentCompositeLastChildInd; ind++) {
- if (typeof dependencyValues.stringMathChildren[ind] === "string") {
- dontGroup = true;
- break;
- }
- }
- }
-
- if (dontGroup) {
- if (compositeReplacementRange.length > currentCompositeInd + 1) {
- nextCompositeInd = currentCompositeInd + 1;
- nextCompositeChildInd =
- compositeReplacementRange[nextCompositeInd].firstInd;
- } else {
- nextCompositeInd = undefined;
- nextCompositeChildInd = undefined;
- }
- currentCompositeInd = undefined;
- currentCompositeLastChildInd = undefined;
- }
- }
-
- if (typeof child === "string") {
- inputString += " " + child + " ";
- } else {
- // a math
- let code = dependencyValues.codePre + mathInd;
- mathInd++;
-
- let nextString;
- if (dependencyValues.format === "latex") {
- // for latex, must explicitly denote that code
- // is a multicharacter variable
- nextString = "\\operatorname{" + code + "}";
- } else {
- // for text, just make sure code is surrounded by spaces
- // (the presence of numbers inside code will ensure that
- // it is parsed as a multicharcter variable)
- nextString = " " + code + " ";
- }
-
- if (currentCompositeInd !== undefined) {
- if (compositeGroupString) {
- // continuing a composite group
- compositeGroupString += ",";
- }
- compositeGroupString += nextString;
- } else {
- inputString += nextString;
- }
- }
-
- if (childInd === currentCompositeLastChildInd) {
- // compositeGroupString contains components separated by commas
- // will wrap in parenthesis unless already contains
- // delimeters before and after
- // TODO: \rangle and \langle?
- let iString = inputString.trimEnd();
- let wrap = false;
- if (iString.length === 0) {
- wrap = true;
- } else {
- let lastChar = iString[iString.length - 1];
- if (!["{", "[", "(", "|", ","].includes(lastChar)) {
- wrap = true;
- } else {
- let nextChild = dependencyValues.stringMathChildren[childInd + 1];
- if (typeof nextChild !== "string") {
- wrap = true;
- } else {
- let nextString = nextChild.trimStart();
- if (nextString.length === 0) {
- wrap = true;
- } else {
- let nextChar = nextString[0];
- if (
- dependencyValues.format === "latex" &&
- nextChar === "\\" &&
- nextString.length > 1
- ) {
- nextChar = nextString[1];
- }
- if (!["}", "]", ")", "|", ","].includes(nextChar)) {
- wrap = true;
- }
- }
- }
- }
- }
-
- if (wrap) {
- compositeGroupString = "(" + compositeGroupString + ")";
- }
-
- inputString += compositeGroupString;
- compositeGroupString = "";
-
- if (compositeReplacementRange.length > currentCompositeInd + 1) {
- nextCompositeInd = currentCompositeInd + 1;
- nextCompositeChildInd =
- compositeReplacementRange[nextCompositeInd].firstInd;
- } else {
- nextCompositeInd = undefined;
- nextCompositeChildInd = undefined;
- }
- currentCompositeInd = undefined;
- currentCompositeLastChildInd = undefined;
- }
- }
+ let inputString = createInputStringFromChildren({
+ stringMathChildren: dependencyValues.stringMathChildren,
+ codePre: dependencyValues.codePre,
+ format: dependencyValues.format,
+ });
let expressionWithCodes = null;
@@ -1932,6 +1781,288 @@ function calculateExpressionWithCodes({ dependencyValues, changes }) {
};
}
+// concatenate strings and with a numbered code for each math child
+// (that will be parsed to form expression with codes)
+// If compositeReplacementAsList is true,
+// then add commas betweeen the components that are all from one composite,
+// if that composite has asList set to true.
+// Put parens around that list in some cases, as described below.
+function createInputStringFromChildren({
+ stringMathChildren,
+ codePre,
+ format,
+}) {
+ let mathInd = 0;
+ let mathIndByChild = [];
+ for (let child of stringMathChildren) {
+ if (typeof child === "string") {
+ mathIndByChild.push(null);
+ } else {
+ mathIndByChild.push(mathInd);
+ mathInd++;
+ }
+ }
+
+ let result = createInputStringFromChildrenSub({
+ compositeReplacementRange: stringMathChildren.compositeReplacementRange,
+ stringMathChildren,
+ startInd: 0,
+ endInd: stringMathChildren.length - 1,
+ mathIndByChild,
+ format,
+ codePre,
+ });
+
+ return result.newChildren.join("");
+}
+
+function createInputStringFromChildrenSub({
+ compositeReplacementRange,
+ stringMathChildren,
+ startInd,
+ endInd,
+ mathIndByChild,
+ format,
+ codePre,
+ potentialListComponents = null,
+}) {
+ let newChildren = [];
+ let newPotentialListComponents = [];
+ let lastChildInd = startInd - 1;
+
+ for (
+ let rangeInd = 0;
+ rangeInd < compositeReplacementRange.length;
+ rangeInd++
+ ) {
+ let range = compositeReplacementRange[rangeInd];
+
+ let rangeFirstInd = range.firstInd;
+ let rangeLastInd = range.lastInd;
+
+ if (rangeFirstInd > lastChildInd && rangeLastInd <= endInd) {
+ if (lastChildInd + 1 < rangeFirstInd) {
+ for (let ind = lastChildInd + 1; ind < rangeFirstInd; ind++) {
+ // we are not grouping these children
+ // but we are separately turning each one into a string
+ // (turning the math children into a code based on codePre and its mathInd)
+ newChildren.push(
+ baseStringFromChildren({
+ stringMathChildren,
+ startInd: ind,
+ endInd: ind,
+ mathIndByChild,
+ format,
+ codePre,
+ }),
+ );
+ }
+ if (potentialListComponents) {
+ // Since we didn't change the components,
+ // their status of being a potential list component is not changed
+ newPotentialListComponents.push(
+ ...potentialListComponents.slice(
+ lastChildInd - startInd + 1,
+ rangeFirstInd - startInd,
+ ),
+ );
+ }
+ }
+
+ // If a composite produced composites that produced children,
+ // then this outer composite is first in the array of replacement ranges.
+ // We first process the children corresponding to any of these replacement composites,
+ // which will concatenate the replacements of each composite into a single text,
+ // which may be be turned into a list according to the settings of that composite.
+
+ // We remove the replacement range of the current composite (any all earlier ones)
+ let subReplacementRange = compositeReplacementRange.slice(rangeInd + 1);
+
+ let {
+ newChildren: childrenInRange,
+ newPotentialListComponents: potentialListComponentsInRange,
+ } = createInputStringFromChildrenSub({
+ compositeReplacementRange: subReplacementRange,
+ stringMathChildren,
+ startInd: rangeFirstInd,
+ endInd: rangeLastInd,
+ mathIndByChild,
+ format,
+ codePre,
+ potentialListComponents: range.potentialListComponents,
+ });
+
+ let allAreListComponents = potentialListComponentsInRange.every((x) => x);
+
+ if (range.asList && allAreListComponents && childrenInRange.length > 1) {
+ // add commas between all children from a single composite
+ let listString = childrenInRange
+ .filter((v) => v.trim() !== "")
+ .map((v, i, a) => (i === a.length - 1 ? v : v.trimEnd()))
+ .join(", ");
+
+ // The following implements the logic to determine if this comma-separated list
+ // should be wrapped by parens.
+ // Wrap with parens if the lists is surrounded by a non-delimiter on either side.
+ // The parens will generally turn the list into a tuple (or to arguments of a function)
+ // when it is parsed into a math-expression.
+
+ let wrap = false;
+
+ // First check if there is a non-delimiter to the left
+ if (rangeFirstInd > 0) {
+ let prevInd = rangeFirstInd - 1;
+ while (prevInd >= 0) {
+ let prevChild = stringMathChildren[prevInd];
+ if (typeof prevChild === "string") {
+ prevChild = prevChild.trim();
+ if (prevChild.length > 0) {
+ if (
+ !["{", "[", "(", "|", ","].includes(
+ prevChild[prevChild.length - 1],
+ )
+ ) {
+ // The string to the left did not contain one of the delimiters,
+ // so we must wrap the list.
+ wrap = true;
+ }
+ break;
+ }
+ } else {
+ // There is a math child to the left,
+ // so we must wrap the list
+ wrap = true;
+ }
+ }
+ }
+
+ if (!wrap) {
+ // Since we didn't have a non-delimiter to the left,
+ // check if there is a non-delimiter to the right.
+ if (rangeLastInd < stringMathChildren.length - 1) {
+ let nextInd = rangeLastInd + 1;
+ while (nextInd <= stringMathChildren.length - 1) {
+ let nextChild = stringMathChildren[nextInd];
+ if (typeof nextChild === "string") {
+ nextChild = nextChild.trim();
+ if (nextChild.length > 0) {
+ let nextChar = nextChild[0];
+ // If the format is latex,
+ // the delimiter could be escaped by a \
+ if (
+ format === "latex" &&
+ nextChar === "\\" &&
+ nextChild.length > 1
+ ) {
+ nextChar = nextChild[1];
+ }
+ if (!["}", "]", ")", "|", ","].includes(nextChar)) {
+ // The string to the right did not contain one of the delimiters,
+ // so we must wrap the list.
+ wrap = true;
+ }
+ break;
+ }
+ } else {
+ // There is a math child to the right,
+ // so we must wrap the list
+ wrap = true;
+ }
+ }
+ }
+ }
+
+ if (wrap) {
+ listString = "(" + listString + ")";
+ }
+
+ newChildren.push(listString);
+ } else {
+ // We are not turning the children in a list,
+ // so just concatentate the strings
+ newChildren.push(childrenInRange.join(""));
+ }
+
+ if (potentialListComponents) {
+ // record whether the result from the composite (a single string now)
+ // should be considered a list component for any outer composite
+ newPotentialListComponents.push(allAreListComponents);
+ }
+ lastChildInd = rangeLastInd;
+ }
+ }
+
+ if (lastChildInd < endInd) {
+ for (let ind = lastChildInd + 1; ind <= endInd; ind++) {
+ // we are not grouping these children
+ // but we are separately turning each one into a string
+ // (turning the math children into a code based on codePre and its mathInd)
+ newChildren.push(
+ baseStringFromChildren({
+ stringMathChildren,
+ startInd: ind,
+ endInd: ind,
+ mathIndByChild,
+ format,
+ codePre,
+ }),
+ );
+ }
+
+ if (potentialListComponents) {
+ // Since we didn't change the components,
+ // their status of being a potential list component is not changed
+ newPotentialListComponents.push(
+ ...potentialListComponents.slice(
+ lastChildInd - startInd + 1,
+ endInd - startInd + 1,
+ ),
+ );
+ }
+ }
+
+ return { newChildren, newPotentialListComponents };
+}
+
+// concatenate string children and codes from math-children
+// into a single string to be parsed into a math component
+function baseStringFromChildren({
+ stringMathChildren,
+ startInd,
+ endInd,
+ mathIndByChild,
+ format,
+ codePre,
+}) {
+ let str = "";
+
+ for (let ind = startInd; ind <= endInd; ind++) {
+ let child = stringMathChildren[ind];
+ if (typeof child === "string") {
+ str += " " + child + " ";
+ } else {
+ // a math
+ let code = codePre + mathIndByChild[ind];
+
+ let nextString;
+ if (format === "latex") {
+ // for latex, must explicitly denote that code
+ // is a multicharacter variable
+ nextString = "\\operatorname{" + code + "}";
+ } else {
+ // for text, just make sure code is surrounded by spaces
+ // (the presence of numbers inside code will ensure that
+ // it is parsed as a multicharcter variable)
+ nextString = " " + code + " ";
+ }
+
+ str += nextString;
+ }
+ }
+
+ return str;
+}
+
function calculateMathValue({ dependencyValues } = {}) {
// if expressionWithCodes is null, there were no string or math children
if (dependencyValues.expressionWithCodes === null) {
diff --git a/src/Core/components/MathInput.js b/src/Core/components/MathInput.js
index fa63c8ac7d..5174522e5c 100644
--- a/src/Core/components/MathInput.js
+++ b/src/Core/components/MathInput.js
@@ -48,8 +48,7 @@ export default class MathInput extends Input {
}
static componentType = "mathInput";
- static variableForPlainMacro = "value";
- static variableForPlainCopy = "value";
+ static variableForImplicitProp = "value";
static processWhenJustUpdatedForNewComponent = true;
diff --git a/src/Core/components/MatrixInput.js b/src/Core/components/MatrixInput.js
index 8ae00bb391..4155376ff4 100644
--- a/src/Core/components/MatrixInput.js
+++ b/src/Core/components/MatrixInput.js
@@ -49,8 +49,7 @@ export class MatrixInput extends Input {
static componentType = "matrixInput";
- static variableForPlainMacro = "value";
- static variableForPlainCopy = "value";
+ static variableForImplicitProp = "value";
static processWhenJustUpdatedForNewComponent = true;
@@ -2838,8 +2837,7 @@ export default class MatrixComponentInput extends BaseComponent {
static componentType = "_matrixComponentInput";
static rendererType = "mathInput";
- static variableForPlainMacro = "value";
- static variableForPlainCopy = "value";
+ static variableForImplicitProp = "value";
static returnStateVariableDefinitions() {
let stateVariableDefinitions = super.returnStateVariableDefinitions();
diff --git a/src/Core/components/Number.js b/src/Core/components/Number.js
index 2616766b7b..802892d0fa 100644
--- a/src/Core/components/Number.js
+++ b/src/Core/components/Number.js
@@ -35,8 +35,8 @@ export default class NumberComponent extends InlineComponent {
}
static componentType = "number";
- static variableForPlainMacro = "value";
- static plainMacroReturnsSameType = true;
+ static variableForImplicitProp = "value";
+ static implicitPropReturnsSameType = true;
static createAttributesObject() {
let attributes = super.createAttributesObject();
diff --git a/src/Core/components/P.js b/src/Core/components/P.js
index 07e62e4d6a..deb25bf1db 100644
--- a/src/Core/components/P.js
+++ b/src/Core/components/P.js
@@ -1,3 +1,4 @@
+import { textFromChildren } from "../utils/text";
import BlockComponent from "./abstract/BlockComponent";
export default class P extends BlockComponent {
@@ -45,16 +46,7 @@ export default class P extends BlockComponent {
},
}),
definition: function ({ dependencyValues }) {
- let text = "";
- for (let child of dependencyValues.inlineChildren) {
- if (typeof child !== "object") {
- text += child.toString();
- } else if (typeof child.stateValues.text === "string") {
- text += child.stateValues.text;
- } else {
- text += " ";
- }
- }
+ let text = textFromChildren(dependencyValues.inlineChildren);
return { setValue: { text } };
},
diff --git a/src/Core/components/Point.js b/src/Core/components/Point.js
index 2c25542a4a..9f7ab3f417 100644
--- a/src/Core/components/Point.js
+++ b/src/Core/components/Point.js
@@ -27,6 +27,8 @@ export default class Point extends GraphicalComponent {
}
static componentType = "point";
+ static canBeInList = true;
+
// Note: for other components with public point state variables,
// the recommended course of action is not to have
// a public state variable with component type point, which would use coordsShadow
diff --git a/src/Core/components/SamplePrimeNumbers.js b/src/Core/components/SamplePrimeNumbers.js
index ef10a3a87d..cac1749f5d 100644
--- a/src/Core/components/SamplePrimeNumbers.js
+++ b/src/Core/components/SamplePrimeNumbers.js
@@ -64,6 +64,12 @@ export default class SamplePrimeNumbers extends CompositeComponent {
public: true,
};
+ attributes.asList = {
+ createPrimitiveOfType: "boolean",
+ createStateVariable: "asList",
+ defaultValue: true,
+ };
+
return attributes;
}
diff --git a/src/Core/components/SampleRandomNumbers.js b/src/Core/components/SampleRandomNumbers.js
index f3e028e9cb..da2a130c79 100644
--- a/src/Core/components/SampleRandomNumbers.js
+++ b/src/Core/components/SampleRandomNumbers.js
@@ -107,6 +107,12 @@ export default class SampleRandomNumbers extends CompositeComponent {
public: true,
};
+ attributes.asList = {
+ createPrimitiveOfType: "boolean",
+ createStateVariable: "asList",
+ defaultValue: true,
+ };
+
return attributes;
}
@@ -591,7 +597,6 @@ export default class SampleRandomNumbers extends CompositeComponent {
component,
componentInfoObjects,
startNum = 0,
- flags,
}) {
let errors = [];
let warnings = [];
@@ -618,7 +623,6 @@ export default class SampleRandomNumbers extends CompositeComponent {
componentType: "number",
componentInfoObjects,
compositeCreatesNewNamespace: newNamespace,
- flags,
});
}
@@ -650,7 +654,6 @@ export default class SampleRandomNumbers extends CompositeComponent {
static async calculateReplacementChanges({
component,
componentInfoObjects,
- flags,
}) {
// TODO: don't yet have a way to return errors and warnings!
let errors = [];
@@ -687,7 +690,6 @@ export default class SampleRandomNumbers extends CompositeComponent {
component,
componentInfoObjects,
startNum: component.replacements.length,
- flags,
});
errors.push(...result.errors);
warnings.push(...result.warnings);
diff --git a/src/Core/components/Select.js b/src/Core/components/Select.js
index 553b4226e3..cd6e1f5695 100644
--- a/src/Core/components/Select.js
+++ b/src/Core/components/Select.js
@@ -50,6 +50,12 @@ export default class Select extends CompositeComponent {
defaultValue: false,
};
+ attributes.asList = {
+ createPrimitiveOfType: "boolean",
+ createStateVariable: "asList",
+ defaultValue: true,
+ };
+
return attributes;
}
diff --git a/src/Core/components/SelectFromSequence.js b/src/Core/components/SelectFromSequence.js
index 53bb5f35a2..bc399cea16 100644
--- a/src/Core/components/SelectFromSequence.js
+++ b/src/Core/components/SelectFromSequence.js
@@ -225,7 +225,6 @@ export default class SelectFromSequence extends Sequence {
static async createSerializedReplacements({
component,
componentInfoObjects,
- flags,
}) {
let errors = [];
let warnings = [];
@@ -272,7 +271,6 @@ export default class SelectFromSequence extends Sequence {
componentType,
componentInfoObjects,
compositeCreatesNewNamespace: newNamespace,
- flags,
});
}
diff --git a/src/Core/components/SelectPrimeNumbers.js b/src/Core/components/SelectPrimeNumbers.js
index a8b0446d1b..39546d4964 100644
--- a/src/Core/components/SelectPrimeNumbers.js
+++ b/src/Core/components/SelectPrimeNumbers.js
@@ -67,6 +67,12 @@ export default class SelectPrimeNumbers extends CompositeComponent {
createComponentOfType: "_listOfNumberLists",
};
+ attributes.asList = {
+ createPrimitiveOfType: "boolean",
+ createStateVariable: "asList",
+ defaultValue: true,
+ };
+
return attributes;
}
diff --git a/src/Core/components/SelectRandomNumbers.js b/src/Core/components/SelectRandomNumbers.js
index 057a584bc3..9b2fd6616d 100644
--- a/src/Core/components/SelectRandomNumbers.js
+++ b/src/Core/components/SelectRandomNumbers.js
@@ -182,7 +182,6 @@ export default class SelectRandomNumbers extends SampleRandomNumbers {
static async createSerializedReplacements({
component,
componentInfoObjects,
- flags,
}) {
let errors = [];
let warnings = [];
@@ -207,7 +206,6 @@ export default class SelectRandomNumbers extends SampleRandomNumbers {
componentType: "number",
componentInfoObjects,
compositeCreatesNewNamespace: newNamespace,
- flags,
});
}
diff --git a/src/Core/components/Sequence.js b/src/Core/components/Sequence.js
index 541bbb9d41..5b865dad1f 100644
--- a/src/Core/components/Sequence.js
+++ b/src/Core/components/Sequence.js
@@ -34,6 +34,12 @@ export default class Sequence extends CompositeComponent {
let sequenceAttributes = returnStandardSequenceAttributes();
Object.assign(attributes, sequenceAttributes);
+ attributes.asList = {
+ createPrimitiveOfType: "boolean",
+ createStateVariable: "asList",
+ defaultValue: true,
+ };
+
return attributes;
}
@@ -85,7 +91,6 @@ export default class Sequence extends CompositeComponent {
component,
workspace,
componentInfoObjects,
- flags,
}) {
// console.log(`create serialized replacements for ${component.componentName}`)
@@ -158,7 +163,6 @@ export default class Sequence extends CompositeComponent {
componentType,
componentInfoObjects,
compositeCreatesNewNamespace: newNamespace,
- flags,
});
}
@@ -194,7 +198,6 @@ export default class Sequence extends CompositeComponent {
component,
workspace,
componentInfoObjects,
- flags,
}) {
// console.log(`calculate replacement changes for ${component.componentName}`);
@@ -247,7 +250,6 @@ export default class Sequence extends CompositeComponent {
component,
workspace,
componentInfoObjects,
- flags,
});
let newSerializedReplacements = replacementResults.replacements;
@@ -397,7 +399,6 @@ export default class Sequence extends CompositeComponent {
componentType,
componentInfoObjects,
compositeCreatesNewNamespace: newNamespace,
- flags,
});
}
diff --git a/src/Core/components/Shuffle.js b/src/Core/components/Shuffle.js
index 57073f4c72..980ab82637 100644
--- a/src/Core/components/Shuffle.js
+++ b/src/Core/components/Shuffle.js
@@ -7,6 +7,7 @@ import {
enumeratePermutations,
} from "../utils/enumeration";
import { setUpVariantSeedAndRng } from "../utils/variants";
+import { returnGroupIntoComponentTypeSeparatedBySpacesOutsideParens } from "./commonsugar/lists";
export default class Shuffle extends CompositeComponent {
static componentType = "shuffle";
@@ -25,9 +26,87 @@ export default class Shuffle extends CompositeComponent {
createPrimitiveOfType: "number",
};
+ attributes.type = {
+ createPrimitiveOfType: "string",
+ };
+
+ attributes.asList = {
+ createPrimitiveOfType: "boolean",
+ createStateVariable: "asList",
+ defaultValue: true,
+ };
+
return attributes;
}
+ static returnSugarInstructions() {
+ let sugarInstructions = super.returnSugarInstructions();
+
+ function breakStringsMacrosIntoTypeBySpaces({
+ matchedChildren,
+ componentAttributes,
+ componentInfoObjects,
+ }) {
+ // only if all children are strings or macros
+ if (
+ !matchedChildren.every(
+ (child) =>
+ typeof child === "string" ||
+ child.doenetAttributes?.createdFromMacro,
+ )
+ ) {
+ return { success: false };
+ }
+
+ let type;
+ if (componentAttributes.type) {
+ type = componentAttributes.type;
+ } else {
+ return { success: false };
+ }
+
+ if (!["math", "text", "number", "boolean"].includes(type)) {
+ console.warn(`Invalid type ${type}`);
+ return { success: false };
+ }
+
+ // break any string by white space and wrap pieces with type
+ let groupIntoComponentTypesSeparatedBySpaces =
+ returnGroupIntoComponentTypeSeparatedBySpacesOutsideParens({
+ componentType: type,
+ forceComponentType: true,
+ });
+ let result = groupIntoComponentTypesSeparatedBySpaces({
+ matchedChildren,
+ componentInfoObjects,
+ });
+
+ if (result.success) {
+ let newChildren = result.newChildren;
+
+ let newAttributes = {
+ addLevelToAssignNames: {
+ primitive: true,
+ },
+ };
+
+ return {
+ success: true,
+ newChildren,
+ newAttributes,
+ };
+ } else {
+ return { success: false };
+ }
+ }
+
+ sugarInstructions.push({
+ replacementFunction: breakStringsMacrosIntoTypeBySpaces,
+ });
+
+ return sugarInstructions;
+ }
+
static returnChildGroups() {
return [
{
@@ -53,7 +132,7 @@ export default class Shuffle extends CompositeComponent {
definition({ dependencyValues }) {
let originalComponentNames = [];
for (let child of dependencyValues.children) {
- if (child.stateValues.componentNamesInList) {
+ if (child.stateValues?.componentNamesInList) {
originalComponentNames.push(
...child.stateValues.componentNamesInList,
);
@@ -253,7 +332,7 @@ export default class Shuffle extends CompositeComponent {
replacements.push(
await replacementSource.serialize({
- sourceAttributesToIgnore: ["isResponse"],
+ primitiveSourceAttributesToIgnore: ["isResponse"],
}),
);
}
diff --git a/src/Core/components/Slider.js b/src/Core/components/Slider.js
index bcb25c182a..276584ed5d 100644
--- a/src/Core/components/Slider.js
+++ b/src/Core/components/Slider.js
@@ -19,8 +19,7 @@ export default class Slider extends BaseComponent {
}
static componentType = "slider";
- static variableForPlainMacro = "value";
- static variableForPlainCopy = "value";
+ static variableForImplicitProp = "value";
static createAttributesObject() {
let attributes = super.createAttributesObject();
diff --git a/src/Core/components/Sort.js b/src/Core/components/Sort.js
index 2fd2af1bd8..06cf99be4b 100644
--- a/src/Core/components/Sort.js
+++ b/src/Core/components/Sort.js
@@ -2,6 +2,7 @@ import CompositeComponent from "./abstract/CompositeComponent";
import { postProcessCopy } from "../utils/copy";
import me from "math-expressions";
import { processAssignNames } from "../utils/serializedStateProcessing";
+import { returnGroupIntoComponentTypeSeparatedBySpacesOutsideParens } from "./commonsugar/lists";
export default class Sort extends CompositeComponent {
static componentType = "sort";
@@ -38,9 +39,87 @@ export default class Sort extends CompositeComponent {
createPrimitiveOfType: "string",
};
+ attributes.type = {
+ createPrimitiveOfType: "string",
+ };
+
+ attributes.asList = {
+ createPrimitiveOfType: "boolean",
+ createStateVariable: "asList",
+ defaultValue: true,
+ };
+
return attributes;
}
+ static returnSugarInstructions() {
+ let sugarInstructions = super.returnSugarInstructions();
+
+ function breakStringsMacrosIntoTypeBySpaces({
+ matchedChildren,
+ componentAttributes,
+ componentInfoObjects,
+ }) {
+ // only if all children are strings or macros
+ if (
+ !matchedChildren.every(
+ (child) =>
+ typeof child === "string" ||
+ child.doenetAttributes?.createdFromMacro,
+ )
+ ) {
+ return { success: false };
+ }
+
+ let type;
+ if (componentAttributes.type) {
+ type = componentAttributes.type;
+ } else {
+ return { success: false };
+ }
+
+ if (!["math", "text", "number", "boolean"].includes(type)) {
+ console.warn(`Invalid type ${type}`);
+ return { success: false };
+ }
+
+ // break any string by white space and wrap pieces with type
+ let groupIntoComponentTypesSeparatedBySpaces =
+ returnGroupIntoComponentTypeSeparatedBySpacesOutsideParens({
+ componentType: type,
+ forceComponentType: true,
+ });
+ let result = groupIntoComponentTypesSeparatedBySpaces({
+ matchedChildren,
+ componentInfoObjects,
+ });
+
+ if (result.success) {
+ let newChildren = result.newChildren;
+
+ let newAttributes = {
+ addLevelToAssignNames: {
+ primitive: true,
+ },
+ };
+
+ return {
+ success: true,
+ newChildren,
+ newAttributes,
+ };
+ } else {
+ return { success: false };
+ }
+ }
+
+ sugarInstructions.push({
+ replacementFunction: breakStringsMacrosIntoTypeBySpaces,
+ });
+
+ return sugarInstructions;
+ }
+
static returnChildGroups() {
return [
{
@@ -320,7 +399,7 @@ export default class Sort extends CompositeComponent {
replacements.push(
await replacementSource.serialize({
- sourceAttributesToIgnore: ["isResponse"],
+ primitiveSourceAttributesToIgnore: ["isResponse"],
}),
);
}
diff --git a/src/Core/components/SubsetOfRealsInput.js b/src/Core/components/SubsetOfRealsInput.js
index bc36e45aba..fce998d0e1 100644
--- a/src/Core/components/SubsetOfRealsInput.js
+++ b/src/Core/components/SubsetOfRealsInput.js
@@ -21,8 +21,7 @@ export default class SubsetOfRealsInput extends BlockComponent {
}
static componentType = "subsetOfRealsInput";
- static variableForPlainMacro = "subsetValue";
- static variableForPlainCopy = "subsetValue";
+ static variableForImplicitProp = "subsetValue";
static createAttributesObject() {
let attributes = super.createAttributesObject();
diff --git a/src/Core/components/Text.js b/src/Core/components/Text.js
index dbac3d8569..58c6b5d6bc 100644
--- a/src/Core/components/Text.js
+++ b/src/Core/components/Text.js
@@ -8,6 +8,7 @@ import {
returnSelectedStyleStateVariableDefinition,
returnTextStyleDescriptionDefinitions,
} from "../utils/style";
+import { textFromChildren } from "../utils/text";
import InlineComponent from "./abstract/InlineComponent";
import me from "math-expressions";
@@ -25,8 +26,8 @@ export default class Text extends InlineComponent {
static includeBlankStringChildren = true;
- static variableForPlainMacro = "value";
- static plainMacroReturnsSameType = true;
+ static variableForImplicitProp = "value";
+ static implicitPropReturnsSameType = true;
// even if inside a component that turned on descendantCompositesMustHaveAReplacement
// don't required composite replacements
@@ -123,14 +124,9 @@ export default class Text extends InlineComponent {
},
};
}
- let value = "";
- for (let comp of dependencyValues.textLikeChildren) {
- if (typeof comp === "string") {
- value += comp;
- } else {
- value += comp.stateValues.text;
- }
- }
+
+ let value = textFromChildren(dependencyValues.textLikeChildren);
+
return { setValue: { value } };
},
inverseDefinition: function ({
diff --git a/src/Core/components/TextInput.js b/src/Core/components/TextInput.js
index a83d6e1849..a2ef53d47d 100644
--- a/src/Core/components/TextInput.js
+++ b/src/Core/components/TextInput.js
@@ -39,8 +39,7 @@ export default class Textinput extends Input {
}
static componentType = "textInput";
- static variableForPlainMacro = "value";
- static variableForPlainCopy = "value";
+ static variableForImplicitProp = "value";
static processWhenJustUpdatedForNewComponent = true;
diff --git a/src/Core/components/Vector.js b/src/Core/components/Vector.js
index 31a1f7e243..5e48dc3d4f 100644
--- a/src/Core/components/Vector.js
+++ b/src/Core/components/Vector.js
@@ -28,6 +28,8 @@ export default class Vector extends GraphicalComponent {
}
static componentType = "vector";
+ static canBeInList = true;
+
static primaryStateVariableForDefinition = "displacementShadow";
static createAttributesObject() {
diff --git a/src/Core/components/abstract/BaseComponent.js b/src/Core/components/abstract/BaseComponent.js
index ba18738dde..aadb4801c7 100644
--- a/src/Core/components/abstract/BaseComponent.js
+++ b/src/Core/components/abstract/BaseComponent.js
@@ -1120,11 +1120,12 @@ export default class BaseComponent {
let parametersForChildren = { ...parameters };
- let sourceAttributesToIgnore;
- if (parameters.sourceAttributesToIgnore) {
- sourceAttributesToIgnore = parameters.sourceAttributesToIgnore;
+ let primitiveSourceAttributesToIgnore;
+ if (parameters.primitiveSourceAttributesToIgnore) {
+ primitiveSourceAttributesToIgnore =
+ parameters.primitiveSourceAttributesToIgnore;
} else {
- sourceAttributesToIgnore = [];
+ primitiveSourceAttributesToIgnore = [];
}
if (includeDefiningChildren) {
@@ -1163,7 +1164,7 @@ export default class BaseComponent {
} else {
// copy others if copy all or not set to be ignored
if (
- !sourceAttributesToIgnore.includes(attrName) ||
+ !primitiveSourceAttributesToIgnore.includes(attrName) ||
parameters.copyAll
) {
serializedComponent.attributes[attrName] = JSON.parse(
@@ -1239,6 +1240,8 @@ export default class BaseComponent {
delete serializedComponent.doenetAttributes.prescribedName;
delete serializedComponent.doenetAttributes.assignNames;
+ delete serializedComponent.doenetAttributes
+ .assignNamesForCompositeReplacement;
return serializedComponent;
}
diff --git a/src/Core/components/abstract/InlineRenderInlineChildren.js b/src/Core/components/abstract/InlineRenderInlineChildren.js
index afb0470b54..70d8ec920d 100644
--- a/src/Core/components/abstract/InlineRenderInlineChildren.js
+++ b/src/Core/components/abstract/InlineRenderInlineChildren.js
@@ -1,3 +1,4 @@
+import { textFromChildren } from "../../utils/text";
import InlineComponent from "./InlineComponent";
export default class InlineRenderInlineChildren extends InlineComponent {
@@ -38,16 +39,7 @@ export default class InlineRenderInlineChildren extends InlineComponent {
},
}),
definition: function ({ dependencyValues }) {
- let text = "";
- for (let child of dependencyValues.inlineChildren) {
- if (typeof child !== "object") {
- text += child.toString();
- } else if (typeof child.stateValues.text === "string") {
- text += child.stateValues.text;
- } else {
- text += " ";
- }
- }
+ let text = textFromChildren(dependencyValues.inlineChildren);
text =
componentClass.beginTextDelimiter +
diff --git a/src/Core/components/abstract/MathBaseOperator.js b/src/Core/components/abstract/MathBaseOperator.js
index 16253842a9..574429d2f3 100644
--- a/src/Core/components/abstract/MathBaseOperator.js
+++ b/src/Core/components/abstract/MathBaseOperator.js
@@ -120,6 +120,10 @@ export default class MathOperator extends MathComponent {
childGroups: ["mathLists"],
variableNames: ["maths"],
},
+ shadowSource: {
+ dependencyType: "shadowSource",
+ variableNames: ["isNumericOperator"],
+ },
}),
definition({ dependencyValues }) {
let isNumericOperator;
@@ -131,7 +135,11 @@ export default class MathOperator extends MathComponent {
dependencyValues.mathChildren.length === 0 &&
dependencyValues.mathListChildren.length === 0
) {
- isNumericOperator = true;
+ isNumericOperator =
+ dependencyValues.shadowSource?.stateValues.isNumericOperator;
+ if (isNumericOperator === undefined) {
+ isNumericOperator = true;
+ }
} else {
// have math children and aren't forced to be numeric or symbolic
// will be numeric only if have all math children are numbers
diff --git a/src/Core/components/abstract/TextOrInline.js b/src/Core/components/abstract/TextOrInline.js
index ac66a1a508..e55edb4e88 100644
--- a/src/Core/components/abstract/TextOrInline.js
+++ b/src/Core/components/abstract/TextOrInline.js
@@ -1,3 +1,4 @@
+import { textFromChildren } from "../../utils/text";
import InlineComponent from "./InlineComponent";
export default class TextOrInline extends InlineComponent {
@@ -33,14 +34,8 @@ export default class TextOrInline extends InlineComponent {
},
}),
definition: function ({ dependencyValues }) {
- let value = "";
- for (let comp of dependencyValues.inlineChildren) {
- if (typeof comp !== "object") {
- value += comp.toString();
- } else if (typeof comp.stateValues.text === "string") {
- value += comp.stateValues.text;
- }
- }
+ let value = textFromChildren(dependencyValues.inlineChildren);
+
return { setValue: { value } };
},
};
diff --git a/src/Core/components/chemistry/OrbitalDiagram.js b/src/Core/components/chemistry/OrbitalDiagram.js
index 3556ae6d34..dfc6a7b651 100644
--- a/src/Core/components/chemistry/OrbitalDiagram.js
+++ b/src/Core/components/chemistry/OrbitalDiagram.js
@@ -11,8 +11,8 @@ export default class OrbitalDiagram extends BlockComponent {
static componentType = "orbitalDiagram";
- static variableForPlainMacro = "value";
- static plainMacroReturnsSameType = true;
+ static variableForImplicitProp = "value";
+ static implicitPropReturnsSameType = true;
static createAttributesObject() {
let attributes = super.createAttributesObject();
diff --git a/src/Core/components/chemistry/OrbitalDiagramInput.js b/src/Core/components/chemistry/OrbitalDiagramInput.js
index 7afe0a7185..fa80cd5e94 100644
--- a/src/Core/components/chemistry/OrbitalDiagramInput.js
+++ b/src/Core/components/chemistry/OrbitalDiagramInput.js
@@ -21,8 +21,7 @@ export default class OrbitalDiagramInput extends BlockComponent {
static componentType = "orbitalDiagramInput";
- static variableForPlainMacro = "value";
- static variableForPlainCopy = "value";
+ static variableForImplicitProp = "value";
static createAttributesObject() {
let attributes = super.createAttributesObject();
diff --git a/src/Core/utils/copy.js b/src/Core/utils/copy.js
index bd52251c8a..296ee6839e 100644
--- a/src/Core/utils/copy.js
+++ b/src/Core/utils/copy.js
@@ -231,8 +231,8 @@ export function convertAttributesForComponentType({
componentType,
componentInfoObjects,
compositeAttributesObj = {},
+ dontSkipAttributes = [],
compositeCreatesNewNamespace,
- flags,
}) {
let errors = [];
let warnings = [];
@@ -249,10 +249,12 @@ export function convertAttributesForComponentType({
for (let attrName in attributes) {
if (
attrName in compositeAttributesObj &&
- !compositeAttributesObj[attrName].leaveRaw
+ !compositeAttributesObj[attrName].leaveRaw &&
+ !dontSkipAttributes.includes(attrName)
) {
// skip any attributes in the composite itself
// unless specifically marked to not be processed for the composite
+ // or argument is passed in to not skip
continue;
}
@@ -315,7 +317,6 @@ export async function verifyReplacementsMatchSpecifiedType({
workspace = {},
componentInfoObjects,
compositeAttributesObj,
- flags,
components,
publicCaseInsensitiveAliasSubstitutions,
}) {
@@ -519,7 +520,6 @@ export async function verifyReplacementsMatchSpecifiedType({
componentInfoObjects,
compositeAttributesObj,
compositeCreatesNewNamespace: newNamespace,
- flags,
});
let uniqueIdentifierBase = requiredComponentType + "|empty" + i;
@@ -636,10 +636,12 @@ export async function verifyReplacementsMatchSpecifiedType({
replacements = processResult.serializedComponents;
- workspace.numReplacementsBySource.push(replacements.length);
- workspace.numNonStringReplacementsBySource.push(
- replacements.filter((x) => typeof x !== "string").length,
- );
+ if (!wrapExistingReplacements) {
+ workspace.numReplacementsBySource.push(replacements.length);
+ workspace.numNonStringReplacementsBySource.push(
+ replacements.filter((x) => typeof x !== "string").length,
+ );
+ }
if (replacementChanges) {
replacementChanges = [];
diff --git a/src/Core/utils/serializedStateProcessing.js b/src/Core/utils/serializedStateProcessing.js
index 1bff153eeb..02503621a5 100644
--- a/src/Core/utils/serializedStateProcessing.js
+++ b/src/Core/utils/serializedStateProcessing.js
@@ -935,8 +935,16 @@ function copyTargetOrFromURIAttributeCreatesCopyComponent(
serializedComponents,
isCompositeComponent,
) {
+ // Convert Outer
- Intended target: Hello
-
- Five copies:
-
-
- New namespace
- Local target: Hola
- Five copies of local:
-
- Five copies of base:
-
-
- Another new namespace
- Local target: Marhaban
- Five copies of local:
-
- Five copies of middle:
-
- Five copies of base:
-
-
Copied content
Grab the DoenetML from external p:
diff --git a/src/Media/bafkreibw2hnx6fjk56ofulow4cs5gfspz5audke3rxrbg6mi3yv5lvgnia.doenet b/src/Media/bafkreibw2hnx6fjk56ofulow4cs5gfspz5audke3rxrbg6mi3yv5lvgnia.doenet
deleted file mode 100644
index 85689d8b81..0000000000
--- a/src/Media/bafkreibw2hnx6fjk56ofulow4cs5gfspz5audke3rxrbg6mi3yv5lvgnia.doenet
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
-Don't get this: Bye
-
\ No newline at end of file
diff --git a/src/Media/bafkreictwhjxdmqxxvpfoqybgdfp75tcvwda56kewdxhjhe2ixcia5bqu4.doenet b/src/Media/bafkreic2ntu5jyvhrm5wnfxngtao35dupv6so547rw32y5hnb4dn2gt4um.doenet
similarity index 88%
rename from src/Media/bafkreictwhjxdmqxxvpfoqybgdfp75tcvwda56kewdxhjhe2ixcia5bqu4.doenet
rename to src/Media/bafkreic2ntu5jyvhrm5wnfxngtao35dupv6so547rw32y5hnb4dn2gt4um.doenet
index 653efc15b3..a80a124bc6 100644
--- a/src/Media/bafkreictwhjxdmqxxvpfoqybgdfp75tcvwda56kewdxhjhe2ixcia5bqu4.doenet
+++ b/src/Media/bafkreic2ntu5jyvhrm5wnfxngtao35dupv6so547rw32y5hnb4dn2gt4um.doenet
@@ -24,7 +24,7 @@
Initial condition:
diff --git a/src/Media/bafkreic2z7kam3hnfbbpscwurh5lidhmtxmdlxcv7xtewp5mkqq32envae.doenet b/src/Media/bafkreic2z7kam3hnfbbpscwurh5lidhmtxmdlxcv7xtewp5mkqq32envae.doenet
new file mode 100644
index 0000000000..b15a00ee97
--- /dev/null
+++ b/src/Media/bafkreic2z7kam3hnfbbpscwurh5lidhmtxmdlxcv7xtewp5mkqq32envae.doenet
@@ -0,0 +1,5 @@
+
+
+
+Don't get this: Bye
+
\ No newline at end of file
diff --git a/src/Media/bafkreiccroxlq6rumheoxcs2vfze2h6u6ybi3yx4snhn7asbidbbit6wqa.doenet b/src/Media/bafkreiccroxlq6rumheoxcs2vfze2h6u6ybi3yx4snhn7asbidbbit6wqa.doenet
new file mode 100644
index 0000000000..41616d9ea1
--- /dev/null
+++ b/src/Media/bafkreiccroxlq6rumheoxcs2vfze2h6u6ybi3yx4snhn7asbidbbit6wqa.doenet
@@ -0,0 +1,3 @@
+
Don't get this: Bye
\ No newline at end of file
diff --git a/src/Media/bafkreickzviscuc3v3bodp73qfgarfexcasf6txflg5huseru2qdpylaou.doenet b/src/Media/bafkreickzviscuc3v3bodp73qfgarfexcasf6txflg5huseru2qdpylaou.doenet
new file mode 100644
index 0000000000..9f1783c2fc
--- /dev/null
+++ b/src/Media/bafkreickzviscuc3v3bodp73qfgarfexcasf6txflg5huseru2qdpylaou.doenet
@@ -0,0 +1,59 @@
+Outer
+ Intended target: Hello
+
+ Five copies:
+ $(hi{name="c1"})
+ $(/s/hi{name="c2"})
+ $(../s/hi{name="c3"})
+ $(../../s/hi{name="c4"})
+ $(../../../s/hi{name="c5"})
+
+
+ Four no matches:$(/hi{name="nm1"})$(../hi{name="nm2"})$(../../hi{name="nm3"})$(../../../hi{name="nm4"})
+
+ New namespace
+ Local target: Hola
+ Five copies of local:
+ $(hi{name="l1"})
+ $(/s/s/hi{name="l2"})
+ $(../s/hi{name="l3"})
+ $(../../s/s/hi{name="l4"})
+ $(../../../s/s/hi{name="l5"})
+
+ Fives copies of base:
+ $(/s/hi{name="c1"})
+ $(../hi{name="c2"})
+ $(../../s/hi{name="c3"})
+ $(../../../s/hi{name="c4"})
+ $(../../../../s/hi{name="c5"})
+
+ Four no matches:$(/hi{name="nm1"})$(../../hi{name="nm2"})$(../../../hi{name="nm3"})$(../../../../hi{name="nm4"})
+
+ Another new namespace
+ Local target: Marhaban
+ Five copies of local:
+ $(hi{name="l1"})
+ $(/s/s/s/hi{name="l2"})
+ $(../s/hi{name="l3"})
+ $(../../s/s/hi{name="l4"})
+ $(../../../s/s/s/hi{name="l5"})
+
+ Five copies of middle:
+ $(/s/s/hi{name="m1"})
+ $(../hi{name="m2"})
+ $(../../s/hi{name="m3"})
+ $(../../../s/s/hi{name="m4"})
+ $(../../../../s/s/hi{name="m5"})
+
+ Fives copies of base:
+ $(/s/hi{name="c1"})
+ $(../../hi{name="c2"})
+ $(../../../s/hi{name="c3"})
+ $(../../../../s/hi{name="c4"})
+ $(../../../../../s/hi{name="c5"})
+
+ Four no matches:$(/hi{name="nm1"})$(../../../hi{name="nm2"})$(../../../../hi{name="nm3"})$(../../../../../hi{name="nm4"})
+ Don't get this: Bye
\ No newline at end of file
diff --git a/src/Media/bafkreid5s6fwzzfaax7pr3d2i2iu2743vvzrvttjy55vcmvunka7nu3ope.doenet b/src/Media/bafkreid5s6fwzzfaax7pr3d2i2iu2743vvzrvttjy55vcmvunka7nu3ope.doenet
new file mode 100644
index 0000000000..04f0590289
--- /dev/null
+++ b/src/Media/bafkreid5s6fwzzfaax7pr3d2i2iu2743vvzrvttjy55vcmvunka7nu3ope.doenet
@@ -0,0 +1,4 @@
+
+Outer
+ Intended target: Hello
+
+ Five copies:
+ $(hi{name="c1"})
+ $(/hi{name="c2"})
+ $(../hi{name="c3"})
+ $(../../hi{name="c4"})
+ $(../../../hi{name="c5"})
+
+
+ New namespace
+ Local target: Hola
+ Five copies of local:
+ $(hi{name="l1"})
+ $(/s/hi{name="l2"})
+ $(../s/hi{name="l3"})
+ $(../../s/hi{name="l4"})
+ $(../../../s/hi{name="l5"})
+
+ Five copies of base:
+ $(/hi{name="c1"})
+ $(../hi{name="c2"})
+ $(../../hi{name="c3"})
+ $(../../../hi{name="c4"})
+ $(../../../../hi{name="c5"})
+
+
+ Another new namespace
+ Local target: Marhaban
+ Five copies of local:
+ $(hi{name="l1"})
+ $(/s/s/hi{name="l2"})
+ $(../s/hi{name="l3"})
+ $(../../s/s/hi{name="l4"})
+ $(../../../s/s/hi{name="l5"})
+
+ Five copies of middle:
+ $(/s/hi{name="m1"})
+ $(../hi{name="m2"})
+ $(../../s/hi{name="m3"})
+ $(../../../s/hi{name="m4"})
+ $(../../../../s/hi{name="m5"})
+
+ Five copies of base:
+ $(/hi{name="c1"})
+ $(../../hi{name="c2"})
+ $(../../../hi{name="c3"})
+ $(../../../../hi{name="c4"})
+ $(../../../../../hi{name="c5"})
+
+ Intended target: Hello
+
+Five copies:
+ $(hi{name="c1"})
+ $(/hi{name="c2"})
+ $(../hi{name="c3"})
+ $(../../hi{name="c4"})
+ $(../../../hi{name="c5"})
+
+
+New namespace
+ Local target: Hola
+ Copy of local: $(hi{name="l1"})
+ Fives copies of base:
+ $(/hi{name="c1"})
+ $(../hi{name="c2"})
+ $(../../hi{name="c3"})
+ $(../../../hi{name="c4"})
+ $(../../../../hi{name="c5"})
+
+
+ Another new namespace
+ Local target: Marhaban
+ Copy of local: $(hi{name="l1"})
+ Copy of middle: $(../hi{name="m1"})
+ Fives copies of base:
+ $(/hi{name="c1"})
+ $(../../hi{name="c2"})
+ $(../../../hi{name="c3"})
+ $(../../../../hi{name="c4"})
+ $(../../../../../hi{name="c5"})
+
+ Intended target: Hello
-
-Five copies:
-
-
-New namespace
- Local target: Hola
- Copy of local:
- Fives copies of base:
-
-
- Another new namespace
- Local target: Marhaban
- Copy of local:
- Copy of middle:
- Fives copies of base:
-
-
diff --git a/src/Viewer/renderers/c.jsx b/src/Viewer/renderers/c.jsx
index b5e3968074..0e0c065d53 100644
--- a/src/Viewer/renderers/c.jsx
+++ b/src/Viewer/renderers/c.jsx
@@ -1,5 +1,6 @@
import React from "react";
import useDoenetRenderer from "../useDoenetRenderer";
+import { addCommasForCompositeRanges } from "./utils/composites";
export default React.memo(function C(props) {
let { name, id, SVs, children } = useDoenetRenderer(props);
@@ -8,6 +9,15 @@ export default React.memo(function C(props) {
return null;
}
+ if (SVs._compositeReplacementActiveRange) {
+ children = addCommasForCompositeRanges({
+ children,
+ compositeReplacementActiveRange: SVs._compositeReplacementActiveRange,
+ startInd: 0,
+ endInd: children.length - 1,
+ });
+ }
+
return (
diff --git a/src/Viewer/renderers/containerInline.jsx b/src/Viewer/renderers/containerInline.jsx
index 4c13b18201..b4d7324b6c 100644
--- a/src/Viewer/renderers/containerInline.jsx
+++ b/src/Viewer/renderers/containerInline.jsx
@@ -1,5 +1,6 @@
import React from "react";
import useDoenetRenderer from "../useDoenetRenderer";
+import { addCommasForCompositeRanges } from "./utils/composites";
export default React.memo(function ContainerInline(props) {
let { name, id, SVs, children } = useDoenetRenderer(props);
@@ -8,6 +9,15 @@ export default React.memo(function ContainerInline(props) {
return null;
}
+ if (SVs._compositeReplacementActiveRange) {
+ children = addCommasForCompositeRanges({
+ children,
+ compositeReplacementActiveRange: SVs._compositeReplacementActiveRange,
+ startInd: 0,
+ endInd: children.length - 1,
+ });
+ }
+
return (
diff --git a/src/Viewer/renderers/contentPicker.jsx b/src/Viewer/renderers/contentPicker.jsx
index 92c2d3df8a..1583702be9 100644
--- a/src/Viewer/renderers/contentPicker.jsx
+++ b/src/Viewer/renderers/contentPicker.jsx
@@ -4,6 +4,7 @@ import VisibilitySensor from "react-visibility-sensor-v2";
import { useEffect } from "react";
import { rendererState } from "../useDoenetRenderer";
import { useSetRecoilState } from "recoil";
+import { addCommasForCompositeRanges } from "./utils/composites";
export default React.memo(function ContentPicker(props) {
let {
@@ -148,6 +149,15 @@ export default React.memo(function ContentPicker(props) {
);
+ if (SVs._compositeReplacementActiveRange) {
+ children = addCommasForCompositeRanges({
+ children,
+ compositeReplacementActiveRange: SVs._compositeReplacementActiveRange,
+ startInd: 0,
+ endInd: children.length - 1,
+ });
+ }
+
return (
diff --git a/src/Viewer/renderers/em.jsx b/src/Viewer/renderers/em.jsx
index 63521aca8f..9eec44ab39 100644
--- a/src/Viewer/renderers/em.jsx
+++ b/src/Viewer/renderers/em.jsx
@@ -1,5 +1,6 @@
import React from "react";
import useDoenetRenderer from "../useDoenetRenderer";
+import { addCommasForCompositeRanges } from "./utils/composites";
export default React.memo(function Em(props) {
let { name, id, SVs, children } = useDoenetRenderer(props);
@@ -8,6 +9,15 @@ export default React.memo(function Em(props) {
return null;
}
+ if (SVs._compositeReplacementActiveRange) {
+ children = addCommasForCompositeRanges({
+ children,
+ compositeReplacementActiveRange: SVs._compositeReplacementActiveRange,
+ startInd: 0,
+ endInd: children.length - 1,
+ });
+ }
+
return (
<>
diff --git a/src/Viewer/renderers/footnote.jsx b/src/Viewer/renderers/footnote.jsx
index 953f9f1746..aabf2d0737 100644
--- a/src/Viewer/renderers/footnote.jsx
+++ b/src/Viewer/renderers/footnote.jsx
@@ -45,8 +45,8 @@ export default React.memo(function Footnote(props) {
+ {footnoteMessage}
- {footnoteMessage}
);
});
diff --git a/src/Viewer/renderers/hint.jsx b/src/Viewer/renderers/hint.jsx
index 46928aa031..86b2d84237 100644
--- a/src/Viewer/renderers/hint.jsx
+++ b/src/Viewer/renderers/hint.jsx
@@ -8,6 +8,7 @@ import { faCaretDown as twirlIsOpen } from "@fortawesome/free-solid-svg-icons";
import VisibilitySensor from "react-visibility-sensor-v2";
import styled from "styled-components";
+import { addCommasForCompositeRanges } from "./utils/composites";
const SpanStyling = styled.span`
&: focus {
@@ -41,6 +42,7 @@ export default React.memo(function Hint(props) {
}
let title;
+ let removedChildInd = null;
// BADBADBAD: need to redo how getting the title child
// getting it using the internal guts of componentInstructions
// is just asking for trouble
@@ -52,6 +54,7 @@ export default React.memo(function Hint(props) {
) {
title = children[ind];
children.splice(ind, 1); // remove title
+ removedChildInd = ind;
break;
}
}
@@ -81,6 +84,16 @@ export default React.memo(function Hint(props) {
let openCloseText = "open";
if (SVs.open) {
+ if (SVs._compositeReplacementActiveRange) {
+ children = addCommasForCompositeRanges({
+ children,
+ compositeReplacementActiveRange: SVs._compositeReplacementActiveRange,
+ startInd: 0,
+ endInd: children.length - 1,
+ removedInd: removedChildInd,
+ });
+ }
+
// twirlIcon =
diff --git a/src/Viewer/renderers/pre.jsx b/src/Viewer/renderers/pre.jsx
index c3e5de0ff5..4ef6e80bdc 100644
--- a/src/Viewer/renderers/pre.jsx
+++ b/src/Viewer/renderers/pre.jsx
@@ -1,6 +1,7 @@
import React, { useEffect } from "react";
import useDoenetRenderer from "../useDoenetRenderer";
import VisibilitySensor from "react-visibility-sensor-v2";
+import { addCommasForCompositeRanges } from "./utils/composites";
export default React.memo(function Pre(props) {
let { name, id, SVs, children, actions, callAction } =
@@ -24,6 +25,15 @@ export default React.memo(function Pre(props) {
if (SVs.hidden) return null;
+ if (SVs._compositeReplacementActiveRange) {
+ children = addCommasForCompositeRanges({
+ children,
+ compositeReplacementActiveRange: SVs._compositeReplacementActiveRange,
+ startInd: 0,
+ endInd: children.length - 1,
+ });
+ }
+
for (let ind of SVs.displayDoenetMLIndices) {
let prevChild = children[ind - 1];
diff --git a/src/Viewer/renderers/q.jsx b/src/Viewer/renderers/q.jsx
index d195eaabf0..bd913e4c38 100644
--- a/src/Viewer/renderers/q.jsx
+++ b/src/Viewer/renderers/q.jsx
@@ -1,5 +1,6 @@
import React from "react";
import useDoenetRenderer from "../useDoenetRenderer";
+import { addCommasForCompositeRanges } from "./utils/composites";
export default React.memo(function Q(props) {
let { name, id, SVs, children } = useDoenetRenderer(props);
@@ -8,6 +9,15 @@ export default React.memo(function Q(props) {
return null;
}
+ if (SVs._compositeReplacementActiveRange) {
+ children = addCommasForCompositeRanges({
+ children,
+ compositeReplacementActiveRange: SVs._compositeReplacementActiveRange,
+ startInd: 0,
+ endInd: children.length - 1,
+ });
+ }
+
return (
<>
+ {childrenInRange}
+
+ );
+ newChildren.push(childrenInRange);
+ if (potentialListComponents) {
+ newPotentialListComponents.push(allListComponents);
+ }
+ }
+ lastChildInd = rangeLastInd;
+ }
+ }
+
+ if (lastChildInd < endInd) {
+ newChildren.push(...children.slice(lastChildInd + 1, endInd + 1));
+ if (potentialListComponents) {
+ newPotentialListComponents.push(
+ ...potentialListComponents.slice(
+ lastChildInd - startInd + 1,
+ endInd - startInd + 1,
+ ),
+ );
+ }
+ }
+
+ return { newChildren, newPotentialListComponents };
+}
+
+function removeEndingBlankString(component) {
+ if (typeof component === "string") {
+ return component.trimEnd();
+ }
+ if (!(component.props?.children?.length > 0)) {
+ return component;
+ }
+
+ let children = [...component.props.children];
+ let originalLastChild = children[children.length - 1];
+ let lastChild = originalLastChild;
+ while (typeof lastChild === "string" && lastChild.trim() === "") {
+ // the last child was a blank string so remove it,
+ // looping to previous child if it exists
+ children.pop();
+ if (children.length === 0) {
+ // we need to recreate component since React makes it read only
+ component = { ...component };
+ component.props = { ...component.props };
+ component.props.children = [];
+ return component;
+ }
+ lastChild = children[children.length - 1];
+ }
+
+ // recurse to remove any blank string children from lastChild
+ // (or blank end of the string lastChild)
+ lastChild = removeEndingBlankString(lastChild);
+
+ if (lastChild !== originalLastChild) {
+ // we need to recreate component since React makes it read only
+ component = { ...component };
+ component.props = { ...component.props };
+ component.props.children = [
+ ...children.slice(0, children.length - 1),
+ lastChild,
+ ];
+ }
+
+ return component;
+}