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

Small tweaks to some functional test tools.

Browse Source 
Add data labels so the tools works in the workflow editor and added a conditional switches to some with collection params and multiple input data parameters to test some state-y logic in workflow editor.
This commit is contained in:
John Chilton
2014-09-03 08:43:25 -04:00
parent 6d727ce454
commit ef1877b468
4 changed files with 31 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/functional/tools/collection_mixed_param.xml
+13 -2
View File
@@ -3,8 +3,19 @@
cat #for $f in $f1# ${f} #end for# $f2 >> $out1;
</command>
<inputs>
<param name="f1" type="data_collection" collection_type="paired" />
<param name="f2" type="data" format="txt" />
<param name="f1" type="data_collection" collection_type="paired" label="collection param" />
<param name="f2" type="data" format="txt" label="data param" />
<conditional name="advanced">
<param name="full" type="select" label="Parameter Settings">
<option value="no">Use defaults</option>
<option value="yes">Full parameter list</option>
</param>
<when value="yes">
<param name="advanced_threshold" type="integer" value="8" />
</when>
<when value="no">
</when>
</conditional>
</inputs>
<outputs>
<data format="txt" name="out1" />
test/functional/tools/collection_paired_test.xml
+1 -1
View File
@@ -3,7 +3,7 @@
cat $f1.forward $f1['reverse'] >> $out1;
</command>
<inputs>
<param name="f1" type="data_collection" collection_type="paired" />
<param name="f1" type="data_collection" collection_type="paired" label="Input pair" />
</inputs>
<outputs>
<data format="txt" name="out1" />
test/functional/tools/multi_data_param.xml
+13 -2
View File
@@ -4,8 +4,19 @@
cat #for $f in $f2# ${f} #end for# >> $out2
</command>
<inputs>
<param name="f1" type="data" format="txt" multiple="true" />
<param name="f2" type="data" format="txt" multiple="true" />
<param name="f1" type="data" format="txt" multiple="true" label="Data 1" />
<param name="f2" type="data" format="txt" multiple="true" label="Data 2" />
<conditional name="advanced">
<param name="full" type="select" label="Parameter Settings">
<option value="no">Use defaults</option>
<option value="yes">Full parameter list</option>
</param>
<when value="yes">
<param name="advanced_threshold" type="integer" value="8" />
</when>
<when value="no">
</when>
</conditional>
</inputs>
<outputs>
<data format="txt" name="out1" />
test/qunit/tests/workflow_editor_tests.js
+4 -2
View File
@@ -803,11 +803,12 @@ define([
return node;
},
addOutput: function( terminal, connected ) {
var self = this;
var connectedOutput = this.newOutputTerminal();
var inputTerminal = this.newInputTerminal();
var node = terminal.node;
if( connected ) {
with_workflow_global( function() {
var inputTerminal = self.newInputTerminal();
new Connector( inputTerminal, connectedOutput );
} );
}
@@ -818,10 +819,11 @@ define([
return this.addOutput( terminal, true );
},
addConnectedInput: function( terminal ) {
var self = this;
var connectedInput = this.newInputTerminal();
var outputTerminal = this.newOutputTerminal();
var node = terminal.node;
with_workflow_global( function() {
var outputTerminal = self.newOutputTerminal();
new Connector( connectedInput, outputTerminal );
} );
this._addTerminalTo( connectedInput, node.input_terminals );