Merge branch '2024.11'

gitlabci · gitlabci · commit de28b785fe33 · 2024-11-27T10:06:01.000Z
diff --git a/tests/tine20/Addressbook/Import/CsvTest.php b/tests/tine20/Addressbook/Import/CsvTest.php
@@ -127,7 +127,7 @@ public function testImportUmlaut()
             $record = $exception['exception']['clientRecord'];
             if ($record['email'] === Tinebase_Core::getUser()->accountEmailAddress) {
                 $found = TRUE;
-                $this->assertEquals($myContact->org_name, $record['org_name']);
+                $this->assertStringContainsString('leckerer', $record['org_name']);
             }
         }
         

Original file line number	Diff line number	Diff line change
`@@ -127,7 +127,7 @@ public function testImportUmlaut()`
`127`	`127`	`$record = $exception['exception']['clientRecord'];`
`128`	`128`	`if ($record['email'] === Tinebase_Core::getUser()->accountEmailAddress) {`
`129`	`129`	`$found = TRUE;`
`130`		`- $this->assertEquals($myContact->org_name, $record['org_name']);`
	`130`	`+ $this->assertStringContainsString('leckerer', $record['org_name']);`
`131`	`131`	`}`
`132`	`132`	`}`
`133`	`133`