issue 518 appium semaphoreci

.gitignore

@@ -48,4 +48,4 @@ appium/node_modules
 appium/package-lock.json
 appium/tmp
 appium/.env
-appium/apps
+appium/FlowCrypt.app

.semaphore/semaphore.yml

@@ -1,23 +1,18 @@
 version: v1.0
 name: FlowCrypt iOS App
-
 agent:
   machine:
     type: a1-standard-4
     os_image: macos-xcode13
-
 execution_time_limit:
-  minutes: 45
-
-auto_cancel: # cancel running CI for older commits on same branch if new commits are added
+  minutes: 60
+auto_cancel:
   running:
-    when: "branch != 'master'"
-
+    when: branch != 'master'
 blocks:
-
   - name: Ubuntu iOS tests
     execution_time_limit:
-      minutes: 10
+      minutes: 5
     task:
       agent:
         machine:
@@ -33,21 +28,14 @@ blocks:
           - checkout
           - cd ~/git/flowcrypt-ios/
       jobs:
-
         - name: TypeScript - Core standalone tests
           commands:
-            - sem-version node 12
-            - mkdir .custom-npm
-            - cd .custom-npm
-            - npm install npm@7.23.0
-            - cd ../Core
-            - ../.custom-npm/node_modules/.bin/npm --version
+            - sem-version node 12 && mkdir .custom-npm && cd .custom-npm && npm install npm@7.23.0 && cd ../Core
             - ../.custom-npm/node_modules/.bin/npm install
             - ../.custom-npm/node_modules/.bin/npm test
-
   - name: Mac iOS tests
     execution_time_limit:
-      minutes: 40
+      minutes: 55
     task:
       secrets:
         - name: flowcrypt-ios-ci-secrets
@@ -64,24 +52,17 @@ blocks:
           - make dependencies
           - cache store
           - mv ~/test-ci-secrets.json ~/git/flowcrypt-ios/FlowCryptUITests/test-ci-secrets.json
+          - mv ~/appium-env ~/git/flowcrypt-ios/appium/.env
       jobs:
-
-        - name: 'Swift - FlowCryptTests'
+        - name: Swift tests + Appium tests
           commands:
             - bundle exec fastlane do_everything
-            # - bundle exec fastlane test_ui
-
-        # - name: 'Swift - FlowCryptTests(with email server)'
-        #   commands:
-        #     # telnet is used by check_email_server.sh
-        #     - brew install telnet
-        #     # point domain "mail" to IP of dev IMAP mailserver
-        #     - sudo bash -c 'echo "217.163.30.119 mail" >> /etc/hosts'
-        #     - cat /etc/hosts
-        #     # mailserver runs on ports 10025, 10143
-        #     # ports 10456, 10993 are not enabled yet
-        #     - nc -zv 217.163.30.119 10025
-        #     - nc -zv 217.163.30.119 10143
-        #     - nc -zv mail 10025
-        #     - nc -zv mail 10143
-        #     - cd docker-mailserver/ && ./check_email_server.sh
+            - bundle exec fastlane build_e2e
+            - mv /var/tmp/Debug-iphonesimulator/FlowCrypt.app ~/git/flowcrypt-ios/appium
+            - sem-version node 12 && npm install -g appium@1.22.0 && cd ~/git/flowcrypt-ios/appium && npm i
+            - npm run ios.smoke
+      epilogue:
+        on_fail:
+          commands:
+            - artifact push job ~/git/flowcrypt-ios/appium/tmp
+            - artifact push job ~/git/flowcrypt-ios/appium/FlowCrypt.app

appium/README.md

@@ -4,7 +4,7 @@ Project to run Appium tests together with WebdriverIO for:
 
 - iOS/Android Native Apps
 
-## Before running tests, please create a `./apps` directory, download the app and move the app file into that directory
+## Before running tests, please download the app and move the app file into appium directory
 
 ##Create .env file in appium root and set next variables in that file:  
 ACCOUNT_EMAIL=

