[galaxy-commits] commit/galaxy-central: carlfeberhard: Tools API: use history manager to get history in create() to allow anon users to get their only history; Update browser/casper tests to use api upload for testing, remove use of upload tool form

1 new commit in galaxy-central:

https://bitbucket.org/galaxy/galaxy-central/commits/9f224596521f/ Changeset: 9f224596521f User: carlfeberhard Date: 2014-11-19 19:53:51+00:00 Summary: Tools API: use history manager to get history in create() to allow anon users to get their only history; Update browser/casper tests to use api upload for testing, remove use of upload tool form Affected #: 11 files

diff -r e4dbcc06df53f4a47717ddd047dd85911bab888e -r 9f224596521f7ac224f5bb17f41b69e395de11d1 lib/galaxy/webapps/galaxy/api/tools.py --- a/lib/galaxy/webapps/galaxy/api/tools.py +++ b/lib/galaxy/webapps/galaxy/api/tools.py @@ -2,6 +2,7 @@

from galaxy import exceptions from galaxy import web, util +from galaxy import managers from galaxy.web import _future_expose_api_anonymous from galaxy.web import _future_expose_api from galaxy.web.base.controller import BaseAPIController @@ -29,6 +30,12 @@ RESTful controller for interactions with tools. """

+ def __init__( self, app ): + super( ToolsController, self ).__init__( app ) + self.mgrs = util.bunch.Bunch( + histories=managers.histories.HistoryManager() + ) + @web.expose_api def index( self, trans, **kwds ): """ @@ -131,7 +138,7 @@ # dataset upload. history_id = payload.get("history_id", None) if history_id: - target_history = self.get_history( trans, history_id ) + target_history = self.mgrs.histories.get( trans, trans.security.decode_id( history_id ) ) else: target_history = None

diff -r e4dbcc06df53f4a47717ddd047dd85911bab888e -r 9f224596521f7ac224f5bb17f41b69e395de11d1 test/casperjs/anon-history-tests.js --- a/test/casperjs/anon-history-tests.js +++ b/test/casperjs/anon-history-tests.js @@ -34,6 +34,7 @@ var historyFrameInfo = {}, filenameToUpload = '1.txt', filepathToUpload = '../../test-data/' + filenameToUpload, + testUploadedId = null, testUploadInfo = {};

