From 9c9ca6cc513b982092cad05321d3d0e852df5d3d Mon Sep 17 00:00:00 2001 From: Christy Jacob Date: Sat, 9 Jan 2021 12:29:55 +0530 Subject: [PATCH] feat: fixed issues in tests --- src/Appwrite/Utopia/Response/Filters/V06.php | 14 ++++++------- tests/unit/Utopia/Filters/V06Test.php | 22 ++++++++++---------- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/Appwrite/Utopia/Response/Filters/V06.php b/src/Appwrite/Utopia/Response/Filters/V06.php index d6bd85ac8f..71080d1ddd 100644 --- a/src/Appwrite/Utopia/Response/Filters/V06.php +++ b/src/Appwrite/Utopia/Response/Filters/V06.php @@ -193,13 +193,13 @@ class V06 extends Filter { private function parseLocale(array $content) { - $content['ip'] = empty($content['ip']) ?? ''; - $content['countryCode'] = empty($content['countryCode']) ?? '--'; - $content['country'] = empty($content['country']) ?? Locale::getText('locale.country.unknown'); - $content['continent'] = empty($content['continent']) ?? Locale::getText('locale.country.unknown'); - $content['continentCode'] = empty($content['continentCode']) ?? '--'; - $content['eu'] = empty($content['eu']) ?? false; - $content['currency'] = empty($content['currency']) ?? null; + $content['ip'] = $content['ip'] ?? ''; + $content['countryCode'] = $content['countryCode'] ?? '--'; + $content['country'] = $content['country'] ?? Locale::getText('locale.country.unknown'); + $content['continent'] = $content['continent'] ?? Locale::getText('locale.country.unknown'); + $content['continentCode'] = $content['continentCode'] ?? '--'; + $content['eu'] = $content['eu'] ?? false; + $content['currency'] = $content['currency'] ?? null; return $content; } diff --git a/tests/unit/Utopia/Filters/V06Test.php b/tests/unit/Utopia/Filters/V06Test.php index 5f680fc547..59c688ea0d 100644 --- a/tests/unit/Utopia/Filters/V06Test.php +++ b/tests/unit/Utopia/Filters/V06Test.php @@ -234,19 +234,19 @@ class V06Test extends TestCase $this->assertEquals($parsedResponse['logs'][0]['model'], 'Nexus 5'); $this->assertEquals($parsedResponse['logs'][0]['time'], 1592981250); - $this->assertEquals($parsedResponse['sessions'][0]['OS']['name'], 'Mac'); - $this->assertEquals($parsedResponse['sessions'][0]['OS']['platform'], ''); - $this->assertEquals($parsedResponse['sessions'][0]['OS']['short_name'], 'Mac'); - $this->assertEquals($parsedResponse['sessions'][0]['OS']['version'], 'Mac'); + $this->assertEquals($parsedResponse['logs'][0]['OS']['name'], 'Mac'); + $this->assertEquals($parsedResponse['logs'][0]['OS']['platform'], ''); + $this->assertEquals($parsedResponse['logs'][0]['OS']['short_name'], 'Mac'); + $this->assertEquals($parsedResponse['logs'][0]['OS']['version'], 'Mac'); - $this->assertEquals($parsedResponse['sessions'][0]['client']['engine'], 'WebKit'); - $this->assertEquals($parsedResponse['sessions'][0]['client']['name'], 'Chrome Mobile iOS'); - $this->assertEquals($parsedResponse['sessions'][0]['client']['short_name'], 'CM'); - $this->assertEquals($parsedResponse['sessions'][0]['client']['type'], 'browser'); - $this->assertEquals($parsedResponse['sessions'][0]['client']['version'], '84.0'); + $this->assertEquals($parsedResponse['logs'][0]['client']['engine'], 'WebKit'); + $this->assertEquals($parsedResponse['logs'][0]['client']['name'], 'Chrome Mobile iOS'); + $this->assertEquals($parsedResponse['logs'][0]['client']['short_name'], 'CM'); + $this->assertEquals($parsedResponse['logs'][0]['client']['type'], 'browser'); + $this->assertEquals($parsedResponse['logs'][0]['client']['version'], '84.0'); - $this->assertEquals($parsedResponse['sessions'][0]['geo']['isoCode'], 'US'); - $this->assertEquals($parsedResponse['sessions'][0]['geo']['country'], 'United States'); + $this->assertEquals($parsedResponse['logs'][0]['geo']['isoCode'], 'US'); + $this->assertEquals($parsedResponse['logs'][0]['geo']['country'], 'United States'); } public function testParseTeam()