From 2c357ed0f563d4584f1591f456c84f384a810584 Mon Sep 17 00:00:00 2001 From: Dmitry Sotnikov Date: Mon, 24 Jan 2022 14:51:01 +0200 Subject: [PATCH 01/12] debug for timezone --- appium/config/wdio.mock.conf.js | 7 ++++--- ...ilOnAttesterWithDisallowAttesterSearchForDomain.spec.ts | 2 ++ 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/appium/config/wdio.mock.conf.js b/appium/config/wdio.mock.conf.js index 0ee49f6cf..7bdec0147 100644 --- a/appium/config/wdio.mock.conf.js +++ b/appium/config/wdio.mock.conf.js @@ -4,9 +4,10 @@ const pathWdioConfig = require('path'); require('dotenv').config({ path: pathWdioConfig.resolve(__dirname, '../.env') }); config.suites = { - all: [ - './tests/specs/mock/**/*.spec.ts' - ], + // all: [ + // './tests/specs/mock/**/*.spec.ts' + // ], + all: ['./tests/specs/mock/setup/CannotFindEmailOnAttesterWithDisallowAttesterSearchForDomain.spec.ts'] }; config.capabilities = [ diff --git a/appium/tests/specs/mock/setup/CannotFindEmailOnAttesterWithDisallowAttesterSearchForDomain.spec.ts b/appium/tests/specs/mock/setup/CannotFindEmailOnAttesterWithDisallowAttesterSearchForDomain.spec.ts index 86811cc76..c0268f57e 100644 --- a/appium/tests/specs/mock/setup/CannotFindEmailOnAttesterWithDisallowAttesterSearchForDomain.spec.ts +++ b/appium/tests/specs/mock/setup/CannotFindEmailOnAttesterWithDisallowAttesterSearchForDomain.spec.ts @@ -27,6 +27,8 @@ describe('SETUP: ', () => { }; await mockApi.withMockedApis(async () => { + let times = await driver.getDeviceTime(); + console.log('times', times); await SplashScreen.login(); await SetupKeyScreen.setPassPhrase(); await MailFolderScreen.checkInboxScreen(); From bad3e32eab4907e9d4505214d5c97c50bb737a01 Mon Sep 17 00:00:00 2001 From: Dmitry Sotnikov Date: Mon, 24 Jan 2022 15:23:05 +0200 Subject: [PATCH 02/12] debug for timezone --- ...ndEmailOnAttesterWithDisallowAttesterSearchForDomain.spec.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appium/tests/specs/mock/setup/CannotFindEmailOnAttesterWithDisallowAttesterSearchForDomain.spec.ts b/appium/tests/specs/mock/setup/CannotFindEmailOnAttesterWithDisallowAttesterSearchForDomain.spec.ts index c0268f57e..ac958501f 100644 --- a/appium/tests/specs/mock/setup/CannotFindEmailOnAttesterWithDisallowAttesterSearchForDomain.spec.ts +++ b/appium/tests/specs/mock/setup/CannotFindEmailOnAttesterWithDisallowAttesterSearchForDomain.spec.ts @@ -27,7 +27,7 @@ describe('SETUP: ', () => { }; await mockApi.withMockedApis(async () => { - let times = await driver.getDeviceTime(); + const times = await driver.getDeviceTime(); console.log('times', times); await SplashScreen.login(); await SetupKeyScreen.setPassPhrase(); From 9a816c5fd303bd89f7889eba1c87150b30a7b01c Mon Sep 17 00:00:00 2001 From: fcvakintos Date: Mon, 24 Jan 2022 14:51:43 +0000 Subject: [PATCH 03/12] Update Semaphore configuration --- .semaphore/semaphore.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.semaphore/semaphore.yml b/.semaphore/semaphore.yml index 07b890a36..583e42cb9 100644 --- a/.semaphore/semaphore.yml +++ b/.semaphore/semaphore.yml @@ -41,6 +41,7 @@ blocks: - 'wget https://flowcrypt.s3.eu-central-1.amazonaws.com/dev/flowcrypt-ios-2021-12-17-v060-for-ci-migration-test.zip -P ~/git/flowcrypt-ios/appium' - cd appium && npm run-script lint - unzip flowcrypt-ios-*.zip + - sudo ln -sf /usr/share/zoneinfo/Europe/Belgrade /etc/localtime - npm run-script test.mock.all - npm run-script test.live.all epilogue: @@ -79,4 +80,4 @@ after_pipeline: jobs: - name: Publish Results commands: - - test-results gen-pipeline-report \ No newline at end of file + - test-results gen-pipeline-report From b00e0fb55dbe6de0ac7b16cc07cd7eb6c7d90d89 Mon Sep 17 00:00:00 2001 From: fcvakintos Date: Mon, 24 Jan 2022 15:32:55 +0000 Subject: [PATCH 04/12] Update Semaphore configuration --- .semaphore/semaphore.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.semaphore/semaphore.yml b/.semaphore/semaphore.yml index 583e42cb9..3d79780a5 100644 --- a/.semaphore/semaphore.yml +++ b/.semaphore/semaphore.yml @@ -41,7 +41,7 @@ blocks: - 'wget https://flowcrypt.s3.eu-central-1.amazonaws.com/dev/flowcrypt-ios-2021-12-17-v060-for-ci-migration-test.zip -P ~/git/flowcrypt-ios/appium' - cd appium && npm run-script lint - unzip flowcrypt-ios-*.zip - - sudo ln -sf /usr/share/zoneinfo/Europe/Belgrade /etc/localtime + - sudo ln -sf /usr/share/zoneinfo/UTC /etc/localtime - npm run-script test.mock.all - npm run-script test.live.all epilogue: From 2dc80b07576d22233b7ac1f6a9f4a171969a1add Mon Sep 17 00:00:00 2001 From: Dmitry Sotnikov Date: Mon, 24 Jan 2022 18:05:49 +0200 Subject: [PATCH 05/12] added fixes for debug --- appium/config/wdio.mock.conf.js | 2 +- ...ndEmailOnAttesterWithDisallowAttesterSearchForDomain.spec.ts | 2 -- appium/tests/specs/mock/setup/UpdateOlderPubKeyToNewer.spec.ts | 2 ++ 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/appium/config/wdio.mock.conf.js b/appium/config/wdio.mock.conf.js index 7bdec0147..c89ff7e56 100644 --- a/appium/config/wdio.mock.conf.js +++ b/appium/config/wdio.mock.conf.js @@ -7,7 +7,7 @@ config.suites = { // all: [ // './tests/specs/mock/**/*.spec.ts' // ], - all: ['./tests/specs/mock/setup/CannotFindEmailOnAttesterWithDisallowAttesterSearchForDomain.spec.ts'] + all: ['./tests/specs/mock/setup/UpdateOlderPubKeyToNewer.spec.ts'] }; config.capabilities = [ diff --git a/appium/tests/specs/mock/setup/CannotFindEmailOnAttesterWithDisallowAttesterSearchForDomain.spec.ts b/appium/tests/specs/mock/setup/CannotFindEmailOnAttesterWithDisallowAttesterSearchForDomain.spec.ts index ac958501f..86811cc76 100644 --- a/appium/tests/specs/mock/setup/CannotFindEmailOnAttesterWithDisallowAttesterSearchForDomain.spec.ts +++ b/appium/tests/specs/mock/setup/CannotFindEmailOnAttesterWithDisallowAttesterSearchForDomain.spec.ts @@ -27,8 +27,6 @@ describe('SETUP: ', () => { }; await mockApi.withMockedApis(async () => { - const times = await driver.getDeviceTime(); - console.log('times', times); await SplashScreen.login(); await SetupKeyScreen.setPassPhrase(); await MailFolderScreen.checkInboxScreen(); diff --git a/appium/tests/specs/mock/setup/UpdateOlderPubKeyToNewer.spec.ts b/appium/tests/specs/mock/setup/UpdateOlderPubKeyToNewer.spec.ts index a788a19af..8f366202a 100644 --- a/appium/tests/specs/mock/setup/UpdateOlderPubKeyToNewer.spec.ts +++ b/appium/tests/specs/mock/setup/UpdateOlderPubKeyToNewer.spec.ts @@ -40,6 +40,8 @@ describe('SETUP: ', () => { const newFingerprintsValue = CommonData.updateRecipientPublicKey.newFingerprints; await mockApi.withMockedApis(async () => { + const times = await driver.getDeviceTime(); + console.log('times', times); //stage 1 await SplashScreen.login(); await SetupKeyScreen.setPassPhrase(); From 1a353e9efffe9ac9e4d959ef578c2d78eb69814c Mon Sep 17 00:00:00 2001 From: fcvakintos Date: Wed, 26 Jan 2022 13:58:31 +0000 Subject: [PATCH 06/12] Update Semaphore configuration --- .semaphore/semaphore.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.semaphore/semaphore.yml b/.semaphore/semaphore.yml index 3d79780a5..ff470592b 100644 --- a/.semaphore/semaphore.yml +++ b/.semaphore/semaphore.yml @@ -41,7 +41,6 @@ blocks: - 'wget https://flowcrypt.s3.eu-central-1.amazonaws.com/dev/flowcrypt-ios-2021-12-17-v060-for-ci-migration-test.zip -P ~/git/flowcrypt-ios/appium' - cd appium && npm run-script lint - unzip flowcrypt-ios-*.zip - - sudo ln -sf /usr/share/zoneinfo/UTC /etc/localtime - npm run-script test.mock.all - npm run-script test.live.all epilogue: From 573273bc12a31780a1ac5632f30dc5212dbacc9a Mon Sep 17 00:00:00 2001 From: Dmitry Sotnikov Date: Wed, 26 Jan 2022 16:03:08 +0200 Subject: [PATCH 07/12] added fixes for timezone --- appium/tests/data/index.ts | 4 ++-- appium/tests/screenobjects/public-key-details.screen.ts | 9 ++++++--- .../specs/mock/setup/UpdateOlderPubKeyToNewer.spec.ts | 1 + 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/appium/tests/data/index.ts b/appium/tests/data/index.ts index 322ef4edc..ab3ee9e7a 100644 --- a/appium/tests/data/index.ts +++ b/appium/tests/data/index.ts @@ -56,8 +56,8 @@ export const CommonData = { }, updateRecipientPublicKey: { email: 'updating.key@example.test', - oldSignatureDate: 'Jan 12, 2022 at 11:16:58 AM',//time for CI runs - newSignatureDate: 'Jan 12, 2022 at 11:27:20 AM',//time for CI runs + oldSignatureDate: 'Jan 12, 2022 7:16:58 PM',//in UTC time for remote running + newSignatureDate: 'Jan 12, 2022 7:27:20 PM',//in UTC time for remote running // oldSignatureDate: 'Jan 12, 2022 at 9:16:58 PM', //- for local run // newSignatureDate: 'Jan 12, 2022 at 9:27:20 PM', // for local run oldFingerprints: '7E181662A26EC6748D6FDB1CC7C990C1A2EA78DD, 5C23518345A6595E81EBFEFCA71D94A76202B1D0', diff --git a/appium/tests/screenobjects/public-key-details.screen.ts b/appium/tests/screenobjects/public-key-details.screen.ts index dde5fbb5d..8114a4de1 100644 --- a/appium/tests/screenobjects/public-key-details.screen.ts +++ b/appium/tests/screenobjects/public-key-details.screen.ts @@ -1,5 +1,6 @@ import BaseScreen from './base.screen'; import ElementHelper from "../helpers/ElementHelper"; +import moment from 'moment-timezone' const SELECTORS = { BACK_BTN: '~aid-back-button', @@ -86,9 +87,11 @@ class PublicKeyDetailsScreen extends BaseScreen { } checkSignatureDateValue = async (value: string) => { - const signatureValue = await this.signatureValue; - await signatureValue.waitForExist(); - expect(await signatureValue.getValue()).toEqual(value); + const signatureValue = await this.signatureValue.getValue(); + console.log('value', signatureValue); + console.log('test1', moment(signatureValue).utcOffset(0).format('D MMM yyyy, hh:mm:ss A')); + console.log('test2', moment(value).utcOffset(0).format('D MMM yyyy, hh:mm:ss A')); + expect(moment(signatureValue).utcOffset(0).format('D MMM yyyy, hh:mm:ss A')).toEqual(value); } getLastFetchedDateValue = async () => { diff --git a/appium/tests/specs/mock/setup/UpdateOlderPubKeyToNewer.spec.ts b/appium/tests/specs/mock/setup/UpdateOlderPubKeyToNewer.spec.ts index 8f366202a..749be114f 100644 --- a/appium/tests/specs/mock/setup/UpdateOlderPubKeyToNewer.spec.ts +++ b/appium/tests/specs/mock/setup/UpdateOlderPubKeyToNewer.spec.ts @@ -42,6 +42,7 @@ describe('SETUP: ', () => { await mockApi.withMockedApis(async () => { const times = await driver.getDeviceTime(); console.log('times', times); + //stage 1 await SplashScreen.login(); await SetupKeyScreen.setPassPhrase(); From c205eb55c82f13111996ae4ae47b9f3567400d76 Mon Sep 17 00:00:00 2001 From: Dmitry Sotnikov Date: Wed, 26 Jan 2022 16:42:28 +0200 Subject: [PATCH 08/12] added fixes for timezone --- appium/tests/screenobjects/public-key-details.screen.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appium/tests/screenobjects/public-key-details.screen.ts b/appium/tests/screenobjects/public-key-details.screen.ts index 8114a4de1..7f645788a 100644 --- a/appium/tests/screenobjects/public-key-details.screen.ts +++ b/appium/tests/screenobjects/public-key-details.screen.ts @@ -1,6 +1,6 @@ import BaseScreen from './base.screen'; import ElementHelper from "../helpers/ElementHelper"; -import moment from 'moment-timezone' +import moment from 'moment' const SELECTORS = { BACK_BTN: '~aid-back-button', From f6b4b67eaa1d3c256263839c0642c4e3b7c1f6bf Mon Sep 17 00:00:00 2001 From: Dmitry Sotnikov Date: Wed, 26 Jan 2022 17:55:47 +0200 Subject: [PATCH 09/12] added fixes for timezone --- appium/tests/screenobjects/public-key-details.screen.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appium/tests/screenobjects/public-key-details.screen.ts b/appium/tests/screenobjects/public-key-details.screen.ts index 7f645788a..4711e079f 100644 --- a/appium/tests/screenobjects/public-key-details.screen.ts +++ b/appium/tests/screenobjects/public-key-details.screen.ts @@ -89,7 +89,7 @@ class PublicKeyDetailsScreen extends BaseScreen { checkSignatureDateValue = async (value: string) => { const signatureValue = await this.signatureValue.getValue(); console.log('value', signatureValue); - console.log('test1', moment(signatureValue).utcOffset(0).format('D MMM yyyy, hh:mm:ss A')); + console.log('test1', moment(signatureValue.replace('at', '')).utcOffset(0).format('D MMM yyyy, hh:mm:ss A')); console.log('test2', moment(value).utcOffset(0).format('D MMM yyyy, hh:mm:ss A')); expect(moment(signatureValue).utcOffset(0).format('D MMM yyyy, hh:mm:ss A')).toEqual(value); } From 3dda901f5a73c2174f5a5c1bb3e77fffe87144f5 Mon Sep 17 00:00:00 2001 From: Dmitry Sotnikov Date: Thu, 27 Jan 2022 10:05:41 +0200 Subject: [PATCH 10/12] added fixes for checkSignatureDate method, added convert date to UTC timezone --- appium/config/wdio.mock.conf.js | 7 +++---- appium/tests/data/index.ts | 6 ++---- appium/tests/screenobjects/public-key-details.screen.ts | 6 ++---- 3 files changed, 7 insertions(+), 12 deletions(-) diff --git a/appium/config/wdio.mock.conf.js b/appium/config/wdio.mock.conf.js index c89ff7e56..0ee49f6cf 100644 --- a/appium/config/wdio.mock.conf.js +++ b/appium/config/wdio.mock.conf.js @@ -4,10 +4,9 @@ const pathWdioConfig = require('path'); require('dotenv').config({ path: pathWdioConfig.resolve(__dirname, '../.env') }); config.suites = { - // all: [ - // './tests/specs/mock/**/*.spec.ts' - // ], - all: ['./tests/specs/mock/setup/UpdateOlderPubKeyToNewer.spec.ts'] + all: [ + './tests/specs/mock/**/*.spec.ts' + ], }; config.capabilities = [ diff --git a/appium/tests/data/index.ts b/appium/tests/data/index.ts index ab3ee9e7a..5a129415b 100644 --- a/appium/tests/data/index.ts +++ b/appium/tests/data/index.ts @@ -56,10 +56,8 @@ export const CommonData = { }, updateRecipientPublicKey: { email: 'updating.key@example.test', - oldSignatureDate: 'Jan 12, 2022 7:16:58 PM',//in UTC time for remote running - newSignatureDate: 'Jan 12, 2022 7:27:20 PM',//in UTC time for remote running - // oldSignatureDate: 'Jan 12, 2022 at 9:16:58 PM', //- for local run - // newSignatureDate: 'Jan 12, 2022 at 9:27:20 PM', // for local run + oldSignatureDate: '12 Jan 2022, 07:16:58 PM',//in UTC + newSignatureDate: '12 Jan 2022, 07:27:20 PM',//in UTC oldFingerprints: '7E181662A26EC6748D6FDB1CC7C990C1A2EA78DD, 5C23518345A6595E81EBFEFCA71D94A76202B1D0', newFingerprints: '7E181662A26EC6748D6FDB1CC7C990C1A2EA78DD, 5C23518345A6595E81EBFEFCA71D94A76202B1D0, 40E4EE0325E38F717737889AC54F277266650211' }, diff --git a/appium/tests/screenobjects/public-key-details.screen.ts b/appium/tests/screenobjects/public-key-details.screen.ts index 4711e079f..a843901be 100644 --- a/appium/tests/screenobjects/public-key-details.screen.ts +++ b/appium/tests/screenobjects/public-key-details.screen.ts @@ -88,10 +88,8 @@ class PublicKeyDetailsScreen extends BaseScreen { checkSignatureDateValue = async (value: string) => { const signatureValue = await this.signatureValue.getValue(); - console.log('value', signatureValue); - console.log('test1', moment(signatureValue.replace('at', '')).utcOffset(0).format('D MMM yyyy, hh:mm:ss A')); - console.log('test2', moment(value).utcOffset(0).format('D MMM yyyy, hh:mm:ss A')); - expect(moment(signatureValue).utcOffset(0).format('D MMM yyyy, hh:mm:ss A')).toEqual(value); + const convertedToUTC = moment(signatureValue.replace('at', '')).utcOffset(0).format('D MMM yyyy, hh:mm:ss A'); + expect(convertedToUTC).toEqual(value); } getLastFetchedDateValue = async () => { From ae3c17f2a171baf44ef6d8b61e092e8affd5ef5d Mon Sep 17 00:00:00 2001 From: Dmitry Sotnikov Date: Thu, 27 Jan 2022 16:30:58 +0200 Subject: [PATCH 11/12] update --- Podfile.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Podfile.lock b/Podfile.lock index c9ee828b6..e04d6e530 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -15,8 +15,8 @@ PODS: - PINRemoteImage/PINCache (3.0.3): - PINCache (~> 3.0.3) - PINRemoteImage/Core - - SwiftFormat/CLI (0.49.2) - - SwiftLint (0.45.1) + - SwiftFormat/CLI (0.49.3) + - SwiftLint (0.46.1) - SwiftyRSA (1.7.0): - SwiftyRSA/ObjC (= 1.7.0) - SwiftyRSA/ObjC (1.7.0) @@ -64,8 +64,8 @@ SPEC CHECKSUMS: PINCache: 7a8fc1a691173d21dbddbf86cd515de6efa55086 PINOperation: 00c935935f1e8cf0d1e2d6b542e75b88fc3e5e20 PINRemoteImage: f1295b29f8c5e640e25335a1b2bd9d805171bd01 - SwiftFormat: dca5803d3e2120aed5614f1653d252e62ac33be1 - SwiftLint: 06ac37e4d38c7068e0935bb30cda95f093bec761 + SwiftFormat: a3b79e8b5f8ecdec7a716b998aee230d08512894 + SwiftLint: aaa29a9f649316095a9079595cb60906bd899353 SwiftyRSA: 8c6dd1ea7db1b8dc4fb517a202f88bb1354bc2c6 Texture: 2e8ab2519452515f7f5a520f5a8f7e0a413abfa3 From f696eef81112a268d0fd7096addcd19442ed0c8c Mon Sep 17 00:00:00 2001 From: Dmitry Sotnikov Date: Fri, 28 Jan 2022 10:50:29 +0200 Subject: [PATCH 12/12] removed methods for debug --- appium/tests/specs/mock/setup/UpdateOlderPubKeyToNewer.spec.ts | 3 --- 1 file changed, 3 deletions(-) diff --git a/appium/tests/specs/mock/setup/UpdateOlderPubKeyToNewer.spec.ts b/appium/tests/specs/mock/setup/UpdateOlderPubKeyToNewer.spec.ts index 749be114f..a788a19af 100644 --- a/appium/tests/specs/mock/setup/UpdateOlderPubKeyToNewer.spec.ts +++ b/appium/tests/specs/mock/setup/UpdateOlderPubKeyToNewer.spec.ts @@ -40,9 +40,6 @@ describe('SETUP: ', () => { const newFingerprintsValue = CommonData.updateRecipientPublicKey.newFingerprints; await mockApi.withMockedApis(async () => { - const times = await driver.getDeviceTime(); - console.log('times', times); - //stage 1 await SplashScreen.login(); await SetupKeyScreen.setPassPhrase();