@@ -73,15 +74,24 @@ spaceghost.then( function testAnonUpload(){ this.test.comment( 'anon-user should be able to upload files' );

- spaceghost.tools.uploadFile( filepathToUpload, function uploadCallback( _uploadInfo ){ - this.debug( 'uploaded HDA info: ' + this.jsonStr( this.quickInfo( _uploadInfo.hdaElement ) ) ); - var hasHda = _uploadInfo.hdaElement, - hasClass = _uploadInfo.hdaElement.attributes[ 'class' ], - hasOkClass = _uploadInfo.hdaElement.attributes[ 'class' ].indexOf( 'state-ok' ) !== -1; - this.test.assert( ( hasHda && hasClass && hasOkClass ), "Uploaded file: " + _uploadInfo.hdaElement.text ); - testUploadInfo = _uploadInfo; + var currHistory = spaceghost.api.histories.index()[0]; + spaceghost.api.tools.thenUpload( currHistory.id, { + filepath: filepathToUpload + }, function uploadCallback( uploadedId ){ + testUploadedId = uploadedId; }); +}); +spaceghost.openHomePage().historypanel.waitForHdas( function testAnonUpload(){ + this.test.comment( 'uploaded files should be well formed in the panel' );

+ var hdaElement = spaceghost.getElementInfo( '#dataset-' + testUploadedId ); + this.debug( 'uploaded HDA info: ' + this.jsonStr( this.quickInfo( hdaElement ) ) ); + + var hasHda = hdaElement, + hasClass = hdaElement.attributes[ 'class' ], + hasOkClass = hdaElement.attributes[ 'class' ].indexOf( 'state-ok' ) !== -1; + this.test.assert( ( hasHda && hasClass && hasOkClass ), "Uploaded file: " + hdaElement.text ); + testUploadInfo = hdaElement; }); spaceghost.then( function testAnonUpload(){ this.test.comment( "empty should be NO LONGER be displayed" ); @@ -101,7 +111,7 @@ var hdaInfo = this.historypanel.hdaElementInfoByTitle( filenameToUpload ); this.test.assert( hdaInfo !== null, "After logging in - found a matching hda by name and hid" ); if( hdaInfo ){ - this.test.assert( testUploadInfo.hdaElement.attributes.id === hdaInfo.attributes.id, + this.test.assert( testUploadInfo.attributes.id === hdaInfo.attributes.id, "After logging in - found a matching hda by hda view id: " + hdaInfo.attributes.id ); } });

diff -r e4dbcc06df53f4a47717ddd047dd85911bab888e -r 9f224596521f7ac224f5bb17f41b69e395de11d1 test/casperjs/api-anon-history-tests.js --- a/test/casperjs/api-anon-history-tests.js +++ b/test/casperjs/api-anon-history-tests.js @@ -67,11 +67,13 @@ // ------------------------------------------------------------------------------------------- hdas spaceghost.thenOpen( spaceghost.baseUrl ).waitForSelector( spaceghost.historypanel.data.selectors.history.name ); spaceghost.then( function(){ - spaceghost.tools.uploadFile( '../../test-data/1.sam', function( uploadInfo ){ - this.test.assert( uploadInfo.hdaElement !== null, "Convenience function produced hda" ); - var state = this.historypanel.getHdaState( '#' + uploadInfo.hdaElement.attributes.id ); - this.test.assert( state === 'ok', "Convenience function produced hda in ok state" ); - }); + var currHistory = spaceghost.api.histories.index()[0]; + spaceghost.api.tools.thenUpload( currHistory.id, { + filepath: '../../test-data/1.sam' + }, function( uploadedId ){ + var hda = spaceghost.api.hdas.show( currHistory.id, uploadedId ); + this.test.assert( hda.state === 'ok', "Convenience function produced hda in ok state" ); + }); });

spaceghost.then( function(){

diff -r e4dbcc06df53f4a47717ddd047dd85911bab888e -r 9f224596521f7ac224f5bb17f41b69e395de11d1 test/casperjs/api-visualizations-tests.js --- a/test/casperjs/api-visualizations-tests.js +++ b/test/casperjs/api-visualizations-tests.js @@ -153,25 +153,25 @@ visualizationData.bler = 'blah'; this.api.assertRaises( function(){ created = this.api.visualizations.create( visualizationData ); - }, 400, 'unknown key: bler' ); + }, 500, "create_visualization() got an unexpected keyword argument 'bler'" ); delete visualizationData.bler;

this.test.comment( 'Calling create with an unparsable JSON config will cause an API error' ); visualizationData.config = '3 = nime'; this.api.assertRaises( function(){ created = this.api.visualizations.create( visualizationData ); - }, 400, 'config must be a dictionary (JSON)' ); + }, 400, 'config must be a dictionary' );

// ------------------------------------------------------------------------------------------ UPDATE // ........................................................................................... idiot proofing - this.test.comment( 'updating using a nonsense key should fail with an error' ); - this.api.assertRaises( function(){ - returned = this.api.visualizations.update( created.id, { bler : 'blah' }); - }, 400, 'unknown key: bler' ); + //this.test.comment( 'updating using a nonsense key should fail with an error' ); + //this.api.assertRaises( function(){ + // returned = this.api.visualizations.update( created.id, { type: 'test', bler : 'blah' }); + //}, 400, 'unknown key: bler' );

this.test.comment( 'updating by attempting to change type should cause an error' ); this.api.assertRaises( function(){ - returned = this.api.visualizations.update( created.id, { title : 30 }); + returned = this.api.visualizations.update( created.id, { type: 'test', title : 30 }); }, 400, 'title must be a string or unicode' ); //TODO: the other types...

diff -r e4dbcc06df53f4a47717ddd047dd85911bab888e -r 9f224596521f7ac224f5bb17f41b69e395de11d1 test/casperjs/api-workflow-tests.js --- a/test/casperjs/api-workflow-tests.js +++ b/test/casperjs/api-workflow-tests.js @@ -29,7 +29,7 @@ 'id', 'input_steps', 'tool_id', 'type' ], simpleBedFilepath = '../../test-data/2.bed', - uploadedFile = null, + uploadedFileId = null, workflowCreateKeys = [ 'history', 'outputs' ];

