From 74a8bae0a48ddf00f1e88ff1fd4a85d387f8d5a7 Mon Sep 17 00:00:00 2001
From: daiwei <daiwei521@126.com>
Date: Tue, 25 Nov 2025 15:58:24 +0800
Subject: [PATCH] fix(tests): update props merging tests for style and class

---
 .../transformElement.spec.ts.snap             | 20 +++++++++++++++++++
 .../transforms/transformElement.spec.ts       |  4 ++--
 2 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/packages/compiler-vapor/__tests__/transforms/__snapshots__/transformElement.spec.ts.snap b/packages/compiler-vapor/__tests__/transforms/__snapshots__/transformElement.spec.ts.snap
index 65b1d3bf01..53d9c55613 100644
--- a/packages/compiler-vapor/__tests__/transforms/__snapshots__/transformElement.spec.ts.snap
+++ b/packages/compiler-vapor/__tests__/transforms/__snapshots__/transformElement.spec.ts.snap
@@ -75,6 +75,16 @@ export function render(_ctx) {
 }"
 `;
 
+exports[`compiler: element transform > component > props merging: class 1`] = `
+"import { resolveComponent as _resolveComponent, createComponentWithFallback as _createComponentWithFallback } from 'vue';
+
+export function render(_ctx) {
+  const _component_Foo = _resolveComponent("Foo")
+  const n0 = _createComponentWithFallback(_component_Foo, { class: () => (["foo", { bar: _ctx.isBar }]) }, null, true)
+  return n0
+}"
+`;
+
 exports[`compiler: element transform > component > props merging: event handlers 1`] = `
 "import { resolveComponent as _resolveComponent, createComponentWithFallback as _createComponentWithFallback } from 'vue';
 
@@ -97,6 +107,16 @@ export function render(_ctx) {
 }"
 `;
 
+exports[`compiler: element transform > component > props merging: style 1`] = `
+"import { resolveComponent as _resolveComponent, createComponentWithFallback as _createComponentWithFallback } from 'vue';
+
+export function render(_ctx) {
+  const _component_Foo = _resolveComponent("Foo")
+  const n0 = _createComponentWithFallback(_component_Foo, { style: () => (["color: green", { color: 'red' }]) }, null, true)
+  return n0
+}"
+`;
+
 exports[`compiler: element transform > component > resolve component from setup bindings (inline const) 1`] = `
 "
   const n0 = _createComponent(Example, null, null, true)
diff --git a/packages/compiler-vapor/__tests__/transforms/transformElement.spec.ts b/packages/compiler-vapor/__tests__/transforms/transformElement.spec.ts
index c825a4fbb6..c143fea02a 100644
--- a/packages/compiler-vapor/__tests__/transforms/transformElement.spec.ts
+++ b/packages/compiler-vapor/__tests__/transforms/transformElement.spec.ts
@@ -346,14 +346,14 @@ describe('compiler: element transform', () => {
       expect(code).contains('onClick: () => [_on_click, _on_click1]')
     })
 
-    test.todo('props merging: style', () => {
+    test('props merging: style', () => {
       const { code } = compileWithElementTransform(
         `<Foo style="color: green" :style="{ color: 'red' }" />`,
       )
       expect(code).toMatchSnapshot()
     })
 
-    test.todo('props merging: class', () => {
+    test('props merging: class', () => {
       const { code } = compileWithElementTransform(
         `<Foo class="foo" :class="{ bar: isBar }" />`,
       )
-- 
2.47.3