jspsych 6.2.0 → 7.1.0

package/tests/jsPsych.utils/utils.test.js

@@ -1,58 +0,0 @@
-const root = '../../';
-
-require(root + 'jspsych.js');
-
-describe('unique', function(){
-  test('generates unique array when there are duplicates', function(){
-    var arr = [1,1,2,2,3,3];
-    var out = jsPsych.utils.unique(arr);
-    expect(out).toEqual([1,2,3]);
-    expect(out).not.toEqual(arr);
-  });
-
-  test('generates same array when there are no duplicates', function(){
-    var arr = [1,2,3];
-    var out = jsPsych.utils.unique(arr);
-    expect(out).toEqual(arr);
-  })
-});
-
-describe('flatten', function(){
-  test('generates flat array from flat input', function(){
-    var arr = [1,1,2,2,3,3];
-    var out = jsPsych.utils.flatten(arr);
-    expect(out).toEqual(arr);
-  });
-
-  test('generates flat array from nested input', function(){
-    var arr = [1,[1,2,2],[3],3];
-    var out = jsPsych.utils.flatten(arr);
-    expect(out).toEqual([1,1,2,2,3,3]);
-  });
-});
-
-describe('deepCopy', function(){
-  test('works for objects', function(){
-    var o = {a:1,b:{c:2,d:3}};
-    var o2 = jsPsych.utils.deepCopy(o);
-    o2.b.c = 4;
-    expect(o.b.c).toBe(2);
-  });
-  test('works for objects with arrays', function(){
-    var o = {a:1,b:[2,3]};
-    var o2 = jsPsych.utils.deepCopy(o);
-    o2.b[0] = 4;
-    expect(JSON.stringify(o2.b)).toBe(JSON.stringify([4,3]));
-    expect(o.b[0]).toBe(2);
-  });
-  test('works for objects with functions', function(){
-    var c = 0;
-    var o = {a:1, b:function(){c=2}};
-    var o2 = jsPsych.utils.deepCopy(o);
-    o2.b = function(){ c = 1 }
-    o.b();
-    expect(c).toBe(2);
-    o2.b();
-    expect(c).toBe(1);
-  })
-})

package/tests/plugins/plugin-animation.test.js

@@ -1,35 +0,0 @@
-const root = '../../';
-
-jest.useFakeTimers();
-
-describe('animation plugin', function(){
-
-	beforeEach(function(){
-		require(root + 'jspsych.js');
-		require(root + 'plugins/jspsych-animation.js');
-	});
-
-	test('loads correctly', function(){
-		expect(typeof window.jsPsych.plugins['animation']).not.toBe('undefined');
-	});
-
-	// SKIP FOR NOW
-	test.skip('displays stimuli', function(){
-
-		var animation_sequence = ['img/face_1.jpg', 'img/face_2.jpg'];
-
-		var trial = {
-			type: 'animation',
-			stimuli: animation_sequence,
-			render_on_canvas: false
-		}
-
-		jsPsych.init({
-			timeline: [trial],
-			auto_preload: false
-		});
-
-		expect(jsPsych.getDisplayElement().innerHTML).toMatch('<img src="img/face_1.jpg" id="jspsych-animation-image"></img>');
-	});
-
-});

package/tests/plugins/plugin-audio-button-response.test.js

@@ -1,15 +0,0 @@
-const root = '../../';
-
-jest.useFakeTimers();
-
-describe('audio-button-response', function(){
-	
-	beforeEach(function(){
-		require(root + 'jspsych.js');
-		require(root + 'plugins/jspsych-audio-button-response');
-	});
-
-	test('loads correctly', function(){
-		expect(typeof window.jsPsych.plugins['audio-button-response']).not.toBe('undefined');
-	});
-});

package/tests/plugins/plugin-audio-keyboard-response.test.js

