opensource/galaxy
3
0
Fork 0
mirror of https://github.com/galaxyproject/galaxy.git synced 2026-09-24 16:30:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix functional tests for library templates.

Browse Source
This commit is contained in:
Dave Bouvier
2014-04-25 10:41:53 -04:00
parent aecbc6da2a
commit 06c2434f6e
2 changed files with 16 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/base/twilltestcase.py
+6 -9
View File
@@ -2040,16 +2040,13 @@ class TwillTestCase( unittest.TestCase ):
dis-inherit your template, call the manage_library_template_inheritance() below immediately after you call this
method in your test code. Templates added to Requesttype objects are always inherited to samples.
"""
if item_type == 'library':
url = "%s/library_common/add_template?cntrller=%s&item_type=%s&form_type=%s&library_id=%s" % \
( self.url, cntrller, item_type, form_type, library_id )
elif item_type == 'folder':
url = "%s/library_common/add_template?cntrller=%s&item_type=%s&form_type=%s&library_id=%s&folder_id=%s" % \
( self.url, cntrller, item_type, form_type, library_id, folder_id )
params = dict( cntrller=cntrller, item_type=item_type, form_type=form_type, library_id=library_id )
url = "/library_common/add_template"
if item_type == 'folder':
params[ 'folder_id' ] = folder_id
elif item_type == 'ldda':
url = "%s/library_common/add_template?cntrller=%s&item_type=%s&form_type=%s&library_id=%s&folder_id=%s&ldda_id=%s" % \
( self.url, cntrller, item_type, form_type, library_id, folder_id, ldda_id )
self.visit_url( url )
params[ 'ldda_id' ] = ldda_id
self.visit_url( url, params )
self.check_page_for_string ( "Select a template for the" )
self.refresh_form( "form_id", form_id )
# For some unknown reason, twill barfs if the form number ( 1 ) is used in the following
test/functional/test_library_templates.py
+10 -8
View File
@@ -72,12 +72,14 @@ class TestLibraryFeatures( TwillTestCase ):
# Pass number of options we want in our SelectField
num_options = 2
# Create form for library template
strings_displayed_after_submit = [ "The form '%s' has been updated with the changes." % type ]
self.create_form( name=type,
description=form_desc,
form_type=galaxy.model.FormDefinition.types.LIBRARY_INFO_TEMPLATE,
field_type=type,
num_options=num_options,
field_name=field_name )
field_name=field_name,
strings_displayed_after_submit=strings_displayed_after_submit )
# Get all of the new form definitions for later use
global AddressField_form
AddressField_form = get_form( 'AddressField' )
@@ -145,7 +147,7 @@ class TestLibraryFeatures( TwillTestCase ):
# Add a template containing an AddressField to library1
self.add_template( cntrller='library_admin',
item_type='library',
form_type=galaxy.model.FormDefinition.types.LIBRARY_INFO_TEMPLATE.replace( ' ', '+' ),
form_type=galaxy.model.FormDefinition.types.LIBRARY_INFO_TEMPLATE,
form_id=self.security.encode_id( AddressField_form.id ),
form_name=AddressField_form.name,
library_id=self.security.encode_id( library1.id ) )
@@ -287,7 +289,7 @@ class TestLibraryFeatures( TwillTestCase ):
# Add a template containing an CheckboxField to library1
self.add_template( cntrller='library_admin',
item_type='library',
form_type=galaxy.model.FormDefinition.types.LIBRARY_INFO_TEMPLATE.replace( ' ', '+' ),
form_type=galaxy.model.FormDefinition.types.LIBRARY_INFO_TEMPLATE,
form_id=self.security.encode_id( CheckboxField_form.id ),
form_name=CheckboxField_form.name,
library_id=self.security.encode_id( library2.id ) )
@@ -363,7 +365,7 @@ class TestLibraryFeatures( TwillTestCase ):
# Logged in as admin_user
self.add_template( cntrller='library_admin',
item_type='library',
form_type=galaxy.model.FormDefinition.types.LIBRARY_INFO_TEMPLATE.replace( ' ', '+' ),
form_type=galaxy.model.FormDefinition.types.LIBRARY_INFO_TEMPLATE,
form_id=self.security.encode_id( SelectField_form.id ),
form_name=SelectField_form.name,
library_id=self.security.encode_id( library3.id ) )
@@ -464,7 +466,7 @@ class TestLibraryFeatures( TwillTestCase ):
# Add an inheritable template to library4
self.add_template( cntrller='library_admin',
item_type='library',
form_type=galaxy.model.FormDefinition.types.LIBRARY_INFO_TEMPLATE.replace( ' ', '+' ),
form_type=galaxy.model.FormDefinition.types.LIBRARY_INFO_TEMPLATE,
form_id=self.security.encode_id( TextArea_form.id ),
form_name=TextArea_form.name,
library_id=self.security.encode_id( library4.id ) )
@@ -533,7 +535,7 @@ class TestLibraryFeatures( TwillTestCase ):
# Add an inheritable template to library5
self.add_template( cntrller='library_admin',
item_type='library',
form_type=galaxy.model.FormDefinition.types.LIBRARY_INFO_TEMPLATE.replace( ' ', '+' ),
form_type=galaxy.model.FormDefinition.types.LIBRARY_INFO_TEMPLATE,
form_id=self.security.encode_id( TextField_form.id ),
form_name=TextField_form.name,
library_id=self.security.encode_id( library5.id ) )
@@ -602,7 +604,7 @@ class TestLibraryFeatures( TwillTestCase ):
# Currently there is only a TextField, and we'll add a TextArea.
self.edit_template( cntrller='library_admin',
item_type='library',
form_type=galaxy.model.FormDefinition.types.LIBRARY_INFO_TEMPLATE.replace( ' ', '+' ),
form_type=galaxy.model.FormDefinition.types.LIBRARY_INFO_TEMPLATE,
library_id=self.security.encode_id( library5.id ),
field_type='TextArea',
field_label_1=TextArea_form.name,
@@ -647,7 +649,7 @@ class TestLibraryFeatures( TwillTestCase ):
# We won't select an option since we have no workflow to select
self.add_template( cntrller='library_admin',
item_type='library',
form_type=galaxy.model.FormDefinition.types.LIBRARY_INFO_TEMPLATE.replace( ' ', '+' ),
form_type=galaxy.model.FormDefinition.types.LIBRARY_INFO_TEMPLATE,
form_id=self.security.encode_id( WorkflowField_form.id ),
form_name=WorkflowField_form.name,
library_id=self.security.encode_id( library6.id ) )