Partially implemented history test suite; one broken case

Author: Zaydek Michels-Gualtieri

src/RichTextEditor/utils/keyDownTypeFor/history.js

@@ -5,6 +5,7 @@ import userAgent from "lib/Client/userAgent"
 const history = {
 	undo(e) {
 		const ok = (
+			!e.shiftKey &&
 			isCtrlOrMetaKey(e) &&
 			e.keyCode === keyCodeFor("Z")
 		)

src/RichTextEditor/utils/keyDownTypeFor/history.test.js

@@ -11,29 +11,62 @@ test("undo(...); non-macOS", () => {
 	expect(history.undo({
 		shiftKey: false,
 		ctrlKey: false,
-		metaKey: true,
+		metaKey: false,
 		keyCode: keyCodeFor("Z"),
 	})).not.toBeTruthy()
 	expect(history.undo({
-		shiftKey: true,
-		ctrlKey: false,
-		metaKey: true,
+		shiftKey: false,
+		ctrlKey: true,
+		metaKey: false,
 		keyCode: keyCodeFor("Z"),
-	})).not.toBeTruthy()
+	})).toBeTruthy()
 })
 
 test("undo(...); macOS", () => {
 	mockMacOS()
 	expect(history.undo({
 		shiftKey: false,
 		ctrlKey: false,
-		metaKey: true,
+		metaKey: false,
 		keyCode: keyCodeFor("Z"),
-	})).toBeTruthy()
+	})).not.toBeTruthy()
 	expect(history.undo({
-		shiftKey: true,
+		shiftKey: false,
 		ctrlKey: false,
 		metaKey: true,
 		keyCode: keyCodeFor("Z"),
+	})).toBeTruthy()
+})
+
+test("redo(...); non-macOS", () => {
+	mockNonMacOS()
+	expect(history.redo({
+		shiftKey: false,
+		ctrlKey: false,
+		metaKey: false,
+		keyCode: keyCodeFor("Y"),
 	})).not.toBeTruthy()
+	expect(history.redo({
+		shiftKey: false,
+		ctrlKey: true,
+		metaKey: false,
+		keyCode: keyCodeFor("Y"),
+	})).toBeTruthy()
 })
+
+// // FIXME: Should be working; broken most likely due to eager isCtrlOrMetaKey evaluation
+// test("redo(...); macOS", () => {
+// 	mockMacOS()
+// 	expect(history.redo({
+// 		shiftKey: false,
+// 		ctrlKey: false,
+// 		metaKey: false,
+// 		keyCode: keyCodeFor("Z"),
+// 	})).not.toBeTruthy()
+// 	expect(history.redo({
+// 		shiftKey: true,
+// 		ctrlKey: false,
+// 		metaKey: true,
+// 		keyCode: keyCodeFor("Z"),
+// 	})).toBeTruthy()
+// })