1 new commit in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/changeset/2e0d02ea0aaf/ changeset: 2e0d02ea0aaf user: james_taylor date: 2012-10-01 21:24:36 summary: test framework: no longer pass webapp argument to requests affected #: 2 files diff -r cda0af45c3d3bd4fa9e62b37b5cc91f5272a0178 -r 2e0d02ea0aaf51301582671740c9281a1a8e15cf test/base/twilltestcase.py --- a/test/base/twilltestcase.py +++ b/test/base/twilltestcase.py @@ -835,12 +835,11 @@ self.assertTrue( genome_build == dbkey ) # Functions associated with user accounts - def create( self, cntrller='user', email='test@bx.psu.edu', password='testuser', username='admin-user', webapp='galaxy', redirect='' ): + def create( self, cntrller='user', email='test@bx.psu.edu', password='testuser', username='admin-user', redirect='' ): # HACK: don't use panels because late_javascripts() messes up the twill browser and it # can't find form fields (and hence user can't be logged in). self.visit_url( "%s/user/create?cntrller=%s&use_panels=False" % ( self.url, cntrller ) ) tc.fv( '1', 'email', email ) - tc.fv( '1', 'webapp', webapp ) tc.fv( '1', 'redirect', redirect ) tc.fv( '1', 'password', password ) tc.fv( '1', 'confirm', password ) @@ -945,17 +944,16 @@ self.visit_url( "%s/%s" % ( self.url, url ) ) self.check_page_for_string( 'Default history permissions have been changed.' ) self.home() - def login( self, email='test@bx.psu.edu', password='testuser', username='admin-user', webapp='galaxy', redirect='' ): + def login( self, email='test@bx.psu.edu', password='testuser', username='admin-user', redirect='' ): # test@bx.psu.edu is configured as an admin user previously_created, username_taken, invalid_username = \ - self.create( email=email, password=password, username=username, webapp=webapp, redirect=redirect ) + self.create( email=email, password=password, username=username, redirect=redirect ) if previously_created: # The acount has previously been created, so just login. # HACK: don't use panels because late_javascripts() messes up the twill browser and it # can't find form fields (and hence user can't be logged in). self.visit_url( "%s/user/login?use_panels=False" % self.url ) tc.fv( '1', 'email', email ) - tc.fv( '1', 'webapp', webapp ) tc.fv( '1', 'redirect', redirect ) tc.fv( '1', 'password', password ) tc.submit( 'login_button' ) @@ -1221,13 +1219,12 @@ # Dataset Security stuff # Tests associated with users def create_new_account_as_admin( self, email='test4@bx.psu.edu', password='testuser', - username='regular-user4', webapp='galaxy', redirect='' ): + username='regular-user4', redirect='' ): """Create a new account for another user""" # HACK: don't use panels because late_javascripts() messes up the twill browser and it # can't find form fields (and hence user can't be logged in). self.visit_url( "%s/user/create?cntrller=admin" % self.url ) tc.fv( '1', 'email', email ) - tc.fv( '1', 'webapp', webapp ) tc.fv( '1', 'redirect', redirect ) tc.fv( '1', 'password', password ) tc.fv( '1', 'confirm', password ) diff -r cda0af45c3d3bd4fa9e62b37b5cc91f5272a0178 -r 2e0d02ea0aaf51301582671740c9281a1a8e15cf test/functional/test_admin_features.py --- a/test/functional/test_admin_features.py +++ b/test/functional/test_admin_features.py @@ -29,7 +29,6 @@ previously_created, username_taken, invalid_username = self.create_new_account_as_admin( email='diff@you.com', password=password, username='admin-user', - webapp='galaxy', redirect='' ) if not username_taken: raise AssertionError, "The public name (%s) is already being used by another user, but no error was displayed" \ @@ -39,14 +38,12 @@ previously_created, username_taken, invalid_username = self.create_new_account_as_admin( email='diff@you.com', password=password, username='h', - webapp='galaxy', redirect='' ) if not invalid_username: raise AssertionError, "The public name (%s) is is invalid, but no error was displayed" % username previously_created, username_taken, invalid_username = self.create_new_account_as_admin( email=email, password=password, username='regular-user3', - webapp='galaxy', redirect='' ) # Get the user object for later tests global regular_user3 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.