Merge tag '4.9.0/8950' into main-4.9.0-8950

ProtonMail · Oct 18, 2023 · dc0410b · dc0410b
2 parents 3413472 + b23fafe
commit dc0410b
Show file tree

Hide file tree

Showing 512 changed files with 10,214 additions and 13,862 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -190,18 +190,51 @@ test:ui:smoke:
   tags:
     - iOS_GENERAL
 
+test:ui:sanity:
+  dependencies:
+    - deploy:review
+    - build:debug:for-testing
+  stage: test
+  rules:
+      # Allow job to run automatically on each scheduled job with sanity test type
+    - if: '$CI_PIPELINE_SOURCE == "schedule" && $TEST_TYPE == "sanity"'
+      when: always
+    - when: manual
+  before_script:
+    - *setup_project
+    - echo DYNAMIC_DOMAIN="${DYNAMIC_DOMAIN}"
+  script:
+    - cd ProtonMail
+    - bundle exec fastlane ui_test testplan:"SanityTests" concurrent_workers:"4"
+  artifacts:
+    when: always
+    name: "test-report"
+    paths:
+      - test_output/TestResults
+    expire_in: 10 days
+    reports:
+      coverage_report:
+        coverage_format: cobertura
+        path: test_output/slatherOutput/cobertura.xml
+      junit: test_output/TestResults/report.xml
+  allow_failure: true
+  tags:
+    - iOS_UITEST
+
 report:slack:smoke:
   dependencies:
     - test:ui:smoke
   image: $CI_REGISTRY/tpe/test-scripts
   stage: report
-  rules:
-    - if: "$CI_COMMIT_BRANCH"
-      when: never
-    - if: "$CI_COMMIT_BRANCH && $CI_OPEN_MERGE_REQUESTS"
-      when: never
-    - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
-      when: always
+  except:
+    - schedules
+  only:
+    refs:
+      - master
+      - main
+      - develop
+      - /^release\/.*$/
+      - merge_requests
   script:
     - test_reporter.py
       --path test_output/TestResults/
@@ -218,7 +251,8 @@ test:ui:feature:
     - build:debug:for-testing
   stage: test
   rules:
-    - if: '$TEST_TYPE == "regression" || $TEST_TYPE == "feature"'
+    - if: '$TEST_TYPE == "feature"'
+      when: always
   artifacts:
     when: always
     name: "test-report"
@@ -236,14 +270,42 @@ test:ui:feature:
   tags:
     - iOS_UITEST
 
