Changed userAgent implementation to use getters because history relies on the runtime value for the user agent. Added back all the history tests.

Author: Zaydek Michels-Gualtieri

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

@@ -54,19 +54,18 @@ test("redo(...); non-macOS", () => {
 	})).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()
-// })
+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()
+})

src/lib/Client/userAgent/index.js

@@ -5,28 +5,23 @@ function testUserAgent(substr) {
 	return navigator.userAgent.indexOf(substr) >= 0
 }
 
-// TODO: Add testedAppleDevice?
-// TODO: Add testedAndroidDevice?
-const userAgent = {
-	// https://apple.com
-	isAAPL: testUserAgent("Mac OS X"),
-	// https://android.com
-	isGOOG: testUserAgent("Android"),
-}
+// TODO: Refactor to isAppleDevice?
+// TODO: Refactor to isAndroidDevice?
+const userAgent = process.env.NODE_ENV === "test"
+	? Object.freeze({
+		// https://apple.com
+		get isAAPL() {
+			return testUserAgent("Mac OS X")
+		},
+		// https://android.com
+		get isGOOG() {
+			return testUserAgent("Android")
+		},
+	}) : Object.freeze({
+		// https://apple.com
+		isAAPL: testUserAgent("Mac OS X"),
+		// https://android.com
+		isGOOG: testUserAgent("Android"),
+	})
 
 export default userAgent
-
-// const userAgent = {
-// 	// Tests the user agent for a substring.
-// 	//
-// 	// https://css-tricks.com/snippets/javascript/test-mac-pc-javascript
-// 	test(substr) {
-// 		return navigator.userAgent.indexOf(substr) >= 0
-// 	},
-// 	// https://apple.com
-// 	isAAPL: this.test("Mac OS X"),
-// 	// https://android.com
-// 	isGOOG: this.test("Android"),
-// }
-//
-// export default userAgent