Fix Scrape integration for date and timestamp devices (#84480)

* Scrape integration fix for date and timestamp devices

* Changes advised by PR review. Merged test source and used walrus operator

homeassistant/components/scrape/sensor.py

@@ -13,7 +13,9 @@ from homeassistant.components.sensor import (
     DEVICE_CLASSES_SCHEMA,
     PLATFORM_SCHEMA as PARENT_PLATFORM_SCHEMA,
     STATE_CLASSES_SCHEMA,
+    SensorDeviceClass,
 )
+from homeassistant.components.sensor.helpers import async_parse_date_datetime
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import (
     CONF_ATTRIBUTE,
@@ -246,12 +248,19 @@ class ScrapeSensor(CoordinatorEntity[ScrapeCoordinator], TemplateSensor):
         """Update state from the rest data."""
         value = self._extract_value()
 
-        if self._value_template is not None:
-            self._attr_native_value = (
-                self._value_template.async_render_with_possible_json_value(value, None)
-            )
-        else:
+        if (template := self._value_template) is not None:
+            value = template.async_render_with_possible_json_value(value, None)
+
+        if self.device_class not in {
+            SensorDeviceClass.DATE,
+            SensorDeviceClass.TIMESTAMP,
+        }:
             self._attr_native_value = value
+            return
+
+        self._attr_native_value = async_parse_date_datetime(
+            value, self.entity_id, self.device_class
+        )
 
     @callback
     def _handle_coordinator_update(self) -> None:

tests/components/scrape/__init__.py

@@ -103,6 +103,9 @@ class MockRestData:
                 "<h1>Current Version: 2021.12.10</h1>Released: <span class='release-date'>January 17, 2022</span>"
                 "<div class='links' style='links'><a href='/latest-release-notes/'>Release notes</a></div></div>"
                 "<template>Trying to get</template>"
+                "<div class='current-time'>"
+                "<h1>Current Time:</h1><span class='utc-time'>2022-12-22T13:15:30Z</span>"
+                "</div>"
             )
         if self.payload == "test_scrape_sensor2":
             self.data = (

tests/components/scrape/test_sensor.py

@@ -338,6 +338,119 @@ async def test_scrape_sensor_attribute_and_tag(hass: HomeAssistant) -> None:
     assert state2.state == "Trying to get"
 
 
+async def test_scrape_sensor_device_date(hass: HomeAssistant) -> None:
+    """Test Scrape sensor with a device of type DATE."""
+    config = {
+        DOMAIN: [
+            return_integration_config(
+                sensors=[
+                    {
+                        "select": ".release-date",
+                        "name": "HA Date",
+                        "device_class": "date",
+                        "value_template": "{{ strptime(value, '%B %d, %Y').strftime('%Y-%m-%d') }}",
+                    }
+                ],
+            ),
+        ]
+    }
+
+    mocker = MockRestData("test_scrape_sensor")
+    with patch(
+        "homeassistant.components.rest.RestData",
+        return_value=mocker,
+    ):
+        assert await async_setup_component(hass, DOMAIN, config)
+        await hass.async_block_till_done()
+
+    state = hass.states.get("sensor.ha_date")
+    assert state.state == "2022-01-17"
+
+
+async def test_scrape_sensor_device_date_errors(hass: HomeAssistant) -> None:
+    """Test Scrape sensor with a device of type DATE."""
+    config = {
+        DOMAIN: [
+            return_integration_config(
+                sensors=[
+                    {
+                        "select": ".current-version h1",
+                        "name": "HA Date",
+                        "device_class": "date",
+                    }
+                ],
+            ),
+        ]
+    }
+
+    mocker = MockRestData("test_scrape_sensor")
+    with patch(
+        "homeassistant.components.rest.RestData",
+        return_value=mocker,
+    ):
+        assert await async_setup_component(hass, DOMAIN, config)
+        await hass.async_block_till_done()
+
+    state = hass.states.get("sensor.ha_date")
+    assert state.state == STATE_UNKNOWN
+
+
+async def test_scrape_sensor_device_timestamp(hass: HomeAssistant) -> None:
+    """Test Scrape sensor with a device of type TIMESTAMP."""
+    config = {
+        DOMAIN: [
+            return_integration_config(
+                sensors=[
+                    {
+                        "select": ".utc-time",
+                        "name": "HA Timestamp",
+                        "device_class": "timestamp",
+                    }
+                ],
+            ),
+        ]
+    }
+
+    mocker = MockRestData("test_scrape_sensor")
+    with patch(
+        "homeassistant.components.rest.RestData",
+        return_value=mocker,
+    ):
+        assert await async_setup_component(hass, DOMAIN, config)
+        await hass.async_block_till_done()
+
+    state = hass.states.get("sensor.ha_timestamp")
+    assert state.state == "2022-12-22T13:15:30+00:00"
+
+
+async def test_scrape_sensor_device_timestamp_error(hass: HomeAssistant) -> None:
+    """Test Scrape sensor with a device of type TIMESTAMP."""
+    config = {
+        DOMAIN: [
+            return_integration_config(
+                sensors=[
+                    {
+                        "select": ".current-time",
+                        "name": "HA Timestamp",
+                        "device_class": "timestamp",
+                    }
+                ],
+            ),
+        ]
+    }
+
+    mocker = MockRestData("test_scrape_sensor")
+    with patch(
+        "homeassistant.components.rest.RestData",
+        return_value=mocker,
+    ):
+        assert await async_setup_component(hass, DOMAIN, config)
+        await hass.async_block_till_done()
+
+    state = hass.states.get("sensor.ha_timestamp")
+    assert state.state == STATE_UNKNOWN
+
+
 async def test_scrape_sensor_errors(hass: HomeAssistant) -> None:
     """Test Scrape sensor handle errors."""
     config = {