+test:ui:regression:
+  dependencies:
+    - deploy:review
+    - build:debug:for-testing
+  stage: test
+  rules:
+      # Allow job to run automatically on each scheduled job with regression test type
+    - if: '$CI_PIPELINE_SOURCE == "schedule" && $TEST_TYPE == "regression"'
+      when: always
+    - when: manual
+  artifacts:
+    when: always
+    name: "test-report"
+    paths:
+      - test_output/TestResults
+    expire_in: 10 days
+    reports:
+      junit: test_output/TestResults/report.xml
+  before_script:
+    - bash <(curl -s https://raw.githubusercontent.com/TitouanVanBelle/XCTestHTMLReport/master/install.sh) '2.0.0'
+    - *setup_project
+  script:
+    - cd ProtonMail
+    - bundle exec fastlane ui_test testplan:RegressionTests concurrent_workers:$NUMBER_OF_DEVICES
+  allow_failure: true
+  tags:
+    - iOS_UITEST
+
 test:ui:monkey:
   dependencies:
     - deploy:review
     - build:debug:for-testing
   timeout: 2 hours
   stage: test
   rules:
-    - if: '$TEST_TYPE == "regression" || $TEST_TYPE == "monkey"'
+    - if: '$TEST_TYPE == "monkey"'
   artifacts:
     when: always
     name: "monkey-report"
@@ -263,6 +325,7 @@ test:ui:monkey:
 report:slack:feature:
   dependencies:
     - test:ui:feature
+    - test:ui:regression
   image: $CI_REGISTRY/tpe/test-scripts
   stage: report
   rules:
@@ -284,7 +347,7 @@ report:slack:monkey:
   image: $CI_REGISTRY/tpe/test-scripts
   stage: report
   rules:
-    - if: '$TEST_TYPE == "regression" || $TEST_TYPE == "monkey"'
+    - if: '$TEST_TYPE == "monkey"'
       when: always
   script:
     - test_reporter.py
@@ -296,20 +359,41 @@ report:slack:monkey:
   tags:
     - small
 
-report:testmo:feature:
+report:testmo:regression:
   dependencies:
-    - test:ui:feature
+    - test:ui:regression
   stage: report
   extends: .testmo-upload
-  dependencies:
-    - test:ui:feature
   rules:
-    - if: '$TEST_TYPE == "regression" || $TEST_TYPE == "feature"'
-      when: always
+    - when: manual
+  before_script:
+    - echo "$MILESTONE"
+    - 'if [ -z $MILESTONE ]; then echo "Testmo MILESTONE is not provided. Failing the job."; exit 1; fi'
   variables:
     PROJECT_ID: "7"
     NAME: "$TEST_PLAN"
-    MILESTONE: "nightly-automation"
+    MILESTONE: "$MILESTONE"
+    TAGS: "$CI_COMMIT_REF_SLUG"
+    SOURCE: "ios"
+    RESULT_FOLDER: "./test_output/TestResults/*.xml"
+  allow_failure: true
+  tags:
+    - small
+
+report:testmo:sanity:
+  needs:
+    - test:ui:sanity
+  stage: report
+  extends: .testmo-upload
+  rules:
+    - when: manual
+  before_script:
+    - echo "$MILESTONE"
+    - 'if [ -z $MILESTONE ]; then echo "Testmo MILESTONE is not provided. Failing the job."; exit 1; fi'
+  variables:
+    PROJECT_ID: "7"
+    NAME: "SanityTests"
+    MILESTONE: "$MILESTONE"
     TAGS: "$CI_COMMIT_REF_SLUG"
     SOURCE: "ios"
     RESULT_FOLDER: "./test_output/TestResults/*.xml"

diff --git a/.locale-state.metadata b/.locale-state.metadata
@@ -1,4 +1,4 @@
 {
   "project": "apple-mail-v4",
-  "locale": "4ef8dbfd3f36e42878341baa5bc88aa55577ac14"
+  "locale": "30650b5db2e64523e2e3eb411f1b5f1094635557"
 }
diff --git a/ProtonMail/Podfile b/ProtonMail/Podfile
@@ -58,7 +58,6 @@ end
 def app_share_pods
   app_share_push_pods
 
-  pod 'AwaitKit', :git => 'https://github.com/yannickl/AwaitKit.git', :commit => '4b725f40dd189f40c0962cba792f06a2073bd977'
   pod 'Groot', '3.0.1'
   pod 'MBProgressHUD' , '1.1.0'
   pod 'PromiseKit', '6.13.1'
@@ -122,6 +121,7 @@ target 'ProtonMailTests' do
   pod 'ProtonCore-TestingToolkit/UnitTests/DataModel', :git => proton_core_path, :tag => proton_core_version
   pod 'ProtonCore-TestingToolkit/UnitTests/Networking', :git => proton_core_path, :tag => proton_core_version
   pod "ProtonCore-TestingToolkit/UnitTests/Authentication", :git => proton_core_path, :tag => proton_core_version
+  pod 'fusion', :git => proton_test_path, :commit => proton_test_commit
   app_pods
 end
 

diff --git a/ProtonMail/Podfile.lock b/ProtonMail/Podfile.lock
@@ -1,7 +1,5 @@
 PODS:
   - Alamofire (5.4.4)
-  - AwaitKit (5.2.0):
-    - PromiseKit (~> 6)
   - EllipticCurveKeyPair (2.0)
   - fusion (2.0.1)
   - Groot (3.0.1):
@@ -273,7 +271,6 @@ PODS:
   - Yams (5.0.5)
 
 DEPENDENCIES:
-  - AwaitKit (from `https://github.com/yannickl/AwaitKit.git`, commit `4b725f40dd189f40c0962cba792f06a2073bd977`)
   - "fusion (from `git@gitlab.protontech.ch:tpe/apple-fusion.git`, commit `9b250a7f`)"
   - Groot (= 3.0.1)
   - "iosMonkey (from `git@gitlab.protontech.ch:tpe/ios-monkey.git`, commit `fa348f33`)"
@@ -354,9 +351,6 @@ SPEC REPOS:
     - Yams
 
 EXTERNAL SOURCES:
-  AwaitKit:
-    :commit: 4b725f40dd189f40c0962cba792f06a2073bd977
-    :git: https://github.com/yannickl/AwaitKit.git
   fusion:
     :commit: 9b250a7f
     :git: "git@gitlab.protontech.ch:tpe/apple-fusion.git"
@@ -485,9 +479,6 @@ EXTERNAL SOURCES:
     :git: https://github.com/ProtonMail/TrustKit.git
 
 CHECKOUT OPTIONS:
-  AwaitKit:
-    :commit: 4b725f40dd189f40c0962cba792f06a2073bd977
-    :git: https://github.com/yannickl/AwaitKit.git
   fusion:
     :commit: 9b250a7f
     :git: "git@gitlab.protontech.ch:tpe/apple-fusion.git"
@@ -617,7 +608,6 @@ CHECKOUT OPTIONS:
 
 SPEC CHECKSUMS:
   Alamofire: f3b09a368f1582ab751b3fff5460276e0d2cf5c9
-  AwaitKit: 512626cd12c82b1fbffddc8f414d0364cb456004
   EllipticCurveKeyPair: 8c69e5238a6e47243a10a48fbd41dfb19110b22e
   fusion: 4ce692b0bd8030d952dde9b4ceae3ab9fd3d2b72
   Groot: a668afbcf0be88d76c0a26c714cfa4638ceaca66
@@ -673,6 +663,6 @@ SPEC CHECKSUMS:
   TrustKit: f830ff5af0a8cbad5178aef1d0951389b096d312
   Yams: 271b5757cee031e087ae6322128895c04826c4f3
 
-PODFILE CHECKSUM: 909c16ca321bafdd06be4a5f397b6a35f3c14c68
+PODFILE CHECKSUM: 7809078cae7e70580d42f1bff97b83dacfb28681
 
 COCOAPODS: 1.12.1
diff --git a/ProtonMail/Pods/AwaitKit/LICENSE b/ProtonMail/Pods/AwaitKit/LICENSE