HoshinoKoji/jsPsych
1
0
Fork 0
mirror of https://github.com/jspsych/jsPsych.git synced 2025-05-12 08:38:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

change keyCodes to keys in calls to utils.pressKey()

Browse Source
This commit is contained in:
Becky Gilbert 2021-02-09 15:29:02 -08:00
parent d01881c692
commit 7e288d4481
5 changed files with 44 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tests/jsPsych/css-classes-parameter.test.js
View File

@ -18,7 +18,7 @@ describe('The css_classes parameter for trials', function(){
jsPsych.init({timeline:[trial]});
expect(jsPsych.getDisplayElement().classList.contains('foo')).toBe(true);
utils.pressKey(32);
utils.pressKey('a');
})
test('Gracefully handles single class when not in array', function(){
@ -31,7 +31,7 @@ describe('The css_classes parameter for trials', function(){
jsPsych.init({timeline:[trial]});
expect(jsPsych.getDisplayElement().classList.contains('foo')).toBe(true);
utils.pressKey(32);
utils.pressKey('a');
})
test('Removes the added classes at the end of the trial', function(){
@ -44,7 +44,7 @@ describe('The css_classes parameter for trials', function(){
jsPsych.init({timeline:[trial]});
expect(jsPsych.getDisplayElement().classList.contains('foo')).toBe(true);
utils.pressKey(32);
utils.pressKey('a');
expect(jsPsych.getDisplayElement().classList.contains('foo')).toBe(false);
})
@ -61,7 +61,7 @@ describe('The css_classes parameter for trials', function(){
jsPsych.init({timeline:[tm]});
expect(jsPsych.getDisplayElement().classList.contains('foo')).toBe(true);
utils.pressKey(32);
utils.pressKey('a');
expect(jsPsych.getDisplayElement().classList.contains('foo')).toBe(false);
})
@ -78,7 +78,7 @@ describe('The css_classes parameter for trials', function(){
jsPsych.init({timeline:[trial]});
expect(jsPsych.getDisplayElement().classList.contains('foo')).toBe(true);
utils.pressKey(32);
utils.pressKey('a');
expect(jsPsych.getDisplayElement().classList.contains('foo')).toBe(false);
})
@ -100,7 +100,7 @@ describe('The css_classes parameter for trials', function(){
jsPsych.init({timeline:[t]});
expect(jsPsych.getDisplayElement().classList.contains('foo')).toBe(true);
utils.pressKey(32);
utils.pressKey('a');
expect(jsPsych.getDisplayElement().classList.contains('foo')).toBe(false);
})

28
tests/jsPsych/events.test.js
View File

@ -393,11 +393,11 @@ describe('on_timeline_finish', function(){
jsPsych.init({timeline: [mini_timeline]});
utils.pressKey(32);
utils.pressKey('a');
expect(on_finish_fn).not.toHaveBeenCalled();
utils.pressKey(32);
utils.pressKey('a');
expect(on_finish_fn).not.toHaveBeenCalled();
utils.pressKey(32);
utils.pressKey('a');
expect(on_finish_fn).toHaveBeenCalled();
});
@ -423,8 +423,8 @@ describe('on_timeline_finish', function(){
jsPsych.init({timeline: [mini_timeline]});
utils.pressKey(32);
utils.pressKey(32);
utils.pressKey('a');
utils.pressKey('a');
expect(on_finish_fn.mock.calls.length).toBe(1);
})
@ -446,8 +446,8 @@ describe('on_timeline_finish', function(){
jsPsych.init({timeline: [mini_timeline]});
utils.pressKey(32);
utils.pressKey(32);
utils.pressKey('a');
utils.pressKey('a');
expect(on_finish_fn.mock.calls.length).toBe(2);
})
@ -479,9 +479,9 @@ describe('on_timeline_start', function(){
jsPsych.init({timeline: [mini_timeline]});
expect(on_start_fn).toHaveBeenCalled();
utils.pressKey(32);
utils.pressKey(32);
utils.pressKey(32);
utils.pressKey('a');
utils.pressKey('a');
utils.pressKey('a');
expect(on_start_fn.mock.calls.length).toBe(1);
})
@ -509,8 +509,8 @@ describe('on_timeline_start', function(){
jsPsych.init({timeline: [mini_timeline]});
expect(on_start_fn).toHaveBeenCalled();
utils.pressKey(32);
utils.pressKey(32);
utils.pressKey('a');
utils.pressKey('a');
expect(on_start_fn.mock.calls.length).toBe(1);
})
@ -533,8 +533,8 @@ describe('on_timeline_start', function(){
jsPsych.init({timeline: [mini_timeline]});
expect(on_start_fn).toHaveBeenCalled();
utils.pressKey(32);
utils.pressKey(32);
utils.pressKey('a');
utils.pressKey('a');
expect(on_start_fn.mock.calls.length).toBe(2);
})

8
tests/jsPsych/functions-as-parameters.test.js
View File

@ -21,7 +21,7 @@ describe('standard use of function as parameter', function(){
})
expect(jsPsych.getDisplayElement().innerHTML).toMatch('foo');
utils.pressKey(32);
utils.pressKey('a');
});
test('function evaluates at runtime', function(){
@ -41,7 +41,7 @@ describe('standard use of function as parameter', function(){
})
expect(jsPsych.getDisplayElement().innerHTML).toMatch('bar');
utils.pressKey(32);
utils.pressKey('a');
})
})
@ -60,7 +60,7 @@ describe('data as function', function(){
timeline: [trial]
})
utils.pressKey(32);
utils.pressKey('a');
expect(jsPsych.data.get().values()[0].x).toBe(1)
})
@ -78,7 +78,7 @@ describe('data as function', function(){
timeline: [trial]
})
utils.pressKey(32);
utils.pressKey('a');
expect(jsPsych.data.get().values()[0].x).toBe(1)
})
})

