2 new commits in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/a0d853e0fe80/ Changeset: a0d853e0fe80 User: davebgx Date: 2014-04-22 18:58:42 Summary: Fix library template functional tests. Revert change to user info tests that was breaking library template tests. Affected #: 3 files diff -r 4a697eff12901cdb715667526bc097948646da86 -r a0d853e0fe804be7b21191957998ec7cdd4d8305 test/base/twilltestcase.py --- a/test/base/twilltestcase.py +++ b/test/base/twilltestcase.py @@ -1698,17 +1698,16 @@ num_fields=1, num_options=0, field_name='1_field_name', strings_displayed=[], strings_displayed_after_submit=[] ): """Create a new form definition.""" - strings_displayed_after_submit.extend( [ name, description, form_type ] ) self.visit_url( "%s/forms/create_form_definition" % self.url ) for check_str in strings_displayed: self.check_page_for_string( check_str ) - tc.fv( "1", "name", name ) - tc.fv( "1", "description", description ) - tc.fv( "1", "form_type_select_field", form_type ) + tc.fv( "create_form_definition", "name", name ) + tc.fv( "create_form_definition", "description", description ) + tc.fv( "create_form_definition", "form_type_select_field", form_type ) tc.submit( "create_form_button" ) if form_type == "Sequencing Sample Form": tc.submit( "add_layout_grid" ) - tc.fv( "1", "grid_layout0", form_layout_name ) + tc.fv( "create_form_definition", "grid_layout0", form_layout_name ) # if not adding any fields at this time, remove the default empty field if num_fields == 0: tc.submit( "remove_button" ) @@ -1720,8 +1719,8 @@ field_help_contents = 'Field %i help' % index1 field_default = 'field_default_0' field_default_contents = '%s default contents' % form_type - tc.fv( "1", field_label, field_contents ) - tc.fv( "1", field_help_name, field_help_contents ) + tc.fv( "edit_form_definition", field_label, field_contents ) + tc.fv( "edit_form_definition", field_help_name, field_help_contents ) if field_type == 'SelectField': # SelectField field_type requires a refresh_on_change self.refresh_form( 'field_type_0', field_type ) @@ -1735,11 +1734,11 @@ for index2 in range( num_options ): option_field_name = 'field_0_option_%i' % index2 option_field_value = 'Option%i' % index2 - tc.fv( "1", option_field_name, option_field_value ) + tc.fv( "edit_form_definition", option_field_name, option_field_value ) else: - tc.fv( "1", "field_type_0", field_type ) - tc.fv( "1", 'field_name_0', field_name ) - tc.fv( "1", field_default, field_default_contents ) + tc.fv( "edit_form_definition", "field_type_0", field_type ) + tc.fv( "edit_form_definition", 'field_name_0', field_name ) + tc.fv( "edit_form_definition", field_default, field_default_contents ) # All done... now save tc.submit( "save_changes_button" ) for check_str in strings_displayed_after_submit: diff -r 4a697eff12901cdb715667526bc097948646da86 -r a0d853e0fe804be7b21191957998ec7cdd4d8305 test/functional/test_library_templates.py --- a/test/functional/test_library_templates.py +++ b/test/functional/test_library_templates.py @@ -436,7 +436,7 @@ strings_displayed=[ 'SelectField', 'Option1' ] ) # Import a dataset from the current history filename = '8.bed' - self.new_history( name='import with SelectField' ) + self.new_history( name='import+with+SelectField' ) self.upload_file( filename ) hda = get_latest_hda() self.upload_library_dataset( cntrller='library_admin', diff -r 4a697eff12901cdb715667526bc097948646da86 -r a0d853e0fe804be7b21191957998ec7cdd4d8305 test/functional/test_user_info.py --- a/test/functional/test_user_info.py +++ b/test/functional/test_user_info.py @@ -38,12 +38,15 @@ """Testing creating a new user info form and editing it""" # Logged in as admin_user # Create a the first form - self.create_form( name='Student', - description="This is Student user info form's description", - form_type=get_user_info_form_definition(), + name = "Student" + desc = "This is Student user info form's description" + form_type = get_user_info_form_definition() + self.create_form( name=name, + description=desc, + form_type=form_type, num_fields=0, strings_displayed=[ 'Create a new form definition' ], - strings_displayed_after_submit=[] ) + strings_displayed_after_submit=[ name, desc, form_type ] ) tmp_form = get_form( 'Student' ) # Add fields to the form field_dicts = [ dict( label='Affiliation', @@ -73,12 +76,14 @@ assert form_one is not None, 'Problem retrieving form named "Student" from the database' assert len( form_one.fields ) == len( tmp_form.fields ) + len( field_dicts ) # Create the second form - self.create_form( name='Researcher', - description="This is Researcher user info form's description", - form_type=get_user_info_form_definition(), + name = "Researcher" + desc = "This is Researcher user info form's description" + self.create_form( name=name, + description=desc, + form_type=form_type, num_fields=0, strings_displayed=[ 'Create a new form definition' ], - strings_displayed_after_submit=[] ) + strings_displayed_after_submit=[ name, desc, form_type ] ) tmp_form = get_form( 'Researcher' ) # Add fields to the form self.edit_form( id=self.security.encode_id( tmp_form.current.id ), https://bitbucket.org/galaxy/galaxy-central/commits/2342d31a1f5c/ Changeset: 2342d31a1f5c User: davebgx Date: 2014-04-22 18:59:21 Summary: Merge stable changes into default. Affected #: 0 files Repository URL: https://bitbucket.org/galaxy/galaxy-central/ -- This is a commit notification from bitbucket.org. You are receiving this because you have the service enabled, addressing the recipient of this email.