Notify: Only attach target if in call data (home-assistant#3831)

* Only pass through the target if it has a value * Target will no longer be none
robjohnson189 · Oct 12, 2016 · d302dbe · d302dbe
1 parent e135691
commit d302dbe
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 4 deletions.
diff --git a/homeassistant/components/notify/__init__.py b/homeassistant/components/notify/__init__.py
@@ -101,7 +101,7 @@ def notify_message(notify_service, call):
 
             if targets.get(call.service) is not None:
                 kwargs[ATTR_TARGET] = [targets[call.service]]
-            else:
+            elif call.data.get(ATTR_TARGET) is not None:
                 kwargs[ATTR_TARGET] = call.data.get(ATTR_TARGET)
 
             message.hass = hass

diff --git a/tests/components/notify/test_demo.py b/tests/components/notify/test_demo.py
@@ -64,7 +64,6 @@ def test_method_forwards_correct_data(self):
         data = self.events[0].data
         assert {
             'message': 'my message',
-            'target': None,
             'title': 'my title',
             'data': {'hello': 'world'}
         } == data
@@ -92,7 +91,6 @@ def test_calling_notify_from_script_loaded_from_yaml_without_title(self):
         self.assertTrue(len(self.events) == 1)
         assert {
             'message': 'Test 123 4',
-            'target': None,
             'data': {
                 'push': {
                     'sound':
@@ -124,7 +122,6 @@ def test_calling_notify_from_script_loaded_from_yaml_with_title(self):
         assert {
             'message': 'Test 123 4',
             'title': 'Test',
-            'target': None,
             'data': {
                 'push': {
                     'sound':