From e310453fd0bde9c0c565c6f68b2fcd09942ac49a Mon Sep 17 00:00:00 2001
From: John Chilton <jmchilton@gmail.com>
Date: Fri, 7 Oct 2016 09:45:18 -0400
Subject: [PATCH] Improved docs and testing for color params.

---
 lib/galaxy/tools/xsd/galaxy.xsd             |  2 +-
 test/functional/tools/color_param.xml       | 30 +++++++++++++++++++++
 test/functional/tools/samples_tool_conf.xml |  1 +
 3 files changed, 32 insertions(+), 1 deletion(-)
 create mode 100644 test/functional/tools/color_param.xml

diff --git a/lib/galaxy/tools/xsd/galaxy.xsd b/lib/galaxy/tools/xsd/galaxy.xsd
index 3b58a5255f0..8d0cecc92c1 100644
--- a/lib/galaxy/tools/xsd/galaxy.xsd
+++ b/lib/galaxy/tools/xsd/galaxy.xsd
@@ -2046,7 +2046,7 @@ in the [planemo documentation](http://planemo.readthedocs.io/en/latest/writing_a
 
 #### ``color``
 
-$attribute_list:value
+$attribute_list:value,rgb
 
 ##### Examples
 
diff --git a/test/functional/tools/color_param.xml b/test/functional/tools/color_param.xml
new file mode 100644
index 00000000000..fb4d01652f8
--- /dev/null
+++ b/test/functional/tools/color_param.xml
@@ -0,0 +1,30 @@
+<tool id="color_param" name="color_param" version="1.0.0">
+    <command>
+        echo "$color_default"  > $out_file1;
+        echo "$color_rgb"      > $out_file2;
+    </command>
+    <inputs>
+        <param name="color_default" type="color" value="#aabbcc" />
+        <param name="color_rgb" type="color" value="#aabbcc" rgb="true" />
+    </inputs>
+    <outputs>
+        <data name="out_file1" format="txt" />
+        <data name="out_file2" format="txt" />
+    </outputs>
+    <tests>
+        <test>
+            <param name="color_default" value="#aaaaaa" />
+            <param name="color_rgb" value="#aaaaaa" />
+            <output name="out_file1">
+                <assert_contents>
+                    <has_line line="#aaaaaa" />
+                </assert_contents>
+            </output>
+            <output name="out_file2">
+                <assert_contents>
+                    <has_line line="(170, 170, 170)" />
+                </assert_contents>
+            </output>
+        </test>
+    </tests>
+</tool>
diff --git a/test/functional/tools/samples_tool_conf.xml b/test/functional/tools/samples_tool_conf.xml
index 2f2e3c6bc0e..d57356e25d9 100644
--- a/test/functional/tools/samples_tool_conf.xml
+++ b/test/functional/tools/samples_tool_conf.xml
@@ -2,6 +2,7 @@
 <toolbox tool_path="${tool_conf_dir}" is_shed_conf="false">
   <tool file="upload.xml"/>
   <tool file="simple_constructs.xml" />
+  <tool file="color_param.xml" />
   <tool file="inheritance_simple.xml" />
   <tool file="boolean_conditional.xml" />
   <tool file="composite.xml" />