diff --git a/tests/e2e/Services/GraphQL/Base.php b/tests/e2e/Services/GraphQL/Base.php index 4683c3d8bf..9ffabc8fcb 100644 --- a/tests/e2e/Services/GraphQL/Base.php +++ b/tests/e2e/Services/GraphQL/Base.php @@ -2000,11 +2000,10 @@ trait Base } }'; case self::$CREATE_TOPIC: - return 'mutation createTopic($topicId: String!, $name: String!, $description: String!) { - messagingCreateTopic(topicId: $topicId, name: $name, description: $description) { + return 'mutation createTopic($topicId: String!, $name: String!) { + messagingCreateTopic(topicId: $topicId, name: $name) { _id name - description } }'; case self::$LIST_TOPICS: @@ -2014,7 +2013,6 @@ trait Base topics { _id name - description } } }'; @@ -2023,15 +2021,13 @@ trait Base messagingGetTopic(topicId: $topicId) { _id name - description } }'; case self::$UPDATE_TOPIC: - return 'mutation updateTopic($topicId: String!, $name: String!, $description: String!) { - messagingUpdateTopic(topicId: $topicId, name: $name, description: $description) { + return 'mutation updateTopic($topicId: String!, $name: String!) { + messagingUpdateTopic(topicId: $topicId, name: $name) { _id name - description } }'; case self::$DELETE_TOPIC: @@ -2098,8 +2094,8 @@ trait Base } }'; case self::$CREATE_EMAIL: - return 'mutation createEmail($messageId: String!, $topics: [String!], $users: [String!], $targets: [String!], $subject: String!, $content: String!, $status: String, $description: String, $html: Boolean, $cc: [String], $bcc: [String], $scheduledAt: String) { - messagingCreateEmail(messageId: $messageId, topics: $topics, users: $users, targets: $targets, subject: $subject, content: $content, status: $status, description: $description, html: $html, cc: $cc, bcc: $bcc, scheduledAt: $scheduledAt) { + return 'mutation createEmail($messageId: String!, $topics: [String!], $users: [String!], $targets: [String!], $subject: String!, $content: String!, $status: String, $html: Boolean, $cc: [String], $bcc: [String], $scheduledAt: String) { + messagingCreateEmail(messageId: $messageId, topics: $topics, users: $users, targets: $targets, subject: $subject, content: $content, status: $status, html: $html, cc: $cc, bcc: $bcc, scheduledAt: $scheduledAt) { _id topics users @@ -2109,12 +2105,11 @@ trait Base deliveryErrors deliveredTotal status - description } }'; case self::$CREATE_SMS: - return 'mutation createSMS($messageId: String!, $topics: [String!], $users: [String!], $targets: [String!], $content: String!, $status: String, $description: String, $scheduledAt: String) { - messagingCreateSMS(messageId: $messageId, topics: $topics, users: $users, targets: $targets, content: $content, status: $status, description: $description, scheduledAt: $scheduledAt) { + return 'mutation createSMS($messageId: String!, $topics: [String!], $users: [String!], $targets: [String!], $content: String!, $status: String, $scheduledAt: String) { + messagingCreateSMS(messageId: $messageId, topics: $topics, users: $users, targets: $targets, content: $content, status: $status, scheduledAt: $scheduledAt) { _id topics users @@ -2124,12 +2119,11 @@ trait Base deliveryErrors deliveredTotal status - description } }'; case self::$CREATE_PUSH_NOTIFICATION: - return 'mutation createPushNotification($messageId: String!, $topics: [String!], $users: [String!], $targets: [String!], $title: String!, $body: String!, $data: Json, $action: String, $icon: String, $sound: String, $color: String, $tag: String, $badge: String, $status: String, $description: String, $scheduledAt: String) { - messagingCreatePushNotification(messageId: $messageId, topics: $topics, users: $users, targets: $targets, title: $title, body: $body, data: $data, action: $action, icon: $icon, sound: $sound, color: $color, tag: $tag, badge: $badge, status: $status, description: $description, scheduledAt: $scheduledAt) { + return 'mutation createPushNotification($messageId: String!, $topics: [String!], $users: [String!], $targets: [String!], $title: String!, $body: String!, $data: Json, $action: String, $icon: String, $sound: String, $color: String, $tag: String, $badge: String, $status: String, $scheduledAt: String) { + messagingCreatePushNotification(messageId: $messageId, topics: $topics, users: $users, targets: $targets, title: $title, body: $body, data: $data, action: $action, icon: $icon, sound: $sound, color: $color, tag: $tag, badge: $badge, status: $status, scheduledAt: $scheduledAt) { _id topics users @@ -2139,7 +2133,6 @@ trait Base deliveryErrors deliveredTotal status - description } }'; case self::$LIST_MESSAGES: @@ -2157,7 +2150,6 @@ trait Base deliveryErrors deliveredTotal status - description } } }'; @@ -2174,12 +2166,11 @@ trait Base deliveryErrors deliveredTotal status - description } }'; case self::$UPDATE_EMAIL: - return 'mutation updateEmail($messageId: String!, $topics: [String!], $users: [String!], $targets: [String!], $subject: String, $content: String, $status: String, $description: String, $html: Boolean, $cc: [String], $bcc: [String], $scheduledAt: String) { - messagingUpdateEmail(messageId: $messageId, topics: $topics, users: $users, targets: $targets, subject: $subject, content: $content, status: $status, description: $description, html: $html, cc: $cc, bcc: $bcc, scheduledAt: $scheduledAt) { + return 'mutation updateEmail($messageId: String!, $topics: [String!], $users: [String!], $targets: [String!], $subject: String, $content: String, $status: String, , $html: Boolean, $cc: [String], $bcc: [String], $scheduledAt: String) { + messagingUpdateEmail(messageId: $messageId, topics: $topics, users: $users, targets: $targets, subject: $subject, content: $content, status: $status, html: $html, cc: $cc, bcc: $bcc, scheduledAt: $scheduledAt) { _id topics users @@ -2189,12 +2180,11 @@ trait Base deliveryErrors deliveredTotal status - description } }'; case self::$UPDATE_SMS: - return 'mutation updateSMS($messageId: String!, $topics: [String!], $users: [String!], $targets: [String!], $content: String, $status: String, $description: String, $scheduledAt: String) { - messagingUpdateSMS(messageId: $messageId, topics: $topics, users: $users, targets: $targets, content: $content, status: $status, description: $description, scheduledAt: $scheduledAt) { + return 'mutation updateSMS($messageId: String!, $topics: [String!], $users: [String!], $targets: [String!], $content: String, $status: String, $scheduledAt: String) { + messagingUpdateSMS(messageId: $messageId, topics: $topics, users: $users, targets: $targets, content: $content, status: $status, scheduledAt: $scheduledAt) { _id topics users @@ -2204,12 +2194,11 @@ trait Base deliveryErrors deliveredTotal status - description } }'; case self::$UPDATE_PUSH_NOTIFICATION: - return 'mutation updatePushNotification($messageId: String!, $topics: [String!], $users: [String!], $targets: [String!], $title: String, $body: String, $data: Json, $action: String, $icon: String, $sound: String, $color: String, $tag: String, $badge: String, $status: String, $description: String, $scheduledAt: String) { - messagingUpdatePushNotification(messageId: $messageId, topics: $topics, users: $users, targets: $targets, title: $title, body: $body, data: $data, action: $action, icon: $icon, sound: $sound, color: $color, tag: $tag, badge: $badge, status: $status, description: $description, scheduledAt: $scheduledAt) { + return 'mutation updatePushNotification($messageId: String!, $topics: [String!], $users: [String!], $targets: [String!], $title: String, $body: String, $data: Json, $action: String, $icon: String, $sound: String, $color: String, $tag: String, $badge: String, $status: String, $scheduledAt: String) { + messagingUpdatePushNotification(messageId: $messageId, topics: $topics, users: $users, targets: $targets, title: $title, body: $body, data: $data, action: $action, icon: $icon, sound: $sound, color: $color, tag: $tag, badge: $badge, status: $status, scheduledAt: $scheduledAt) { _id topics users @@ -2219,7 +2208,6 @@ trait Base deliveryErrors deliveredTotal status - description } }'; case self::$COMPLEX_QUERY: diff --git a/tests/e2e/Services/GraphQL/MessagingTest.php b/tests/e2e/Services/GraphQL/MessagingTest.php index 40134c2217..dba655b558 100644 --- a/tests/e2e/Services/GraphQL/MessagingTest.php +++ b/tests/e2e/Services/GraphQL/MessagingTest.php @@ -285,7 +285,6 @@ class MessagingTest extends Scope 'variables' => [ 'topicId' => ID::unique(), 'name' => 'topic1', - 'description' => 'Active users', ], ]; $response = $this->client->call(Client::METHOD_POST, '/graphql', \array_merge([ @@ -296,7 +295,6 @@ class MessagingTest extends Scope $this->assertEquals(200, $response['headers']['status-code']); $this->assertEquals('topic1', $response['body']['data']['messagingCreateTopic']['name']); - $this->assertEquals('Active users', $response['body']['data']['messagingCreateTopic']['description']); return $response['body']['data']['messagingCreateTopic']; } @@ -313,7 +311,6 @@ class MessagingTest extends Scope 'variables' => [ 'topicId' => $topicId, 'name' => 'topic2', - 'description' => 'Inactive users', ], ]; $response = $this->client->call(Client::METHOD_POST, '/graphql', \array_merge([ @@ -324,7 +321,6 @@ class MessagingTest extends Scope $this->assertEquals(200, $response['headers']['status-code']); $this->assertEquals('topic2', $response['body']['data']['messagingUpdateTopic']['name']); - $this->assertEquals('Inactive users', $response['body']['data']['messagingUpdateTopic']['description']); return $topicId; } @@ -368,7 +364,6 @@ class MessagingTest extends Scope $this->assertEquals(200, $response['headers']['status-code']); $this->assertEquals('topic2', $response['body']['data']['messagingGetTopic']['name']); - $this->assertEquals('Inactive users', $response['body']['data']['messagingGetTopic']['description']); } /** @@ -594,7 +589,6 @@ class MessagingTest extends Scope 'variables' => [ 'topicId' => ID::unique(), 'name' => 'topic1', - 'description' => 'Active users', ], ]; $topic = $this->client->call(Client::METHOD_POST, '/graphql', \array_merge([ @@ -801,7 +795,6 @@ class MessagingTest extends Scope 'variables' => [ 'topicId' => ID::unique(), 'name' => 'topic1', - 'description' => 'Active users', ], ]; $topic = $this->client->call(Client::METHOD_POST, '/graphql', \array_merge([ @@ -1006,7 +999,6 @@ class MessagingTest extends Scope 'variables' => [ 'topicId' => ID::unique(), 'name' => 'topic1', - 'description' => 'Active users', ], ]; $topic = $this->client->call(Client::METHOD_POST, '/graphql', \array_merge([ diff --git a/tests/e2e/Services/Messaging/MessagingBase.php b/tests/e2e/Services/Messaging/MessagingBase.php index 0e7fca8507..efd72481c7 100644 --- a/tests/e2e/Services/Messaging/MessagingBase.php +++ b/tests/e2e/Services/Messaging/MessagingBase.php @@ -269,7 +269,6 @@ trait MessagingBase ]); $this->assertEquals(201, $response['headers']['status-code']); $this->assertEquals('my-app', $response['body']['name']); - $this->assertEquals('', $response['body']['description']); return $response['body']; } @@ -285,11 +284,9 @@ trait MessagingBase 'x-appwrite-key' => $this->getProject()['apiKey'], ], [ 'name' => 'android-app', - 'description' => 'updated-description' ]); $this->assertEquals(200, $response['headers']['status-code']); $this->assertEquals('android-app', $response['body']['name']); - $this->assertEquals('updated-description', $response['body']['description']); return $response['body']['$id']; } @@ -298,17 +295,6 @@ trait MessagingBase */ public function testListTopic(string $topicId) { - $response = $this->client->call(Client::METHOD_GET, '/messaging/topics', [ - 'content-type' => 'application/json', - 'x-appwrite-project' => $this->getProject()['$id'], - 'x-appwrite-key' => $this->getProject()['apiKey'], - ], [ - 'search' => 'updated-description', - ]); - - $this->assertEquals(200, $response['headers']['status-code']); - $this->assertEquals(1, \count($response['body']['topics'])); - $response = $this->client->call(Client::METHOD_GET, '/messaging/topics', [ 'content-type' => 'application/json', 'x-appwrite-project' => $this->getProject()['$id'], @@ -350,7 +336,6 @@ trait MessagingBase ]); $this->assertEquals(200, $response['headers']['status-code']); $this->assertEquals('android-app', $response['body']['name']); - $this->assertEquals('updated-description', $response['body']['description']); $this->assertEquals(0, $response['body']['total']); } @@ -407,7 +392,6 @@ trait MessagingBase $this->assertEquals(200, $topic['headers']['status-code']); $this->assertEquals('android-app', $topic['body']['name']); - $this->assertEquals('updated-description', $topic['body']['description']); $this->assertEquals(1, $topic['body']['total']); return [ @@ -626,7 +610,6 @@ trait MessagingBase $this->assertEquals(200, $topic['headers']['status-code']); $this->assertEquals('android-app', $topic['body']['name']); - $this->assertEquals('updated-description', $topic['body']['description']); $this->assertEquals(0, $topic['body']['total']); } @@ -724,7 +707,6 @@ trait MessagingBase ], [ 'topicId' => ID::unique(), 'name' => 'topic1', - 'description' => 'Test Topic' ]); $this->assertEquals(201, $topic['headers']['status-code']); @@ -881,7 +863,6 @@ trait MessagingBase ], [ 'topicId' => ID::unique(), 'name' => 'topic1', - 'description' => 'Test Topic' ]); $this->assertEquals(201, $topic['headers']['status-code']); @@ -1042,7 +1023,6 @@ trait MessagingBase ], [ 'topicId' => ID::unique(), 'name' => 'topic1', - 'description' => 'Test Topic' ]); $this->assertEquals(201, $topic['headers']['status-code']); diff --git a/tests/e2e/Services/Messaging/MessagingConsoleClientTest.php b/tests/e2e/Services/Messaging/MessagingConsoleClientTest.php index 0baa465b48..89315db278 100644 --- a/tests/e2e/Services/Messaging/MessagingConsoleClientTest.php +++ b/tests/e2e/Services/Messaging/MessagingConsoleClientTest.php @@ -170,7 +170,6 @@ class MessagingConsoleClientTest extends Scope ], $this->getHeaders()), [ 'topicId' => ID::unique(), 'name' => 'my-app', - 'description' => 'web app' ]); $this->assertEquals(201, $topic['headers']['status-code']); @@ -178,7 +177,7 @@ class MessagingConsoleClientTest extends Scope 'content-type' => 'application/json', 'x-appwrite-project' => $this->getProject()['$id'], ], $this->getHeaders()), [ - 'description' => 'updated-description' + 'name' => 'android-app' ]); $this->assertEquals(200, $response['headers']['status-code']);