Merge branch 'main' into move-if

.github/workflows/pull_requests_labels.yml

@@ -24,4 +24,5 @@ jobs:
           labels: >-
               Breaking Change, Experimental, pr: new-feature,
               pr: enhancement, pr: refactor, pr: bugfix,
-              pr: dependency-update
+              pr: dependency-update, pr: action, pr: test,
+              pr: repository

tests/test_config_flow.py

@@ -16,6 +16,7 @@
     MockedResponse,
     ResponseMocker,
     create_config_entry,
+    get_hacs,
     recursive_remove_key,
     safe_json_dumps,
 )
@@ -292,16 +293,15 @@ async def test_already_configured(
     )
 
 
-async def test_options_flow(
-    hass: HomeAssistant, setup_integration: Generator, hacs: HacsBase
-) -> None:
+async def test_options_flow(hass: HomeAssistant, setup_integration: Generator) -> None:
     """Test reconfiguring."""
     config_entry = hass.config_entries.async_entries(DOMAIN)[0]
     result = await hass.config_entries.options.async_init(config_entry.entry_id)
     assert result["type"] == FlowResultType.FORM
     assert result["step_id"] == "user"
 
     # Test defaults
+    hacs = get_hacs(hass)
     schema = result["data_schema"].schema
     for key in schema:
         assert key.default() == getattr(hacs.configuration, str(key))
@@ -337,7 +337,7 @@ async def test_options_flow(
 
     # Check config entry is reloaded with new options
     await hass.async_block_till_done()
-    hacs = hass.data[DOMAIN]
-
+    # Get a new HACS instance after reload
+    hacs = get_hacs(hass)
     for key, val in config_entry.options.items():
         assert getattr(hacs.configuration, str(key)) == val