Evgeny Anatskiy 73e90fc7f5 Merge branch 'dev' into auto_tour_generation ...

# Conflicts:
#	static/maps/mvc/tool/tool-form-base.js.map
#	static/maps/mvc/tool/tool-form.js.map
#	static/scripts/bundled/analysis.bundled.js
#	static/scripts/bundled/analysis.bundled.js.map
#	static/scripts/bundled/libs.bundled.js
#	static/scripts/bundled/libs.bundled.js.map
#	static/scripts/bundled/login.bundled.js
#	static/scripts/bundled/login.bundled.js.map
#	static/scripts/mvc/tool/tool-form-base.js
#	static/scripts/mvc/tool/tool-form.js

2017-04-08 00:56:21 +02:00

..

api

Merge branch 'release_17.01' into dev

2017-04-04 15:07:31 +01:00

base

Merge branch 'release_17.01' into dev

2017-03-30 13:44:42 -07:00

casperjs

Migrate more CasperJS API tests to the API test framework.

2016-12-08 11:24:17 -05:00

docker

Simplify run_test_wrapper.sh per @natefoo comments.

2017-03-20 09:12:33 -04:00

functional

Merge branch 'dev' into auto_tour_generation

2017-04-08 00:56:21 +02:00

galaxy_selenium

Merge pull request #3841 from jmchilton/selenium_fixes_7

2017-03-29 14:38:11 -04:00

integration

Merge remote-tracking branch 'upstream/release_17.01' into dev

2017-03-31 08:31:42 -07:00

manual

Refactor API helpers for re-use in rest of test framework.

2017-01-08 08:13:42 -05:00

qunit

More test cases for collection builders.

2017-03-24 10:07:58 -04:00

selenium_tests

Allow upload to collections.

2017-03-28 09:31:26 -04:00

shed_functional

Disable tool shed test function that fails frequently on Jenkins.

2017-03-26 22:55:11 -04:00

unit

Move ToolWatcher from Toolbox to ConfigWatchers class

2017-04-03 15:29:42 +02:00

TESTING.md

Touch up Galaxy testing documentation.

2017-03-06 09:44:50 -05:00