Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

History Introduction tour fixes for structural changes #3185

Merged
merged 2 commits into from Dec 22, 2016

Conversation

Projects
None yet
4 participants
@dannon
Copy link
Member

commented Nov 16, 2016

WIP, addressing #3182

@bgruening

This comment has been minimized.

Copy link
Member

commented Dec 12, 2016

@galaxybot test this

@dannon

This comment has been minimized.

Copy link
Member Author

commented Dec 12, 2016

@bgruening Is the suite of tests now running testing tours too?

@bgruening

This comment has been minimized.

Copy link
Member

commented Dec 12, 2016

Not yet, afaik, but @jmchilton was working on it. But all tests were red, so I thought retrigger before merging is a good idea.

@jmchilton

This comment has been minimized.

Copy link
Member

commented Dec 12, 2016

There are tests for the other two tours - they work for me locally and on rare occasions on Jenkins.

https://github.com/galaxyproject/galaxy/blob/dev/test/selenium_tests/test_stock_tours.py

@bgruening

This comment has been minimized.

Copy link
Member

commented Dec 12, 2016

Always faster then I can follow. Thanks @jmchilton!

@dannon

This comment has been minimized.

Copy link
Member Author

commented Dec 12, 2016

Yep, that's exactly what I wanted to check on, whether or not the 'tour testing' was live and functional, thanks guys!

@jmchilton

This comment has been minimized.

Copy link
Member

commented Dec 16, 2016

@dannon I can no longer PR your repository - I assume it is because there are too many forks and it doesn't load them all in the drop down to select a target. However - if you'd be willing to merge https://github.com/jmchilton/galaxy/tree/tour_history_fixes into your branch that would be awesome. It fixes the tour and adds a test case for it.

@dannon

This comment has been minimized.

Copy link
Member Author

commented Dec 16, 2016

@jmchilton Weird, sure, I'll check out merging that in.

@bgruening

This comment has been minimized.

Copy link
Member

commented Dec 20, 2016

Got today a mail about this, can we get this fixed, anything blocking.

@dannon

This comment has been minimized.

Copy link
Member Author

commented Dec 20, 2016

@bgruening Nothing blocking, just time. Let me do this now.

@bgruening

This comment has been minimized.

Copy link
Member

commented Dec 20, 2016

Urgs, sorry. But thanks for doing it now!

@dannon dannon force-pushed the dannon:tour_history_fixes branch from 4c7e582 to e36913c Dec 20, 2016

@dannon dannon force-pushed the dannon:tour_history_fixes branch from e36913c to 10720fa Dec 20, 2016

@dannon

This comment has been minimized.

Copy link
Member Author

commented Dec 20, 2016

@bgruening Give it a shot now.

@dannon dannon added status/review and removed status/WIP labels Dec 20, 2016

@dannon

This comment has been minimized.

Copy link
Member Author

commented Dec 20, 2016

(I haven't had a chance to tinker with it again, but I did pull @jmchilton's additional changes to this branch, and took this out of WIP. If this is a good start, we can merge it and move on from there.)

@galaxybot galaxybot added this to the 17.01 milestone Dec 21, 2016

@jmchilton jmchilton merged commit c000e68 into galaxyproject:dev Dec 22, 2016

4 checks passed

api test Build finished. 244 tests run, 0 skipped, 0 failed.
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
framework test Build finished. 132 tests run, 0 skipped, 0 failed.
Details
toolshed test Build finished. 580 tests run, 0 skipped, 0 failed.
Details

@jmchilton jmchilton referenced this pull request Dec 22, 2016

Merged

[16.10] Backport #3185 #3357

martenson added a commit that referenced this pull request Dec 23, 2016

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.