Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion homeassistant/components/cloud/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
from homeassistant.util import dt as dt_util
from homeassistant.components.alexa import smart_home as alexa_sh
from homeassistant.components.google_assistant import helpers as ga_h
from homeassistant.components.google_assistant import const as ga_c

from . import http_api, iot
from .const import CONFIG_DIR, DOMAIN, SERVERS
Expand Down Expand Up @@ -52,7 +53,8 @@

GOOGLE_ENTITY_SCHEMA = vol.Schema({
vol.Optional(CONF_NAME): cv.string,
vol.Optional(CONF_ALIASES): vol.All(cv.ensure_list, [cv.string])
vol.Optional(CONF_ALIASES): vol.All(cv.ensure_list, [cv.string]),
vol.Optional(ga_c.CONF_ROOM_HINT): cv.string,
})

ASSISTANT_SCHEMA = vol.Schema({
Expand Down
4 changes: 3 additions & 1 deletion tests/components/cloud/test_iot.py
Original file line number Diff line number Diff line change
Expand Up @@ -318,7 +318,8 @@ def test_handler_google_actions(hass):
'entity_config': {
'switch.test': {
'name': 'Config name',
'aliases': 'Config alias'
'aliases': 'Config alias',
'room': 'living room'
}
}
}
Expand Down Expand Up @@ -347,6 +348,7 @@ def test_handler_google_actions(hass):
assert device['name']['name'] == 'Config name'
assert device['name']['nicknames'] == ['Config alias']
assert device['type'] == 'action.devices.types.SWITCH'
assert device['roomHint'] == 'living room'


async def test_refresh_token_expired(hass):
Expand Down