Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: 58b9767d179cd7e877f6cc8e637f1859d8dd5138 https://github.com/galaxyproject/galaxy/commit/58b9767d179cd7e877f6cc8e637f1... Author: John Chilton <jmchilton@gmail.com> Date: 2017-11-27 (Mon, 27 Nov 2017) Changed paths: M client/galaxy/scripts/qunit/tests/modal_tests.js M client/karma.config.js Log Message: ----------- Fixup modal_tests.js Disable jQuery FX instead of mocking time - mocking time with sinon seems to not be working :(. Tests are conceptually cleaner this way IMO anyway. Commit: 2983a04e999193c1a250b1d6aaf9ed67a40536fa https://github.com/galaxyproject/galaxy/commit/2983a04e999193c1a250b1d6aaf9e... Author: John Chilton <jmchilton@gmail.com> Date: 2017-11-27 (Mon, 27 Nov 2017) Changed paths: M client/galaxy/scripts/qunit/tests/form_tests.js M client/karma.config.js Log Message: ----------- Re-enable form qunit tests. Commit: 2f2ee90c6c103f39db716aaabb38297f0e53d540 https://github.com/galaxyproject/galaxy/commit/2f2ee90c6c103f39db716aaabb382... Author: John Chilton <jmchilton@gmail.com> Date: 2017-11-27 (Mon, 27 Nov 2017) Changed paths: M client/galaxy/scripts/qunit/tests/masthead_tests.js M client/karma.config.js Log Message: ----------- Re-enable masthead tests. Commit: f0dc1e4f7a5a36bd1a01bbc938e27db97301663f https://github.com/galaxyproject/galaxy/commit/f0dc1e4f7a5a36bd1a01bbc938e27... Author: John Chilton <jmchilton@gmail.com> Date: 2017-11-27 (Mon, 27 Nov 2017) Changed paths: R client/galaxy/scripts/qunit/tests/galaxy-app-base.js A client/galaxy/scripts/qunit/tests/galaxy_app_base_tests.js R client/galaxy/scripts/qunit/tests/graph.js A client/galaxy/scripts/qunit/tests/graph_tests.js R client/galaxy/scripts/qunit/tests/hda-base.js A client/galaxy/scripts/qunit/tests/hda_base_tests.js R client/galaxy/scripts/qunit/tests/job-dag.js A client/galaxy/scripts/qunit/tests/job_dag_tests.js R client/galaxy/scripts/qunit/tests/list-of-pairs-collection-creator.js A client/galaxy/scripts/qunit/tests/list_of_pairs_collection_creator_tests.js R client/galaxy/scripts/qunit/tests/metrics-logger.js A client/galaxy/scripts/qunit/tests/metrics_logger_tests.js R client/galaxy/scripts/qunit/tests/utils_test.js A client/galaxy/scripts/qunit/tests/utils_tests.js M client/karma.config.js Log Message: ----------- Rename qunit test files for consistency. Commit: 364e4518a833a77b977b8b48392e86e8833fe091 https://github.com/galaxyproject/galaxy/commit/364e4518a833a77b977b8b48392e8... Author: John Chilton <jmchilton@gmail.com> Date: 2017-11-27 (Mon, 27 Nov 2017) Changed paths: M client/galaxy/scripts/qunit/test.js Log Message: ----------- In qunit single pack mode - enumerate the files to figure out the problems. Commit: 4270a7b0e39e36a8177dc596b839355eac115035 https://github.com/galaxyproject/galaxy/commit/4270a7b0e39e36a8177dc596b8393... Author: John Chilton <jmchilton@gmail.com> Date: 2017-11-27 (Mon, 27 Nov 2017) Changed paths: M client/galaxy/scripts/qunit/tests/list_of_pairs_collection_creator_tests.js Log Message: ----------- Fix a missing server.restore in a test case. Commit: 395a6c3a5f5f2c1ed24b17b7b6f6753625d3e4b7 https://github.com/galaxyproject/galaxy/commit/395a6c3a5f5f2c1ed24b17b7b6f67... Author: John Chilton <jmchilton@gmail.com> Date: 2017-11-27 (Mon, 27 Nov 2017) Changed paths: M client/package.json Log Message: ----------- Switch qunit testing to producing a single webpack bundle. I think a lot of the remaining issues stem from attempting to load multiple bundles in the same web browser window - repeatedly loading jQuery, select2, etc.... This variant is much closer to running all the tests in a seemingly more flexible order and I've never seen a select2 problem this way. Commit: 930ac1ab796a7d4414d6c573c752d9dcc07f4de2 https://github.com/galaxyproject/galaxy/commit/930ac1ab796a7d4414d6c573c752d... Author: John Chilton <jmchilton@gmail.com> Date: 2017-11-27 (Mon, 27 Nov 2017) Changed paths: M client/galaxy/scripts/qunit/tests/form_tests.js M client/galaxy/scripts/qunit/tests/galaxy_app_base_tests.js M client/galaxy/scripts/qunit/tests/graph_tests.js M client/galaxy/scripts/qunit/tests/hda_base_tests.js M client/galaxy/scripts/qunit/tests/history_contents_model_tests.js M client/galaxy/scripts/qunit/tests/job_dag_tests.js M client/galaxy/scripts/qunit/tests/list_of_pairs_collection_creator_tests.js M client/galaxy/scripts/qunit/tests/masthead_tests.js M client/galaxy/scripts/qunit/tests/metrics_logger_tests.js M client/galaxy/scripts/qunit/tests/modal_tests.js M client/galaxy/scripts/qunit/tests/page_tests.js M client/galaxy/scripts/qunit/tests/popover_tests.js M client/galaxy/scripts/qunit/tests/ui_tests.js M client/galaxy/scripts/qunit/tests/upload_dialog_tests.js M client/galaxy/scripts/qunit/tests/utils_tests.js M client/galaxy/scripts/qunit/tests/workflow_editor_tests.js Log Message: ----------- Convert qunit tests to ES6. ... and make client-format them. Commit: 4769a98ea0db663b33465de48485f69965e39da8 https://github.com/galaxyproject/galaxy/commit/4769a98ea0db663b33465de48485f... Author: John Chilton <jmchilton@gmail.com> Date: 2017-11-27 (Mon, 27 Nov 2017) Changed paths: M client/galaxy/scripts/qunit/test.js M client/galaxy/scripts/qunit/tests/list_of_pairs_collection_creator_tests.js Log Message: ----------- Comment out the one failing qunit test. Commit: 1b4d8e5b9a518a9116168added511a099ac1acf4 https://github.com/galaxyproject/galaxy/commit/1b4d8e5b9a518a9116168added511... Author: Dannon Baker <dannon.baker@gmail.com> Date: 2017-11-30 (Thu, 30 Nov 2017) Changed paths: M client/galaxy/scripts/qunit/test.js M client/galaxy/scripts/qunit/tests/form_tests.js R client/galaxy/scripts/qunit/tests/galaxy-app-base.js A client/galaxy/scripts/qunit/tests/galaxy_app_base_tests.js R client/galaxy/scripts/qunit/tests/graph.js A client/galaxy/scripts/qunit/tests/graph_tests.js R client/galaxy/scripts/qunit/tests/hda-base.js A client/galaxy/scripts/qunit/tests/hda_base_tests.js M client/galaxy/scripts/qunit/tests/history_contents_model_tests.js R client/galaxy/scripts/qunit/tests/job-dag.js A client/galaxy/scripts/qunit/tests/job_dag_tests.js R client/galaxy/scripts/qunit/tests/list-of-pairs-collection-creator.js A client/galaxy/scripts/qunit/tests/list_of_pairs_collection_creator_tests.js M client/galaxy/scripts/qunit/tests/masthead_tests.js R client/galaxy/scripts/qunit/tests/metrics-logger.js A client/galaxy/scripts/qunit/tests/metrics_logger_tests.js M client/galaxy/scripts/qunit/tests/modal_tests.js M client/galaxy/scripts/qunit/tests/page_tests.js M client/galaxy/scripts/qunit/tests/popover_tests.js M client/galaxy/scripts/qunit/tests/ui_tests.js M client/galaxy/scripts/qunit/tests/upload_dialog_tests.js R client/galaxy/scripts/qunit/tests/utils_test.js A client/galaxy/scripts/qunit/tests/utils_tests.js M client/galaxy/scripts/qunit/tests/workflow_editor_tests.js M client/karma.config.js M client/package.json Log Message: ----------- Merge pull request #5074 from jmchilton/qunit_fixes More QUnit Fixes and Enhancements Compare: https://github.com/galaxyproject/galaxy/compare/1385cf4f83ac...1b4d8e5b9a51