1 new commit in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/b4e8b3080281/ Changeset: b4e8b3080281 User: carlfeberhard Date: 2014-09-09 16:09:06 Summary: Fix to b0c8da2: fix collapse call to curr panel in options; Browser tests: fix history selectors, misc. fixes Affected #: 8 files diff -r fbf45bfcdd19ce116a083a0742603234c91bc461 -r b4e8b308028162d72c4c393e1c876f1a17b2a614 templates/webapps/galaxy/root/index.mako --- a/templates/webapps/galaxy/root/index.mako +++ b/templates/webapps/galaxy/root/index.mako @@ -66,7 +66,7 @@ }, "${_("Collapse Expanded Datasets")}": function() { if( Galaxy && Galaxy.currHistoryPanel ){ - Galaxy.currHistoryPanel.collapseAllHdaBodies(); + Galaxy.currHistoryPanel.collapseAll(); } }, "${_("Include Deleted Datasets")}": function( clickEvent, thisMenuOption ) { diff -r fbf45bfcdd19ce116a083a0742603234c91bc461 -r b4e8b308028162d72c4c393e1c876f1a17b2a614 test/casperjs/anon-history-tests.js --- a/test/casperjs/anon-history-tests.js +++ b/test/casperjs/anon-history-tests.js @@ -23,7 +23,7 @@ unnamedName = spaceghost.historypanel.data.text.history.newName, nameSelector = spaceghost.historypanel.data.selectors.history.name, - subtitleSelector = spaceghost.historypanel.data.selectors.history.subtitle, + sizeSelector = spaceghost.historypanel.data.selectors.history.size, initialSizeStr = spaceghost.historypanel.data.text.history.newSize, tagIconSelector = spaceghost.historypanel.data.selectors.history.tagIcon, annoIconSelector = spaceghost.historypanel.data.selectors.history.annoIcon, @@ -47,11 +47,11 @@ this.test.assertVisible( nameSelector, 'History name is visible' ); this.test.assertSelectorHasText( nameSelector, unnamedName, 'History name is ' + unnamedName ); - this.test.comment( "history subtitle should display size and size should be 0 bytes" ); - this.test.assertExists( subtitleSelector, 'Found ' + subtitleSelector ); - this.test.assertVisible( subtitleSelector, 'History subtitle is visible' ); - this.test.assertSelectorHasText( subtitleSelector, initialSizeStr, - 'History subtitle has "' + initialSizeStr + '"' ); + this.test.comment( "history should display size and size should be 0 bytes" ); + this.test.assertExists( sizeSelector, 'Found ' + sizeSelector ); + this.test.assertVisible( sizeSelector, 'History size is visible' ); + this.test.assertSelectorHasText( sizeSelector, initialSizeStr, + 'History size has "' + initialSizeStr + '"' ); this.test.comment( "NO tags or annotations icons should be available for an anonymous user" ); this.test.assertDoesntExist( tagIconSelector, 'Tag icon button not found' ); diff -r fbf45bfcdd19ce116a083a0742603234c91bc461 -r b4e8b308028162d72c4c393e1c876f1a17b2a614 test/casperjs/api-anon-history-tests.js --- a/test/casperjs/api-anon-history-tests.js +++ b/test/casperjs/api-anon-history-tests.js @@ -8,7 +8,7 @@ spaceghost.start(); // =================================================================== TESTS -spaceghost.thenOpen( spaceghost.baseUrl ).waitForSelector( '.history-name' ); +spaceghost.thenOpen( spaceghost.baseUrl ).waitForSelector( spaceghost.historypanel.data.selectors.history.name ); spaceghost.then( function(){ // ------------------------------------------------------------------------------------------- anon allowed @@ -65,7 +65,7 @@ }); // ------------------------------------------------------------------------------------------- hdas -spaceghost.thenOpen( spaceghost.baseUrl ).waitForSelector( '.history-name' ); +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" ); diff -r fbf45bfcdd19ce116a083a0742603234c91bc461 -r b4e8b308028162d72c4c393e1c876f1a17b2a614 test/casperjs/history-panel-tests.js --- a/test/casperjs/history-panel-tests.js +++ b/test/casperjs/history-panel-tests.js @@ -27,6 +27,7 @@ nameSelector = spaceghost.historypanel.data.selectors.history.name, subtitleSelector = spaceghost.historypanel.data.selectors.history.subtitle, + sizeSelector = spaceghost.historypanel.data.selectors.history.size, unnamedName = spaceghost.historypanel.data.text.history.newName, initialSizeStr = spaceghost.historypanel.data.text.history.newSize, tagIconSelector = spaceghost.historypanel.data.selectors.history.tagIcon, @@ -64,11 +65,11 @@ this.test.assertVisible( nameSelector, 'History name is visible' ); this.test.assertSelectorHasText( nameSelector, unnamedName, 'History name is ' + unnamedName ); - this.test.comment( "history subtitle should display size and size should be: " + initialSizeStr ); - this.test.assertExists( subtitleSelector, 'Found ' + subtitleSelector ); - this.test.assertVisible( subtitleSelector, 'History subtitle is visible' ); - this.test.assertSelectorHasText( subtitleSelector, initialSizeStr, - 'History subtitle has "' + initialSizeStr + '"' ); + this.test.comment( "history should display size and size should be: " + initialSizeStr ); + this.test.assertExists( sizeSelector, 'Found ' + sizeSelector ); + this.test.assertVisible( sizeSelector, 'History size is visible' ); + this.test.assertSelectorHasText( sizeSelector, initialSizeStr, + 'History size has "' + initialSizeStr + '"' ); this.test.comment( "tags and annotation icons should be available" ); this.test.assertExists( tagIconSelector, 'Tag icon button found' ); @@ -157,12 +158,12 @@ this.test.assertSelectorHasText( nameSelector, newHistoryName, 'History name is ' + newHistoryName ); var onetxtFilesize = require( 'fs' ).size( filepathToUpload ), - expectedSubtitle = onetxtFilesize + ' bytes'; - this.test.comment( "history subtitle should display size and size should be " + onetxtFilesize + " bytes" ); - this.test.assertExists( subtitleSelector, 'Found ' + subtitleSelector ); - this.test.assertVisible( subtitleSelector, 'History subtitle is visible' ); - this.test.assertSelectorHasText( subtitleSelector, expectedSubtitle, - 'History subtitle has "' + expectedSubtitle + '": ' + this.fetchText( subtitleSelector ).trim() ); + expectedSize = onetxtFilesize + ' bytes'; + this.test.comment( "history should display size and size should be " + onetxtFilesize + " bytes" ); + this.test.assertExists( sizeSelector, 'Found ' + sizeSelector ); + this.test.assertVisible( sizeSelector, 'History size is visible' ); + this.test.assertSelectorHasText( sizeSelector, expectedSize, + 'History size has "' + expectedSize + '": ' + this.fetchText( sizeSelector ).trim() ); this.test.comment( "tags and annotation icons should be available" ); this.test.assertExists( tagIconSelector, 'Tag icon button found' ); diff -r fbf45bfcdd19ce116a083a0742603234c91bc461 -r b4e8b308028162d72c4c393e1c876f1a17b2a614 test/casperjs/login-tests.js --- a/test/casperjs/login-tests.js +++ b/test/casperjs/login-tests.js @@ -17,7 +17,8 @@ password = spaceghost.fixtureData.testUser.password; } -var userEmailSelector = '//a[contains(text(),"Logged in as")]'; +//var userEmailSelector = '//a[contains(text(),"Logged in as")]'; +var userEmailSelector = spaceghost.data.selectors.masthead.userMenu.userEmail_xpath; // =================================================================== TESTS // register a user (again...) diff -r fbf45bfcdd19ce116a083a0742603234c91bc461 -r b4e8b308028162d72c4c393e1c876f1a17b2a614 test/casperjs/modules/historypanel.js --- a/test/casperjs/modules/historypanel.js +++ b/test/casperjs/modules/historypanel.js @@ -356,15 +356,16 @@ }, selectors : { history : { - title : '.history-title', - name : '.history-title .history-name', - nameEditableTextInput : '.history-name input', - subtitle : '.history-subtitle', - tagIcon : '.history-secondary-actions .history-tag-btn', - tagArea : '.history-controls .tags-display', - annoIcon : '.history-secondary-actions .history-annotate-btn', - annoArea : '.history-controls .annotation-display', - emptyMsg : '.empty-history-message', + title : '.controls .title', + name : '.title .name', + nameEditableTextInput : '.name input', + subtitle : '.subtitle', + size : '.history-size', + tagIcon : '.actions .history-tag-btn', + tagArea : '.controls .tags-display', + annoIcon : '.actions .history-annotate-btn', + annoArea : '.controls .annotation-display', + emptyMsg : '.empty-message', hdaContainer: '.datasets-list' }, hda : { diff -r fbf45bfcdd19ce116a083a0742603234c91bc461 -r b4e8b308028162d72c4c393e1c876f1a17b2a614 test/casperjs/modules/user.js --- a/test/casperjs/modules/user.js +++ b/test/casperjs/modules/user.js @@ -56,14 +56,14 @@ // need manual submit (not a normal html form) this.click( xpath( spaceghost.data.selectors.registrationPage.submit_xpath ) ); }); + this.waitForNavigation( 'user/create', function afterRegister(){ + // this.withMainPanel( function mainAfterRegister(){ + // var messageInfo = spaceghost.getElementInfo( spaceghost.data.selectors.messages.all ); + // spaceghost.debug( 'post registration message:\n' + spaceghost.jsonStr( messageInfo ) ); + // }); + }); }); - this.waitForNavigation( 'user/create', function afterRegister(){ - // this.withMainPanel( function mainAfterRegister(){ - // var messageInfo = spaceghost.getElementInfo( spaceghost.data.selectors.messages.all ); - // spaceghost.debug( 'post registration message:\n' + spaceghost.jsonStr( messageInfo ) ); - // }); - }); }); }; diff -r fbf45bfcdd19ce116a083a0742603234c91bc461 -r b4e8b308028162d72c4c393e1c876f1a17b2a614 test/casperjs/spaceghost.js --- a/test/casperjs/spaceghost.js +++ b/test/casperjs/spaceghost.js @@ -638,7 +638,7 @@ } function catchNavReq( url ){ - //this.debug( 'nav.req: ' + url ); + this.debug( 'nav.req: ' + url ); for( var i=( urlsToWaitFor.length - 1 ); i>=0; i -= 1 ){ //this.debug( '\t checking: ' + urlsToWaitFor[i] ); if( urlMatches( urlsToWaitFor[i], url ) ){ 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.