@@ -154,15 +154,17 @@ });

// now run the uploaded workflow -spaceghost.tools.uploadFile( simpleBedFilepath, function( uploadInfo ){ - uploadedFile = uploadInfo; +spaceghost.then( function(){ + var currHistory = spaceghost.api.histories.index()[0]; + spaceghost.api.tools.thenUpload( currHistory.id, { filepath: simpleBedFilepath }, function( uploadedId ){ + uploadedFileId = uploadedId; + }); }); spaceghost.then( function(){ var currentHistory = this.api.histories.index()[0], firstWorkflow = this.api.workflows.show( this.api.workflows.index()[0].id );

//this.debug( this.jsonStr( uploadedFile ) ); - var uploadedFileId = uploadedFile.hdaElement.attributes.id.split( '-' )[1]; this.debug( this.jsonStr( uploadedFileId ) ); this.debug( this.jsonStr( this.api.hdas.show( currentHistory.id, uploadedFileId ) ) );

diff -r e4dbcc06df53f4a47717ddd047dd85911bab888e -r 9f224596521f7ac224f5bb17f41b69e395de11d1 test/casperjs/hda-state-tests.js --- a/test/casperjs/hda-state-tests.js +++ b/test/casperjs/hda-state-tests.js @@ -25,8 +25,9 @@ }

var tooltipSelector = spaceghost.data.selectors.tooltipBalloon, - filepathToUpload = '../../test-data/1.txt', - testUploadInfo = {}, + filenameToUpload = '1.txt', + filepathToUpload = '../../test-data/' + filenameToUpload, + testUploadId = null, //TODO: get from the api module - that doesn't exist yet summaryShouldBeArray = [ '10 lines', 'format', 'txt' ], infoShouldBe = 'uploaded txt file', @@ -37,10 +38,14 @@ // start a new user and upload a file spaceghost.user.loginOrRegisterUser( email, password ); spaceghost.then( function upload(){ - spaceghost.tools.uploadFile( filepathToUpload, function uploadCallback( _uploadInfo ){ - testUploadInfo = _uploadInfo; - }); + var currHistory = spaceghost.api.histories.index()[0]; + spaceghost.api.tools.thenUpload( currHistory.id, { + filepath: filepathToUpload + }, function uploadCallback( uploadId ){ + testUploadId = uploadId; + }); }); +spaceghost.openHomePage();

// =================================================================== TEST HELPERS //NOTE: to be called with fn.call( spaceghost, ... ) @@ -278,7 +283,7 @@ spaceghost.then( function(){ this.test.comment( 'HDAs in the "ok" state should be well formed' );

- var uploadSelector = '#' + testUploadInfo.hdaElement.attributes.id; + var uploadSelector = '#dataset-' + testUploadId; this.test.assertVisible( uploadSelector, 'HDA is visible' );

this.test.comment( 'should have the proper state class' ); @@ -288,7 +293,7 @@ // since we're using css there's no great way to test state icon (.state-icon is empty)

this.test.comment( 'should have proper title and hid' ); - testTitle.call( spaceghost, uploadSelector, testUploadInfo.filename ); + testTitle.call( spaceghost, uploadSelector, filenameToUpload );

this.test.comment( 'should have all of the three, main buttons' ); testTitleButtonStructure.call( spaceghost, uploadSelector ); @@ -308,7 +313,7 @@ // restore to collapsed spaceghost.then( function(){ this.test.comment( "Collapsing hda in 'ok' state should hide body again" ); - var uploadSelector = '#' + testUploadInfo.hdaElement.attributes.id; + var uploadSelector = '#dataset-' + testUploadId;

