jspsych 6.2.0 → 7.1.0

package/tests/jsPsych/timelines.test.js

@@ -1,498 +0,0 @@
-const root = '../../';
-const utils = require('../testing-utils.js');
-
-beforeEach(function(){
-  require(root + 'jspsych.js');
-  require(root + 'plugins/jspsych-html-keyboard-response.js');
-});
-
-describe('loop function', function(){
-
-  test('repeats a timeline when returns true', function(){
-
-    var count = 0;
-
-    var trial = {
-      timeline: [{
-        type: 'html-keyboard-response',
-        stimulus: 'foo'
-      }],
-      loop_function: function(){
-        if(count < 1){
-          count++;
-          return true;
-        } else {
-          return false;
-        }
-      }
-    }
-
-    jsPsych.init({
-      timeline: [trial]
-    });
-
-    // first trial
-    utils.pressKey(32);
-    expect(jsPsych.data.get().count()).toBe(1);
-
-    // second trial
-    utils.pressKey(32);
-    expect(jsPsych.data.get().count()).toBe(2);
-
-  });
-
-  test('does not repeat when returns false', function(){
-
-    var count = 0;
-
-    var trial = {
-      timeline: [{
-        type: 'html-keyboard-response',
-        stimulus: 'foo'
-      }],
-      loop_function: function(){
-        return false
-      }
-    }
-
-    jsPsych.init({
-      timeline: [trial]
-    });
-
-    // first trial
-    utils.pressKey(32);
-
-    expect(jsPsych.data.get().count()).toBe(1);
-
-    // second trial
-    utils.pressKey(32);
-
-    expect(jsPsych.data.get().count()).toBe(1);
-
-  });
-
-  test('gets the data from the most recent iteration', function(){
-
-    var data_count = [];
-    var count = 0;
-
-    var trial = {
-      timeline: [{
-        type: 'html-keyboard-response',
-        stimulus: 'foo'
-      }],
-      loop_function: function(data){
-        data_count.push(data.count());
-        if(count < 2){
-          count++;
-          return true;
-        } else {
-          return false;
-        }
-      }
-    }
-
-    jsPsych.init({
-      timeline: [trial]
-    });
-
-    // first trial
-    utils.pressKey(32);
-
-    // second trial
-    utils.pressKey(32);
-
-    // third trial
-    utils.pressKey(32);
-
-    expect(data_count).toEqual([1,1,1]);
-    expect(jsPsych.data.get().count()).toBe(3);
-
-  });
-
-  test('timeline variables from nested timelines are available in loop function', function(){
-
-    var counter = 0;
-
-    var trial2 = {
-      type: 'html-keyboard-response',
-      stimulus: jsPsych.timelineVariable('word')
-    }
-
-    var innertimeline = {
-      timeline: [{
-        type: 'html-keyboard-response',
-        stimulus: 'foo'
-      }],
-      loop_function: function(){
-        if(jsPsych.timelineVariable('word', true) == 'b' && counter < 2){
-          counter++;
-          return true;
-        } else {
-          counter = 0;
-          return false;
-        }
-      }
-    }
-
-    var outertimeline = {
-      timeline: [trial2, innertimeline],
-      timeline_variables: [
-        {word: 'a'},
-        {word: 'b'},
-        {word: 'c'}
-      ]
-    }
-
-    jsPsych.init({
-      timeline: [outertimeline]
-    });
-
-    expect(jsPsych.getDisplayElement().innerHTML).toMatch('a');
-    utils.pressKey(32);
-    expect(jsPsych.getDisplayElement().innerHTML).toMatch('foo');
-    utils.pressKey(32);
-    expect(jsPsych.getDisplayElement().innerHTML).toMatch('b');
-    utils.pressKey(32);
-    expect(jsPsych.getDisplayElement().innerHTML).toMatch('foo');
-    utils.pressKey(32);
-    expect(jsPsych.getDisplayElement().innerHTML).toMatch('foo');
-    utils.pressKey(32);
-    expect(jsPsych.getDisplayElement().innerHTML).toMatch('foo');
-    utils.pressKey(32);
-    expect(jsPsych.getDisplayElement().innerHTML).toMatch('c');
-    utils.pressKey(32);
-    expect(jsPsych.getDisplayElement().innerHTML).toMatch('foo');
-    utils.pressKey(32);
-  });
-
-});
-
-describe('conditional function', function(){
-
-  test('skips the timeline when returns false', function(){
-
-    var conditional = {
-      timeline: [{
-        type: 'html-keyboard-response',
-        stimulus: 'foo'
-      }],
-      conditional_function: function(){
-        return false;
-      }
-    }
-
-    var trial = {
-      type: 'html-keyboard-response',
-      stimulus: 'bar'
-    }
-
-    jsPsych.init({
-      timeline: [conditional, trial]
-    });
-
-    expect(jsPsych.getDisplayElement().innerHTML).toMatch('bar');
-
-    // clear
-    utils.pressKey(32);
-  });
-
-  test('completes the timeline when returns true', function(){
-    var conditional = {
-      timeline: [{
-        type: 'html-keyboard-response',
-        stimulus: 'foo'
-      }],
-      conditional_function: function(){
-        return true;
-      }
-    }
-
-    var trial = {
-      type: 'html-keyboard-response',
-      stimulus: 'bar'
-    }
-
-    jsPsych.init({
-      timeline: [conditional, trial]
-    });
-
-    expect(jsPsych.getDisplayElement().innerHTML).toMatch('foo');
-
-    // next
-    utils.pressKey(32);
-
-    expect(jsPsych.getDisplayElement().innerHTML).toMatch('bar');
-
-    // clear
-    utils.pressKey(32);
-  });
-
-  test('executes on every loop of the timeline', function(){
-
-    var count = 0;
-    var conditional_count = 0;
-
-    var trial = {
-      timeline: [{
-        type: 'html-keyboard-response',
-        stimulus: 'foo'
-      }],
-      loop_function: function(){
-        if(count < 1){
-          count++;
-          return true;
-        } else {
-          return false;
-        }
-      },
-      conditional_function: function(){
-        conditional_count++;
-        return true;
-      }
-    }
-
-    jsPsych.init({
-      timeline: [trial]
-    });
-
-    expect(conditional_count).toBe(1);
-
-    // first trial
-    utils.pressKey(32);
-
-    expect(conditional_count).toBe(2);
-
-    // second trial
-    utils.pressKey(32);
-
-    expect(conditional_count).toBe(2);
-  });
-
-  test('timeline variables from nested timelines are available', function(){
-    var trial = {
-      type: 'html-keyboard-response',
-      stimulus: 'foo'
-    }
-
-    var trial2 = {
-      type: 'html-keyboard-response',
-      stimulus: jsPsych.timelineVariable('word')
-    }
-
-    var innertimeline = {
-      timeline: [trial],
-      conditional_function: function(){
-        if(jsPsych.timelineVariable('word', true) == 'b'){
-          return false;
-        } else {
-          return true;
-        }
-      }
-    }
-
-    var outertimeline = {
-      timeline: [trial2, innertimeline],
-      timeline_variables: [
-        {word: 'a'},
-        {word: 'b'},
-        {word: 'c'}
-      ]
-    }
-
-    jsPsych.init({
-      timeline: [outertimeline]
-    });
-
-    expect(jsPsych.getDisplayElement().innerHTML).toMatch('a');
-    utils.pressKey(32);
-    expect(jsPsych.getDisplayElement().innerHTML).toMatch('foo');
-    utils.pressKey(32);
-    expect(jsPsych.getDisplayElement().innerHTML).toMatch('b');
-    utils.pressKey(32);
-    expect(jsPsych.getDisplayElement().innerHTML).toMatch('c');
-    utils.pressKey(32);
-    expect(jsPsych.getDisplayElement().innerHTML).toMatch('foo');
-    utils.pressKey(32);
-  });
-
-});
-
-describe('endCurrentTimeline', function(){
-
-  test('stops the current timeline, skipping to the end after the trial completes', function(){
-    var t = {
-      timeline: [
-        {
-          type: 'html-keyboard-response',
-          stimulus: 'foo',
-          on_finish: function(){
-            jsPsych.endCurrentTimeline();
-          }
-        },
-        {
-          type: 'html-keyboard-response',
-          stimulus: 'bar'
-        }
-      ]
-    }
-
-    var t2 = {
-      type: 'html-keyboard-response',
-      stimulus: 'woo'
-    }
-
-    jsPsych.init({
-      timeline: [t, t2]
-    });
-
-    expect(jsPsych.getDisplayElement().innerHTML).toMatch('foo');
-
-    utils.pressKey(32);
-
-    expect(jsPsych.getDisplayElement().innerHTML).toMatch('woo');
-
-    utils.pressKey(32);
-
-  });
-
-  test('works inside nested timelines', function(){
-    var t = {
-      timeline: [
-        {
-          timeline: [
-            {
-              type: 'html-keyboard-response',
-              stimulus: 'foo',
-              on_finish: function(){
-                jsPsych.endCurrentTimeline();
-              }
-            },
-            {
-              type: 'html-keyboard-response',
-              stimulus: 'skip me!'
-            }
-          ]
-        },
-        {
-          type: 'html-keyboard-response',
-          stimulus: 'bar'
-        }
-      ]
-    }
-
-    var t2 = {
-      type: 'html-keyboard-response',
-      stimulus: 'woo'
-    }
-
-    jsPsych.init({
-      timeline: [t, t2]
-    });
-
-    expect(jsPsych.getDisplayElement().innerHTML).toMatch('foo');
-
-    utils.pressKey(32);
-
-    expect(jsPsych.getDisplayElement().innerHTML).toMatch('bar');
-
-    utils.pressKey(32);
-
-    expect(jsPsych.getDisplayElement().innerHTML).toMatch('woo');
-
-    utils.pressKey(32);
-  })
-});
-
-
-describe('nested timelines', function() {
-  test('works without other parameters', function() {
-    var t1 = {
-      type: 'html-keyboard-response',
-      stimulus: 'foo'
-    };
-
-    var t2 = {
-      type: 'html-keyboard-response',
-      stimulus: 'bar'
-    };
-    
-    var trials = {
-      timeline: [t1, t2]
-    };
-
-    jsPsych.init({
-      timeline: [trials]
-    });
-
-    expect(jsPsych.getDisplayElement().innerHTML).toMatch('foo');
-
-    utils.pressKey(32);
-
-    expect(jsPsych.getDisplayElement().innerHTML).toMatch('bar');
-
-    utils.pressKey(32);
-
-  })
-})
-
-describe('add node to end of timeline', function(){
-
-  test('adds node to end of timeline, without callback', function() {
-    var new_trial = {
-       type: 'html-keyboard-response',
-       stimulus: 'bar'
-    };
-
-    var new_timeline = {
-      timeline: [new_trial]
-    };
-
-    var timeline = [
-      {
-        type: 'html-keyboard-response',
-        stimulus: 'foo',
-        on_start: function() {
-          jsPsych.addNodeToEndOfTimeline(new_timeline);
-        }
-      }
-    ];
-
-    jsPsych.init({
-      timeline: timeline
-    });
-
-    expect(jsPsych.getDisplayElement().innerHTML).toMatch('foo');
-    utils.pressKey(32);
-    expect(jsPsych.getDisplayElement().innerHTML).toMatch('bar');
-    utils.pressKey(32);
-  });
-
-  test('adds node to end of timeline, with callback', function() {
-    var t = {
-      type: 'html-keyboard-response',
-      stimulus: 'foo',
-      on_finish: function(){
-        jsPsych.pauseExperiment();
-        jsPsych.addNodeToEndOfTimeline({
-          timeline: [{
-            type: 'html-keyboard-response',
-            stimulus: 'bar'
-          }]
-        }, jsPsych.resumeExperiment)
-      }
-    };
-
-    jsPsych.init({
-      timeline: [t]
-    });
-
-    expect(jsPsych.getDisplayElement().innerHTML).toMatch('foo');
-    utils.pressKey(32);
-    expect(jsPsych.getDisplayElement().innerHTML).toMatch('bar');
-    utils.pressKey(32);
-
-  });
-
-});
-

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

@@ -1,116 +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));
-  });
-  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);
-  });
-});