jspsych 6.3.0 → 7.1.1

package/tests/jsPsych.data/data-json-conversion.test.js

@@ -1,120 +0,0 @@
-const root = '../../';
-const utils = require('../testing-utils.js');
-
-jest.useFakeTimers();
-
-describe('data conversion to json', function(){
-
-	beforeEach(function(){
-		require(root + 'jspsych.js');
-  });
-  
-  test('survey-text data response object is correctly converted', function(){
-    require(root + 'plugins/jspsych-survey-text.js');
-
-    var trial = {
-      type: 'survey-text',
-      questions: [
-        {prompt: 'Q1'},
-        {prompt: 'Q2'}
-      ]
-    }
-
-    var timeline = [trial];
-
-    jsPsych.init({timeline});
-
-    document.querySelector('#input-0').value = 'Response 1';
-    document.querySelector('#input-1').value = 'Response 2';
-
-    utils.clickTarget(document.querySelector('#jspsych-survey-text-next'));
-
-    var json_data = jsPsych.data.get().ignore(['rt','internal_node_id', 'time_elapsed', 'trial_type']).json();
-    expect(json_data).toBe(JSON.stringify([{response: {Q0: "Response 1", Q1: "Response 2"}, trial_index: 0}]));
-  })
-
-  test('same-different-html stimulus array is correctly converted', function(){
-    require(root + 'plugins/jspsych-same-different-html.js');
-
-    var trial = {
-      type: 'same-different-html',
-      stimuli: ['<p>Climbing</p>', '<p>Walking</p>'],
-      answer: 'different',
-      gap_duration: 0,
-      first_stim_duration: null
-    }
-
-    var timeline = [trial];
-
-    jsPsych.init({timeline: timeline});
-
-    expect(jsPsych.getDisplayElement().innerHTML).toMatch('<p>Climbing</p>');
-    utils.pressKey('q');
-    jest.runAllTimers();
-    expect(jsPsych.getDisplayElement().innerHTML).toMatch('<p>Walking</p>');
-    utils.pressKey('q');
-    expect(jsPsych.getDisplayElement().innerHTML).toBe('');
-
-    var json_data = jsPsych.data.get().ignore(['rt','internal_node_id','time_elapsed','trial_type','rt_stim1','response_stim1']).json(); 
-    expect(json_data).toBe(JSON.stringify([{answer: 'different', correct: false, stimulus: ['<p>Climbing</p>','<p>Walking</p>'], response: 'q',  trial_index: 0}]));
-  })
-
-  test('survey-multi-select response array is correctly converted', function(){
-    require(root + 'plugins/jspsych-survey-multi-select.js');
-
-    var trial = {
-      type: 'survey-multi-select',
-      questions: [
-        {prompt: "foo", options: ["fuzz", "bizz", "bar"], name: 'q'}
-      ]
-    };
-
-    var timeline = [trial];
-
-    jsPsych.init({timeline: timeline});
-
-    expect(jsPsych.getDisplayElement().innerHTML).toMatch('foo');
-    utils.clickTarget(document.querySelector('#jspsych-survey-multi-select-response-0-0'));
-    utils.clickTarget(document.querySelector('#jspsych-survey-multi-select-response-0-1'));
-    utils.clickTarget(document.querySelector('#jspsych-survey-multi-select-next'));
-    expect(jsPsych.getDisplayElement().innerHTML).toBe('');
-
-    var json_data = jsPsych.data.get().ignore(['rt','internal_node_id','time_elapsed','trial_type','question_order']).json(); 
-    var data_js = [
-      {
-        response: {
-          q: ["fuzz","bizz"], 
-        },
-        trial_index: 0
-      }
-    ];
-    expect(json_data).toBe(JSON.stringify(data_js));
-  })
-
-  test('instructions view_history is correctly converted - issue #670', function(){
-    require(root + 'plugins/jspsych-instructions.js');
-
-    var trial = {
-      type: 'instructions',
-      pages: ['page 1','page 2'],
-      key_forward: 'a',
-      allow_keys: true
-    };
-
-    jsPsych.init({timeline: [trial]});
-
-    expect(jsPsych.getDisplayElement().innerHTML).toMatch('page 1');
-    utils.pressKey('a');
-    expect(jsPsych.getDisplayElement().innerHTML).toMatch('page 2');
-    utils.pressKey('a');
-    expect(jsPsych.getDisplayElement().innerHTML).toBe('');
-
-    var json_data = jsPsych.data.get().ignore(['rt','internal_node_id','time_elapsed']).json(); 
-    var js_data = JSON.parse(json_data);
-    expect(Array.isArray(js_data[0].view_history)).toBe(true);
-    expect(js_data[0].view_history.length).toBe(2);
-    expect(js_data[0].view_history[0].page_index).toBe(0);
-    expect(js_data[0].view_history[1].page_index).toBe(1);
-  })
-
-});

