Appwrite/appwrite
1
0 Fork 0
mirror of https://github.com/appwrite/appwrite.git synced 2026-05-26 13:51:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/1.5.x' into fix-smtp-provider-update

Browse Source 
# Conflicts:
#	tests/e2e/Services/Messaging/MessagingBase.php
This commit is contained in:
Jake Barnby committed 2024-02-13 15:21:15 +13:00
2 parents 01e88e65d6 7b791aa371
commit 13ea6787cb
2 files changed
+6 -6
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

tests/e2e/Services/GraphQL/MessagingTest.php
+2 -2
View File
@@ -138,8 +138,8 @@ class MessagingTest extends Scope
'Telesign' => [
'providerId' => $providers[3]['_id'],
'name' => 'Telesign2',
'username' => 'my-username',
'password' => 'my-password',
'customerId' => 'my-username',
'apiKey' => 'my-password',
],
'Textmagic' => [
'providerId' => $providers[4]['_id'],
tests/e2e/Services/Messaging/MessagingBase.php
+4 -4
View File
@@ -51,8 +51,8 @@ trait MessagingBase
'telesign' => [
'providerId' => ID::unique(),
'name' => 'Telesign1',
'username' => 'my-username',
'password' => 'my-password',
'customerId' => 'my-username',
'apiKey' => 'my-password',
'from' => '+123456789',
],
'textmagic' => [
@@ -142,8 +142,8 @@ trait MessagingBase
],
'telesign' => [
'name' => 'Telesign2',
'username' => 'my-username',
'password' => 'my-password',
'customerId' => 'my-username',
'apiKey' => 'my-password',
],
'textmagic' => [
'name' => 'Textmagic2',