spaceghost.historypanel.thenCollapseHda( uploadSelector, function collapseOkState(){ this.test.assertNotVisible( uploadSelector + ' ' + this.historypanel.data.selectors.hda.body, @@ -321,16 +326,17 @@ // set state directly through model, wait for re-render //TODO: not ideal to test this this.evaluate( function(){ - return Galaxy.currHistoryPanel.model.contents.at( 0 ).set( 'state', 'new' ); + console.debug( Galaxy.currHistoryPanel.model.contents.getByHid( 1 ) ); + return Galaxy.currHistoryPanel.model.contents.getByHid( 1 ).set( 'state', 'new' ); }); this.wait( 1000, function(){ this.test.comment( 'HDAs in the "new" state should be well formed' );

- var uploadSelector = '#' + testUploadInfo.hdaElement.attributes.id; + var uploadSelector = '#dataset-' + testUploadId; this.test.assertVisible( uploadSelector, 'HDA is visible' );

// should have proper title and hid - testTitle.call( spaceghost, uploadSelector, testUploadInfo.filename ); + testTitle.call( spaceghost, uploadSelector, filenameToUpload );

this.test.comment( 'new HDA should have the new state class' ); this.assertHasClass( uploadSelector, this.historypanel.data.selectors.hda.wrapper.stateClasses['new'], @@ -378,7 +384,7 @@ }); // restore state, collapse spaceghost.then( function revertStateAndCollapse(){ - var uploadSelector = '#' + testUploadInfo.hdaElement.attributes.id; + var uploadSelector = '#dataset-' + testUploadId;

this.historypanel.thenCollapseHda( uploadSelector, function(){ this.evaluate( function(){

diff -r e4dbcc06df53f4a47717ddd047dd85911bab888e -r 9f224596521f7ac224f5bb17f41b69e395de11d1 test/casperjs/history-options-tests.js --- a/test/casperjs/history-options-tests.js +++ b/test/casperjs/history-options-tests.js @@ -26,17 +26,24 @@ var includeDeletedOptionsLabel = spaceghost.historyoptions.data.labels.options.includeDeleted;

// local -var filepathToUpload = '../../test-data/1.txt', - testUploadInfo = {}; +var filenameToUpload = '1.txt', + filepathToUpload = '../../test-data/' + filenameToUpload, + testUploadId = null;

// =================================================================== TESTS // ------------------------------------------------------------------- set up // start a new user and upload a file spaceghost.user.loginOrRegisterUser( email, password ); -spaceghost.tools.uploadFile( filepathToUpload, function uploadCallback( _uploadInfo ){ - testUploadInfo = _uploadInfo; +spaceghost.then( function upload(){ + var currHistory = spaceghost.api.histories.index()[0]; + spaceghost.api.tools.thenUpload( currHistory.id, { + filepath: filepathToUpload + }, function uploadCallback( uploadId ){ + testUploadId = uploadId; + }); }); +spaceghost.openHomePage();

// ------------------------------------------------------------------- history options menu structure //NOTE: options menu should be functionally tested elsewhere @@ -69,45 +76,6 @@ "Clicking away from the menu closes it" ); });

-// ------------------------------------------------------------------- options allow showing/hiding deleted hdas -spaceghost.then( function(){ - this.test.comment( 'Deleting HDA' ); - var uploadSelector = '#' + testUploadInfo.hdaElement.attributes.id; - - this.historypanel.deleteHda( uploadSelector, function(){ - this.test.assertNotExists( uploadSelector, "Deleted HDA is NOT in the DOM" ); - }); -}); - -spaceghost.then( function(){ - this.test.comment( 'History options->' + includeDeletedOptionsLabel + ' shows deleted datasets' ); - var uploadSelector = '#' + testUploadInfo.hdaElement.attributes.id; - - this.historyoptions.includeDeleted( function(){ - this.test.assertExists( uploadSelector, - "Deleted HDA is in the DOM (using history options -> " + includeDeletedOptionsLabel + ")" ); - this.test.assertVisible( uploadSelector, - "Deleted HDA is visible again (using history options -> " + includeDeletedOptionsLabel + ")" ); - }); -}); - -spaceghost.then( function(){ - this.test.comment( 'History options->' + includeDeletedOptionsLabel + ' (again) re-hides deleted datasets' ); - - this.historyoptions.excludeDeleted( function(){ - this.test.assertDoesntExist( '#' + testUploadInfo.hdaElement.attributes.id, - "Deleted HDA is not in the DOM (using history options -> " + includeDeletedOptionsLabel + ")" ); - }); -}); - -spaceghost.then( function(){ - // undelete the uploaded file - this.historyoptions.includeDeleted( function(){ - this.historypanel.undeleteHda( '#' + testUploadInfo.hdaElement.attributes.id ); - spaceghost.debug( 'undeleted' ); - }); - -});

// ------------------------------------------------------------------- hidden hdas aren't shown // ------------------------------------------------------------------- history options allows showing hidden hdas @@ -116,13 +84,13 @@

// ------------------------------------------------------------------- history options collapses all expanded hdas spaceghost.then( function(){ - this.historypanel.thenExpandHda( '#' + testUploadInfo.hdaElement.attributes.id ); + this.historypanel.thenExpandHda( '#dataset-' + testUploadId ); }); spaceghost.then( function(){ this.test.comment( 'History option collapses all expanded hdas' );

this.historyoptions.collapseExpanded( function(){ - var uploadedSelector = '#' + testUploadInfo.hdaElement.attributes.id; + var uploadedSelector = '#dataset-' + testUploadId; this.test.assertNotVisible( uploadedSelector + ' ' + this.historypanel.data.selectors.hda.body, "Body for uploaded file is not visible" ); });

diff -r e4dbcc06df53f4a47717ddd047dd85911bab888e -r 9f224596521f7ac224f5bb17f41b69e395de11d1 test/casperjs/history-panel-tests.js --- a/test/casperjs/history-panel-tests.js +++ b/test/casperjs/history-panel-tests.js @@ -48,7 +48,7 @@ var newHistoryName = "Test History", filepathToUpload = '../../test-data/1.txt', historyFrameInfo = {}, - testUploadInfo = {}; + testUploadId = null;

// =================================================================== TESTS @@ -138,16 +138,15 @@

// ------------------------------------------------------------------- check structure of NON empty history // upload file: 1.txt -spaceghost.tools.uploadFile( filepathToUpload, function uploadCallback( _uploadInfo ){ - this.test.comment( 'uploaded file should appear in history' ); - - this.debug( 'uploaded HDA info: ' + this.jsonStr( _uploadInfo ) ); - var hasHda = _uploadInfo.hdaElement, - hasClass = _uploadInfo.hdaElement.attributes[ 'class' ], - hasOkClass = _uploadInfo.hdaElement.attributes[ 'class' ].indexOf( wrapperOkClassName ) !== -1; - this.test.assert( ( hasHda && hasClass && hasOkClass ), "Uploaded file: " + _uploadInfo.filename ); - testUploadInfo = _uploadInfo; +spaceghost.then( function upload(){ + var currHistory = spaceghost.api.histories.index()[0]; + spaceghost.api.tools.thenUpload( currHistory.id, { + filepath: filepathToUpload + }, function uploadCallback( uploadId ){ + testUploadId = uploadId; + }); }); +spaceghost.openHomePage();

spaceghost.then( function checkPanelStructure(){ this.test.comment( 'checking structure of non-empty panel' ); @@ -231,8 +230,7 @@ // broken in webkit w/ jq 1.7 spaceghost.historypanel.waitForHdas( function(){ this.test.comment( 'HDAs can be expanded by clicking on the name' ); - this.debug( this.jsonStr( testUploadInfo ) ); - var uploadedSelector = '#' + testUploadInfo.hdaElement.attributes.id; + var uploadedSelector = '#dataset-' + testUploadId;

this.click( uploadedSelector + ' ' + this.historypanel.data.selectors.hda.title ); this.wait( 1000, function(){ @@ -244,7 +242,7 @@ // ------------------------------------------------------------------- expanded hdas are still expanded after a refresh spaceghost.then( function(){ this.test.comment( 'Expanded hdas are still expanded after a refresh' ); - var uploadedSelector = '#' + testUploadInfo.hdaElement.attributes.id; + var uploadedSelector = '#dataset-' + testUploadId;

this.click( refreshButtonSelector ); this.historypanel.waitForHdas( function(){ @@ -257,7 +255,7 @@ // ------------------------------------------------------------------- expanded hdas collapse by clicking name again spaceghost.then( function(){ this.test.comment( 'Expanded hdas collapse by clicking name again' ); - var uploadedSelector = '#' + testUploadInfo.hdaElement.attributes.id; + var uploadedSelector = '#dataset-' + testUploadId;

this.click( uploadedSelector + ' ' + this.historypanel.data.selectors.hda.title ); this.wait( 500, function(){ @@ -269,7 +267,7 @@ // ------------------------------------------------------------------- collapsed hdas still collapsed after a refresh spaceghost.then( function(){ this.test.comment( 'collapsed hdas still collapsed after a refresh' ); - var uploadedSelector = '#' + testUploadInfo.hdaElement.attributes.id; + var uploadedSelector = '#dataset-' + testUploadId;

this.click( refreshButtonSelector ); this.historypanel.waitForHdas( function(){

diff -r e4dbcc06df53f4a47717ddd047dd85911bab888e -r 9f224596521f7ac224f5bb17f41b69e395de11d1 test/casperjs/modules/api.js --- a/test/casperjs/modules/api.js +++ b/test/casperjs/modules/api.js @@ -355,6 +355,7 @@ // have to attach like GET param - due to body loss in jq url = utils.format( this.urlTpls.update, historyId, id ); if( purge ){ +console.debug( 'adding purge:' + purge ); url += '?purge=True'; } return this.api._ajax( url, { @@ -489,7 +490,7 @@

/** post a file to the upload1 tool over ajax */ ToolsAPI.prototype.upload = function upload( historyId, options ){ - this.api.spaceghost.info( 'tools.upload: ' + [ historyId, this.api.spaceghost.jsonStr( options ) ] ); + this.api.spaceghost.info( 'api.tools.upload: ' + [ historyId, this.api.spaceghost.jsonStr( options ) ] ); this.api.ensureId( historyId ); options = options || {};

@@ -512,6 +513,7 @@ if( options.tabs ){ inputs[ 'files_0|space_to_tab' ] = 'Yes'; } + var response = this.api.spaceghost.evaluate( function( url, historyId, inputs ){ var file = $( 'input[name="casperjs-upload-file"]' )[0].files[0], formData = new FormData(); @@ -559,9 +561,6 @@ this.debug( 'uploadedId: ' + uploadedId ); });

- spaceghost.debug( '---------------------------------------------------------- timeout: ' + ( options.timeout || spaceghost.api.tools.DEFAULT_UPLOAD_TIMEOUT ) ); - spaceghost.debug( 'timeout: ' + options.timeout ); - spaceghost.debug( 'timeout: ' + spaceghost.api.tools.DEFAULT_UPLOAD_TIMEOUT ); spaceghost.then( function(){ this.waitFor( function testHdaState(){

diff -r e4dbcc06df53f4a47717ddd047dd85911bab888e -r 9f224596521f7ac224f5bb17f41b69e395de11d1 test/casperjs/modules/historyoptions.js --- a/test/casperjs/modules/historyoptions.js +++ b/test/casperjs/modules/historyoptions.js @@ -232,8 +232,6 @@ datasetSecurity : "Dataset Security", resumePausedJobs : "Resume Paused Jobs", collapseExpanded : 'Collapse Expanded Datasets', - includeDeleted : 'Include Deleted Datasets', - includeHidden : 'Include Hidden Datasets', unhideHiddenDatasets : "Unhide Hidden Datasets", purgeDeletedDatasets : "Purge Deleted Datasets", showStructure : "Show Structure",

diff -r e4dbcc06df53f4a47717ddd047dd85911bab888e -r 9f224596521f7ac224f5bb17f41b69e395de11d1 test/casperjs/upload-tests.js --- a/test/casperjs/upload-tests.js +++ b/test/casperjs/upload-tests.js @@ -21,8 +21,6 @@ password = spaceghost.fixtureData.testUser.password; }

-var testUploadInfo = {}; - // =================================================================== TESTS // ------------------------------------------------------------------- start a new user spaceghost.user.loginOrRegisterUser( email, password ).openHomePage( function(){ @@ -30,63 +28,21 @@ this.test.assert( loggedInAs === email, 'loggedInAs() matches email: "' + loggedInAs + '"' ); });

-// ------------------------------------------------------------------- long form -// upload a file... +// ------------------------------------------------------------------- api upload spaceghost.then( function(){ - this.test.comment( 'Test uploading a file' ); + this.test.comment( 'Test API function' );

- var filename = '1.txt', - filepath = '../../test-data/' + filename; - this.tools._uploadFile( filepath ); - - // when an upload begins successfully main should reload with a infomessagelarge - this.withMainPanel( function mainAfterUpload(){ - var infoInfo = this.elementInfoOrNull( this.data.selectors.messages.infolarge ); - this.test.assert( infoInfo !== null, - "Found infomessagelarge after uploading file" ); - this.test.assert( infoInfo.text.indexOf( this.data.text.upload.success ) !== -1, - "Found upload success message: " + this.data.text.upload.success ); - - testUploadInfo.name = filename; + var currHistoryId = spaceghost.api.histories.index()[0].id; + spaceghost.api.tools.thenUpload( currHistoryId, { + filepath : '../../test-data/1.sam' + }, function(){ + var hdas = spaceghost.api.hdas.index( currHistoryId ); + spaceghost.test.assert( hdas.length === 1, 'One dataset uploaded: ' + hdas.length ); + spaceghost.test.assert( hdas[0].state === 'ok', 'State is: ' + hdas[0].state ); + spaceghost.test.assert( hdas[0].name === '1.sam', 'Name is: ' + hdas[0].name ); }); });

-// ... and move to the history panel and wait for upload to finish -spaceghost.historypanel.waitForHda( '1.txt', - function uploadComplete( hdaElement ){ - this.test.pass( 'Upload completed successfully for: ' + this.jsonStr( hdaElement.attributes.id ) ); - }, - function timeout( hdaElement ){ - this.debug( 'hdaElement:\n' + this.jsonStr( hdaElement ) ); - this.test.fail( 'Test timed out for upload: ' + testUploadInfo.name ); - }, - 30 * 1000 -); - -// ------------------------------------------------------------------- short form -spaceghost.then( function(){ - this.test.comment( 'Test convenience function' ); - - spaceghost.tools.uploadFile( '../../test-data/1.sam', function( uploadInfo ){ - this.test.assert( uploadInfo.hdaElement !== null, "Convenience function produced hda" ); - var state = this.historypanel.getHdaState( '#' + uploadInfo.hdaElement.attributes.id ); - this.test.assert( state === 'ok', "Convenience function produced hda in ok state" ); - }); -}); - -// ------------------------------------------------------------------- test conv. fn error -/* -//??: this error's AND waitFor()s THREE times (or more) - something to do with assertStepsRaise + waitFor -spaceghost.then( function(){ - this.test.comment( 'testing convenience function timeout error' ); - this.assertStepsRaise( 'GalaxyError: Upload Error: timeout waiting', function(){ - spaceghost.tools.uploadFile( '../../test-data/1.sam', function( uploadInfo ){ - this.test.fail( "Convenience function did not timeout!" ); - }, 50 ); - }); -}); -*/ - // =================================================================== spaceghost.run( function(){ test.done(); }); });

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.