package/tests/jsPsych.data/datacollection.test.js

@@ -1,117 +0,0 @@
-const root = '../../';
-
-require(root + 'jspsych.js');
-
-var data = [
-  {rt: 100, filter: true},
-  {rt: 200, filter: false},
-  {rt: 300, filter: true},
-  {rt: 400, filter: false},
-  {rt: 500, filter: false}
-];
-
-jsPsych.data._customInsert(data);
-
-describe('DataCollection', function(){
-  test('#filter', function(){
-    expect(jsPsych.data.get().filter({filter: true}).count()).toBe(2);
-  });
-  test('#filter OR', function(){
-    expect(jsPsych.data.get().filter([{filter: true}, {rt: 300}]).count()).toBe(2);
-    expect(jsPsych.data.get().filter([{filter: true}, {rt: 200}]).count()).toBe(3);
-  })
-  test('#filterCustom', function(){
-    expect(jsPsych.data.get().filterCustom(function(x){ return x.rt > 200 && x.filter == false}).count()).toBe(2);
-  });
-  test('#ignore', function(){
-    expect(jsPsych.data.get().ignore('rt').select('rt').count()).toBe(0);
-  });
-  test('#select', function(){
-    expect(JSON.stringify(jsPsych.data.get().select('rt').values)).toBe(JSON.stringify([100,200,300,400,500]));
-  });
-  test('#addToAll', function(){
-    expect(jsPsych.data.get().readOnly().addToAll({added: 5}).select('added').count()).toBe(5);
-  });
-  test('#addToLast', function(){
-    jsPsych.data.get().addToLast({lastonly: true});
-    expect(jsPsych.data.get().values()[4].lastonly).toBe(true);
-  });
-  test('#readOnly', function(){
-    var d = jsPsych.data.get().readOnly().values();
-    d[0].rt = 0;
-    expect(jsPsych.data.get().values()[0].rt).toBe(100);
-  });
-  test('not #readOnly', function(){
-    var d = jsPsych.data.get().values();
-    d[0].rt = 0;
-    expect(jsPsych.data.get().values()[0].rt).toBe(0);
-  });
-  test('#count', function(){
-    expect(jsPsych.data.get().count()).toBe(5);
-  });
-  test('#push', function(){
-    jsPsych.data.get().push({rt: 600, filter: true});
-    expect(jsPsych.data.get().count()).toBe(6);
-    data = [
-      {rt: 100, filter: true},
-      {rt: 200, filter: false},
-      {rt: 300, filter: true},
-      {rt: 400, filter: false},
-      {rt: 500, filter: false}
-    ];
-    jsPsych.data._customInsert(data);
-  });
-  test('#values', function(){
-    expect(JSON.stringify(jsPsych.data.get().values())).toBe(JSON.stringify(data));
-    expect(jsPsych.data.get().values()).toBe(data);
-  });
-  test('#first', function(){
-    expect(jsPsych.data.get().first(3).count()).toBe(3);
-    expect(jsPsych.data.get().first(2).values()[1].rt).toBe(200);
-    expect(jsPsych.data.get().first().count()).toBe(1);
-    expect(() => {
-      jsPsych.data.get().first(-1)
-    }).toThrow();
-    expect(() => {
-      jsPsych.data.get().first(0)
-    }).toThrow();
-    expect(jsPsych.data.get().filter({foo: "bar"}).first(1).count()).toBe(0);
-    var n = jsPsych.data.get().count();
-    var too_many = n+1;
-    expect(jsPsych.data.get().first(too_many).count()).toBe(n);
-  });
-  test('#last', function(){
-    expect(jsPsych.data.get().last(2).count(2)).toBe(2);
-    expect(jsPsych.data.get().last(2).values()[0].rt).toBe(400);
-    expect(jsPsych.data.get().last().count()).toBe(1);
-    expect(() => {
-      jsPsych.data.get().last(-1)
-    }).toThrow();
-    expect(() => {
-      jsPsych.data.get().last(0)
-    }).toThrow();
-    expect(jsPsych.data.get().filter({foo: "bar"}).last(1).count()).toBe(0);
-    var n = jsPsych.data.get().count();
-    var too_many = n+1;
-    expect(jsPsych.data.get().last(too_many).count()).toBe(n);
-  });
-  test('#join', function(){
-    var dc1 = jsPsych.data.get().filter({filter: true});
-    var dc2 = jsPsych.data.get().filter({rt: 500});
-    var data = dc1.join(dc2);
-    expect(data.count()).toBe(3);
-    expect(data.values()[2].rt).toBe(500);
-  });
-  test('#unqiueNames', function(){
-    var data = [
-      {rt: 100, filter: true},
-      {rt: 200, filter: false},
-      {rt: 300, filter: true, v1: false},
-      {rt: 400, filter: false, v2: true},
-      {rt: 500, filter: false, v1: false}
-    ];
-
-    jsPsych.data._customInsert(data);
-    expect(jsPsych.data.get().uniqueNames().length).toBe(4);
-  })
-});

