Josh de Leeuw
|
969484f0e6
|
Merge branch 'master' into preload-docs
|
2021-02-12 11:28:47 -05:00 |
|
Becky Gilbert
|
5331b5c123
|
change numeric keyCodes to key strings, change valid keys to lowercase in examples/docs (missed these out in the earlier keyCode->key change)
|
2021-02-11 15:06:03 -08:00 |
|
Becky Gilbert
|
470c0d4c5f
|
remove auto_preload: false in jsPsych.init from tests because preloading is moved to plugin
|
2021-02-11 14:25:31 -08:00 |
|
Becky Gilbert
|
9729cd99ef
|
video tests just check that register preload is called, no longer test for auto-preloading
|
2021-02-11 14:24:29 -08:00 |
|
Josh de Leeuw
|
418e15db3d
|
Merge branch 'master' of https://github.com/jspsych/jsPsych
|
2021-02-10 09:05:06 -05:00 |
|
Josh de Leeuw
|
8c4d17d675
|
fix a few test console.log and console.error messages
|
2021-02-10 09:05:02 -05:00 |
|
Becky Gilbert
|
d465c20b05
|
add tests
|
2021-02-09 17:17:08 -08:00 |
|
Becky Gilbert
|
7e288d4481
|
change keyCodes to keys in calls to utils.pressKey()
|
2021-02-09 15:29:02 -08:00 |
|
Becky Gilbert
|
d01881c692
|
merge changes from master and fix merge conflict
|
2021-02-09 15:23:40 -08:00 |
|
Becky Gilbert
|
51ee542e2e
|
update with changes to master and fix merge conflict
|
2021-02-09 14:22:59 -08:00 |
|
Becky Gilbert
|
a106dbbd13
|
fix tests for addNodeToEndOfTimeline (no longer accepts callback)
|
2021-02-09 14:18:31 -08:00 |
|
Becky Gilbert
|
c8298e226f
|
merge master into preload plugin branch and fix merge conflict
|
2021-02-09 10:57:46 -08:00 |
|
Josh de Leeuw
|
89a99da36f
|
Merge branch 'feature-all-timeline-vars' into feature-timeline-events
|
2021-02-09 13:32:18 -05:00 |
|
Josh de Leeuw
|
e0c0cc1d08
|
Merge pull request #1492 from jspsych/master
merge master updates into feature-all-timeline-vars-branch
|
2021-02-09 13:16:58 -05:00 |
|
Josh de Leeuw
|
b10c69eb21
|
Merge branch 'master' into feature-key-code-update
|
2021-02-08 22:00:09 -05:00 |
|
Josh de Leeuw
|
fbd9e4ca85
|
remove media folder from tests since functions are now mocked
|
2021-02-05 10:57:50 -05:00 |
|
Josh de Leeuw
|
bb07c913c7
|
change tests to use mock functions
|
2021-02-05 10:55:52 -05:00 |
|
Josh de Leeuw
|
7dbcfea7da
|
add a test to ensure loop function runs only once with TVs #585
|
2021-02-04 21:53:55 -05:00 |
|
Josh de Leeuw
|
8dd61e6bed
|
conditional_function only runs with first set of variables #585
|
2021-02-04 21:50:23 -05:00 |
|
Josh de Leeuw
|
9da9f4eaf0
|
the broken test should resolve when we merge in changes from feature-timeline-events branch
|
2021-02-04 21:41:49 -05:00 |
|
Becky Gilbert
|
711504887f
|
add case_sensitive_responses option to jsPsych.init, add tests and example #396
|
2021-02-04 17:31:51 -08:00 |
|
Becky Gilbert
|
278668d048
|
change keyCode to key in keyboard event passed to dispatchEvent
|
2021-02-03 11:19:46 -08:00 |
|
Becky Gilbert
|
665b0ce9fa
|
finish adding/fixing tests #1351
|
2021-01-29 16:22:50 -08:00 |
|
Becky Gilbert
|
bc39856bec
|
add preload tests (not finished yet), nested timeline test fails #1351
|
2021-01-29 09:48:38 -08:00 |
|
Josh de Leeuw
|
1caecc6bf9
|
fixes protection of nested function params, adds test
|
2021-01-27 11:47:54 -05:00 |
|
Josh de Leeuw
|
e0ee7f02e2
|
conditional_function only runs once when repetitions > 0
|
2021-01-26 15:32:57 -05:00 |
|
Josh de Leeuw
|
d22ce24264
|
update expected behavior of timeline events
|
2021-01-26 13:52:58 -05:00 |
|
Becky Gilbert
|
188cb14e3d
|
Merge branch 'master' into feature-css-class-trial
|
2021-01-18 12:18:43 -08:00 |
|
Josh de Leeuw
|
6a2dc21bc8
|
replaces keyCode with .key, gets all tests working
|
2021-01-15 17:55:12 -05:00 |
|
Becky Gilbert
|
5c653f4bde
|
remove uncessary true argument from jsPsych.timelineVariable in examples/tests #883
|
2021-01-13 10:08:38 -08:00 |
|
Josh de Leeuw
|
d5d462d4c8
|
switch auto_preload to bool, add trials parameter, implement working tests
|
2021-01-07 22:15:38 -05:00 |
|
Josh de Leeuw
|
df4057bd52
|
remove outdated test
|
2021-01-07 16:15:13 -05:00 |
|
Josh de Leeuw
|
83a6ea61c9
|
add working test
|
2021-01-07 16:13:34 -05:00 |
|
Josh de Leeuw
|
f39f394866
|
adds test and handles non-array #832
|
2020-12-29 22:06:28 -05:00 |
|
Josh de Leeuw
|
5881c4455e
|
added tests for #883
|
2020-12-29 21:57:20 -05:00 |
|
Josh de Leeuw
|
24369ff282
|
implements a first pass at #1237
|
2020-12-28 13:59:19 -05:00 |
|
Josh de Leeuw
|
76c5d02597
|
add additional testing for #832, fixes function declaration
|
2020-12-26 17:24:33 -05:00 |
|
Josh de Leeuw
|
f6ac098b4c
|
first draft of #832
|
2020-12-23 09:56:40 -05:00 |
|
Josh de Leeuw
|
6192ea6f5a
|
add failing test for #988
|
2020-12-17 15:10:16 -05:00 |
|
Josh de Leeuw
|
b6a28b0433
|
adds first pass at #883
|
2020-12-16 15:15:41 -05:00 |
|
Josh de Leeuw
|
983810145b
|
add broken test to illustrate problem in #585
|
2020-12-16 11:05:48 -05:00 |
|
Josh de Leeuw
|
b8225d7add
|
first pass at implementation and test for timeline start and finish events (#585)
|
2020-12-16 10:49:10 -05:00 |
|
Becky Gilbert
|
0e2745c79d
|
improve preloading test based on console.warn
|
2020-12-07 16:57:01 -08:00 |
|
Becky Gilbert
|
c7b3762c0a
|
fix registerPreload test
|
2020-12-03 09:18:07 -08:00 |
|
Becky Gilbert
|
b67d4a4881
|
add auto preload test
|
2020-12-02 12:11:38 -08:00 |
|
Becky Gilbert
|
32cdeae645
|
Merge branch 'master' into fix-consecutive-images
|
2020-11-25 10:50:26 -08:00 |
|
Becky Gilbert
|
bbef9ef9d2
|
Merge pull request #1203 from jspsych/freesort
Updates to free-sort plugin
|
2020-11-25 09:48:05 -08:00 |
|
Becky Gilbert
|
1aaee22324
|
Merge pull request #1136 from awhug/master
Add maxdiff plugin
|
2020-11-20 15:09:39 -08:00 |
|
Becky Gilbert
|
8f24267aae
|
update expected regex to handle plugin modifications
|
2020-11-19 14:40:44 -08:00 |
|
Becky Gilbert
|
e9adaff0e0
|
add render_on_canvas: false to tests
|
2020-11-09 14:22:43 -08:00 |
|