test: get tests running on macOS again by leveraging built-in platfor…

…m detection (#5144)
ueberdosis · May 14, 2024 · 1ff58ae · 1ff58ae
1 parent cdc147a
commit 1ff58ae
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 15 deletions.
diff --git a/demos/src/Marks/Strike/React/index.spec.js b/demos/src/Marks/Strike/React/index.spec.js
@@ -58,15 +58,15 @@ context('/src/Marks/Strike/React/', () => {
 
   it('should strike the selected text when the keyboard shortcut is pressed', () => {
     cy.get('.tiptap')
-      .trigger('keydown', { ctrlKey: true, shiftKey: true, key: 's' })
+      .trigger('keydown', { modKey: true, shiftKey: true, key: 's' })
       .find('s')
       .should('contain', 'Example Text')
   })
 
   it('should toggle the selected text striked when the keyboard shortcut is pressed', () => {
     cy.get('.tiptap')
-      .trigger('keydown', { ctrlKey: true, shiftKey: true, key: 's' })
-      .trigger('keydown', { ctrlKey: true, shiftKey: true, key: 's' })
+      .trigger('keydown', { modKey: true, shiftKey: true, key: 's' })
+      .trigger('keydown', { modKey: true, shiftKey: true, key: 's' })
       .find('s')
       .should('not.exist')
   })

diff --git a/demos/src/Marks/Strike/Vue/index.spec.js b/demos/src/Marks/Strike/Vue/index.spec.js
@@ -64,15 +64,15 @@ context('/src/Marks/Strike/Vue/', () => {
 
   it('should strike the selected text when the keyboard shortcut is pressed', () => {
     cy.get('.tiptap')
-      .trigger('keydown', { ctrlKey: true, shiftKey: true, key: 's' })
+      .trigger('keydown', { modKey: true, shiftKey: true, key: 's' })
       .find('s')
       .should('contain', 'Example Text')
   })
 
   it('should toggle the selected text striked when the keyboard shortcut is pressed', () => {
     cy.get('.tiptap')
-      .trigger('keydown', { ctrlKey: true, shiftKey: true, key: 's' })
-      .trigger('keydown', { ctrlKey: true, shiftKey: true, key: 's' })
+      .trigger('keydown', { modKey: true, shiftKey: true, key: 's' })
+      .trigger('keydown', { modKey: true, shiftKey: true, key: 's' })
       .find('s')
       .should('not.exist')
   })

diff --git a/packages/extension-strike/src/strike.ts b/packages/extension-strike/src/strike.ts
@@ -1,5 +1,4 @@
 import {
-  isMacOS,
   Mark,
   markInputRule,
   markPasteRule,
@@ -98,15 +97,9 @@ export const Strike = Mark.create<StrikeOptions>({
   },
 
   addKeyboardShortcuts() {
-    const shortcuts: Record<string, () => boolean> = {}
-
-    if (isMacOS()) {
-      shortcuts['Mod-Shift-s'] = () => this.editor.commands.toggleStrike()
-    } else {
-      shortcuts['Ctrl-Shift-s'] = () => this.editor.commands.toggleStrike()
+    return {
+      'Mod-Shift-s': () => this.editor.commands.toggleStrike(),
     }
-
-    return shortcuts
   },
 
   addInputRules() {