package/tests/jsPsych.data/datacolumn.test.js

@@ -1,50 +0,0 @@
-const root = '../../';
-
-require(root + 'jspsych.js');
-
-var data = [
-  {rt: 100, filter: true},
-  {rt: 200, filter: false},
-  {rt: 300, filter: true},
-  {rt: 400, filter: false},
-  {rt: 500, filter: false}
-];
-
-jsPsych.data._customInsert(data);
-
-describe('DataColumn', function(){
-  test('#sum', function(){
-    expect(jsPsych.data.get().select('rt').sum()).toBe(1500);
-  });
-  test('#mean', function(){
-    expect(jsPsych.data.get().select('rt').mean()).toBe(300);
-  });
-  test('#count', function(){
-    expect(jsPsych.data.get().select('rt').count()).toBe(5);
-  });
-  test('#min', function(){
-    expect(jsPsych.data.get().select('rt').min()).toBe(100);
-  });
-  test('#max', function(){
-    expect(jsPsych.data.get().select('rt').max()).toBe(500);
-  });
-  test('#variance', function(){
-    expect(jsPsych.data.get().select('rt').variance()).toBe((Math.pow(200,2)+Math.pow(100,2)+Math.pow(100,2)+Math.pow(200,2))/(5-1));
-  });
-  test('#sd', function(){
-    expect(jsPsych.data.get().select('rt').sd()).toBe(Math.sqrt((Math.pow(200,2)+Math.pow(100,2)+Math.pow(100,2)+Math.pow(200,2))/(5-1)));
-  });
-  test('#median', function(){
-    expect(jsPsych.data.get().select('rt').median()).toBe(300);
-  });
-  test('#subset', function(){
-    expect(jsPsych.data.get().select('rt').subset(function(x){ return x > 300; }).count()).toBe(2);
-  });
-  test('#frequencies', function(){
-    expect(jsPsych.data.get().select('filter').frequencies()).toEqual({true:2, false: 3})
-  });
-  test('#all', function(){
-    expect(jsPsych.data.get().select('rt').all(function(x){ return x < 600})).toBe(true);
-    expect(jsPsych.data.get().select('filter').all(function(x){ return x; })).toBe(false);
-  });
-});

package/tests/jsPsych.data/datamodule.test.js

