Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: 36863f5e97ae9ff4be20e7cccf2b22e83dd05f00 https://github.com/galaxyproject/galaxy/commit/36863f5e97ae9ff4be20e7cccf2b2... Author: John Chilton <jmchilton@gmail.com> Date: 2017-10-04 (Wed, 04 Oct 2017) Changed paths: M .ci/jenkins/selenium/galaxy.ini M .ci/jenkins/selenium/run_tests.sh Log Message: ----------- Selenium - run tests with a proxy prefix. Commit: 9a43048d899fa7b2cd409f35f7125f6c97b111e9 https://github.com/galaxyproject/galaxy/commit/9a43048d899fa7b2cd409f35f7125... Author: John Chilton <jmchilton@gmail.com> Date: 2017-10-04 (Wed, 04 Oct 2017) Changed paths: M .ci/jenkins/selenium/Dockerfile M .ci/jenkins/selenium/run_tests.sh M run_tests.sh Log Message: ----------- Fix library tests when run via docker-compose setup used by Jenkins. Need to point the tests at the same master API key used to configure Galaxy for those tests and need to make the default admin test user a admin user of that Galaxy. Commit: 225ad7fb45be2213821f320a47d69813dde114e3 https://github.com/galaxyproject/galaxy/commit/225ad7fb45be2213821f320a47d69... Author: John Chilton <jmchilton@gmail.com> Date: 2017-10-04 (Wed, 04 Oct 2017) Changed paths: M templates/sharing_base.mako A test/galaxy_selenium/components.py M test/galaxy_selenium/data.py M test/galaxy_selenium/has_driver.py M test/galaxy_selenium/navigates_galaxy.py M test/galaxy_selenium/navigation.yml A test/galaxy_selenium/smart_components.py M test/selenium_tests/framework.py M test/selenium_tests/test_anon_history.py M test/selenium_tests/test_custom_builds.py M test/selenium_tests/test_history_dataset_state.py M test/selenium_tests/test_history_options.py M test/selenium_tests/test_history_panel.py M test/selenium_tests/test_history_sharing.py M test/selenium_tests/test_published_histories_grid.py M test/selenium_tests/test_registration.py M test/selenium_tests/test_saved_histories.py Log Message: ----------- Continue push toward smarter component based Selenium testing. This continues a thread started in 0650978a9171866aeda4be0aedbd0090fd8649ec and #4732 of switching to smarter selectors from a more structured YAML description of the Galaxy DOM. This continues that by: - Eliminating any use of the old navigation YAML file (navigation-data.yml). - Replace href selectors with other things since they break when testing Galaxy with a proxy-prefix. - Extending the raw selectors to allow concept of nesting selectors. - Building even smarter "components" that wrap these raw selectors generated from the YAML directly in a way that allows them to utilize the actual Selenium session and helper class. So the old ``self.navigation_data`` is gone, ``self.navigation`` still yields the raw selectors, and ``self.components`` yields the smarter variant. Hopefully all will agree the code that uses ``self.components`` is more compact and readable. The following a very basic example of this: ```diff def click_masthead_user(self): - self.wait_for_and_click(self.navigation.masthead.selectors.user) + self.components.masthead.user.wait_for_and_click() ``` Here is an example of combining it with the new child selector syntax: ```diff def assert_item_dbkey_displayed_as(self, hid, dbkey): - item_body_selector = self.history_panel_item_body_selector(hid=hid, wait=True) - dbkey_selector = item_body_selector + ' ' + self.test_data["historyPanel"]["selectors"]["hda"]["dbkey"] - dbkey_element = self.wait_for_selector_visible(dbkey_selector) - assert dbkey in dbkey_element.text + item_body = self.history_panel_item_component(hid=hid) + dbkey_text = item_body.dbkey.wait_for_text() + assert dbkey in dbkey_text ``` Commit: cc5f44bccc520389356be5dda152f940b11b9d69 https://github.com/galaxyproject/galaxy/commit/cc5f44bccc520389356be5dda152f... Author: John Chilton <jmchilton@gmail.com> Date: 2017-10-04 (Wed, 04 Oct 2017) Changed paths: M test/selenium_tests/test_library_contents.py Log Message: ----------- Comment out test that doesn't work on Jenkins. I don't know why it doesn't work - I'll revisit later but Jenkins is currently broken. Commit: bbd96f2446dd02820b7caa768d518facc656ac4b https://github.com/galaxyproject/galaxy/commit/bbd96f2446dd02820b7caa768d518... Author: John Chilton <jmchilton@gmail.com> Date: 2017-10-04 (Wed, 04 Oct 2017) Changed paths: M test/galaxy_selenium/navigates_galaxy.py Log Message: ----------- Fix linting for this branch. Commit: 9cc456ca8f55f69fb148850993ed1f342b38c5c6 https://github.com/galaxyproject/galaxy/commit/9cc456ca8f55f69fb148850993ed1... Author: John Chilton <jmchilton@gmail.com> Date: 2017-10-09 (Mon, 09 Oct 2017) Changed paths: M .ci/jenkins/selenium/Dockerfile M .ci/jenkins/selenium/docker-compose.yml M .ci/jenkins/selenium/run_galaxy.bash M .ci/jenkins/selenium/run_tests.sh Log Message: ----------- Fix Jenkins Selenium tests to run as the external user. Should prevent root from owning files under Linux. Also re-organize the startup order so that it waits for postgres to come alive after the virtualenv has been created and installed - this should signficantly speed up the runtime of these tests. Commit: 70956fc0806a1b7cc561c889cbd737a597dd0fcf https://github.com/galaxyproject/galaxy/commit/70956fc0806a1b7cc561c889cbd73... Author: Martin Cech <marten@bx.psu.edu> Date: 2017-10-09 (Mon, 09 Oct 2017) Changed paths: M .ci/jenkins/selenium/Dockerfile M .ci/jenkins/selenium/docker-compose.yml M .ci/jenkins/selenium/galaxy.ini M .ci/jenkins/selenium/run_galaxy.bash M .ci/jenkins/selenium/run_tests.sh M run_tests.sh M templates/sharing_base.mako A test/galaxy_selenium/components.py M test/galaxy_selenium/data.py M test/galaxy_selenium/has_driver.py M test/galaxy_selenium/navigates_galaxy.py M test/galaxy_selenium/navigation.yml A test/galaxy_selenium/smart_components.py M test/selenium_tests/framework.py M test/selenium_tests/test_anon_history.py M test/selenium_tests/test_custom_builds.py M test/selenium_tests/test_history_dataset_state.py M test/selenium_tests/test_history_options.py M test/selenium_tests/test_history_panel.py M test/selenium_tests/test_history_sharing.py M test/selenium_tests/test_library_contents.py M test/selenium_tests/test_published_histories_grid.py M test/selenium_tests/test_registration.py M test/selenium_tests/test_saved_histories.py Log Message: ----------- Merge pull request #4757 from jmchilton/selenium_docker_as_user Run Selenium tests as external user. Compare: https://github.com/galaxyproject/galaxy/compare/d9ddc5291c8b...70956fc0806a