1 new commit in galaxy-central:
https://bitbucket.org/galaxy/galaxy-central/commits/5bca0c757606/
Changeset: 5bca0c757606
User: carlfeberhard
Date: 2013-09-12 20:44:11
Summary: QA, browser tests: update tooltip selector for Bootstrap 3
Affected #: 1 file
diff -r b9505d30f85f6e5e49640c6428185ab427899ec4 -r 5bca0c757606024bbc29c2e30d55cff9dcaae99a test/casperjs/spaceghost.js
--- a/test/casperjs/spaceghost.js
+++ b/test/casperjs/spaceghost.js
@@ -1109,7 +1109,7 @@
*/
SpaceGhost.prototype.data = {
selectors : {
- tooltipBalloon : '.bs-tooltip',
+ tooltipBalloon : '.tooltip',
editableText : '.editable-text',
editableTextInput : 'input#renaming-active',
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.
1 new commit in galaxy-central:
https://bitbucket.org/galaxy/galaxy-central/commits/b9505d30f85f/
Changeset: b9505d30f85f
User: carlfeberhard
Date: 2013-09-12 20:27:05
Summary: QA, browser tests: fix for history update with non-attribute key (fails silently now); fix for hda create when no from_ld_id is given (now 400)
Affected #: 2 files
diff -r 85e8246c95e4ea02d666d13de2264b00453c2bd6 -r b9505d30f85f6e5e49640c6428185ab427899ec4 test/casperjs/api-hda-tests.js
--- a/test/casperjs/api-hda-tests.js
+++ b/test/casperjs/api-hda-tests.js
@@ -371,7 +371,7 @@
// ------------------------------------------------------------------------------------------- ERRORS
- this.test.comment( 'create should error with "not implemented" when the param "from_ld_id" is not used' );
+ this.test.comment( 'create should error with "Please define the source" when the param "from_ld_id" is not used' );
var errored = false;
try {
// sending an empty object won't work
@@ -379,15 +379,14 @@
} catch( err ){
errored = true;
- this.test.assert( err.message.indexOf( 'Not implemented' ) !== -1,
+ this.test.assert( err.message.indexOf( 'Please define the source' ) !== -1,
'Error has the proper message: ' + err.message );
- this.test.assert( err.status === 501, 'Error has the proper status code: ' + err.status );
+ this.test.assert( err.status === 400, 'Error has the proper status code: ' + err.status );
}
if( !errored ){
this.test.fail( 'create without "from_ld_id" did not cause error' );
}
-
//var returned = this.api.hdas.update( lastHistory.id, hdaIndex[0].id, { deleted: true, blerp: 'blerp' });
//var returned = this.api.hdas.update( lastHistory.id, { deleted: true, blerp: 'blerp' });
//this.debug( 'returned:' + this.jsonStr( returned ) );
diff -r 85e8246c95e4ea02d666d13de2264b00453c2bd6 -r b9505d30f85f6e5e49640c6428185ab427899ec4 test/casperjs/api-history-tests.js
--- a/test/casperjs/api-history-tests.js
+++ b/test/casperjs/api-history-tests.js
@@ -172,8 +172,8 @@
});
this.test.assert( countKeys( returned ) === 0, "No changed returned: " + this.jsonStr( returned ) );
- this.test.comment( 'updating using a nonsense key should fail with an error' );
- var err = {};
+ this.test.comment( 'updating using a nonsense key should fail silently' );
+ var err = null;
try {
returned = this.api.histories.update( newFirstHistory.id, {
konamiCode : 'uuddlrlrba'
@@ -182,8 +182,7 @@
err = error;
//this.debug( this.jsonStr( err ) );
}
- this.test.assert( !!err.message, "Error occurred: " + err.message );
- this.test.assert( err.status === 400, "Error status is 400: " + err.status );
+ this.test.assert( err === null, "No error occurred: " + this.jsonStr( err ) );
this.test.comment( 'updating by attempting to change type should cause an error' );
err = {};
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.
1 new commit in galaxy-central:
https://bitbucket.org/galaxy/galaxy-central/commits/ea0c57f1cdf0/
Changeset: ea0c57f1cdf0
User: dan
Date: 2013-09-12 16:55:16
Summary: Fix for unicode values in rst_to_html.
Affected #: 1 file
diff -r 13a0dffd3422178b5ae46afdb9aeb819680b8e61 -r ea0c57f1cdf0c17906bda3455ca0201972eb87c9 lib/galaxy/util/__init__.py
--- a/lib/galaxy/util/__init__.py
+++ b/lib/galaxy/util/__init__.py
@@ -444,9 +444,9 @@
def write( self, str ):
if len( str ) > 0 and not str.isspace():
log.warn( str )
- return docutils.core.publish_string(s,
+ return unicodify( docutils.core.publish_string( s,
writer=docutils.writers.html4css1.Writer(),
- settings_overrides={"embed_stylesheet": False, "template": os.path.join(os.path.dirname(__file__), "docutils_template.txt"), "warning_stream": FakeStream()})
+ settings_overrides={ "embed_stylesheet": False, "template": os.path.join(os.path.dirname(__file__), "docutils_template.txt"), "warning_stream": FakeStream() } ) )
def xml_text(root, name=None):
"""Returns the text inside an element"""
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.