Merge branch 'trunk' into issue/6031-display_selected_variation_attributes

Author: rachelmcr

.buildkite/commands/run-ui-tests.sh

@@ -27,4 +27,4 @@ install_cocoapods
 echo "--- 🧪 Testing"
 xcrun simctl list >> /dev/null
 rake mocks &
-bundle exec fastlane test_without_building name:"$TEST_NAME" try_count:3 device:"$DEVICE" ios_version:"$IOS_VERSION"
+bundle exec fastlane test_without_building name:"$TEST_NAME" device:"$DEVICE" ios_version:"$IOS_VERSION"

.buildkite/commands/run-unit-tests.sh

@@ -12,4 +12,4 @@ echo "--- :rubygems: Setting up Gems"
 install_gems
 
 echo "--- 🧪 Testing"
-bundle exec fastlane test_without_building name:UnitTests try_count:3
+bundle exec fastlane test_without_building name:UnitTests

.circleci/config.yml

@@ -98,7 +98,7 @@ jobs:
           command: bundle --path vendor/bundle
       - run:
           name: Run Unit Tests
-          command: bundle exec fastlane test_without_building name:UnitTests try_count:3 device:'<< parameters.device >>' ios-version:'<< parameters.ios-version >>'
+          command: bundle exec fastlane test_without_building name:UnitTests device:'<< parameters.device >>' ios-version:'<< parameters.ios-version >>'
       - ios/save-xcodebuild-artifacts:
           result-bundle-path: build/results
   UI Tests:

Gemfile.lock

@@ -16,17 +16,17 @@ GEM
     artifactory (3.0.15)
     atomos (0.1.3)
     aws-eventstream (1.2.0)
-    aws-partitions (1.541.0)
-    aws-sdk-core (3.124.0)
+    aws-partitions (1.553.0)
+    aws-sdk-core (3.126.0)
       aws-eventstream (~> 1, >= 1.0.2)
       aws-partitions (~> 1, >= 1.525.0)
       aws-sigv4 (~> 1.1)
       jmespath (~> 1.0)
-    aws-sdk-kms (1.52.0)
-      aws-sdk-core (~> 3, >= 3.122.0)
+    aws-sdk-kms (1.54.0)
+      aws-sdk-core (~> 3, >= 3.126.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.109.0)
-      aws-sdk-core (~> 3, >= 3.122.0)
+    aws-sdk-s3 (1.112.0)
+      aws-sdk-core (~> 3, >= 3.126.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.4)
     aws-sigv4 (1.4.0)
@@ -77,7 +77,6 @@ GEM
     cocoapods-try (1.2.0)
     colored (1.2)
     colored2 (3.1.2)
-    colorize (0.8.1)
     commander (4.6.0)
       highline (~> 2.0.0)
     concurrent-ruby (1.1.9)
@@ -92,17 +91,18 @@ GEM
     escape (0.0.4)
     ethon (0.15.0)
       ffi (>= 1.15.0)
-    excon (0.89.0)
-    faraday (1.8.0)
+    excon (0.91.0)
+    faraday (1.9.3)
       faraday-em_http (~> 1.0)
       faraday-em_synchrony (~> 1.0)
       faraday-excon (~> 1.1)
-      faraday-httpclient (~> 1.0.1)
+      faraday-httpclient (~> 1.0)
+      faraday-multipart (~> 1.0)
       faraday-net_http (~> 1.0)
-      faraday-net_http_persistent (~> 1.1)
+      faraday-net_http_persistent (~> 1.0)
       faraday-patron (~> 1.0)
       faraday-rack (~> 1.0)
-      multipart-post (>= 1.2, < 3)
+      faraday-retry (~> 1.0)
       ruby2_keywords (>= 0.0.4)
     faraday-cookie_jar (0.0.7)
       faraday (>= 0.8.0)
@@ -111,14 +111,17 @@ GEM
     faraday-em_synchrony (1.0.0)
     faraday-excon (1.1.0)
     faraday-httpclient (1.0.1)
+    faraday-multipart (1.0.3)
+      multipart-post (>= 1.2, < 3)
     faraday-net_http (1.0.1)
     faraday-net_http_persistent (1.2.0)
     faraday-patron (1.0.0)
     faraday-rack (1.0.0)
+    faraday-retry (1.0.3)
     faraday_middleware (1.2.0)
       faraday (~> 1.0)
-    fastimage (2.2.5)
-    fastlane (2.199.0)
+    fastimage (2.2.6)
+    fastlane (2.204.2)
       CFPropertyList (>= 2.3, < 4.0.0)
       addressable (>= 2.8, < 3.0.0)
       artifactory (~> 3.0)
