jeans/core
jeans/core
1
0
Fork 0
mirror of https://github.com/home-assistant/core.git synced 2025-07-19 03:07:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Weblink - Allow relative urls in config (#11808)

Browse Source 
* Allow relative url

* Allow absolute urls in config schema

* change after pylint build

* Add tests and change error message

* Change regex to check starting forward slash only

* Change error message and const name
This commit is contained in:
Rene Nulsch 2018-01-27 07:30:39 +01:00 committed by Paulus Schoutsen
parent af5d0b3443
commit 74b0740e1c
2 changed files with 70 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
homeassistant/components/weblink.py
View File

@ -16,12 +16,15 @@ import homeassistant.helpers.config_validation as cv
_LOGGER = logging.getLogger(__name__)
CONF_ENTITIES = 'entities'
CONF_RELATIVE_URL_ERROR_MSG = "Invalid relative URL. Absolute path required."
CONF_RELATIVE_URL_REGEX = r'\A/'
DOMAIN = 'weblink'
ENTITIES_SCHEMA = vol.Schema({
# pylint: disable=no-value-for-parameter
vol.Required(CONF_URL): vol.Url(),
vol.Required(CONF_URL): vol.Any(
vol.Match(CONF_RELATIVE_URL_REGEX, msg=CONF_RELATIVE_URL_ERROR_MSG),
cv.url),
vol.Required(CONF_NAME): cv.string,
vol.Optional(CONF_ICON): cv.icon,
})

65
tests/components/test_weblink.py
View File

@ -26,6 +26,71 @@ class TestComponentWeblink(unittest.TestCase):
}
}))
def test_bad_config_relative_url(self):
"""Test if new entity is created."""
self.assertFalse(setup_component(self.hass, 'weblink', {
'weblink': {
'entities': [
{
weblink.CONF_NAME: 'My router',
weblink.CONF_URL: '../states/group.bla'
},
],
}
}))
def test_bad_config_relative_file(self):
"""Test if new entity is created."""
self.assertFalse(setup_component(self.hass, 'weblink', {
'weblink': {
'entities': [
{
weblink.CONF_NAME: 'My group',
weblink.CONF_URL: 'group.bla'
},
],
}
}))
def test_good_config_absolute_path(self):
"""Test if new entity is created."""
self.assertTrue(setup_component(self.hass, 'weblink', {
'weblink': {
'entities': [
{
weblink.CONF_NAME: 'My second URL',
weblink.CONF_URL: '/states/group.bla'
},
],
}
}))
def test_good_config_path_short(self):
"""Test if new entity is created."""
self.assertTrue(setup_component(self.hass, 'weblink', {
'weblink': {
'entities': [
{
weblink.CONF_NAME: 'My third URL',
weblink.CONF_URL: '/states'
},
],
}
}))
def test_good_config_path_directory(self):
"""Test if new entity is created."""
self.assertTrue(setup_component(self.hass, 'weblink', {
'weblink': {
'entities': [
{
weblink.CONF_NAME: 'My last URL',
weblink.CONF_URL: '/states/bla/'
},
],
}
}))
def test_entities_get_created(self):
"""Test if new entity is created."""
self.assertTrue(setup_component(self.hass, weblink.DOMAIN, {