From ee1caa2ce1ab58a1e8b37b0d11d16a975c53ff56 Mon Sep 17 00:00:00 2001 From: Josh de Leeuw Date: Tue, 13 Jun 2017 21:41:38 -0400 Subject: [PATCH] adjust tests to use new keyboard event scope --- tests/plugins/plugin-iat.test.js | 88 +++++++++++++++---------------- tests/plugins/plugin-text.test.js | 10 ++-- 2 files changed, 49 insertions(+), 49 deletions(-) diff --git a/tests/plugins/plugin-iat.test.js b/tests/plugins/plugin-iat.test.js index 32791e9a..a1ab69be 100644 --- a/tests/plugins/plugin-iat.test.js +++ b/tests/plugins/plugin-iat.test.js @@ -34,8 +34,8 @@ describe('iat plugin', function(){ expect(jsPsych.getDisplayElement().innerHTML).toMatch(/blue.png/); - document.dispatchEvent(new KeyboardEvent('keydown', {keyCode: 70})); - document.dispatchEvent(new KeyboardEvent('keyup', {keyCode: 70})); + document.querySelector('.jspsych-display-element').dispatchEvent(new KeyboardEvent('keydown', {keyCode: 70})); + document.querySelector('.jspsych-display-element').dispatchEvent(new KeyboardEvent('keyup', {keyCode: 70})); expect(jsPsych.getDisplayElement().innerHTML).toBe(""); }); @@ -61,8 +61,8 @@ describe('iat plugin', function(){ expect(jsPsych.getDisplayElement().innerHTML).toMatch(/hello/); - document.dispatchEvent(new KeyboardEvent('keydown', {keyCode: 70})); - document.dispatchEvent(new KeyboardEvent('keyup', {keyCode: 70})); + document.querySelector('.jspsych-display-element').dispatchEvent(new KeyboardEvent('keydown', {keyCode: 70})); + document.querySelector('.jspsych-display-element').dispatchEvent(new KeyboardEvent('keyup', {keyCode: 70})); expect(jsPsych.getDisplayElement().innerHTML).toBe(""); }); @@ -82,13 +82,13 @@ describe('iat plugin', function(){ timeline: [trial] }); - document.dispatchEvent(new KeyboardEvent('keydown', {keyCode: 32})); - document.dispatchEvent(new KeyboardEvent('keyup', {keyCode: 32})); + document.querySelector('.jspsych-display-element').dispatchEvent(new KeyboardEvent('keydown', {keyCode: 32})); + document.querySelector('.jspsych-display-element').dispatchEvent(new KeyboardEvent('keyup', {keyCode: 32})); expect(jsPsych.getDisplayElement().innerHTML).toMatch('

hello

'); - document.dispatchEvent(new KeyboardEvent('keydown', {keyCode: 70})); - document.dispatchEvent(new KeyboardEvent('keyup', {keyCode: 70})); + document.querySelector('.jspsych-display-element').dispatchEvent(new KeyboardEvent('keydown', {keyCode: 70})); + document.querySelector('.jspsych-display-element').dispatchEvent(new KeyboardEvent('keyup', {keyCode: 70})); expect(jsPsych.getDisplayElement().innerHTML).toBe(""); }); @@ -108,13 +108,13 @@ describe('iat plugin', function(){ timeline: [trial] }); - document.dispatchEvent(new KeyboardEvent('keydown', {keyCode: 32})); - document.dispatchEvent(new KeyboardEvent('keyup', {keyCode: 32})); + document.querySelector('.jspsych-display-element').dispatchEvent(new KeyboardEvent('keydown', {keyCode: 32})); + document.querySelector('.jspsych-display-element').dispatchEvent(new KeyboardEvent('keyup', {keyCode: 32})); expect(jsPsych.getDisplayElement().innerHTML).toMatch(new RegExp('

hello

')); - document.dispatchEvent(new KeyboardEvent('keydown', {keyCode: 74})); - document.dispatchEvent(new KeyboardEvent('keyup', {keyCode: 74})); + document.querySelector('.jspsych-display-element').dispatchEvent(new KeyboardEvent('keydown', {keyCode: 74})); + document.querySelector('.jspsych-display-element').dispatchEvent(new KeyboardEvent('keyup', {keyCode: 74})); expect(jsPsych.getDisplayElement().innerHTML).toBe(""); @@ -137,13 +137,13 @@ describe('iat plugin', function(){ timeline: [trial] }); - document.dispatchEvent(new KeyboardEvent('keydown', {keyCode: 70})); - document.dispatchEvent(new KeyboardEvent('keyup', {keyCode: 70})); + document.querySelector('.jspsych-display-element').dispatchEvent(new KeyboardEvent('keydown', {keyCode: 70})); + document.querySelector('.jspsych-display-element').dispatchEvent(new KeyboardEvent('keyup', {keyCode: 70})); expect(jsPsych.getDisplayElement().innerHTML).toMatch(new RegExp('

hello

')); - document.dispatchEvent(new KeyboardEvent('keydown', {keyCode: 32})); - document.dispatchEvent(new KeyboardEvent('keyup', {keyCode: 32})); + document.querySelector('.jspsych-display-element').dispatchEvent(new KeyboardEvent('keydown', {keyCode: 32})); + document.querySelector('.jspsych-display-element').dispatchEvent(new KeyboardEvent('keyup', {keyCode: 32})); expect(jsPsych.getDisplayElement().innerHTML).toBe(""); @@ -166,13 +166,13 @@ describe('iat plugin', function(){ timeline: [trial] }); - document.dispatchEvent(new KeyboardEvent('keydown', {keyCode: 74})); - document.dispatchEvent(new KeyboardEvent('keyup', {keyCode: 74})); + document.querySelector('.jspsych-display-element').dispatchEvent(new KeyboardEvent('keydown', {keyCode: 74})); + document.querySelector('.jspsych-display-element').dispatchEvent(new KeyboardEvent('keyup', {keyCode: 74})); expect(jsPsych.getDisplayElement().innerHTML).toMatch(new RegExp('

hello

')); - document.dispatchEvent(new KeyboardEvent('keydown', {keyCode: 70})); - document.dispatchEvent(new KeyboardEvent('keyup', {keyCode: 70})); + document.querySelector('.jspsych-display-element').dispatchEvent(new KeyboardEvent('keydown', {keyCode: 70})); + document.querySelector('.jspsych-display-element').dispatchEvent(new KeyboardEvent('keyup', {keyCode: 70})); expect(jsPsych.getDisplayElement().innerHTML).toBe(""); @@ -197,9 +197,9 @@ describe('iat plugin', function(){ expect(jsPsych.getDisplayElement().innerHTML).toMatch(new RegExp('

Press j for:
UNFRIENDLY')); expect(jsPsych.getDisplayElement().innerHTML).toMatch(new RegExp('

Press f for:
FRIENDLY')); - - document.dispatchEvent(new KeyboardEvent('keydown', {keyCode:70})); - document.dispatchEvent(new KeyboardEvent('keyup', {keyCode:70})); + + document.querySelector('.jspsych-display-element').dispatchEvent(new KeyboardEvent('keydown', {keyCode:70})); + document.querySelector('.jspsych-display-element').dispatchEvent(new KeyboardEvent('keyup', {keyCode:70})); expect(jsPsych.getDisplayElement().innerHTML).toBe(""); @@ -226,15 +226,15 @@ describe('iat plugin', function(){ timeline: [trial] }); - expect(jsPsych.getDisplayElement().innerHTML).toMatch(new RegExp('')); + expect(jsPsych.getDisplayElement().querySelector('#wrongImgContainer').style.visibility).toBe('hidden'); - document.dispatchEvent(new KeyboardEvent('keydown', {keyCode:74})); - document.dispatchEvent(new KeyboardEvent('keyup', {keyCode:74})); + document.querySelector('.jspsych-display-element').dispatchEvent(new KeyboardEvent('keydown', {keyCode:74})); + document.querySelector('.jspsych-display-element').dispatchEvent(new KeyboardEvent('keyup', {keyCode:74})); - expect(jsPsych.getDisplayElement().innerHTML).toMatch(new RegExp('')); + expect(jsPsych.getDisplayElement().querySelector('#wrongImgContainer').style.visibility).toBe('visible'); - document.dispatchEvent(new KeyboardEvent('keydown', {keyCode: 70})); - document.dispatchEvent(new KeyboardEvent('keyup', {keyCode: 70})); + document.querySelector('.jspsych-display-element').dispatchEvent(new KeyboardEvent('keydown', {keyCode: 70})); + document.querySelector('.jspsych-display-element').dispatchEvent(new KeyboardEvent('keyup', {keyCode: 70})); expect(jsPsych.getDisplayElement().innerHTML).toBe(""); }); @@ -264,8 +264,8 @@ describe('iat plugin', function(){ expect(jsPsych.getDisplayElement().innerHTML).toMatch(new RegExp('

this is the prompt
')); - document.dispatchEvent(new KeyboardEvent('keydown', {keyCode: 70})); - document.dispatchEvent(new KeyboardEvent('keyup', {keyCode: 70})); + document.querySelector('.jspsych-display-element').dispatchEvent(new KeyboardEvent('keydown', {keyCode: 70})); + document.querySelector('.jspsych-display-element').dispatchEvent(new KeyboardEvent('keyup', {keyCode: 70})); expect(jsPsych.getDisplayElement().innerHTML).toBe(""); }); @@ -277,7 +277,7 @@ describe('iat plugin', function(){ stimulus: '

hello

', is_html: true, display_feedback: false, - response_ends_trial: false, + response_ends_trial: false, timing_response: 500 } @@ -312,8 +312,8 @@ describe('iat plugin', function(){ timeline: [trial] }); - document.dispatchEvent(new KeyboardEvent('keydown', {keyCode: 70})); - document.dispatchEvent(new KeyboardEvent('keyup', {keyCode: 70})); + document.querySelector('.jspsych-display-element').dispatchEvent(new KeyboardEvent('keydown', {keyCode: 70})); + document.querySelector('.jspsych-display-element').dispatchEvent(new KeyboardEvent('keyup', {keyCode: 70})); expect(jsPsych.getDisplayElement().innerHTML).toMatch(new RegExp('

hello

')); @@ -347,10 +347,10 @@ describe('iat plugin', function(){ jest.runTimersToTime(500); - document.dispatchEvent(new KeyboardEvent('keydown', {keyCode: 73})); - document.dispatchEvent(new KeyboardEvent('keyup', {keyCode: 73})); + document.querySelector('.jspsych-display-element').dispatchEvent(new KeyboardEvent('keydown', {keyCode: 73})); + document.querySelector('.jspsych-display-element').dispatchEvent(new KeyboardEvent('keyup', {keyCode: 73})); - expect(jsPsych.getDisplayElement().innerHTML).toMatch(new RegExp('')); + expect(jsPsych.getDisplayElement().querySelector('#wrongImgContainer').style.visibility).toBe('visible'); //expect(jsPsych.getDisplayElement().innerHTML).toMatch(new RegExp('

hello

')); jest.runTimersToTime(1100); @@ -384,20 +384,20 @@ describe('iat plugin', function(){ expect(jsPsych.getDisplayElement().innerHTML).toMatch(new RegExp('

hello

')); - document.dispatchEvent(new KeyboardEvent('keydown', {keyCode: 73})); - document.dispatchEvent(new KeyboardEvent('keyup', {keyCode: 73})); + document.querySelector('.jspsych-display-element').dispatchEvent(new KeyboardEvent('keydown', {keyCode: 73})); + document.querySelector('.jspsych-display-element').dispatchEvent(new KeyboardEvent('keyup', {keyCode: 73})); - expect(jsPsych.getDisplayElement().innerHTML).toMatch(new RegExp('

hello

')); + expect(jsPsych.getDisplayElement().innerHTML).toMatch(new RegExp('

hello

')); jest.runTimersToTime(1000); - expect(jsPsych.getDisplayElement().innerHTML).toMatch(new RegExp('

hello

')); + expect(jsPsych.getDisplayElement().innerHTML).toMatch(new RegExp('

hello

')); jest.runTimersToTime(1500); - document.dispatchEvent(new KeyboardEvent('keydown', {keyCode: 69})); - document.dispatchEvent(new KeyboardEvent('keyup', {keyCode: 69})); + document.querySelector('.jspsych-display-element').dispatchEvent(new KeyboardEvent('keydown', {keyCode: 69})); + document.querySelector('.jspsych-display-element').dispatchEvent(new KeyboardEvent('keyup', {keyCode: 69})); expect(jsPsych.getDisplayElement().innerHTML).toBe(""); }); -}); \ No newline at end of file +}); diff --git a/tests/plugins/plugin-text.test.js b/tests/plugins/plugin-text.test.js index c5887936..1dfd2969 100644 --- a/tests/plugins/plugin-text.test.js +++ b/tests/plugins/plugin-text.test.js @@ -25,8 +25,8 @@ describe('text plugin', function(){ expect(jsPsych.getDisplayElement().innerHTML).toBe('Hello World!'); - document.dispatchEvent(new KeyboardEvent('keydown', {keyCode: 70})); - document.dispatchEvent(new KeyboardEvent('keyup', {keyCode: 70})); + document.querySelector('.jspsych-display-element').dispatchEvent(new KeyboardEvent('keydown', {keyCode: 70})); + document.querySelector('.jspsych-display-element').dispatchEvent(new KeyboardEvent('keyup', {keyCode: 70})); expect(jsPsych.getDisplayElement().innerHTML).toBe(""); }); @@ -53,10 +53,10 @@ describe('text plugin', function(){ expect(jsPsych.getDisplayElement().innerHTML).toBe('Testing'); - document.dispatchEvent(new KeyboardEvent('keydown', {keyCode: 70})); - document.dispatchEvent(new KeyboardEvent('keyup', {keyCode: 70})); + document.querySelector('.jspsych-display-element').dispatchEvent(new KeyboardEvent('keydown', {keyCode: 70})); + document.querySelector('.jspsych-display-element').dispatchEvent(new KeyboardEvent('keyup', {keyCode: 70})); expect(jsPsych.getDisplayElement().innerHTML).toBe('Second Trial'); }); -}); \ No newline at end of file +});