@@ -158,16 +161,7 @@ GEM
       xcpretty (~> 0.3.0)
       xcpretty-travis-formatter (>= 0.0.3)
     fastlane-plugin-appcenter (1.11.1)
-    fastlane-plugin-sentry (1.11.0)
-    fastlane-plugin-test_center (3.15.3)
-      colorize
-      json
-      plist
-      trainer
-      xcodeproj
-      xctest_list (>= 1.2.1)
-    fastlane-plugin-trainer (0.4.1)
-      trainer (>= 0.7.0)
+    fastlane-plugin-sentry (1.11.1)
     fastlane-plugin-wpmreleasetoolkit (2.3.0)
       activesupport (~> 5)
       bigdecimal (~> 1.4)
@@ -187,9 +181,9 @@ GEM
     gh_inspector (1.1.3)
     git (1.9.1)
       rchardet (~> 1.8)
-    google-apis-androidpublisher_v3 (0.14.0)
+    google-apis-androidpublisher_v3 (0.16.0)
       google-apis-core (>= 0.4, < 2.a)
-    google-apis-core (0.4.1)
+    google-apis-core (0.4.2)
       addressable (~> 2.5, >= 2.5.1)
       googleauth (>= 0.16.2, < 2.a)
       httpclient (>= 2.8.1, < 3.a)
@@ -198,19 +192,19 @@ GEM
       retriable (>= 2.0, < 4.a)
       rexml
       webrick
-    google-apis-iamcredentials_v1 (0.9.0)
+    google-apis-iamcredentials_v1 (0.10.0)
       google-apis-core (>= 0.4, < 2.a)
-    google-apis-playcustomapp_v1 (0.6.0)
+    google-apis-playcustomapp_v1 (0.7.0)
       google-apis-core (>= 0.4, < 2.a)
-    google-apis-storage_v1 (0.10.0)
+    google-apis-storage_v1 (0.11.0)
       google-apis-core (>= 0.4, < 2.a)
     google-cloud-core (1.6.0)
       google-cloud-env (~> 1.0)
       google-cloud-errors (~> 1.0)
     google-cloud-env (1.5.0)
       faraday (>= 0.17.3, < 2.0)
     google-cloud-errors (1.2.0)
-    google-cloud-storage (1.35.0)
+    google-cloud-storage (1.36.0)
       addressable (~> 2.8)
       digest-crc (~> 0.4)
       google-apis-iamcredentials_v1 (~> 0.1)
@@ -231,7 +225,7 @@ GEM
     httpclient (2.8.3)
     i18n (1.8.11)
       concurrent-ruby (~> 1.0)
-    jmespath (1.4.0)
+    jmespath (1.5.0)
     json (2.6.1)
     jsonlint (0.3.0)
       oj (~> 3)
@@ -301,9 +295,6 @@ GEM
       unicode-display_width (~> 1.1, >= 1.1.1)
     thread_safe (0.3.6)
     trailblazer-option (0.1.2)
-    trainer (0.9.1)
-      fastlane (>= 2.25.0)
-      plist (>= 3.1.0, < 4.0.0)
     tty-cursor (0.7.1)
     tty-screen (0.8.1)
     tty-spinner (0.9.3)
@@ -333,7 +324,6 @@ GEM
       rouge (~> 2.0.7)
     xcpretty-travis-formatter (1.0.1)
       xcpretty (~> 0.2, >= 0.0.7)
-    xctest_list (1.2.1)
 
 PLATFORMS
   ruby
@@ -348,8 +338,6 @@ DEPENDENCIES
   fastlane (~> 2)
   fastlane-plugin-appcenter (~> 1.6)
   fastlane-plugin-sentry (~> 1.0)
-  fastlane-plugin-test_center (~> 3.0)
-  fastlane-plugin-trainer (~> 0.4.1)
   fastlane-plugin-wpmreleasetoolkit (~> 2.0)
   rake (~> 12.3)
   rmagick (~> 3.2.0)

Hardware/Hardware/CardReader/CardReaderType.swift

@@ -5,6 +5,8 @@ public enum CardReaderType {
     case chipper
     /// Stripe M2
     case stripeM2
+    /// BBPOS WisePad 3
+    case wisepad3
     /// Other
     case other
 }
@@ -22,6 +24,8 @@ extension CardReaderType {
             return "CHIPPER_2X"
         case .stripeM2:
             return "STRIPE_M2"
+        case .wisepad3:
+            return "WISEPAD_3"
         default:
             return "UNKNOWN"
         }

Hardware/Hardware/CardReader/StripeCardReader/CardReaderType+Stripe.swift

