From 93df1e125970a93bc710c9d9b48ea29048bc6cbc Mon Sep 17 00:00:00 2001
From: Leonardo Rivera <leodrivera@gmail.com>
Date: Wed, 23 Sep 2026 12:29:23 -0300
Subject: [PATCH] [gree] Remove the traits() override now handled by climate_ir
 (#19484)

---
 esphome/components/gree/gree.cpp    | 11 -----------
 esphome/components/gree/gree.h      |  1 -
 tests/components/gree/__init__.py   |  6 ++++++
 tests/components/gree/gree_test.cpp | 24 ++++++++++++++++++++++++
 4 files changed, 30 insertions(+), 12 deletions(-)
 create mode 100644 tests/components/gree/__init__.py
 create mode 100644 tests/components/gree/gree_test.cpp

diff --git a/esphome/components/gree/gree.cpp b/esphome/components/gree/gree.cpp
index 634a2d33b5..6add618ecb 100644
--- a/esphome/components/gree/gree.cpp
+++ b/esphome/components/gree/gree.cpp
@@ -5,17 +5,6 @@ namespace esphome::gree {
 
 static const char *const TAG = "gree.climate";
 
-climate::ClimateTraits GreeClimate::traits() {
-  auto t = climate_ir::ClimateIR::traits();
-  // ClimateIR unconditionally includes HEAT_COOL in the base mode set; remove it when heat is not supported.
-  if (!this->supports_heat_) {
-    auto modes = t.get_supported_modes();
-    modes.erase(climate::CLIMATE_MODE_HEAT_COOL);
-    t.set_supported_modes(modes);
-  }
-  return t;
-}
-
 void GreeClimate::set_model(Model model) {
   if (model == GREE_YAN) {
     // YAN only has a vertical vane; the horizontal swing IR bytes are not defined for this model.
diff --git a/esphome/components/gree/gree.h b/esphome/components/gree/gree.h
index 2f87926942..c261629573 100644
--- a/esphome/components/gree/gree.h
+++ b/esphome/components/gree/gree.h
@@ -94,7 +94,6 @@ class GreeClimate final : public climate_ir::ClimateIR {
  protected:
   // Transmit via IR the state of this climate controller.
   void transmit_state() override;
-  climate::ClimateTraits traits() override;
 
   uint8_t operation_mode_();
   uint8_t fan_speed_();
diff --git a/tests/components/gree/__init__.py b/tests/components/gree/__init__.py
new file mode 100644
index 0000000000..8e15f6d479
--- /dev/null
+++ b/tests/components/gree/__init__.py
@@ -0,0 +1,6 @@
+from tests.testing_helpers import ComponentManifestOverride
+
+
+def override_manifest(manifest: ComponentManifestOverride) -> None:
+    # AUTO_LOAD sits on the climate platform, which the unit test build does not load.
+    manifest.dependencies = manifest.dependencies + ["climate_ir", "climate"]
diff --git a/tests/components/gree/gree_test.cpp b/tests/components/gree/gree_test.cpp
new file mode 100644
index 0000000000..9a02c60b39
--- /dev/null
+++ b/tests/components/gree/gree_test.cpp
@@ -0,0 +1,24 @@
+#include <gtest/gtest.h>
+#include "esphome/components/gree/gree.h"
+
+namespace esphome::gree::testing {
+
+TEST(GreeClimateTest, HeatCoolHiddenWithoutHeatByDefault) {
+  GreeClimate climate;
+  climate.set_supports_heat(false);
+  climate.set_supports_cool(true);
+  climate.set_supports_heat_cool(false);
+  EXPECT_FALSE(climate.get_traits().supports_mode(climate::CLIMATE_MODE_HEAT_COOL));
+}
+
+TEST(GreeClimateTest, HeatCoolOverrideAdvertisedWithoutHeat) {
+  GreeClimate climate;
+  climate.set_supports_heat(false);
+  climate.set_supports_cool(true);
+  climate.set_supports_heat_cool(true);
+  auto traits = climate.get_traits();
+  EXPECT_TRUE(traits.supports_mode(climate::CLIMATE_MODE_HEAT_COOL));
+  EXPECT_FALSE(traits.supports_mode(climate::CLIMATE_MODE_HEAT));
+}
+
+}  // namespace esphome::gree::testing