@@ -1,152 +0,0 @@
-const root = '../../';
-const utils = require('../testing-utils.js');
-
-require(root + 'jspsych.js');
-require(root + 'plugins/jspsych-html-keyboard-response.js');
-
-describe('Basic data recording', function(){
-  test('should be able to get rt after running experiment', function(){
-    var timeline = [
-      {type: 'html-keyboard-response', stimulus:'hello'}
-    ];
-    jsPsych.init({timeline:timeline});
-    // click through first trial
-    utils.pressKey('a');
-    // check if data contains rt
-    expect(jsPsych.data.get().select('rt').count()).toBe(1);
-  })
-})
-
-describe('#addProperties', function(){
-
-  test('should add data to all trials if called before experiment starts', function(){
-    var timeline = [
-      {type: 'html-keyboard-response', stimulus:'hello'}
-    ];
-    jsPsych.data.addProperties({'testprop': 1});
-    jsPsych.init({timeline:timeline});
-    // click through first trial
-    utils.pressKey('a');
-    // check if data contains testprop
-    expect(jsPsych.data.get().select('testprop').count()).toBe(1);
-  });
-
-  test('should add data to all trials retroactively', function(){
-    jsPsych.data._fullreset();
-    var timeline = [
-      {type: 'html-keyboard-response', stimulus:'hello'}
-    ];
-    jsPsych.init({timeline:timeline});
-    // click through first trial
-    utils.pressKey('a');
-    // check if data contains testprop
-    expect(jsPsych.data.get().select('testprop').count()).toBe(0);
-    jsPsych.data.addProperties({'testprop': 1});
-    expect(jsPsych.data.get().select('testprop').count()).toBe(1);
-  });
-
-});
-
-describe('#addDataToLastTrial', function(){
-  test('should add any data properties to the last trial', function(){
-    jsPsych.data._fullreset();
-    var timeline = [
-      {
-        type: 'html-keyboard-response',
-        stimulus: 'hello',
-        on_finish: function(){
-          jsPsych.data.addDataToLastTrial({testA: 1, testB: 2});
-        }
-      }
-    ];
-    jsPsych.init({timeline:timeline});
-    // click through first trial
-    utils.pressKey('a');
-    // check data structure
-    expect(jsPsych.data.get().select('testA').values[0]).toBe(1);
-    expect(jsPsych.data.get().select('testB').values[0]).toBe(2);
-  });
-});
-
-describe('#getLastTrialData', function(){
-  test('should return a new DataCollection with only the last trial\'s data', function(){
-    jsPsych.data._fullreset();
-    var timeline = [
-      {type: 'html-keyboard-response', stimulus:'hello'},
-      {type: 'html-keyboard-response', stimulus:'world'}
-    ];
-    jsPsych.init({timeline:timeline});
-    // click through first trial
-    utils.pressKey('a');
-    // click through second trial
-    utils.pressKey('a');
-    // check data structure
-    expect(jsPsych.data.getLastTrialData().select('trial_index').values[0]).toBe(1);
-  });
-});
-
-describe('#getLastTimelineData', function(){
-  test('should return a new DataCollection with only the last timeline\'s data', function(){
-    jsPsych.data._fullreset();
-    var timeline = [
-      {
-        timeline:
-        [
-          {type: 'html-keyboard-response', stimulus:'hello'},
-          {type: 'html-keyboard-response', stimulus:'world'},
-        ]
-      },
-      {
-        timeline:
-        [
-          {type: 'html-keyboard-response', stimulus:'second'},
-          {type: 'html-keyboard-response', stimulus:'time'},
-        ]
-      }
-    ];
-    jsPsych.init({timeline:timeline});
-    // click through all four trials
-    for(var i=0; i<4; i++){
-      utils.pressKey('a');
-    }
-    // check data structure
-    expect(jsPsych.data.getLastTimelineData().count()).toBe(2);
-    expect(jsPsych.data.getLastTimelineData().select('trial_index').values[0]).toBe(2);
-    expect(jsPsych.data.getLastTimelineData().select('trial_index').values[1]).toBe(3);
-  });
-});
-
-describe('#displayData', function(){
-  test('should display in json format', function(){
-    var timeline = [
-      {type: 'html-keyboard-response', stimulus:'hello'}
-    ];
-    jsPsych.init({timeline:timeline});
-    // click through first trial
-    utils.pressKey('a');
-    // overwrite data with custom data
-    var data = [{col1: 1, col2: 2}, {col1: 3, col2: 4}]
-    jsPsych.data._customInsert(data);
-    // display data in json format
-    jsPsych.data.displayData('json');
-    // get display element HTML
-    var html = jsPsych.getDisplayElement().innerHTML;
-    expect(html).toBe('<pre id="jspsych-data-display">'+JSON.stringify(data, null, '\t')+'</pre>');
-  });
-  test('should display in csv format', function(){
-    var timeline = [
-      {type: 'html-keyboard-response', stimulus:'hello'}
-    ];
-    jsPsych.init({timeline:timeline});
-    // click through first trial
-    utils.pressKey('a');
-    // overwrite data with custom data
-    var data = [{col1: 1, col2: 2}, {col1: 3, col2: 4}]
-    jsPsych.data._customInsert(data);
-    // display data in json format
-    jsPsych.data.displayData('csv');
-    // get display element HTML
-    var html = jsPsych.getDisplayElement().innerHTML;
-    expect(html).toBe("<pre id=\"jspsych-data-display\">\"col1\",\"col2\"\r\n\"1\",\"2\"\r\n\"3\",\"4\"\r\n</pre>");
-  });
-});