@@ -1,15 +0,0 @@
-const root = '../../';
-
-jest.useFakeTimers();
-
-describe('audio-keyboard-response', function(){
-	
-	beforeEach(function(){
-		require(root + 'jspsych.js');
-		require(root + 'plugins/jspsych-audio-keyboard-response');
-	});
-
-	test('loads correctly', function(){
-		expect(typeof window.jsPsych.plugins['audio-keyboard-response']).not.toBe('undefined');
-	});
-});

package/tests/plugins/plugin-audio-slider-response.test.js

@@ -1,15 +0,0 @@
-const root = '../../';
-
-jest.useFakeTimers();
-
-describe('audio-slider-response', function(){
-	
-	beforeEach(function(){
-		require(root + 'jspsych.js');
-		require(root + 'plugins/jspsych-audio-slider-response');
-	});
-
-	test('loads correctly', function(){
-		expect(typeof window.jsPsych.plugins['audio-slider-response']).not.toBe('undefined');
-	});
-});

package/tests/plugins/plugin-call-function.test.js

@@ -1,49 +0,0 @@
-const root = '../../';
-
-jest.useFakeTimers();
-
-describe('call-function plugin', function(){
-
-	beforeEach(function(){
-		require(root + 'jspsych.js');
-		require(root + 'plugins/jspsych-call-function.js');
-	});
-
-	test('loads correctly', function(){
-		expect(typeof window.jsPsych.plugins['call-function']).not.toBe('undefined');
-	});
-
-	test('calls function', function(){
-
-		var trial = {
-			type: 'call-function',
-			func: function(){
-				return 1;
-			}
-		}
-
-		jsPsych.init({
-			timeline: [trial]
-		});
-		
-		expect(jsPsych.data.get().values()[0].value).toBe(1);
-	});
-
-	test('async function works', function(){
-		var trial = {
-			type: 'call-function',
-			async: true,
-			func: function(done){
-				var data = 10;
-				done(10);
-			}
-		}
-
-		jsPsych.init({
-			timeline: [trial]
-		});
-
-		expect(jsPsych.data.get().values()[0].value).toBe(10);
-	})
-
-});

package/tests/plugins/plugin-categorize-animation.test.js

