Address a couple of unit and UI tests failures (#5434)

Author: mokagio

Fakes/Fakes/Networking.generated.swift

@@ -1314,6 +1314,8 @@ extension Site {
             description: .fake(),
             url: .fake(),
             plan: .fake(),
+            isJetpackThePluginInstalled: .fake(),
+            isJetpackConnected: .fake(),
             isWooCommerceActive: .fake(),
             isWordPressStore: .fake(),
             timezone: .fake(),

Hardware/HardwareTests/AirPrintReceipt/ReceiptRendererTest.swift

@@ -40,7 +40,7 @@ private extension ReceiptRendererTest {
                 amount: 1,
                 formattedAmount: "1",
                 currency: "USD",
-                date: .init(),
+                date: .init(timeIntervalSince1970: 1636970486),
                 storeName: "Test Store",
                 cardDetails: .init(
                     last4: "1234",

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

@@ -1151,6 +1151,8 @@ extension Site {
         description: CopiableProp<String> = .copy,
         url: CopiableProp<String> = .copy,
         plan: CopiableProp<String> = .copy,
+        isJetpackThePluginInstalled: CopiableProp<Bool> = .copy,
+        isJetpackConnected: CopiableProp<Bool> = .copy,
         isWooCommerceActive: CopiableProp<Bool> = .copy,
         isWordPressStore: CopiableProp<Bool> = .copy,
         timezone: CopiableProp<String> = .copy,
@@ -1161,6 +1163,8 @@ extension Site {
         let description = description ?? self.description
         let url = url ?? self.url
         let plan = plan ?? self.plan
+        let isJetpackThePluginInstalled = isJetpackThePluginInstalled ?? self.isJetpackThePluginInstalled
+        let isJetpackConnected = isJetpackConnected ?? self.isJetpackConnected
         let isWooCommerceActive = isWooCommerceActive ?? self.isWooCommerceActive
         let isWordPressStore = isWordPressStore ?? self.isWordPressStore
         let timezone = timezone ?? self.timezone
@@ -1172,6 +1176,8 @@ extension Site {
             description: description,
             url: url,
             plan: plan,
+            isJetpackThePluginInstalled: isJetpackThePluginInstalled,
+            isJetpackConnected: isJetpackConnected,
             isWooCommerceActive: isWooCommerceActive,
             isWordPressStore: isWordPressStore,
             timezone: timezone,

Networking/Networking/Model/Site.swift

@@ -25,6 +25,14 @@ public struct Site: Decodable, Equatable, GeneratedFakeable, GeneratedCopiable {
     ///
     public let plan: String
 
+    /// Whether the site has Jetpack-the-plugin installed.
+    ///
+    public let isJetpackThePluginInstalled: Bool
+
+    /// Whether the site is connected to Jetpack, either through Jetpack-the-plugin or other plugins that include Jetpack Connection Package.
+    ///
+    public let isJetpackConnected: Bool
+
     ///  Indicates if there is a WooCommerce Store Active.
     ///
     public let isWooCommerceActive: Bool
@@ -50,6 +58,8 @@ public struct Site: Decodable, Equatable, GeneratedFakeable, GeneratedCopiable {
         let name = try siteContainer.decode(String.self, forKey: .name)
         let description = try siteContainer.decode(String.self, forKey: .description)
         let url = try siteContainer.decode(String.self, forKey: .url)
+        let isJetpackThePluginInstalled = try siteContainer.decode(Bool.self, forKey: .isJetpackThePluginInstalled)
+        let isJetpackConnected = try siteContainer.decode(Bool.self, forKey: .isJetpackConnected)
 
         let optionsContainer = try siteContainer.nestedContainer(keyedBy: OptionKeys.self, forKey: .options)
         let isWordPressStore = try optionsContainer.decode(Bool.self, forKey: .isWordPressStore)
@@ -62,6 +72,8 @@ public struct Site: Decodable, Equatable, GeneratedFakeable, GeneratedCopiable {
                   description: description,
                   url: url,
                   plan: String(), // Not created on init. Added in supplementary API request.
+                  isJetpackThePluginInstalled: isJetpackThePluginInstalled,
+                  isJetpackConnected: isJetpackConnected,
                   isWooCommerceActive: isWooCommerceActive,
                   isWordPressStore: isWordPressStore,
                   timezone: timezone,
@@ -75,6 +87,8 @@ public struct Site: Decodable, Equatable, GeneratedFakeable, GeneratedCopiable {
                 description: String,
                 url: String,
                 plan: String,
+                isJetpackThePluginInstalled: Bool,
+                isJetpackConnected: Bool,
                 isWooCommerceActive: Bool,
                 isWordPressStore: Bool,
                 timezone: String,
@@ -84,13 +98,22 @@ public struct Site: Decodable, Equatable, GeneratedFakeable, GeneratedCopiable {
         self.description = description
         self.url = url
         self.plan = plan
+        self.isJetpackThePluginInstalled = isJetpackThePluginInstalled
+        self.isJetpackConnected = isJetpackConnected
         self.isWordPressStore = isWordPressStore
         self.isWooCommerceActive = isWooCommerceActive
         self.timezone = timezone
         self.gmtOffset = gmtOffset
     }
 }
 
+public extension Site {
+    /// Whether the site is connected to Jetpack with Jetpack Connection Package, and not with Jetpack-the-plugin.
+    ///
+    var isJetpackCPConnected: Bool {
+        isJetpackConnected && !isJetpackThePluginInstalled
+    }
+}
 
 /// Defines all of the Site CodingKeys.
 ///
@@ -103,6 +126,8 @@ private extension Site {
         case url            = "URL"
         case options        = "options"
         case plan           = "plan"
+        case isJetpackThePluginInstalled = "jetpack"
+        case isJetpackConnected          = "jetpack_connection"
     }
 
     enum OptionKeys: String, CodingKey {

Networking/Networking/Remote/AccountRemote.swift

@@ -53,7 +53,7 @@ public class AccountRemote: Remote {
     public func loadSites(completion: @escaping (Result<[Site], Error>) -> Void) {
         let path = "me/sites"
         let parameters = [
-            "fields": "ID,name,description,URL,options",
+            "fields": "ID,name,description,URL,options,jetpack,jetpack_connection",
             "options": "timezone,is_wpcom_store,woocommerce_is_active,gmt_offset"
         ]
 

Networking/NetworkingTests/Responses/sites-malformed.json

@@ -6,6 +6,7 @@
       "description": "Testing Tagline",
       "URL": "https:\/\/some-testing-url.testing.blog",
       "jetpack": true,
+      "jetpack_connection": true,
       "updates": {
         "plugins": 3,
         "themes": 1,
@@ -20,6 +21,7 @@
       "description": "Your Favorite Blog",
       "URL": "https:\/\/thoughts.testing.blog",
       "jetpack": false,
+      "jetpack_connection": true,
       "options": {
         "timezone": "",
         "gmt_offset": -4,

Networking/NetworkingTests/Responses/sites.json

@@ -6,6 +6,7 @@
       "description": "Testing Tagline",
       "URL": "https:\/\/some-testing-url.testing.blog",
       "jetpack": true,
+      "jetpack_connection": true,
       "options": {
         "timezone": "",
         "gmt_offset": 3.5,
@@ -144,6 +145,7 @@
       "description": "Your Favorite Blog",
       "URL": "https:\/\/thoughts.testing.blog",
       "jetpack": false,
+      "jetpack_connection": true,
       "options": {
         "timezone": "",
         "gmt_offset": -4,

Storage/Storage.xcodeproj/project.pbxproj

@@ -245,6 +245,7 @@
 		028296F1237D404F00E84012 /* GenericAttribute+CoreDataProperties.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "GenericAttribute+CoreDataProperties.swift"; sourceTree = "<group>"; };
 		0284BD8725BAC75500D00C06 /* Model 43.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = "Model 43.xcdatamodel"; sourceTree = "<group>"; };
 		0284BD8825BAC83700D00C06 /* WooCommerceModelV42toV43.xcmappingmodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcmappingmodel; path = WooCommerceModelV42toV43.xcmappingmodel; sourceTree = "<group>"; };
+		028A81022740E1B400F04D15 /* Model 58.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = "Model 58.xcdatamodel"; sourceTree = "<group>"; };
 		028F00652331605000E6C283 /* Model 20.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = "Model 20.xcdatamodel"; sourceTree = "<group>"; };
 		029DE8AD25C115860046EFF5 /* Model 44.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = "Model 44.xcdatamodel"; sourceTree = "<group>"; };
 		02A098262480D160002F8C7A /* MockCrashLogger.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MockCrashLogger.swift; sourceTree = "<group>"; };
@@ -1692,6 +1693,7 @@
 		B59E11D820A9D00C004121A4 /* WooCommerce.xcdatamodeld */ = {
 			isa = XCVersionGroup;
 			children = (
+				028A81022740E1B400F04D15 /* Model 58.xcdatamodel */,
 				313FC0B62732EE520067408D /* Model 57.xcdatamodel */,
 				31C1D22D2727204200EDEE49 /* Model 56.xcdatamodel */,
 				DE126D1026CE5A28007F901D /* Model 55.xcdatamodel */,
@@ -1750,7 +1752,7 @@
 				746A9D14214071F90013F6FF /* Model 2.xcdatamodel */,
 				B59E11D920A9D00C004121A4 /* Model.xcdatamodel */,
 			);
-			currentVersion = 313FC0B62732EE520067408D /* Model 57.xcdatamodel */;
+			currentVersion = 028A81022740E1B400F04D15 /* Model 58.xcdatamodel */;
 			path = WooCommerce.xcdatamodeld;
 			sourceTree = "<group>";
 			versionGroupType = wrapper.xcdatamodel;

Storage/Storage/Model/MIGRATIONS.md

@@ -2,6 +2,11 @@
 
 This file documents changes in the WCiOS Storage data model. Please explain any changes to the data model as well as any custom migrations.
 
+## Model 58 (Release 8.1.0.0)
+- @jaclync 2021-11-15
+- Added `isJetpackConnected` attribute to `Site` entity.
+- Added `isJetpackThePluginInstalled` attribute to `Site` entity.
+
 ## Model 57 (Release 8.0.0.0)
 - @allendav 2021-11-03
 - Added `isLive` attribute to `PaymentGatewayAccount` entity

Storage/Storage/Model/Site+CoreDataProperties.swift

@@ -16,4 +16,11 @@ extension Site {
     @NSManaged public var isWordPressStore: NSNumber?
     @NSManaged public var timezone: String?
     @NSManaged public var gmtOffset: Double
+    @NSManaged public var isJetpackConnected: Bool
+    @NSManaged public var isJetpackThePluginInstalled: Bool
+
+}
+
+extension Site: Identifiable {
+
 }