package/tests/jsPsych.data/dataparameter.test.js

@@ -1,251 +0,0 @@
-const root = '../../';
-const utils = require('../testing-utils.js');
-
-describe('The data parameter', function(){
-  test('should record data to a trial', function(){
-
-    require(root + 'jspsych.js');
-    require(root + 'plugins/jspsych-html-keyboard-response.js');
-
-    return (new Promise(function(resolve, reject){
-
-      var key_data = null;
-
-      var trial = {
-        type: 'html-keyboard-response',
-        stimulus: 'hello',
-        data: {added: true},
-      }
-
-      jsPsych.init({
-        timeline: [trial],
-        on_finish: function() {
-          var d = jsPsych.data.get().values()[0].added;
-          resolve(d);
-        }
-      });
-
-      utils.pressKey('a');
-
-      //resolve();
-    })).then(function(data) { expect(data).toBe(true) });
-  });
-
-  test('should record data to all nested trials', function(){
-
-    require(root + 'jspsych.js');
-    require(root + 'plugins/jspsych-html-keyboard-response.js');
-
-    return (new Promise(function(resolve, reject){
-
-      var key_data = null;
-
-      var trial = {
-        type: 'html-keyboard-response',
-        timeline: [
-          {stimulus: 'a'},
-          {stimulus: 'b'}
-        ],
-        data: {added: true},
-      }
-
-      jsPsych.init({
-        timeline: [trial],
-        on_finish: function() {
-          var d = jsPsych.data.get().filter({added: true}).count();
-          resolve(d);
-        }
-      });
-
-      utils.pressKey('a');
-
-      utils.pressKey('a');
-
-      //resolve();
-    })).then(function(data) { expect(data).toBe(2) });
-  });
-
-  test('should record data to all nested trials with timeline variables', function(){
-
-    require(root + 'jspsych.js');
-    require(root + 'plugins/jspsych-html-keyboard-response.js');
-
-    return (new Promise(function(resolve, reject){
-
-      var key_data = null;
-
-      var vars = [
-        {stimulus: 'a'},
-        {stimulus: 'b'}
-      ];
-
-      var trial = {
-        timeline: [
-          {type: 'html-keyboard-response',
-          stimulus: jsPsych.timelineVariable('stimulus')}
-        ],
-        timeline_variables: vars,
-        data: {added: true},
-      }
-
-      jsPsych.init({
-        timeline: [trial],
-        on_finish: function() {
-          var d = jsPsych.data.get().filter({added: true}).count();
-          resolve(d);
-        }
-      });
-
-      utils.pressKey('a');
-
-      utils.pressKey('a');
-
-      //resolve();
-    })).then(function(data) { expect(data).toBe(2) });
-  });
-
-  test('should work as timeline variable at root level', function(){
-    require(root + 'jspsych.js');
-    require(root + 'plugins/jspsych-html-keyboard-response.js');
-
-    var trial = {
-      timeline: [
-        {type: 'html-keyboard-response', stimulus: 'foo', data: jsPsych.timelineVariable('d')}
-      ],
-      timeline_variables: [
-        {d: {added: true}},
-        {d: {added: false}}
-      ]
-    }
-
-    jsPsych.init({
-      timeline: [trial]
-    });
-
-    utils.pressKey('a'); // trial 1
-    utils.pressKey('a'); // trial 2
-
-    expect(jsPsych.data.get().filter({added: true}).count()).toBe(1);
-    expect(jsPsych.data.get().filter({added: false}).count()).toBe(1);
-  });
-
-  test('should work as timeline variable at nested level', function(){
-    require(root + 'jspsych.js');
-    require(root + 'plugins/jspsych-html-keyboard-response.js');
-
-    var trial = {
-      timeline: [
-        {type: 'html-keyboard-response', stimulus: 'foo', data: {added: jsPsych.timelineVariable('added')}}
-      ],
-      timeline_variables: [
-        {added: true},
-        {added: false}
-      ]
-    }
-
-    jsPsych.init({
-      timeline: [trial]
-    });
-
-    utils.pressKey('a'); // trial 1
-    utils.pressKey('a'); // trial 2
-
-    expect(jsPsych.data.get().filter({added: true}).count()).toBe(1);
-    expect(jsPsych.data.get().filter({added: false}).count()).toBe(1);
-  });
-
-  test('timeline variable should be available in trial on_finish', function(){
-    require(root + 'jspsych.js');
-    require(root + 'plugins/jspsych-html-keyboard-response.js');
-
-    var trial = {
-      timeline: [
-        {
-          type: 'html-keyboard-response',
-          stimulus: 'foo',
-          data: {added: jsPsych.timelineVariable('added')},
-          on_finish: function(data){
-            data.added_copy = data.added;
-          }}
-      ],
-      timeline_variables: [
-        {added: true},
-        {added: false}
-      ]
-    }
-
-    jsPsych.init({
-      timeline: [trial]
-    });
-
-    utils.pressKey('a'); // trial 1
-    utils.pressKey('a'); // trial 2
-
-    expect(jsPsych.data.get().filter({added_copy: true}).count()).toBe(1);
-    expect(jsPsych.data.get().filter({added_copy: false}).count()).toBe(1);
-  });
-
-  test('should record data to all nested trials with timeline variables even when nested trials have own data', function(){
-
-    require(root + 'jspsych.js');
-    require(root + 'plugins/jspsych-html-keyboard-response.js');
-
-    return (new Promise(function(resolve, reject){
-
-      var key_data = null;
-
-      var vars = [
-        {stimulus: 'a'},
-        {stimulus: 'b'}
-      ];
-
-      var trial = {
-        timeline: [
-          {
-            type: 'html-keyboard-response',
-            stimulus: jsPsych.timelineVariable('stimulus'),
-            data: {foo: 1}
-          }
-        ],
-        timeline_variables: vars,
-        data: {added: true},
-      }
-
-      jsPsych.init({
-        timeline: [trial],
-        on_finish: function() {
-          var d = jsPsych.data.get().filter({added: true, foo: 1}).count();
-          resolve(d);
-        }
-      });
-
-      utils.pressKey('a');
-
-      utils.pressKey('a');
-
-      //resolve();
-    })).then(function(data) { expect(data).toBe(2) });
-  });
-
-  test('should accept a function as a parameter', function(done){
-    var trial = {
-      type: 'html-keyboard-response',
-      stimulus: 'foo',
-      data: {
-        a: function(){ return 1; }
-      }
-    }
-
-    var timeline = [trial];
-
-    jsPsych.init({
-      timeline: timeline,
-      on_finish: function(){
-        expect(jsPsych.data.get().values()[0].a).toBe(1);
-        done();
-      }
-    })
-
-    utils.pressKey('a');
-  })
-});