@@ -1,274 +0,0 @@
-const root = '../../';
-const utils = require('../testing-utils.js');
-
-jest.useFakeTimers();
-
-describe('categorize-animation plugin', function(){
-
-	beforeEach(function(){
-		require(root + 'jspsych.js');
-		require(root + 'plugins/jspsych-categorize-animation.js');
-	});
-
-	test('loads correctly', function(){
-		expect(typeof window.jsPsych.plugins['categorize-animation']).not.toBe('undefined');
-	});
-
-	test('displays stimulus every 500ms', function(){
-		var trial = {
-			type: 'categorize-animation',
-			stimuli: ['img/happy_face_1.jpg', 'img/sad_face_1.jpg'],
-			key_answer: 68,
-			render_on_canvas: false
-		}
-
-		jsPsych.init({
-			timeline: [trial],
-			auto_preload: false
-		});
-
-		jest.runTimersToTime(500);
-		expect(jsPsych.getDisplayElement().innerHTML).toBe('<img src=\"img/happy_face_1.jpg\" class=\"jspsych-categorize-animation-stimulus\">');
-		jest.runTimersToTime(500);
-		expect(jsPsych.getDisplayElement().innerHTML).toBe('<img src=\"img/sad_face_1.jpg\" class=\"jspsych-categorize-animation-stimulus\">')
-	});
-
-	test('prompt should display after animation', function(){
-		var trial = {
-			type: 'categorize-animation',
-			stimuli: ['img/happy_face_1.jpg', 'img/sad_face_1.jpg'],
-			key_answer: 68,
-			prompt: "<p>Press d if the faces had different emotional expressions. Press S if the faces had the same emotional expression.</p>",
-			render_on_canvas: false
-		}
-
-		jsPsych.init({
-			timeline: [trial],
-			auto_preload: false
-		});
-
-		jest.runTimersToTime(1500);
-		expect(jsPsych.getDisplayElement().innerHTML).toBe('<p>Press d if the faces had different emotional expressions. Press S if the faces had the same emotional expression.</p>');
-	});
-
-	test('should display correct if key_answer is pressed', function(){
-		var trial = {
-			type: 'categorize-animation',
-			stimuli: ['img/happy_face_1.jpg', 'img/sad_face_1.jpg'],
-			key_answer: 68,
-			choices: [68, 83],
-			prompt: "<p>Press d if the faces had different emotional expressions. Press S if the faces had the same emotional expression.</p>",
-			render_on_canvas: false
-		}
-
-		jsPsych.init({
-			timeline: [trial],
-			auto_preload: false
-		});
-
-		jest.runTimersToTime(1500);
-		utils.pressKey(68);
-		jest.runTimersToTime(1000);
-		expect(jsPsych.getDisplayElement().innerHTML).toBe('Correct.');
-	});
-
-	test('should display incorrect if different key is pressed', function(){
-		var trial = {
-			type: 'categorize-animation',
-			stimuli: ['img/happy_face_1.jpg', 'img/sad_face_1.jpg'],
-			key_answer: 68,
-			choices: [68, 83],
-			prompt: "<p>Press d if the faces had different emotional expressions. Press S if the faces had the same emotional expression.</p>",
-			render_on_canvas: false
-		}
-
-		jsPsych.init({
-			timeline: [trial],
-			auto_preload: false
-		});
-
-		jest.runTimersToTime(1500);
-		utils.pressKey(83);
-		jest.runTimersToTime(1000);
-		expect(jsPsych.getDisplayElement().innerHTML).toBe('Wrong.');
-	});
-
-	test('text answer should replace %ANS%', function(){
-		var trials = {
-    		type: 'categorize-animation',
-    		stimuli: ['img/happy_face_1.jpg', 'img/sad_face_3.jpg'],
-    		key_answer: 68,
-    		choices: [68, 83],
-    		text_answer: 'different',
-    		correct_text: "<p>Correct. The faces had %ANS% expressions.</p>",
-    		incorrect_text: "<p>Incorrect. The faces had %ANS% expressions.</p>",
-			prompt: "<p>Press D if the faces had different emotional expressions. Press S if the faces had the same emotional expression.</p>",
-			render_on_canvas: false
-  		};
-
-  		jsPsych.init({
-    			timeline: [trials],
-					auto_preload: false
-  		});
-
-		jest.runTimersToTime(1500);
-		utils.pressKey(68);
-		jest.runTimersToTime(1000);
-		expect(jsPsych.getDisplayElement().innerHTML).toBe('<p>Correct. The faces had different expressions.</p>');
-	});
-
-	test('correct text displays when when key_answer is pressed', function(){
-		var trials = {
-    		type: 'categorize-animation',
-    		stimuli: ['img/happy_face_1.jpg', 'img/sad_face_3.jpg'],
-    		key_answer: 68,
-    		choices: [68, 83],
-    		correct_text: "<p>You pressed the correct key</p>",
-    		incorrect_text: "<p>Incorrect.</p>",
-			prompt: "<p>Press D if the faces had different emotional expressions. Press S if the faces had the same emotional expression.</p>",
-			render_on_canvas: false
-  		};
-
-  		jsPsych.init({
-    			timeline: [trials],
-					auto_preload: false
-  		});
-
-		jest.runTimersToTime(1500);
-		utils.pressKey(68);
-		jest.runTimersToTime(1000);
-		expect(jsPsych.getDisplayElement().innerHTML).toBe('<p>You pressed the correct key</p>');
-	});
-
-	test('correct text displays when when key_answer is pressed', function(){
-		var trials = {
-    		type: 'categorize-animation',
-    		stimuli: ['img/happy_face_1.jpg', 'img/sad_face_3.jpg'],
-    		key_answer: 68,
-    		choices: [68, 83],
-    		correct_text: "<p>You pressed the correct key</p>",
-    		incorrect_text: "<p>Incorrect. You pressed the wrong key.</p>",
-			prompt: "<p>Press D if the faces had different emotional expressions. Press S if the faces had the same emotional expression.</p>",
-			render_on_canvas: false
-  		};
-
-  		jsPsych.init({
-    			timeline: [trials],
-					auto_preload: false
-  		});
-
-		jest.runTimersToTime(1500);
-		utils.pressKey(83);
-		jest.runTimersToTime(1000);
-		expect(jsPsych.getDisplayElement().innerHTML).toBe('<p>Incorrect. You pressed the wrong key.</p>');
-	});
-
-	test('duration to display image is based on frame_time', function(){
-		var trials = {
-    		type: 'categorize-animation',
-    		stimuli: ['img/happy_face_1.jpg', 'img/sad_face_1.jpg'],
-    		key_answer: 68,
-    		choices: [68, 83],
-    		frame_time: 1000,
-    		correct_text: "<p>You pressed the correct key</p>",
-    		incorrect_text: "<p>Incorrect. You pressed the wrong key.</p>",
-			prompt: "<p>Press D if the faces had different emotional expressions. Press S if the faces had the same emotional expression.</p>",
-			render_on_canvas: false
-  		};
-
-  		jsPsych.init({
-    		timeline: [trials],
-				auto_preload: false
-  		});
-
-		jest.runTimersToTime(1000);
-		expect(jsPsych.getDisplayElement().innerHTML).toBe('<img src=\"img/happy_face_1.jpg\" class=\"jspsych-categorize-animation-stimulus\">');
-		jest.runTimersToTime(500);
-		expect(jsPsych.getDisplayElement().innerHTML).toBe('<img src=\"img/happy_face_1.jpg\" class=\"jspsych-categorize-animation-stimulus\">');
-		jest.runTimersToTime(500);
-		expect(jsPsych.getDisplayElement().innerHTML).toBe('<img src=\"img/sad_face_1.jpg\" class=\"jspsych-categorize-animation-stimulus\">');
-	});
-
-	test('sequence reps', function(){
-		var trials = {
-    		type: 'categorize-animation',
-    		stimuli: ['img/happy_face_1.jpg', 'img/sad_face_1.jpg'],
-    		key_answer: 68,
-    		choices: [68, 83],
-    		frame_time: 1000,
-    		sequence_reps: 2,
-    		correct_text: "<p>You pressed the correct key</p>",
-    		incorrect_text: "<p>Incorrect. You pressed the wrong key.</p>",
-			prompt: "<p>Press D if the faces had different emotional expressions. Press S if the faces had the same emotional expression.</p>",
-			render_on_canvas: false
-  		};
-
-  		jsPsych.init({
-    		timeline: [trials],
-				auto_preload: false
-  		});
-
-		jest.runTimersToTime(1000);
-		expect(jsPsych.getDisplayElement().innerHTML).toBe('<img src=\"img/happy_face_1.jpg\" class=\"jspsych-categorize-animation-stimulus\">');
-		jest.runTimersToTime(1000);
-		expect(jsPsych.getDisplayElement().innerHTML).toBe('<img src=\"img/sad_face_1.jpg\" class=\"jspsych-categorize-animation-stimulus\">');
-		jest.runTimersToTime(1000);
-		expect(jsPsych.getDisplayElement().innerHTML).toBe('<img src=\"img/happy_face_1.jpg\" class=\"jspsych-categorize-animation-stimulus\">');
-		jest.runTimersToTime(1000);
-		expect(jsPsych.getDisplayElement().innerHTML).toBe('<img src=\"img/sad_face_1.jpg\" class=\"jspsych-categorize-animation-stimulus\">');
-	});
-
-	test('subject can response before animation is completed', function(){
-		var trials = {
-    		type: 'categorize-animation',
-    		stimuli: ['img/happy_face_1.jpg', 'img/sad_face_1.jpg'],
-    		key_answer: 68,
-    		choices: [68, 83],
-    		frame_time: 1000,
-    		sequence_reps: 2,
-    		correct_text: "<p>You pressed the correct key</p>",
-    		incorrect_text: "<p>Incorrect. You pressed the wrong key.</p>",
-    		prompt: "<p>Press D if the faces had different emotional expressions. Press S if the faces had the same emotional expression.</p>",
-			allow_response_before_complete: true,
-			render_on_canvas: false
-  		};
-
-  		jsPsych.init({
-    		timeline: [trials],
-				auto_preload: false
-  		});
-
-		jest.runTimersToTime(1500);
-		utils.pressKey(68);
-		jest.runTimersToTime(500);
-		expect(jsPsych.getDisplayElement().innerHTML).toBe('<img src=\"img/sad_face_1.jpg\" class=\"jspsych-categorize-animation-stimulus\"><p>You pressed the correct key</p>');
-	});
-
-	test('display should clear after feeback_duration is done', function(){
-		var trials = {
-    		type: 'categorize-animation',
-    		stimuli: ['img/happy_face_1.jpg', 'img/sad_face_1.jpg'],
-    		key_answer: 68,
-    		choices: [68, 83],
-    		frame_time: 500,
-    		feeback_duration: 500,
-    		correct_text: "<p>You pressed the correct key</p>",
-    		incorrect_text: "<p>Incorrect. You pressed the wrong key.</p>",
-			prompt: "<p>Press D if the faces had different emotional expressions. Press S if the faces had the same emotional expression.</p>",
-			render_on_canvas: false
-  		};
-
-  		jsPsych.init({
-    		timeline: [trials],
-				auto_preload: false
-  		});
-
-		jest.runTimersToTime(1500);
-		utils.pressKey(68);
-		jest.runTimersToTime(500);
-		expect(jsPsych.getDisplayElement().innerHTML).toBe('<p>You pressed the correct key</p>');
-		jest.runTimersToTime(2000);
-		expect(jsPsych.getDisplayElement().innerHTML).toBe('');
-	});
-
-});

