Skip to content

Commit c7babbc

Browse files
committed
Merge branch 'refactor/hotkey-improvements' of github.com:avo-hq/avo into refactor/hotkey-improvements
2 parents a3300dd + 41e8b9d commit c7babbc

2 files changed

Lines changed: 19 additions & 20 deletions

File tree

spec/system/avo/actions_spec.rb

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -208,9 +208,6 @@
208208
find("body").native.send_keys(:escape)
209209

210210
expect(page).to have_selector '[data-controller~="modal"]'
211-
212-
click_on "Cancel"
213-
expect(page).not_to have_selector '[data-controller~="modal"]'
214211
end
215212
end
216213

spec/system/avo/hotkey_spec.rb

Lines changed: 19 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ def dispatch_keydown(key, code: nil, shift_key: false, ctrl_key: false, meta_key
1313
cancelable: true
1414
}
1515
16-
document.dispatchEvent(new KeyboardEvent("keydown", eventOptions))
17-
window.dispatchEvent(new KeyboardEvent("keydown", eventOptions))
16+
const eventTarget = document.body || document.documentElement
17+
eventTarget.dispatchEvent(new KeyboardEvent("keydown", eventOptions))
1818
JS
1919
end
2020

@@ -37,23 +37,25 @@ def dispatch_active_element_keydown(key)
3737

3838
def dispatch_document_keydown(key, code: nil, shift_key: false, ctrl_key: false, meta_key: false, alt_key: false)
3939
page.evaluate_script(<<~JS)
40-
const event = new KeyboardEvent("keydown", {
41-
key: #{key.to_json},
42-
code: #{code.to_json},
43-
shiftKey: #{shift_key},
44-
ctrlKey: #{ctrl_key},
45-
metaKey: #{meta_key},
46-
altKey: #{alt_key},
47-
bubbles: true,
48-
cancelable: true
49-
})
40+
(() => {
41+
const event = new KeyboardEvent("keydown", {
42+
key: #{key.to_json},
43+
code: #{code.to_json},
44+
shiftKey: #{shift_key},
45+
ctrlKey: #{ctrl_key},
46+
metaKey: #{meta_key},
47+
altKey: #{alt_key},
48+
bubbles: true,
49+
cancelable: true
50+
})
5051
51-
const dispatchResult = document.dispatchEvent(event)
52+
const dispatchResult = document.dispatchEvent(event)
5253
53-
{
54-
defaultPrevented: event.defaultPrevented,
55-
dispatchResult: dispatchResult
56-
}
54+
return {
55+
defaultPrevented: event.defaultPrevented,
56+
dispatchResult
57+
}
58+
})()
5759
JS
5860
end
5961

0 commit comments

Comments
 (0)