From 1183dd23d827f24eaea352335b05396907f8d4ca Mon Sep 17 00:00:00 2001
From: taohebin <taohebin@dcloud.io>
Date: Fri, 21 Jun 2024 15:05:27 +0800
Subject: [PATCH] =?UTF-8?q?test:=20textarea=20=E8=87=AA=E5=8A=A8=E5=8C=96?=
 =?UTF-8?q?=E6=B5=8B=E8=AF=95=E4=BE=8B=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/component/textarea/textarea.test.js | 11 ++++-------
 pages/component/textarea/textarea.uvue    |  2 +-
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/pages/component/textarea/textarea.test.js b/pages/component/textarea/textarea.test.js
index 8c985438..f52c9839 100644
--- a/pages/component/textarea/textarea.test.js
+++ b/pages/component/textarea/textarea.test.js
@@ -74,13 +74,10 @@ describe('component-native-textarea', () => {
     }
   })
 
-  if (!process.env.uniTestPlatformInfo.startsWith('android')) {
-    // TODO: 暂时规避 android 端测试
-    it('both set modelValue and value', async () => {
-      let textarea2 = await page.$('.both-set-textarea');
-      expect(await textarea2.value()).toBe("123")
-    })
-  }
+  it('both set modelValue and value', async () => {
+    const textarea2 = await page.$('#both-model-value');
+    expect(await textarea2.value()).toEqual("123")
+  })
 
   it("maxlength", async () => {
     const input = await page.$('#textarea-instance-maxlength');
diff --git a/pages/component/textarea/textarea.uvue b/pages/component/textarea/textarea.uvue
index 81ac3d87..767d94c9 100644
--- a/pages/component/textarea/textarea.uvue
+++ b/pages/component/textarea/textarea.uvue
@@ -127,7 +127,7 @@
         <view>同时存在 v-model 和 value</view>
       </view>
       <view class="textarea-wrap">
-        <textarea class="textarea-instance" v-model='defaultModel' value='456'></textarea>
+        <textarea id="both-model-value" class="textarea-instance" v-model='defaultModel' value='456'></textarea>
       </view>
 
       <view class="title-wrap">
-- 
GitLab