diff --git a/.prettierrc b/.prettierrc index ffa1b71ab..b205dcd0e 100644 --- a/.prettierrc +++ b/.prettierrc @@ -1,3 +1,4 @@ { - "trailingComma": "all" + "tabWidth": 4, + "endOfLine": "auto" } diff --git a/package.json b/package.json index be497ce7d..19c94a868 100644 --- a/package.json +++ b/package.json @@ -97,9 +97,6 @@ "vscode-jsonrpc": "$vscode-jsonrpc" } }, - "prettier": { - "tabWidth": 4 - }, "dependencies": { "math-expressions": "^2.0.0-alpha70", "react-router-dom": "^6.26.2" diff --git a/packages/doenetml-worker/src/test/tagSpecific/circle.test.ts b/packages/doenetml-worker/src/test/tagSpecific/circle.test.ts index 6ac28e7a9..521170b96 100644 --- a/packages/doenetml-worker/src/test/tagSpecific/circle.test.ts +++ b/packages/doenetml-worker/src/test/tagSpecific/circle.test.ts @@ -1897,17 +1897,20 @@ describe("Circle tag tests", async () => { }); // Will un-skip this once all other circle tests are passing and we change dependencies of center - it.todo("circle where through point depends on unspecified center", async () => { - let core = await createTestCore({ - doenetML: ` + it.todo( + "circle where through point depends on unspecified center", + async () => { + let core = await createTestCore({ + doenetML: ` $circle1.center{assignNames="centerCopy"} `, - }); - }); + }); + }, + ); it("circle where through point 2 depends on through point 1", async () => { let core = await createTestCore({ @@ -4562,17 +4565,25 @@ $c7.radius let stateVariables = await returnAllStateVariables(core); expect(stateVariables["/st1"].stateValues.value).toContain("blue"); - expect(stateVariables["/stn1"].stateValues.value).toContain("blue circle"); + expect(stateVariables["/stn1"].stateValues.value).toContain( + "blue circle", + ); expect(stateVariables["/bst1"].stateValues.value).toContain("blue"); expect(stateVariables["/fst1"].stateValues.value).toContain("unfilled"); - expect(stateVariables["/st2"].stateValues.value).toContain("filled blue"); - expect(stateVariables["/stn2"].stateValues.value).toContain("filled blue circle"); + expect(stateVariables["/st2"].stateValues.value).toContain( + "filled blue", + ); + expect(stateVariables["/stn2"].stateValues.value).toContain( + "filled blue circle", + ); expect(stateVariables["/bst2"].stateValues.value).toContain("blue"); expect(stateVariables["/fst2"].stateValues.value).toContain("blue"); expect(stateVariables["/st3"].stateValues.value).toContain("red"); - expect(stateVariables["/stn3"].stateValues.value).toContain("red circle"); + expect(stateVariables["/stn3"].stateValues.value).toContain( + "red circle", + ); expect(stateVariables["/bst3"].stateValues.value).toContain("red"); expect(stateVariables["/fst3"].stateValues.value).toContain("unfilled"); @@ -4585,9 +4596,15 @@ $c7.radius expect(stateVariables["/bst4"].stateValues.value).toContain("red"); expect(stateVariables["/fst4"].stateValues.value).toContain("green"); - expect(stateVariables["/st5"].stateValues.value).toContain("thick blue"); - expect(stateVariables["/stn5"].stateValues.value).toContain("thick blue circle"); - expect(stateVariables["/bst5"].stateValues.value).toContain("thick blue"); + expect(stateVariables["/st5"].stateValues.value).toContain( + "thick blue", + ); + expect(stateVariables["/stn5"].stateValues.value).toContain( + "thick blue circle", + ); + expect(stateVariables["/bst5"].stateValues.value).toContain( + "thick blue", + ); expect(stateVariables["/fst5"].stateValues.value).toContain("unfilled"); expect(stateVariables["/st6"].stateValues.value).toContain( @@ -4596,12 +4613,20 @@ $c7.radius expect(stateVariables["/stn6"].stateValues.value).toContain( "filled blue circle with a thick border", ); - expect(stateVariables["/bst6"].stateValues.value).toContain("thick blue"); + expect(stateVariables["/bst6"].stateValues.value).toContain( + "thick blue", + ); expect(stateVariables["/fst6"].stateValues.value).toContain("blue"); - expect(stateVariables["/st7"].stateValues.value).toContain("thin dotted red"); - expect(stateVariables["/stn7"].stateValues.value).toContain("thin dotted red circle"); - expect(stateVariables["/bst7"].stateValues.value).toContain("thin dotted red"); + expect(stateVariables["/st7"].stateValues.value).toContain( + "thin dotted red", + ); + expect(stateVariables["/stn7"].stateValues.value).toContain( + "thin dotted red circle", + ); + expect(stateVariables["/bst7"].stateValues.value).toContain( + "thin dotted red", + ); expect(stateVariables["/fst7"].stateValues.value).toContain("unfilled"); expect(stateVariables["/st8"].stateValues.value).toContain( @@ -4610,7 +4635,9 @@ $c7.radius expect(stateVariables["/stn8"].stateValues.value).toContain( "filled green circle with a thin dotted red border", ); - expect(stateVariables["/bst8"].stateValues.value).toContain("thin dotted red"); + expect(stateVariables["/bst8"].stateValues.value).toContain( + "thin dotted red", + ); expect(stateVariables["/fst8"].stateValues.value).toContain("green"); }); @@ -4646,7 +4673,8 @@ $c7.radius - `, }); + `, + }); let stateVariables = await returnAllStateVariables(core); expect(stateVariables["/P1h"].stateValues.value).eqls(false); @@ -4659,5 +4687,4 @@ $c7.radius expect(stateVariables["/Q3h"].stateValues.value).eqls(true); expect(stateVariables["/R3h"].stateValues.value).eqls(false); }); - }); diff --git a/packages/doenetml-worker/src/test/tagSpecific/math.test.ts b/packages/doenetml-worker/src/test/tagSpecific/math.test.ts index 4d76448a1..513e211e6 100644 --- a/packages/doenetml-worker/src/test/tagSpecific/math.test.ts +++ b/packages/doenetml-worker/src/test/tagSpecific/math.test.ts @@ -2458,7 +2458,6 @@ describe("Math tag tests", async () => { `, }); - let indToComp = ["x", "y", "z"]; async function check_values( diff --git a/packages/doenetml/package.json b/packages/doenetml/package.json index 6c6044a65..daa580d82 100644 --- a/packages/doenetml/package.json +++ b/packages/doenetml/package.json @@ -91,8 +91,5 @@ "react-visibility-sensor-v2": "^1.0.0", "recoil": "^0.7.7", "styled-components": "^5.3.11" - }, - "prettier": { - "tabWidth": 4 } } diff --git a/packages/test-cypress/cypress/e2e/tagSpecific/circle.cy.js b/packages/test-cypress/cypress/e2e/tagSpecific/circle.cy.js index 397ce4652..924405160 100644 --- a/packages/test-cypress/cypress/e2e/tagSpecific/circle.cy.js +++ b/packages/test-cypress/cypress/e2e/tagSpecific/circle.cy.js @@ -236,5 +236,4 @@ describe("Circle Tag Tests", function () { "C has a white fill.", ); }); - });