From 83ff6c92a0f1bc4827f64761d86e8ab554152c9b Mon Sep 17 00:00:00 2001
From: Dao Hoang Son <daohoangson@gmail.com>
Date: Wed, 13 Nov 2024 23:30:08 +0700
Subject: [PATCH 1/2] Fix backward compatibility with Flutter@master & beta

---
 packages/core/test/src/core_legacy_test.dart | 5 +++--
 packages/core/test/tag_li_test.dart          | 6 ++++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/packages/core/test/src/core_legacy_test.dart b/packages/core/test/src/core_legacy_test.dart
index 99f11e138..3a6f37b94 100644
--- a/packages/core/test/src/core_legacy_test.dart
+++ b/packages/core/test/src/core_legacy_test.dart
@@ -59,6 +59,7 @@ void main() {
 
     testWidgets('tsb.build', (tester) async {
       const html = '<span class="build-op">Foo</span>';
+      const abcdef = Color(0x00abcdef);
       final buildOp = BuildOp(
         onTree: (_, tree) => tree.append(
           WidgetBit.block(
@@ -66,7 +67,7 @@ void main() {
             WidgetPlaceholder(
               builder: (context, child) {
                 final style = tree.tsb.build(context).style;
-                final colored = style.copyWith(color: const Color(0x00abcdef));
+                final colored = style.copyWith(color: abcdef);
                 return Text('hi', style: colored);
               },
             ),
@@ -83,7 +84,7 @@ void main() {
         ),
         useExplainer: false,
       );
-      expect(explained, contains('0x00abcdef'));
+      expect(explained, contains(abcdef.toString()));
     });
   });
 
diff --git a/packages/core/test/tag_li_test.dart b/packages/core/test/tag_li_test.dart
index c64a668be..82278a3f1 100644
--- a/packages/core/test/tag_li_test.dart
+++ b/packages/core/test/tag_li_test.dart
@@ -1000,14 +1000,16 @@ Future<void> main() async {
         '<ul style="color: #f00"><li>Foo</li></ul>',
         useExplainer: false,
       );
-      expect(disc, contains('Color(0xffff0000)'));
+      const red = Color(0xffff0000);
+      expect(disc, contains(red.toString()));
 
       final circle = await explain(
         tester,
         '<ul style="color: #0f0"><li>Foo</li></ul>',
         useExplainer: false,
       );
-      expect(circle, contains('Color(0xff00ff00)'));
+      const green = Color(0xff00ff00);
+      expect(circle, contains(green.toString()));
     });
   });
 }

From 8bcf10c60644499ff8737daacc38bb3673d66756 Mon Sep 17 00:00:00 2001
From: Dao Hoang Son <daohoangson@gmail.com>
Date: Wed, 13 Nov 2024 23:40:52 +0700
Subject: [PATCH 2/2] Remove `ColorSpace.` from color string

---
 packages/core/test/src/core_legacy_test.dart | 5 ++++-
 packages/core/test/tag_li_test.dart          | 8 ++++++--
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/packages/core/test/src/core_legacy_test.dart b/packages/core/test/src/core_legacy_test.dart
index 3a6f37b94..174ed5189 100644
--- a/packages/core/test/src/core_legacy_test.dart
+++ b/packages/core/test/src/core_legacy_test.dart
@@ -84,7 +84,10 @@ void main() {
         ),
         useExplainer: false,
       );
-      expect(explained, contains(abcdef.toString()));
+
+      // TODO: use hard coded value when our minimum Flutter version > 3.24
+      final abcdefString = abcdef.toString().replaceAll('ColorSpace.', '');
+      expect(explained, contains(abcdefString));
     });
   });
 
diff --git a/packages/core/test/tag_li_test.dart b/packages/core/test/tag_li_test.dart
index 82278a3f1..fe3b97fdf 100644
--- a/packages/core/test/tag_li_test.dart
+++ b/packages/core/test/tag_li_test.dart
@@ -1000,16 +1000,20 @@ Future<void> main() async {
         '<ul style="color: #f00"><li>Foo</li></ul>',
         useExplainer: false,
       );
+
+      // TODO: use hard coded value when our minimum Flutter version > 3.24
       const red = Color(0xffff0000);
-      expect(disc, contains(red.toString()));
+      expect(disc, contains(red.toString().replaceAll('ColorSpace.', '')));
 
       final circle = await explain(
         tester,
         '<ul style="color: #0f0"><li>Foo</li></ul>',
         useExplainer: false,
       );
+
+      // TODO: use hard coded value when our minimum Flutter version > 3.24
       const green = Color(0xff00ff00);
-      expect(circle, contains(green.toString()));
+      expect(circle, contains(green.toString().replaceAll('ColorSpace.', '')));
     });
   });
 }