From d6a17b309825228a07129e9b113ea3aeb9e79606 Mon Sep 17 00:00:00 2001
From: Pablo Zmdl <pablo@nextcloud.com>
Date: Wed, 26 Jun 2024 14:19:09 +0200
Subject: [PATCH] Fix browser tests for iframed message parts

---
 tests/Browser/Mail/PreviewTest.php | 15 ++++++++++-----
 tests/Browser/Mail/PrintTest.php   |  8 ++++++--
 2 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/tests/Browser/Mail/PreviewTest.php b/tests/Browser/Mail/PreviewTest.php
index 488f376adbe..c65bf14e51f 100644
--- a/tests/Browser/Mail/PreviewTest.php
+++ b/tests/Browser/Mail/PreviewTest.php
@@ -55,8 +55,10 @@ public function testPreview()
                     ->assertSeeIn('#remote-objects-message', 'To protect your privacy remote resources have been blocked.');
 
                 // Images
-                $this->assertMatchesRegularExpression('/action=get/', $browser->attribute('p#v1attached > img', 'src'));
-                $this->assertMatchesRegularExpression('/blocked/', $browser->attribute('p#v1remote > img', 'src'));
+                $browser->withinFrame('#message-htmlpart1', function ($browser) {
+                    $this->assertMatchesRegularExpression('/action=get/', $browser->attribute('p#attached > img', 'src'));
+                    $this->assertMatchesRegularExpression('/blocked/', $browser->attribute('p#remote > img', 'src'));
+                });
 
                 // Attachments list
                 $browser->assertMissing('#attachment-list');
@@ -151,9 +153,7 @@ public function testPreviewMorelink()
             $browser->withinFrame('#messagecontframe', static function ($browser) {
                 $browser->waitFor('img.contactphoto');
 
-                $browser->assertSeeIn('.subject', 'Lines')
-                    ->assertSeeIn('.message-part div.pre', 'Plain text message body.')
-                    ->assertVisible('.message-part div.pre .sig');
+                $browser->assertSeeIn('.subject', 'Lines');
 
                 $browser->assertMissing('.header-headers')
                     ->click('a.headers-details')
@@ -163,6 +163,11 @@ public function testPreviewMorelink()
                     ->assertDontSeeIn('.header.cc', 'test11@domain.tld')
                     ->assertSeeIn('.header.cc a.morelink', '2 more...')
                     ->click('.header.cc a.morelink');
+
+                $browser->withinFrame('#message-part1', static function ($browser) {
+                    $browser->assertSeeIn('div.pre', 'Plain text message body.')
+                        ->assertVisible('div.pre .sig');
+                });
             });
 
             $browser->with(new Dialog(), static function ($browser) {
diff --git a/tests/Browser/Mail/PrintTest.php b/tests/Browser/Mail/PrintTest.php
index fce5fc3bb30..e7e49b661fe 100644
--- a/tests/Browser/Mail/PrintTest.php
+++ b/tests/Browser/Mail/PrintTest.php
@@ -54,10 +54,14 @@ public function testPrint()
                 ]);
             });
 
+            // Check iframed body.
+            $browser->withinFrame('#message-part1', static function ($browser) {
+                $browser->assertSeeIn('div.pre', 'Plain text message body.')
+                    ->assertVisible('div.pre .sig');
+            });
+            // Check headers.
             $browser->assertVisible('img.contactphoto')
                 ->assertSeeIn('.subject', 'Lines')
-                ->assertSeeIn('.message-part div.pre', 'Plain text message body.')
-                ->assertVisible('.message-part div.pre .sig')
                 // Tests "more recipients" link
                 ->with('.header-headers .header.cc', static function ($browser) {
                     $browser->assertSee('test10@domain.tld')