Fix missing fixture (#67)

* add more lines from const

* use fixture

* use autouse in conftest

* run generate

Author: MatthewFlamm

README.md

@@ -1,6 +1,6 @@
 # pytest-homeassistant-custom-component
 
-![HA core version](https://img.shields.io/static/v1?label=HA+core+version&message=2021.5.0b4&labelColor=blue)
+![HA core version](https://img.shields.io/static/v1?label=HA+core+version&message=2021.6.0b0&labelColor=blue)
 
 Package to automatically extract testing plugins from Home Assistant for custom component testing.
 The goal is to provide the same functionality as the tests in home-assistant/core.

pytest_homeassistant_custom_component/common.py

@@ -9,7 +9,7 @@
 import collections
 from collections import OrderedDict
 from contextlib import contextmanager
-from datetime import timedelta
+from datetime import datetime, timedelta
 import functools as ft
 from io import StringIO
 import json
@@ -49,7 +49,7 @@
     STATE_OFF,
     STATE_ON,
 )
-from homeassistant.core import BLOCK_LOG_TIMEOUT, State
+from homeassistant.core import BLOCK_LOG_TIMEOUT, HomeAssistant, State
 from homeassistant.helpers import (
     area_registry,
     device_registry,
@@ -275,7 +275,7 @@ async def _await_count_and_log_pending(
     hass.config.latitude = 32.87336
     hass.config.longitude = -117.22743
     hass.config.elevation = 0
-    hass.config.time_zone = date_util.get_time_zone("US/Pacific")
+    hass.config.time_zone = "US/Pacific"
     hass.config.units = METRIC_SYSTEM
     hass.config.media_dirs = {"local": get_test_config_dir("media")}
     hass.config.skip_pip = True
@@ -366,7 +366,9 @@ def async_fire_mqtt_message(hass, topic, payload, qos=0, retain=False):
 
 
 @ha.callback
-def async_fire_time_changed(hass, datetime_, fire_all=False):
+def async_fire_time_changed(
+    hass: HomeAssistant, datetime_: datetime, fire_all: bool = False
+) -> None:
     """Fire a time changes event."""
     hass.bus.async_fire(EVENT_TIME_CHANGED, {"now": date_util.as_utc(datetime_)})
 
@@ -737,7 +739,6 @@ def __init__(
         state=None,
         options={},
         system_options={},
-        connection_class=config_entries.CONN_CLASS_UNKNOWN,
         unique_id=None,
         disabled_by=None,
         reason=None,
@@ -751,7 +752,6 @@ def __init__(
             "options": options,
             "version": version,
             "title": title,
-            "connection_class": connection_class,
             "unique_id": unique_id,
             "disabled_by": disabled_by,
         }

pytest_homeassistant_custom_component/const.py

@@ -3,8 +3,12 @@
 
 This file is originally from homeassistant/core and modified by pytest-homeassistant-custom-component.
 """
-MAJOR_VERSION = 2021
-MINOR_VERSION = 5
-PATCH_VERSION = "0b4"
-__short_version__ = f"{MAJOR_VERSION}.{MINOR_VERSION}"
-__version__ = f"{__short_version__}.{PATCH_VERSION}"
+from __future__ import annotations
+
+from typing import Final
+
+MAJOR_VERSION: Final = 2021
+MINOR_VERSION: Final = 6
+PATCH_VERSION: Final = "0b0"
+__short_version__: Final = f"{MAJOR_VERSION}.{MINOR_VERSION}"
+__version__: Final = f"{__short_version__}.{PATCH_VERSION}"

pytest_homeassistant_custom_component/plugins.py

@@ -20,7 +20,7 @@
 from homeassistant.auth.const import GROUP_ID_ADMIN, GROUP_ID_READ_ONLY
 from homeassistant.auth.models import Credentials
 from homeassistant.auth.providers import homeassistant, legacy_api_password
-from homeassistant.components import mqtt
+from homeassistant.components import mqtt, recorder
 from homeassistant.components.websocket_api.auth import (
     TYPE_AUTH,
     TYPE_AUTH_OK,
@@ -43,6 +43,8 @@
     MockUser,
     async_fire_mqtt_message,
     async_test_home_assistant,
+    get_test_home_assistant,
+    init_recorder_component,
     mock_storage as mock_storage,
 )
 from .test_util.aiohttp import mock_aiohttp_client  # noqa: E402, isort:skip
@@ -482,7 +484,7 @@ async def mqtt_mock(hass, mqtt_client_mock, mqtt_config):
 @pytest.fixture
 def mock_zeroconf():
     """Mock zeroconf."""
-    with patch("homeassistant.components.zeroconf.HaZeroconf") as mock_zc:
+    with patch("homeassistant.components.zeroconf.models.HaZeroconf") as mock_zc:
         yield mock_zc.return_value
 
 
@@ -599,3 +601,36 @@ def pattern_time_change_listener(ev) -> None:
 def enable_custom_integrations(hass):
     """Enable custom integrations defined in the test dir."""
     hass.data.pop(loader.DATA_CUSTOM_COMPONENTS)
+
+
+@pytest.fixture
+def enable_statistics():
+    """Fixture to control enabling of recorder's statistics compilation.
+
+    To enable statistics, tests can be marked with:
+    @pytest.mark.parametrize("enable_statistics", [True])
+    """
+    return False
+
+
+@pytest.fixture
+def hass_recorder(enable_statistics):
+    """Home Assistant fixture with in-memory recorder."""
+    hass = get_test_home_assistant()
+    stats = recorder.Recorder.async_hourly_statistics if enable_statistics else None
+    with patch(
+        "homeassistant.components.recorder.Recorder.async_hourly_statistics",
+        side_effect=stats,
+        autospec=True,
+    ):
+
+        def setup_recorder(config=None):
+            """Set up with params."""
+            init_recorder_component(hass, config)
+            hass.start()
+            hass.block_till_done()
+            hass.data[recorder.DATA_INSTANCE].block_till_done()
+            return hass
+
+        yield setup_recorder
+        hass.stop()

requirements_dev.txt

@@ -1,6 +1,5 @@
 # This file is originally from homeassistant/core and modified by pytest-homeassistant-custom-component.
 codecov==2.1.10
 mypy==0.812
-pre-commit==2.12.1
-pylint==2.8.0
-astroid==2.5.5
+pre-commit==2.13.0
+pylint==2.8.2

requirements_test.txt

@@ -15,11 +15,11 @@ pytest-cov==2.10.1
 pytest-test-groups==1.0.3
 pytest-sugar==0.9.4
 pytest-timeout==1.4.2
-pytest-xdist==2.1.0
-pytest==6.2.3
-requests_mock==1.8.0
+pytest-xdist==2.2.1
+pytest==6.2.4
+requests_mock==1.9.2
 responses==0.12.0
 respx==0.17.0
 stdlib-list==0.7.0
 tqdm==4.49.0
-homeassistant==2021.5.0b4
+homeassistant==2021.6.0b0

tests/conftest.py

@@ -0,0 +1,8 @@
+"""Fixtures for trsting."""
+import pytest
+
+
+@pytest.fixture(autouse=True)
+def auto_enable_custom_integrations(enable_custom_integrations):
+    yield
+    

tests/test_config_flow.py

@@ -5,8 +5,6 @@
 from custom_components.simple_integration.const import DOMAIN
 
 
-
-
 async def test_form(hass):
     """Test we get the form."""
     await setup.async_setup_component(hass, "persistent_notification", {})