psychopy / psychopy / 4580 / 4

47%

master: 47%

push

travis-ci

BF: Removes unnecessary imports from Cedrus/ioLabs safely (#2373)

* BF: Removes unnecessary imports from Cedrus/ioLabs safely

This fixes a problem where cedrus and ioLabs imports would wipe keyboard
imports if they appeared in the same experiment. This fix adds new
functionality to the experiment class by giving ability to check more
abstractly whether a particular type of component exists in an experiment.
For example, whether a component of type keyboard exists. With this new
functionality, Cedrus and ioLab boxes will only delete keyboard imports
if there are no keyboard components in the experiment.

* TEST: Adds test for new getComponentFromType function

To make the test pass, I had to standardize Slider and QMixPump types.

* BF: Checks for equality between "escape" and KeyPress object

This fixes an error where keypresses were tested for membership in
KeyPress objects, when they should be tested for equality.

* BF: Fixes keyboard imports by importing keyboard in every experiment

- New keyboard to be imported in every experiment

- Cedrus and ioLabs no longer need to have unused keyboard import removed

- Keyboard no longer needs to import keyboard, as already imported. Also,
keyboard object no longer extends keys list, but appends instead.

- Escape with and without keyboard component is checked using getKeys
methods from uninitialised Keyboard object.

- clearEvents kwargs in Keyboard set to None by default, in case called
by ioLabs or other non-keyboard device.

* TEST: Changes dir structure for tests and updates all tests

- All tests needed updating with new keyboard import and how escape is used
to quit experiments.

- The folder structure or script tests had to change, to separate out
Python and JS scripts to make it easier to delete and change individual or
groups of correct script files.

* BF: Fixes image stim test

4836 of 13682 branches covered (35.35%)

18939 of 38902 relevant lines covered (48.68%)

0.49 hits per line