@@ -11,6 +11,8 @@ extension CardReaderType {
             return .chipper
         case .stripeM2:
             return .stripeM2
+        case .wisePad3:
+            return .wisepad3
         default:
             return .other
         }

Hardware/HardwareTests/CardReaderTests.swift

@@ -59,6 +59,13 @@ final class CardReaderTests: XCTestCase {
         XCTAssertEqual(cardReader.readerType, .stripeM2)
     }
 
+    func test_card_reader_maps_reader_type_for_wisepad3() {
+        let mockReader = MockStripeCardReader.wisepad3()
+        let cardReader = CardReader(reader: mockReader)
+
+        XCTAssertEqual(cardReader.readerType, .wisepad3)
+    }
+
     func test_card_reader_maps_reader_type_for_verifone() {
         let mockReader = MockStripeCardReader.verifoneP400()
         let cardReader = CardReader(reader: mockReader)

Hardware/HardwareTests/Mocks/MockStripeCardReader.swift

@@ -53,4 +53,15 @@ extension MockStripeCardReader {
                              batteryLevel: NSNumber(floatLiteral: 0.5),
                              locationId: "st_simulated")
     }
+
+    static func wisepad3() -> Self {
+        MockStripeCardReader(serialNumber: "W3E-SIMULATOR-1",
+                             stripeId: "SIMULATOR",
+                             label: "Simulated WisePad 3",
+                             status: .online,
+                             deviceSoftwareVersion: "0.0.0.1",
+                             deviceType: .wisePad3,
+                             batteryLevel: NSNumber(floatLiteral: 0.5),
+                             locationId: "st_simulated")
+    }
 }

RELEASE-NOTES.txt

@@ -3,6 +3,7 @@
 8.6
 -----
 - [*] Orders: In the experimental Order Creation feature, product variations added to a new order now show a list of their attributes. [https://github.com/woocommerce/woocommerce-ios/pull/6131]
+- [*] Enlarged the tap area for the action button on the notice view. [https://github.com/woocommerce/woocommerce-ios/pull/6146]
 
 8.5
 -----

Storage/Storage/Model/Copiable/Models+Copiable.generated.swift

@@ -13,6 +13,7 @@ extension GeneralAppSettings {
         isStripeInPersonPaymentsSwitchEnabled: CopiableProp<Bool> = .copy,
         isCanadaInPersonPaymentsSwitchEnabled: CopiableProp<Bool> = .copy,
         isProductSKUInputScannerSwitchEnabled: CopiableProp<Bool> = .copy,
+        isCouponManagementSwitchEnabled: CopiableProp<Bool> = .copy,
         knownCardReaders: CopiableProp<[String]> = .copy,
         lastEligibilityErrorInfo: NullableCopiableProp<EligibilityErrorInfo> = .copy,
         lastJetpackBenefitsBannerDismissedTime: NullableCopiableProp<Date> = .copy
@@ -24,6 +25,7 @@ extension GeneralAppSettings {
         let isStripeInPersonPaymentsSwitchEnabled = isStripeInPersonPaymentsSwitchEnabled ?? self.isStripeInPersonPaymentsSwitchEnabled
         let isCanadaInPersonPaymentsSwitchEnabled = isCanadaInPersonPaymentsSwitchEnabled ?? self.isCanadaInPersonPaymentsSwitchEnabled
         let isProductSKUInputScannerSwitchEnabled = isProductSKUInputScannerSwitchEnabled ?? self.isProductSKUInputScannerSwitchEnabled
+        let isCouponManagementSwitchEnabled = isCouponManagementSwitchEnabled ?? self.isCouponManagementSwitchEnabled
         let knownCardReaders = knownCardReaders ?? self.knownCardReaders
         let lastEligibilityErrorInfo = lastEligibilityErrorInfo ?? self.lastEligibilityErrorInfo
         let lastJetpackBenefitsBannerDismissedTime = lastJetpackBenefitsBannerDismissedTime ?? self.lastJetpackBenefitsBannerDismissedTime
@@ -36,6 +38,7 @@ extension GeneralAppSettings {
             isStripeInPersonPaymentsSwitchEnabled: isStripeInPersonPaymentsSwitchEnabled,
             isCanadaInPersonPaymentsSwitchEnabled: isCanadaInPersonPaymentsSwitchEnabled,
             isProductSKUInputScannerSwitchEnabled: isProductSKUInputScannerSwitchEnabled,
+            isCouponManagementSwitchEnabled: isCouponManagementSwitchEnabled,
             knownCardReaders: knownCardReaders,
             lastEligibilityErrorInfo: lastEligibilityErrorInfo,
             lastJetpackBenefitsBannerDismissedTime: lastJetpackBenefitsBannerDismissedTime