Extract config flow to own module (#13840)
* Extract config flow to own module * Lint * fix lint * fix typo * ConfigFlowHandler -> FlowHandler * Rename to data_entry_flow
This commit is contained in:
1 parent
ddd2003629
commit
60508f7215
11 files changed
+428
-388
No files matched your search
@@ -8,7 +8,8 @@ import pytest
|
||||
import voluptuous as vol
|
||||
|
||||
from homeassistant import config_entries as core_ce
|
||||
from homeassistant.config_entries import ConfigFlowHandler, HANDLERS
|
||||
from homeassistant.config_entries import HANDLERS
|
||||
from homeassistant.data_entry_flow import FlowHandler
|
||||
from homeassistant.setup import async_setup_component
|
||||
from homeassistant.components.config import config_entries
|
||||
from homeassistant.loader import set_component
|
||||
@@ -93,7 +94,7 @@ def test_available_flows(hass, client):
|
||||
@asyncio.coroutine
|
||||
def test_initialize_flow(hass, client):
|
||||
"""Test we can initialize a flow."""
|
||||
class TestFlow(ConfigFlowHandler):
|
||||
class TestFlow(FlowHandler):
|
||||
@asyncio.coroutine
|
||||
def async_step_init(self, user_input=None):
|
||||
schema = OrderedDict()
|
||||
@@ -142,7 +143,7 @@ def test_initialize_flow(hass, client):
|
||||
@asyncio.coroutine
|
||||
def test_abort(hass, client):
|
||||
"""Test a flow that aborts."""
|
||||
class TestFlow(ConfigFlowHandler):
|
||||
class TestFlow(FlowHandler):
|
||||
@asyncio.coroutine
|
||||
def async_step_init(self, user_input=None):
|
||||
return self.async_abort(reason='bla')
|
||||
@@ -167,7 +168,7 @@ def test_create_account(hass, client):
|
||||
set_component(
|
||||
'test', MockModule('test', async_setup_entry=mock_coro_func(True)))
|
||||
|
||||
class TestFlow(ConfigFlowHandler):
|
||||
class TestFlow(FlowHandler):
|
||||
VERSION = 1
|
||||
|
||||
@asyncio.coroutine
|
||||
@@ -187,7 +188,9 @@ def test_create_account(hass, client):
|
||||
assert data == {
|
||||
'domain': 'test',
|
||||
'title': 'Test Entry',
|
||||
'type': 'create_entry'
|
||||
'type': 'create_entry',
|
||||
'source': 'user',
|
||||
'version': 1,
|
||||
}
|
||||
|
||||
|
||||
@@ -197,7 +200,7 @@ def test_two_step_flow(hass, client):
|
||||
set_component(
|
||||
'test', MockModule('test', async_setup_entry=mock_coro_func(True)))
|
||||
|
||||
class TestFlow(ConfigFlowHandler):
|
||||
class TestFlow(FlowHandler):
|
||||
VERSION = 1
|
||||
|
||||
@asyncio.coroutine
|
||||
@@ -245,13 +248,15 @@ def test_two_step_flow(hass, client):
|
||||
'domain': 'test',
|
||||
'type': 'create_entry',
|
||||
'title': 'user-title',
|
||||
'version': 1,
|
||||
'source': 'user',
|
||||
}
|
||||
|
||||
|
||||
@asyncio.coroutine
|
||||
def test_get_progress_index(hass, client):
|
||||
"""Test querying for the flows that are in progress."""
|
||||
class TestFlow(ConfigFlowHandler):
|
||||
class TestFlow(FlowHandler):
|
||||
VERSION = 5
|
||||
|
||||
@asyncio.coroutine
|
||||
@@ -283,7 +288,7 @@ def test_get_progress_index(hass, client):
|
||||
@asyncio.coroutine
|
||||
def test_get_progress_flow(hass, client):
|
||||
"""Test we can query the API for same result as we get from init a flow."""
|
||||
class TestFlow(ConfigFlowHandler):
|
||||
class TestFlow(FlowHandler):
|
||||
@asyncio.coroutine
|
||||
def async_step_init(self, user_input=None):
|
||||
schema = OrderedDict()
|
||||
|
||||
@@ -5,7 +5,7 @@ from unittest.mock import patch, MagicMock
|
||||
|
||||
import pytest
|
||||
|
||||
from homeassistant import config_entries
|
||||
from homeassistant import data_entry_flow
|
||||
from homeassistant.bootstrap import async_setup_component
|
||||
from homeassistant.components import discovery
|
||||
from homeassistant.util.dt import utcnow
|
||||
@@ -174,5 +174,5 @@ async def test_discover_config_flow(hass):
|
||||
assert len(m_init.mock_calls) == 1
|
||||
args, kwargs = m_init.mock_calls[0][1:]
|
||||
assert args == ('mock-component',)
|
||||
assert kwargs['source'] == config_entries.SOURCE_DISCOVERY
|
||||
assert kwargs['source'] == data_entry_flow.SOURCE_DISCOVERY
|
||||
assert kwargs['data'] == discovery_info
|
||||
Reference in new issue
Block a user