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

Merge pull request #3228 from jmchilton/configuration_test

Browse Source 
Fix configuration API admin checking and tests.
This commit is contained in:
Martin Cech
2016-11-30 10:25:13 -05:00
committed by GitHub
parent b165757288 b705579125
commit 1bbab2d89d
3 changed files with 42 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/galaxy/webapps/galaxy/api/configuration.py
+1 -1
View File
@@ -29,7 +29,7 @@ class ConfigurationController( BaseAPIController ):
Note: a more complete list is returned if the user is an admin.
"""
is_admin = self.user_manager.is_admin( trans.user )
is_admin = trans.user_is_admin()
serialization_params = self._parse_serialization_params( kwd, 'all' )
return self.get_config_dict( trans, is_admin, **serialization_params )
test/api/test_configuration.py
+41
View File
@@ -0,0 +1,41 @@
from base import api
from base.api_asserts import (
assert_has_keys,
assert_not_has_keys,
)
TEST_KEYS_FOR_ALL_USERS = [
'enable_unique_workflow_defaults',
'ftp_upload_site',
'ftp_upload_dir',
'wiki_url',
'support_url',
'logo_url',
'terms_url',
'allow_user_dataset_purge',
]
TEST_KEYS_FOR_ADMIN_ONLY = [
'library_import_dir',
'user_library_import_dir',
'allow_library_path_paste',
'allow_user_deletion',
]
class ConfigurationApiTestCase(api.ApiTestCase):
def test_normal_user_configuration(self):
config = self._get_configuration()
assert_has_keys(config, *TEST_KEYS_FOR_ALL_USERS)
assert_not_has_keys(config, *TEST_KEYS_FOR_ADMIN_ONLY)
def test_admin_user_configuration(self):
config = self._get_configuration(admin=True)
assert_has_keys(config, *TEST_KEYS_FOR_ALL_USERS)
assert_has_keys(config, *TEST_KEYS_FOR_ADMIN_ONLY)
def _get_configuration(self, data={}, admin=False):
response = self._get("configuration", data=data, admin=admin)
self._assert_status_code_is(response, 200)
configuration = response.json()
return configuration
test/casperjs/api-configuration-tests.js
-75
View File
@@ -1,75 +0,0 @@
var require = patchRequire( require ),
spaceghost = require( 'spaceghost' ).fromCasper( casper ),
xpath = require( 'casper' ).selectXPath,
utils = require( 'utils' ),
format = utils.format;
spaceghost.test.begin( 'Test the Galaxy configuration API', 0, function suite( test ){
spaceghost.start();
// =================================================================== SET UP
var email = spaceghost.user.getRandomEmail(),
password = '123456';
if( spaceghost.fixtureData.testUser ){
email = spaceghost.fixtureData.testUser.email;
password = spaceghost.fixtureData.testUser.password;
}
spaceghost.user.loginOrRegisterUser( email, password );
// =================================================================== TESTS
var normKeys = [
'enable_unique_workflow_defaults',
'ftp_upload_site',
'ftp_upload_dir',
'wiki_url',
'support_url',
'logo_url',
'terms_url',
'allow_user_dataset_purge'
],
adminKeys = normKeys.concat([
'library_import_dir',
'user_library_import_dir',
'allow_library_path_paste',
'allow_user_creation',
'allow_user_deletion'
]);
// ------------------------------------------------------------------------------------------- INDEX
spaceghost.openHomePage().then( function(){
this.test.comment( 'index should get a (shortened) list of configuration settings '
+ 'when requested by a normal user' );
var configIndex = this.api.configuration.index();
this.debug( this.jsonStr( configIndex ) );
this.test.assert( utils.isObject( configIndex ), "index returned an object" );
this.test.assert( this.hasKeys( configIndex, normKeys ), 'Has the proper keys' );
});
spaceghost.user.logout();
// ------------------------------------------------------------------------------------------- INDEX (admin)
spaceghost.tryStepsCatch( function tryAdminLogin(){
spaceghost.user.loginAdmin();
}, function(){} );
//}, function failedLoginRegister(){
// this.info( 'Admin level configuration API tests not run: no admin account available' );
spaceghost.openHomePage().waitForMasthead( function(){
if( spaceghost.user.userIsAdmin() ){
this.test.comment( 'index should get a (full) list of configuration settings '
+ 'when requested by an admin user' );
configIndex = this.api.configuration.index();
this.debug( this.jsonStr( configIndex ) );
this.test.assert( utils.isObject( configIndex ), "index returned an object" );
this.test.assert( this.hasKeys( configIndex, adminKeys ), 'Has the proper keys' );
} else {
this.info( 'Admin level configuration API tests not run: no admin account available' );
}
});
// ===================================================================
spaceghost.run( function(){ test.done(); });
});