From 3742333a8943503417dff7ea514dc2314dff1d64 Mon Sep 17 00:00:00 2001
From: Chris <firstof9@gmail.com>
Date: Mon, 9 Aug 2021 04:21:41 -0700
Subject: [PATCH] Remove zwave_js transition on individual color channels
 (#54303)

---
 homeassistant/components/zwave_js/light.py        |  2 +-
 tests/components/zwave_js/test_services.py        |  9 +++++----
 .../zwave_js/bulb_6_multi_color_state.json        | 15 +++++----------
 3 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/homeassistant/components/zwave_js/light.py b/homeassistant/components/zwave_js/light.py
index f3cabe8b6a7..4f1de6c686d 100644
--- a/homeassistant/components/zwave_js/light.py
+++ b/homeassistant/components/zwave_js/light.py
@@ -301,7 +301,7 @@ class ZwaveLight(ZWaveBaseEntity, LightEntity):
         # fallback to setting the color(s) one by one if multicolor fails
         # not sure this is needed at all, but just in case
         for color, value in colors.items():
-            await self._async_set_color(color, value, zwave_transition)
+            await self._async_set_color(color, value)
 
     async def _async_set_color(
         self,
diff --git a/tests/components/zwave_js/test_services.py b/tests/components/zwave_js/test_services.py
index 3ee656e40c0..4cc5b599f19 100644
--- a/tests/components/zwave_js/test_services.py
+++ b/tests/components/zwave_js/test_services.py
@@ -1021,8 +1021,7 @@ async def test_multicast_set_value_options(
             ],
             ATTR_COMMAND_CLASS: 51,
             ATTR_PROPERTY: "targetColor",
-            ATTR_PROPERTY_KEY: 2,
-            ATTR_VALUE: 2,
+            ATTR_VALUE: '{ "warmWhite": 0, "coldWhite": 0, "red": 255, "green": 0, "blue": 0 }',
             ATTR_OPTIONS: {"transitionDuration": 1},
         },
         blocking=True,
@@ -1038,9 +1037,11 @@ async def test_multicast_set_value_options(
     assert args["valueId"] == {
         "commandClass": 51,
         "property": "targetColor",
-        "propertyKey": 2,
     }
-    assert args["value"] == 2
+    assert (
+        args["value"]
+        == '{ "warmWhite": 0, "coldWhite": 0, "red": 255, "green": 0, "blue": 0 }'
+    )
     assert args["options"] == {"transitionDuration": 1}
 
     client.async_send_command.reset_mock()
diff --git a/tests/fixtures/zwave_js/bulb_6_multi_color_state.json b/tests/fixtures/zwave_js/bulb_6_multi_color_state.json
index dfa72af6aa4..58608131e90 100644
--- a/tests/fixtures/zwave_js/bulb_6_multi_color_state.json
+++ b/tests/fixtures/zwave_js/bulb_6_multi_color_state.json
@@ -267,8 +267,7 @@
                 "min": 0,
                 "max": 255,
                 "label": "Target value (Warm White)",
-                "description": "The target value of the Warm White color.",
-                "valueChangeOptions": ["transitionDuration"]
+                "description": "The target value of the Warm White color."
             }
         },
         {
@@ -286,8 +285,7 @@
                 "min": 0,
                 "max": 255,
                 "label": "Target value (Cold White)",
-                "description": "The target value of the Cold White color.",
-                "valueChangeOptions": ["transitionDuration"]
+                "description": "The target value of the Cold White color."
             }
         },
         {
@@ -305,8 +303,7 @@
                 "min": 0,
                 "max": 255,
                 "label": "Target value (Red)",
-                "description": "The target value of the Red color.",
-                "valueChangeOptions": ["transitionDuration"]
+                "description": "The target value of the Red color."
             }
         },
         {
@@ -324,8 +321,7 @@
                 "min": 0,
                 "max": 255,
                 "label": "Target value (Green)",
-                "description": "The target value of the Green color.",
-                "valueChangeOptions": ["transitionDuration"]
+                "description": "The target value of the Green color."
             }
         },
         {
@@ -343,8 +339,7 @@
                 "min": 0,
                 "max": 255,
                 "label": "Target value (Blue)",
-                "description": "The target value of the Blue color.",
-                "valueChangeOptions": ["transitionDuration"]
+                "description": "The target value of the Blue color."
             }
         },
         {