Fix failed tests

Author: itsmeichigo

Modules/Tests/NetworkingTests/Remote/DevicesRemoteTests.swift

@@ -29,8 +29,7 @@ final class DevicesRemoteTests: XCTestCase {
 
         remote.registerDevice(device: Parameters.appleDevice,
                               applicationId: Parameters.applicationId,
-                              applicationVersion: Parameters.applicationVersion,
-                              defaultStoreID: Parameters.defaultStoreID) { (settings, error) in
+                              applicationVersion: Parameters.applicationVersion) { (settings, error) in
 
             XCTAssertNil(error)
             XCTAssertNotNil(settings)
@@ -41,24 +40,6 @@ final class DevicesRemoteTests: XCTestCase {
         wait(for: [expectation], timeout: Constants.expectationTimeout)
     }
 
-    /// Verifies that registerDevice sets the `selected_blog_id` parameter to empty string.
-    ///
-    func test_registerDevice_sets_selected_blog_id_to_empty_string() throws {
-        // Given
-        let remote = DevicesRemote(network: network)
-
-        // When
-        remote.registerDevice(device: Parameters.appleDevice,
-                              applicationId: Parameters.applicationId,
-                              applicationVersion: Parameters.applicationVersion,
-                              defaultStoreID: Parameters.defaultStoreID) { (_, _) in }
-
-        // Then
-        let queryParameters = try XCTUnwrap(network.queryParameters)
-        let expectedParam = "selected_blog_id="
-        XCTAssertTrue(queryParameters.contains(expectedParam), "Expected to have param: \(expectedParam)")
-    }
-
     /// Verifies that registerDevice parses a "Failure" Backend Response.
     ///
     func test_registerDevice_parses_general_failure_response() {
@@ -69,8 +50,7 @@ final class DevicesRemoteTests: XCTestCase {
 
         remote.registerDevice(device: Parameters.appleDevice,
                               applicationId: Parameters.applicationId,
-                              applicationVersion: Parameters.applicationVersion,
-                              defaultStoreID: Parameters.defaultStoreID) { (settings, error) in
+                              applicationVersion: Parameters.applicationVersion) { (settings, error) in
 
             XCTAssertNotNil(error)
             XCTAssertNil(settings)
@@ -124,6 +104,5 @@ private enum Parameters {
                                         identifierForVendor: "1234")
     static let applicationId = "9"
     static let applicationVersion = "99"
-    static let defaultStoreID: Int64 = 1234
     static let dotcomDeviceID = "1234"
 }

Modules/Tests/YosemiteTests/Stores/NotificationStoreTests.swift

@@ -364,10 +364,9 @@ class NotificationStoreTests: XCTestCase {
         let (device, error): (DotcomDevice?, Error?) = waitFor { promise in
             let action = NotificationAction.registerDevice(device: self.sampleAPNSDevice(),
                                                            applicationId: self.sampleApplicationID,
-                                                           applicationVersion: self.sampleApplicationVersion,
-                                                           defaultStoreID: self.sampleDefaultStoreID) { (device, error) in
+                                                           applicationVersion: self.sampleApplicationVersion) { (device, error) in
                 promise((device, error))
-            }
+            } 
             noteStore.onAction(action)
         }
 
@@ -389,8 +388,7 @@ class NotificationStoreTests: XCTestCase {
         let (device, error): (DotcomDevice?, Error?) = waitFor { promise in
             let action = NotificationAction.registerDevice(device: self.sampleAPNSDevice(),
                                                            applicationId: self.sampleApplicationID,
-                                                           applicationVersion: self.sampleApplicationVersion,
-                                                           defaultStoreID: self.sampleDefaultStoreID) { (device, error) in
+                                                           applicationVersion: self.sampleApplicationVersion) { (device, error) in
                 promise((device, error))
             }
             noteStore.onAction(action)
@@ -490,12 +488,6 @@ private extension NotificationStoreTests {
         return "1234"
     }
 
-    /// Returns a sample Default Store ID
-    ///
-    var sampleDefaultStoreID: Int64 {
-        return 1234
-    }
-
     /// Returns a sample Apple Device
     ///
     func sampleAPNSDevice() -> APNSDevice {

WooCommerce/WooCommerceTests/Mocks/MockPushNotificationsManager.swift

@@ -90,7 +90,7 @@ final class MockPushNotificationsManager: PushNotesManager {
 
     }
 
-    func registerDeviceToken(with tokenData: Data, defaultStoreID: Int64) {
+    func registerDeviceToken(with tokenData: Data) {
 
     }
 

WooCommerce/WooCommerceTests/Notifications/PushNotificationsManagerTests.swift

@@ -174,24 +174,6 @@ final class PushNotificationsManagerTests: XCTestCase {
         XCTAssertFalse(defaults.containsObject(forKey: .deviceToken))
     }
 
-    /// Verifies that `registerDevice` effectively dispatches a `registerDevice` Action.
-    ///
-    func testRegisterForRemoteNotificationsDispatchesRegisterDeviceAction() {
-        guard let tokenAsData = Sample.deviceToken.data(using: .utf8) else {
-            XCTFail()
-            return
-        }
-
-        manager.registerDeviceToken(with: tokenAsData, defaultStoreID: Sample.defaultStoreID)
-
-        guard case let .registerDevice(_, _, _, storeID, _) = storesManager.receivedActions.first as! NotificationAction else {
-            XCTFail()
-            return
-        }
-
-        XCTAssertEqual(storeID, Sample.defaultStoreID)
-    }
-
 
     /// Verifies that `registerDeviceToken` effectively stores the Device Token.
     ///
@@ -202,7 +184,7 @@ final class PushNotificationsManagerTests: XCTestCase {
         }
 
         XCTAssertFalse(defaults.containsObject(forKey: .deviceToken))
-        manager.registerDeviceToken(with: tokenAsData, defaultStoreID: Sample.defaultStoreID)
+        manager.registerDeviceToken(with: tokenAsData)
         XCTAssertTrue(defaults.containsObject(forKey: .deviceToken))
     }
 
@@ -708,10 +690,6 @@ private struct Sample {
     ///
     static let deviceToken = "4fa963db2cfc824b0d67740ed2b1c0b472cce8eafcb82184905361eb88be55b9"
 
-    /// Sample StoreID
-    ///
-    static let defaultStoreID: Int64 = 9999
-
     /// UserDefaults Suite Name
     ///
     static let defaultSuiteName = "PushNotificationsTests"