Migrate test suite to Test2

LICENSE

@@ -2,7 +2,7 @@
                          Online Homework Delivery System                        
                                    Version 2.*                                 
 
-                    Copyright 2000-2018, The WeBWorK Project                    
+                    Copyright 2000-2022, The WeBWorK Project                    
                               All rights reserved.                              
 
     This program is free software; you can redistribute it and/or modify

README

@@ -6,6 +6,6 @@
 
 		http://webwork.maa.org/wiki/Category:Release_Notes  
 
-                    Copyright 2000-2017, The WeBWorK Project
+                    Copyright 2000-2022, The WeBWorK Project
                              http://webwork.maa.org
                               All rights reserved.                             

VERSION

@@ -1,4 +1,4 @@
-$PG_VERSION  ='2.16+develop';
-$PG_COPYRIGHT_YEARS = '1996-2021';
+$PG_VERSION  ='2.17';
+$PG_COPYRIGHT_YEARS = '1996-2022';
 
 1;

htdocs/js/apps/GraphTool/cubictool.js

@@ -38,6 +38,7 @@
 					}
 
 					el.setPosition(JXG.COORDS_BY_USER, [x, el.Y()]);
+					gt.board.update();
 				}
 			},
 

htdocs/js/apps/GraphTool/graphtool.js

@@ -452,6 +452,7 @@ window.graphTool = (containerId, options) => {
 		else if (y > boundingBox[1]) y = boundingBox[1] - gt.snapSizeY;
 
 		point1.setPosition(JXG.COORDS_BY_USER, [x, y]);
+		gt.board.update();
 	};
 
 	// Prevent paired points from being moved into the same position by a drag.  This
@@ -664,6 +665,11 @@ window.graphTool = (containerId, options) => {
 			));
 			this.definingPts.push(center, point);
 			this.focusPoint = center;
+
+			// Redefine the circle's hasPoint method to return true if the center point has the given coordinates, so
+			// that a pointer over the center point will give focus to the object with the center point activated.
+			const circleHasPoint = this.baseObj.hasPoint.bind(this.baseObj);
+			this.baseObj.hasPoint = (x, y) => circleHasPoint(x, y) || center.hasPoint(x, y);
 		}
 
 		handleKeyEvent(e, el) {
@@ -1174,7 +1180,8 @@ window.graphTool = (containerId, options) => {
 							if (e.key !== 'Tab' ||
 								(index === 0 && e.shiftKey) ||
 								(index === gt.graphedObjs.length - 1 && !e.shiftKey) ||
-								(a.length > 1 && ((pIndex === 0 && !e.shiftKey) || (pIndex === 1 && e.shiftKey)))
+								(a.length > 1 &&
+									((pIndex === 0 && !e.shiftKey) || (pIndex === a.length - 1 && e.shiftKey)))
 							)
 								return;
 
@@ -1194,8 +1201,8 @@ window.graphTool = (containerId, options) => {
 
 							obj.blur();
 						};
+						point.rendNode.addEventListener('keydown', point.focusOutHandler);
 					}
-					point.rendNode.addEventListener('keydown', point.focusOutHandler);
 
 					// Attach a focusin handler to all points to update the coordinates display.
 					point.focusInHandler = (e) => gt.setTextCoords(point.X(), point.Y());

htdocs/js/apps/GraphTool/quadratictool.js

@@ -38,6 +38,7 @@
 					}
 
 					el.setPosition(JXG.COORDS_BY_USER, [x, el.Y()]);
+					gt.board.update();
 				}
 			},
 

htdocs/js/apps/Knowls/knowl.js

