Rename createKeyEvent to keydownEvent

This commit is contained in:
Corey Johnson & Nathan Sobo 2012-01-10 15:30:53 -08:00
parent 6ed0684eed
commit 7f3396c125
4 changed files with 14 additions and 18 deletions

View File

@ -8,9 +8,9 @@ describe "CommandMap", ->
y = null
beforeEach ->
d = createKeyEvent 'd'
a = createKeyEvent 'a'
y = createKeyEvent 'y'
d = keydownEvent 'd'
a = keydownEvent 'a'
y = keydownEvent 'y'
delegate = {
action1: jasmine.createSpy('action1')
action2: jasmine.createSpy('action2')
@ -23,10 +23,10 @@ describe "CommandMap", ->
commandMap.mapKey 'd', 'action1'
it "calls the named method on the delegate with the given event when the event matches the pattern", ->
commandMap.handleKeyEvent createKeyEvent('z')
commandMap.handleKeyEvent keydownEvent('z')
expect(delegate.action1).not.toHaveBeenCalled()
event = createKeyEvent 'd'
event = keydownEvent 'd'
commandMap.handleKeyEvent event
expect(delegate.action1).toHaveBeenCalled()

View File

@ -6,10 +6,10 @@ describe "KeyBinder", ->
describe 'keyEventMatchesPattern', ->
expectMatch = (pattern) ->
expect(keyBinder.keyEventMatchesPattern(window.createKeyEvent(pattern), pattern)).toBeTruthy()
expect(keyBinder.keyEventMatchesPattern(window.keydownEvent(pattern), pattern)).toBeTruthy()
expectNoMatch = (eventPattern, patternToTest) ->
event = window.createKeyEvent(eventPattern)
event = window.keydownEvent(eventPattern)
expect(keyBinder.keyEventMatchesPattern(event, patternToTest)).toBeFalsy()
it 'returns true if the modifiers and letter in the pattern match the key event', ->

View File

@ -8,16 +8,12 @@ afterEach ->
window.atom = new (require 'app')
window.keydown = (pattern) ->
console.log @createKeyEvent(pattern)
$(document).trigger @createKeyEvent(pattern)
window.createKeyEvent = (pattern) ->
$.Event "keydown", atom.keyBinder.parseKeyPattern(pattern)
window.keypressEvent = (pattern, properties={}) ->
$.Event "keypress", _.extend(atom.keyBinder.parseKeyPattern(pattern), properties)
window.keydownEvent = (pattern, properties={}) ->
$.Event "keydown", _.extend(atom.keyBinder.parseKeyPattern(pattern), properties)
window.waitsForPromise = (fn) ->
window.waitsFor (moveOn) ->
fn().done(moveOn)

View File

@ -95,10 +95,10 @@ describe "Template", ->
view.someMethod = jasmine.createSpy('someMethod')
view.li1.bindKey 'ctrl+m', 'someMethod'
view.li1.trigger window.createKeyEvent('meta+z')
view.li1.trigger window.keydownEvent('meta+z')
expect(view.someMethod).not.toHaveBeenCalled()
view.li1.trigger window.createKeyEvent('ctrl+m')
view.li1.trigger window.keydownEvent('ctrl+m')
expect(view.someMethod).toHaveBeenCalled()
describe "when passed a key pattern and a function", ->
@ -106,9 +106,9 @@ describe "Template", ->
action = jasmine.createSpy('someMethod')
view.li1.bindKey 'ctrl+m', action
view.li1.trigger window.createKeyEvent('meta+z')
view.li1.trigger window.keydownEvent('meta+z')
expect(action).not.toHaveBeenCalled()
view.li1.trigger window.createKeyEvent('ctrl+m')
view.li1.trigger window.keydownEvent('ctrl+m')
expect(action).toHaveBeenCalled()