appium/config/wdio.ios.app.conf.js

@@ -8,23 +8,18 @@ config.suites = {
         './tests/specs/**/*.spec.ts'
     ],
     smoke: [
-        './tests/specs/login/GmailLogin.spec.ts',
-        './tests/specs/inbox/ReadTextEmail.spec.ts',
-        './tests/specs/composeEmail/CheckComposeEmailAfterReopening.spec.ts',
-        './tests/specs/inbox/ReadEmailAfterRestartApp.spec.ts',
-        './tests/specs/inbox/CheckEncryptedEmailAfterRestartApp.spec.ts',
-        './tests/specs/settings/CheckSettingsForLoggedUser.spec.ts',
+        './tests/specs/login/GmailLogin.spec.ts'
     ]
 };
 
 config.capabilities = [
     {
         platformName: 'iOS',
         iosInstallPause: 5000,
-        deviceName: 'iPhone 11',
+        deviceName: 'iPhone 13',
         platformVersion: '15.0',
         automationName: 'XCUITest',
-        app: join(process.cwd(), './apps/FlowCrypt.app'),
+        app: join(process.cwd(), './FlowCrypt.app'),
         newCommandTimeout: 10000,
         wdaLaunchTimeout: 300000,
         wdaConnectionTimeout: 600000,

appium/package.json

@@ -30,6 +30,7 @@
     "eslint-plugin-promise": "^4.2.1",
     "eslint-plugin-wdio": "^6.6.0",
     "node-fetch": "^2.6.1",
+    "node-gyp": "^8.3.0",
     "ts-node": "^9.1.1",
     "typescript": "^4.1.3",
     "webdriverio": "6.10.11"

fastlane/Fastfile

@@ -12,7 +12,7 @@ platform :ios do
   end
 
   desc "Cocoapod update"
-  lane :cocoapod_update do 
+  lane :cocoapod_update do
     cocoapods(
       try_repo_update_on_error: true
     )
@@ -33,8 +33,8 @@ platform :ios do
       workspace: "FlowCrypt.xcworkspace",
       scheme: "FlowCryptUITests",
       reinstall_app: true,
-      skip_build: true,    
-      disable_slide_to_type: true,  
+      skip_build: true,
+      disable_slide_to_type: true,
       force_quit_simulator: false,
       reset_simulator: true,
       prelaunch_simulator: true,
@@ -51,8 +51,8 @@ platform :ios do
       workspace: "FlowCrypt.xcworkspace",
       scheme: "FlowCryptUITests",
       reinstall_app: true,
-      skip_build: true,    
-      disable_slide_to_type: true,  
+      skip_build: true,
+      disable_slide_to_type: true,
       force_quit_simulator: false,
       reset_simulator: true,
       prelaunch_simulator: true,
@@ -69,7 +69,7 @@ platform :ios do
 
   # UnitTests
   desc "Run Tests"
-  lane :unit_tests do 
+  lane :unit_tests do
     scan(
       scheme: "FlowCryptAppTests",
       skip_build: true
@@ -90,20 +90,31 @@ platform :ios do
 
   end
 
+  desc "Debug Build for e2e testing"
+  lane :build_e2e do
+    xcbuild(
+       workspace: "FlowCrypt.xcworkspace",
+       scheme: "FlowCrypt",
+       configuration: "Debug",
+       xcargs: "-sdk iphonesimulator SYMROOT='/var/tmp/'"
+    )
+
+  end
+
   desc "Record ui tests"
   lane :record_tests do
-      reset_simulator        
+      reset_simulator
       sh("./record.sh")
   end
 
   desc "Build app, run tests, run UI test"
-  lane :do_everything do 
+  lane :do_everything do
     build
     unit_tests
     # test_ui_gmail
     # test_ui_imap
     # record_tests
-  end 
+  end
 
 end