CodeMirror/appwrite
1
0
Fork 0
mirror of synced 2024-09-30 09:18:14 +13:00
Code Issues Projects Releases Wiki Activity

feat: fixed failing tests

Browse source
This commit is contained in:
Christy Jacob 2021-01-05 00:00:20 +05:30
parent 50bca50d10
commit 98309e776e
2 changed files with 21 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
src/Appwrite/Utopia/Response/Filters/V06.php
View file

@ -146,15 +146,14 @@ class V06 extends Filter {
private function parseCurrencyList(array $content) private function parseCurrencyList(array $content)
{ {
$content['locations'] = []; $content['locations'] = [];
$currencies = $content['currencies']; $currencies = $content['currencies'];
$parsedResponse = []; $parsedResponse = [];
foreach($currencies as $currency) { foreach($currencies as $currency) {
$currency['locations'] = []; $currency['locations'] = [];
$parsedResponse[] = $currency; $parsedResponse[] = $currency;
} }
$content['currencies'] = $parsedResponse;
return $parsedResponse; return $content;
} }
private function parseContinentList(array $content) private function parseContinentList(array $content)
@ -164,8 +163,8 @@ class V06 extends Filter {
foreach($continents as $continent) { foreach($continents as $continent) {
$parsedResponse[$continent['code']] = $continent['name']; $parsedResponse[$continent['code']] = $continent['name'];
} }
$content['continents'] = $parsedResponse;
return $parsedResponse; return $content;
} }
private function parsePhoneList(array $content) private function parsePhoneList(array $content)
@ -175,8 +174,8 @@ class V06 extends Filter {
foreach($phones as $phone) { foreach($phones as $phone) {
$parsedResponse[$phone['countryCode']] = $phone['code']; $parsedResponse[$phone['countryCode']] = $phone['code'];
} }
$content['phones'] = $parsedResponse;
return $parsedResponse; return $content;
} }
private function parseCountryList(array $content) private function parseCountryList(array $content)
@ -186,8 +185,8 @@ class V06 extends Filter {
foreach($countries as $country) { foreach($countries as $country) {
$parsedResponse[$country['code']] = $country['name']; $parsedResponse[$country['code']] = $country['name'];
} }
$content['countries'] = $parsedResponse;
return $parsedResponse; return $content;
} }
private function parseLocale(array $content) private function parseLocale(array $content)
@ -216,7 +215,7 @@ class V06 extends Filter {
$parsedResponse[] = [ $parsedResponse[] = [
'event' => $log['event'], 'event' => $log['event'],
'ip' => $log['ip'], 'ip' => $log['ip'],
'time' => strtotime($log['time']), 'time' => $log['time'],
'OS' => $log['osName'].' '.$log['osVersion'], 'OS' => $log['osName'].' '.$log['osVersion'],
'client' => $log['clientName'].' '.$log['clientVersion'], 'client' => $log['clientName'].' '.$log['clientVersion'],
'device' => $log['deviceName'], 'device' => $log['deviceName'],
@ -228,7 +227,8 @@ class V06 extends Filter {
] ]
]; ];
} }
return $parsedResponse; $content['logs'] = $parsedResponse;
return $content;
} }
private function parseSessionList(array $content) private function parseSessionList(array $content)
@ -251,7 +251,8 @@ class V06 extends Filter {
], ],
]; ];
} }
return $parsedResponse; $content['sessions'] = $parsedResponse;
return $content;
} }
private function parseSession(array $content) private function parseSession(array $content)
@ -267,12 +268,13 @@ class V06 extends Filter {
foreach($users as $user) { foreach($users as $user) {
$parsedResponse[] = $this->parseUser($user); $parsedResponse[] = $this->parseUser($user);
} }
return $parsedResponse; $content['users'] = $parsedResponse;
return $content;
} }
private function parseUser(array $content) private function parseUser(array $content)
{ {
foreach (Config::getParam('providers') as $key => $provider) { foreach (Config::getParam('providers', []) as $key => $provider) {
if (!$provider['enabled']) { if (!$provider['enabled']) {
continue; continue;
} }

6
tests/unit/Utopia/Filters/V06Test.php
View file

@ -39,6 +39,8 @@ class V06Test extends TestCase
] ]
]; ];
Config::load('providers', __DIR__.'/../../../../app/config/providers.php');
$model = Response::MODEL_USER; $model = Response::MODEL_USER;
$parsedResponse = $this->filter->parse($content, $model); $parsedResponse = $this->filter->parse($content, $model);
@ -73,6 +75,8 @@ class V06Test extends TestCase
] ]
]; ];
Config::load('providers', __DIR__.'/../../../../app/config/providers.php');
$model = Response::MODEL_USER_LIST; $model = Response::MODEL_USER_LIST;
$parsedResponse = $this->filter->parse($content, $model); $parsedResponse = $this->filter->parse($content, $model);
@ -260,7 +264,7 @@ class V06Test extends TestCase
$parsedResponse = $this->filter->parse($content, $model); $parsedResponse = $this->filter->parse($content, $model);
$this->assertEquals($parsedResponse['ip'], '127.0.0.1'); $this->assertEquals($parsedResponse['ip'], '127.0.0.1');
$this->assertEquals($parsedResponse['contryCode'], 'US'); $this->assertEquals($parsedResponse['countryCode'], 'US');
$this->assertEquals($parsedResponse['country'], 'United States'); $this->assertEquals($parsedResponse['country'], 'United States');
$this->assertEquals($parsedResponse['continentCode'], 'NA'); $this->assertEquals($parsedResponse['continentCode'], 'NA');
$this->assertEquals($parsedResponse['continent'], 'North America'); $this->assertEquals($parsedResponse['continent'], 'North America');