package/tests/plugins/plugin-categorize-html.test.js

@@ -1,17 +0,0 @@
-const root = '../../';
-const utils = require('../testing-utils.js');
-
-jest.useFakeTimers();
-
-describe('categorize-html plugin', function(){
-
-	beforeEach(function(){
-		require(root + 'jspsych.js');
-		require(root + 'plugins/jspsych-categorize-html.js');
-	});
-
-	test('loads correctly', function(){
-		expect(typeof window.jsPsych.plugins['categorize-html']).not.toBe('undefined');
-	});
-
-});

package/tests/plugins/plugin-categorize-image.test.js

@@ -1,17 +0,0 @@
-const root = '../../';
-const utils = require('../testing-utils.js');
-
-jest.useFakeTimers();
-
-describe('categorize-image plugin', function(){
-
-	beforeEach(function(){
-		require(root + 'jspsych.js');
-		require(root + 'plugins/jspsych-categorize-image.js');
-	});
-
-	test('loads correctly', function(){
-		expect(typeof window.jsPsych.plugins['categorize-image']).not.toBe('undefined');
-	});
-
-});

package/tests/plugins/plugin-cloze.test.js

@@ -1,140 +0,0 @@
-const utils = require('../testing-utils.js');
-const root = '../../';
-
-jest.useFakeTimers();
-
-describe('cloze', function(){
-
-	beforeEach(function(){
-		require(root + 'jspsych.js');
-		require(root + 'plugins/jspsych-cloze');
-	});
-
-	test('loads correctly', function(){
-		expect(typeof window.jsPsych.plugins['cloze']).not.toBe('undefined');
-	});
-
-	test('displays cloze', function(){
-		var trial = {
-			type: 'cloze',
-			text: 'This is a %cloze% text.',
-		}
-
-		jsPsych.init({
-			timeline: [trial]
-		});
-
-		expect(jsPsych.getDisplayElement().innerHTML).toMatch('<div class="cloze">This is a <input type="text" id="input0" value=""> text.</div>');
-	}); 
-
-	test('displays default button text', function(){
-		var trial = {
-			type: 'cloze',
-			text: 'This is a %cloze% text.'
-		}
-
-		jsPsych.init({
-			timeline: [trial]
-		});
-
-		expect(jsPsych.getDisplayElement().innerHTML).toMatch(new RegExp('<button class="jspsych-html-button-response-button" type="button" id="finish_cloze_button">OK</button>'));
-	});
-
-	test('displays custom button text', function(){
-		var trial = {
-			type: 'cloze',
-			text: 'This is a %cloze% text.',
-			button_text: 'Next'
-		}
-
-		jsPsych.init({
-			timeline: [trial]
-		});
-
-		expect(jsPsych.getDisplayElement().innerHTML).toMatch(new RegExp('<button class="jspsych-html-button-response-button" type="button" id="finish_cloze_button">Next</button>'));
-	});
-
-	test('ends trial on button click when using default settings, i.e. answers are not checked', function(){
-		var trial = {
-			type: 'cloze',
-			text: 'This is a %cloze% text.'
-		}
-
-		jsPsych.init({
-			timeline: [trial]
-		});
-
-		utils.clickTarget(document.querySelector('#finish_cloze_button'));
-		expect(jsPsych.getDisplayElement().innerHTML).toBe('');
-	});
-
-	test('ends trial on button click when answers are checked and correct', function(){
-		var trial = {
-			type: 'cloze',
-			text: 'This is a %cloze% text.',
-			check_answers: true
-		}
-
-		jsPsych.init({
-			timeline: [trial]
-		});
-
-		document.getElementById('input0').value = 'cloze';
-		utils.clickTarget(document.querySelector('#finish_cloze_button'));
-		expect(jsPsych.getDisplayElement().innerHTML).toBe('');
-	});
-
-	test('does not end trial on button click when answers are checked and not correct', function(){
-		var trial = {
-			type: 'cloze',
-			text: 'This is a %cloze% text.',
-			check_answers: true
-		}
-
-		jsPsych.init({
-			timeline: [trial]
-		});
-
-		document.getElementById('input0').value = 'some wrong answer';
-		utils.clickTarget(document.querySelector('#finish_cloze_button'));
-		expect(jsPsych.getDisplayElement().innerHTML).not.toBe('');
-	});
-
-	test('does not call mistake function on button click when answers are checked and correct', function(){
-		var trial = {
-			type: 'cloze',
-			text: 'This is a %cloze% text.',
-			check_answers: true,
-			mistake_fn: function(){called = true}
-		}
-
-		jsPsych.init({
-			timeline: [trial]
-		});
-
-		var called = false;
-		document.getElementById('input0').value = 'cloze';
-		utils.clickTarget(document.querySelector('#finish_cloze_button'));
-		expect(called).not.toBeTruthy();
-	});
-
-	test('calls mistake function on button click when answers are checked and not correct', function(){
-		var trial = {
-			type: 'cloze',
-			text: 'This is a %cloze% text.',
-			check_answers: true,
-			mistake_fn: function(){called = true}
-		}
-
-		jsPsych.init({
-			timeline: [trial]
-		});
-
-		var called = false;
-		document.getElementById('input0').value = 'some wrong answer';
-		utils.clickTarget(document.querySelector('#finish_cloze_button'));
-		expect(called).toBeTruthy();
-	});
-
-	
-});