Use multiselects for the recipient selection

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>

3 files changed, 12 insertions, 12 deletions

diff --git a/tests/Service/Autocompletion/AutoCompleteServiceTest.php b/tests/Service/Autocompletion/AutoCompleteServiceTest.php
index c75b504b0..bd95fbde3 100644
--- a/tests/Service/Autocompletion/AutoCompleteServiceTest.php
+++ b/tests/Service/Autocompletion/AutoCompleteServiceTest.php
@@ -52,8 +52,8 @@ class AutoCompleteServiceTest extends TestCase {
 		$term = 'jo';
 
 		$contactsResult = [
-			['id' => 12, 'label' => '"john doe" <john@doe.cz>', 'value' => '"john doe" <john@doe.cz>'],
-			['id' => 13, 'label' => '"joe doe" <joe@doe.se>', 'value' => '"joe doe" <joe@doe.se>'],
+			['id' => 12, 'label' => '"john doe" <john@doe.cz>', 'email' => 'john@doe.cz'],
+			['id' => 13, 'label' => '"joe doe" <joe@doe.se>', 'email' => 'joe@doe.se'],
 		];
 		$john = new CollectedAddress();
 		$john->setId(1234);
@@ -65,7 +65,7 @@ class AutoCompleteServiceTest extends TestCase {
 		];
 
 		$groupsResult = [
-			['id' => 20, 'label' => 'Journalists', 'value' => 'Journalists']
+			['id' => 20, 'label' => 'Journalists', 'email' => 'Journalists']
 		];
 
 		$this->contactsIntegration->expects($this->once())
@@ -84,10 +84,10 @@ class AutoCompleteServiceTest extends TestCase {
 		$response = $this->service->findMatches($term);
 
 		$expected = [
-			['id' => 12, 'label' => '"john doe" <john@doe.cz>', 'value' => '"john doe" <john@doe.cz>'],
-			['id' => 13, 'label' => '"joe doe" <joe@doe.se>', 'value' => '"joe doe" <joe@doe.se>'],
-			['id' => 1234, 'label' => 'John Doe', 'value' => '"John Doe" <john@doe.com>'],
-			['id' => 20, 'label' => 'Journalists', 'value' => 'Journalists'],
+			['id' => 12, 'label' => '"john doe" <john@doe.cz>', 'email' => 'john@doe.cz'],
+			['id' => 13, 'label' => '"joe doe" <joe@doe.se>', 'email' => 'joe@doe.se'],
+			['id' => 1234, 'label' => 'John Doe', 'email' => 'john@doe.com'],
+			['id' => 20, 'label' => 'Journalists', 'email' => 'Journalists'],
 		];
 		$this->assertEquals($expected, $response);
 	}
diff --git a/tests/Service/ContactsIntegrationTest.php b/tests/Service/ContactsIntegrationTest.php
index bff62586c..7dd59036f 100644
--- a/tests/Service/ContactsIntegrationTest.php
+++ b/tests/Service/ContactsIntegrationTest.php
@@ -98,19 +98,19 @@ class ContactsIntegrationTest extends TestCase {
 			[
 				'id' => 1,
 				'label' => 'Jonathan Frakes (jonathan@frakes.com)',
-				'value' => '"Jonathan Frakes" <jonathan@frakes.com>',
+				'email' => 'jonathan@frakes.com',
 				'photo' => null,
 			],
 			[
 				'id' => 2,
 				'label' => 'John Doe (john@doe.info)',
-				'value' => '"John Doe" <john@doe.info>',
+				'email' => 'john@doe.info',
 				'photo' => null,
 			],
 			[
 				'id' => 2,
 				'label' => 'John Doe (doe@john.info)',
-				'value' => '"John Doe" <doe@john.info>',
+				'email' => 'doe@john.info',
 				'photo' => null,
 			],
 		];
@@ -160,7 +160,7 @@ class ContactsIntegrationTest extends TestCase {
 			[
 				'id' => 1,
 				'label' => 'Jonathan Frakes (jonathan@frakes.com)',
-				'value' => '"Jonathan Frakes" <jonathan@frakes.com>',
+				'email' => 'jonathan@frakes.com',
 				'photo' => null,
 			],
 		];
diff --git a/tests/Service/GroupsIntegrationTest.php b/tests/Service/GroupsIntegrationTest.php
index ca0aa282b..5fa04f86e 100644
--- a/tests/Service/GroupsIntegrationTest.php
+++ b/tests/Service/GroupsIntegrationTest.php
@@ -59,7 +59,7 @@ class GroupsIntegrationTest extends TestCase {
 			[
 				'id' => 'namespace1:testgroup',
 				'label' => 'first test group (Namespace1)',
-				'value' => 'namespace1:testgroup',
+				'email' => 'namespace1:testgroup',
 				'photo' => null,
 			]
 		];