28
tests/jsPsych/timeline-variables.test.js
View File

@ -273,7 +273,7 @@ describe('timeline variables are correctly evaluated', function(){
})
expect(jsPsych.getDisplayElement().innerHTML).toMatch('foo');
utils.pressKey(32);
utils.pressKey('a');
expect(jsPsych.getDisplayElement().innerHTML).toMatch('bar');
});
@ -303,7 +303,7 @@ describe('timeline variables are correctly evaluated', function(){
})
utils.pressKey(32);
utils.pressKey('a');
expect(x).toBe('foo');
})
@ -333,7 +333,7 @@ describe('timeline variables are correctly evaluated', function(){
})
utils.pressKey(32);
utils.pressKey('a');
expect(x).toBe('foo');
})
@ -360,7 +360,7 @@ describe('timeline variables are correctly evaluated', function(){
})
utils.pressKey(32);
utils.pressKey('a');
expect(jsPsych.data.get().values()[0].x).toBe('foo');
})
@ -389,7 +389,7 @@ describe('timeline variables are correctly evaluated', function(){
})
utils.pressKey(32);
utils.pressKey('a');
expect(x).toBe('foo');
})
@ -418,7 +418,7 @@ describe('timeline variables are correctly evaluated', function(){
})
utils.pressKey(32);
utils.pressKey('a');
expect(x).toBe('foo');
})
@ -443,8 +443,8 @@ describe('jsPsych.allTimelineVariables()', function(){
jsPsych.init({timeline: [t]});
utils.pressKey(32);
utils.pressKey(32);
utils.pressKey('a');
utils.pressKey('a');
var data = jsPsych.data.get().values();
expect(data[0].a).toBe(1);
@ -479,10 +479,10 @@ describe('jsPsych.allTimelineVariables()', function(){
jsPsych.init({timeline: [t2]});
utils.pressKey(32);
utils.pressKey(32);
utils.pressKey(32);
utils.pressKey(32);
utils.pressKey('a');
utils.pressKey('a');
utils.pressKey('a');
utils.pressKey('a');
var data = jsPsych.data.get().values();
@ -523,8 +523,8 @@ describe('jsPsych.allTimelineVariables()', function(){
jsPsych.init({timeline: [t]});
utils.pressKey(32);
utils.pressKey(32);
utils.pressKey('a');
utils.pressKey('a');
expect(a).toBe(1);
expect(b).toBe(2);

12
tests/jsPsych/timelines.test.js
View File

@ -186,12 +186,12 @@ describe('loop function', function(){
});
// first trial
utils.pressKey(32);
utils.pressKey('a');
expect(count).toBe(0);
// second trial
utils.pressKey(32);
utils.pressKey('a');
expect(count).toBe(1);
})
@ -321,12 +321,12 @@ describe('conditional function', function(){
expect(conditional_count).toBe(1);
// first trial
utils.pressKey(32);
utils.pressKey('a');
expect(conditional_count).toBe(1);
// second trial
utils.pressKey(32);
utils.pressKey('a');
expect(conditional_count).toBe(1);
})
@ -356,12 +356,12 @@ describe('conditional function', function(){
expect(conditional_count).toBe(1);
// first trial
utils.pressKey(32);
utils.pressKey('a');
expect(conditional_count).toBe(1);
// second trial
utils.pressKey(32);
utils.pressKey('a');
expect(conditional_count).toBe(1);
})