@@ -15,6 +15,11 @@
 	};
 
 	const initializeKnowl = (knowl) => {
+		if (getComputedStyle(knowl)?.display === '') {
+			setTimeout(() => initializeKnowl(knowl), 100);
+			return;
+		}
+
 		knowl.dataset.bsToggle = 'collapse';
 		if (!knowl.knowlContainer) {
 			knowl.knowlContainer = document.createElement('div');

htdocs/js/apps/MathQuill/mqeditor.css

@@ -15,6 +15,7 @@ span[id^="mq-answer"].incorrect {
 }
 
 span[id^="mq-answer"] {
+	/*rtl:ignore*/
 	direction: ltr;
 	padding: 4px 5px 2px 5px;
 	border-radius: 4px !important;
@@ -31,6 +32,7 @@ input[type="text"].codeshard.mq-edit {
 	max-height: 95vh;
 	position: fixed;
 	font-size: .75em;
+	/*rtl:ignore*/
 	direction: ltr;
 	display: flex;
 	flex-direction: column;

htdocs/js/apps/MathQuill/mqeditor.js

@@ -84,8 +84,11 @@
 			{ id: 'text', latex: '\\text', tooltip: 'text mode (")', icon: 'Tt' }
 		];
 
+		answerQuill.hasFocus = false;
+
 		// Open the toolbar when the mathquill answer box gains focus.
 		answerQuill.textarea.addEventListener('focusin', () => {
+			answerQuill.hasFocus = true;
 			if (answerQuill.toolbar) return;
 
 			answerQuill.toolbar = document.createElement('div');
@@ -114,6 +117,7 @@
 				}));
 
 				button.addEventListener('click', () => {
+					answerQuill.hasFocus = true;
 					answerQuill.mathField.cmd(button.dataset.latex);
 					answerQuill.textarea.focus();
 				})
@@ -136,15 +140,15 @@
 		});
 
 		answerQuill.textarea.addEventListener('focusout', (e) => {
-			if (e.relatedTarget && (e.relatedTarget.closest('.quill-toolbar') ||
-				e.relatedTarget.classList.contains('symbol-button')))
-				return;
-			if (answerQuill.toolbar) {
-				window.removeEventListener('resize', answerQuill.toolbar.adjustWidth);
-				answerQuill.toolbar.tooltips.forEach((tooltip) => tooltip.dispose());
-				answerQuill.toolbar.remove();
-				delete answerQuill.toolbar;
-			}
+			answerQuill.hasFocus = false;
+			setTimeout(function() {
+				if (!answerQuill.hasFocus && answerQuill.toolbar) {
+					window.removeEventListener('resize', answerQuill.toolbar.adjustWidth);
+					answerQuill.toolbar.tooltips.forEach((tooltip) => tooltip.dispose());
+					answerQuill.toolbar.remove();
+					delete answerQuill.toolbar;
+				}
+			}, 200);
 		});
 
 		// Trigger an answer preview when the enter key is pressed in an answer box.
@@ -161,7 +165,7 @@
 				document.querySelector('input[name=previewAnswers]')?.click();
 				// For ww3
 				const previewButtonId =
-					answerQuill.textarea.closest('[name=problemMainForm]')[0]?.id
+					answerQuill.textarea.closest('[name=problemMainForm]')?.id
 						.replace('problemMainForm', 'previewAnswers');
 				if (previewButtonId) document.getElementById(previewButtonId)?.click();
 			}

htdocs/js/apps/Problem/problem.scss

@@ -1,5 +1,5 @@
 /* WeBWorK Online Homework Delivery System
- * Copyright © 2000-2021 The WeBWorK Project, https://github.com/openwebwork
+ * Copyright © 2000-2022 The WeBWorK Project, https://github.com/openwebwork
  *
  * This program is free software; you can redistribute it and/or modify it under
  * the terms of either: (a) the GNU General Public License as published by the
@@ -34,7 +34,6 @@
 
 	/* Problem elements */
 	label, input[type=text], select, textarea {
-		font-size: 16px;
 		font-weight: normal;
 		line-height: 18px;
 		width: auto;
@@ -48,10 +47,13 @@
 		vertical-align: middle;
 		border: 1px solid #ccc;
 		border-radius: 4px;
-		font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
 		background-color: white;
 	}
 
+	textarea, input[type=text] {
+		font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+	}
+
 	input[type=text] {
 		height: 30px;
 		font-size: 14px;

htdocs/js/apps/Scaffold/scaffold.scss

@@ -33,7 +33,7 @@
 			& > button.accordion-button {
 				background: #eee;
 
-				&::focus {
+				&:focus {
 					box-shadow: none;
 				}