mirror of
https://github.com/jspsych/jsPsych.git
synced 2025-05-12 08:38:11 +00:00
Merge pull request #1129 from becky-gilbert/timeline-tests
New test for nested timelines with no other parameters
This commit is contained in:
commit
94d4403be6
@ -348,12 +348,44 @@ describe('endCurrentTimeline', function(){
|
||||
})
|
||||
});
|
||||
|
||||
|
||||
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'
|
||||
type: 'html-keyboard-response',
|
||||
stimulus: 'bar'
|
||||
};
|
||||
|
||||
var new_timeline = {
|
||||
@ -407,3 +439,4 @@ describe('add node to end of timeline', function(){
|
||||
});
|
||||
|
||||
});
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user