details: http://www.bx.psu.edu/hg/galaxy/rev/318dc4410301 changeset: 3687:318dc4410301 user: rc date: Fri Apr 23 15:31:52 2010 -0400 description: lims: - ui cleanup - fixed a functional test bug diffstat: templates/admin/requests/get_data.mako | 5 ++--- test/functional/test_forms_and_requests.py | 15 ++++++++++----- 2 files changed, 12 insertions(+), 8 deletions(-) diffs (44 lines): diff -r f6e86e26cfe2 -r 318dc4410301 templates/admin/requests/get_data.mako --- a/templates/admin/requests/get_data.mako Fri Apr 23 15:16:24 2010 -0400 +++ b/templates/admin/requests/get_data.mako Fri Apr 23 15:31:52 2010 -0400 @@ -113,9 +113,8 @@ </div> <div class="form-row"> <div class="toolParamHelp" style="clear: both;"> - After clicking <b>Transfer</b> do <i>not</i> close this page or - navigate away from this page. Once the transfer is complete - the dataset(s) will show up on this page. + After selecting dataset(s), be sure to click on the <b>Start transfer</b> button. + Once the transfer is complete the dataset(s) will show up on this page. </div> <input type="submit" name="select_files_button" value="Select"/> </div> diff -r f6e86e26cfe2 -r 318dc4410301 test/functional/test_forms_and_requests.py --- a/test/functional/test_forms_and_requests.py Fri Apr 23 15:16:24 2010 -0400 +++ b/test/functional/test_forms_and_requests.py Fri Apr 23 15:31:52 2010 -0400 @@ -372,15 +372,20 @@ % ( request_two.name, request_two.states.REJECTED ) def test_055_reset_data_for_later_test_runs( self ): """Reseting data to enable later test runs to pass""" - # TODO: RC: add whatever is missing from this method that should be marked - # deleted or purged so that later test runs will correctly test features if the - # database has not be purged. - # # Logged in as admin_user + # remove the request_type permissions + rt_actions = sa_session.query( galaxy.model.RequestTypePermissions ) \ + .filter(and_(galaxy.model.RequestTypePermissions.table.c.request_type_id==request_type.id) ) \ + .order_by( desc( galaxy.model.RequestTypePermissions.table.c.create_time ) ) \ + .all() + for a in rt_actions: + sa_session.delete( a ) + sa_session.flush() + ################## # Eliminate all non-private roles ################## - for role in [ role_one ]: + for role in [ role_one, role_two ]: self.mark_role_deleted( self.security.encode_id( role.id ), role.name ) self.purge_role( self.security.encode_id( role.id ), role.name ) # Manually delete the role from the database