More notification tests.

tapashmajumder · tapashmajumder · commit 933ecee9b32b · 2018-10-16T17:43:36.000-07:00
diff --git a/Tests/ui-tests/UITests.swift b/Tests/ui-tests/UITests.swift
@@ -40,7 +40,7 @@ class UITests: XCTestCase {
         // Put teardown code here. This method is called after the invocation of each test method in the class.
     }
     
-    func testSendNotificationOpenGoogle() {
+    func testSendNotificationOpenSafari() {
         allowNotificationsIfNeeded()
         
         app.buttons["Send Notification"].tap()
@@ -53,7 +53,7 @@ class UITests: XCTestCase {
         // Give one second pause before interacting
         sleep(1)
         
-        let button = SpringBoardNotification(springboard: springboard).buttonOpenGoogle
+        let button = SpringBoardNotification(springboard: springboard).buttonOpenSafari
         button.tap()
 
         // Give some time to open
@@ -66,6 +66,51 @@ class UITests: XCTestCase {
         // launch this app again for other tests
         app.launch()
     }
+
+    func testSendNotificationOpenDeeplink() {
+        allowNotificationsIfNeeded()
+        
+        app.buttons["Send Notification"].tap()
+        
+        let notification = springboard.otherElements["NotificationShortLookView"]
+        XCTAssert(notification.waitForExistence(timeout: 10))
+        
+        notification.swipeDown()
+        
+        // Give one second pause before interacting
+        sleep(1)
+        
+        let button = SpringBoardNotification(springboard: springboard).buttonOpenDeeplink
+        button.tap()
+        
+        // Give some time to open
+        sleep(1)
+        
+        waitForElementToAppear(app.staticTexts["https://www.myuniqueurl.com"])
+    }
+
+    func testSendNotificationCustomAction() {
+        allowNotificationsIfNeeded()
+        
+        app.buttons["Send Notification"].tap()
+        
+        let notification = springboard.otherElements["NotificationShortLookView"]
+        XCTAssert(notification.waitForExistence(timeout: 10))
+        
+        notification.swipeDown()
+        
+        // Give one second pause before interacting
+        sleep(1)
+        
+        let button = SpringBoardNotification(springboard: springboard).buttonCustomAction
+        button.tap()
+        
+        // Give some time to open
+        sleep(1)
+        
+        waitForElementToAppear(app.staticTexts["MyUniqueCustomAction"])
+    }
+
     
     func testShowSystemNotification() {
         // Tap the Left Button
@@ -167,9 +212,16 @@ class UITests: XCTestCase {
 struct SpringBoardNotification {
     let springboard: XCUIApplication
     
-    var buttonOpenGoogle: XCUIElement {
-        return springboard.buttons["Open Google"].firstMatch
+    var buttonOpenSafari: XCUIElement {
+        return springboard.buttons["Open Safari"].firstMatch
+    }
+
+    var buttonOpenDeeplink: XCUIElement {
+        return springboard.buttons["Open Deeplink"].firstMatch
     }
-}
 
+    var buttonCustomAction: XCUIElement {
+        return springboard.buttons["Custom Action"].firstMatch
+    }
+}
 
diff --git a/host-app/AppDelegate.swift b/host-app/AppDelegate.swift
@@ -17,7 +17,6 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
 
     var window: UIWindow?
 
-
     func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool {
         // Override point for customization after application launch.
         
@@ -51,42 +50,12 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
     func applicationWillTerminate(_ application: UIApplication) {
         // Called when the application is about to terminate. Save data if appropriate. See also applicationDidEnterBackground:.
     }
-
-    @available(iOS 10.0, *)
-    private func setupNotifications() {
-        UNUserNotificationCenter.current().delegate = self
-        UNUserNotificationCenter.current().getNotificationSettings { (settings) in
-            if settings.authorizationStatus != .authorized {
-                print("Not authorized")
-                // not authorized, ask for permission
-                UNUserNotificationCenter.current().requestAuthorization(options:[.alert, .badge, .sound]) { (success, error) in
-                    print("authGranted: \(success)")
-                    if success {
-                        
-                    }
-                }
-            } else {
-                // already authorized
-            }
-        }
-    }
-}
-
-@available(iOS 10.0, *)
-extension AppDelegate : UNUserNotificationCenterDelegate {
-    public func userNotificationCenter(_ center: UNUserNotificationCenter, willPresent notification: UNNotification, withCompletionHandler completionHandler: @escaping (UNNotificationPresentationOptions) -> Void) {
-        completionHandler([.alert, .badge, .sound])
-    }
-    
-    // The method will be called on the delegate when the user responded to the notification by opening the application, dismissing the notification or choosing a UNNotificationAction. The delegate must be set before the application returns from applicationDidFinishLaunching:.
-    public func userNotificationCenter(_ center: UNUserNotificationCenter, didReceive response: UNNotificationResponse, withCompletionHandler completionHandler: @escaping () -> Void) {
-        IterableAppIntegration.userNotificationCenter(center, didReceive: response, withCompletionHandler: completionHandler)
-    }
 }
 
 extension AppDelegate : IterableCustomActionDelegate {
     func handle(iterableCustomAction action: IterableAction, inContext context: IterableActionContext) -> Bool {
         ITBInfo("handleCustomAction: \(action)")
+        NotificationCenter.default.post(name: .handleIterableCustomAction, object: nil, userInfo: ["name" : action.type])
         return true
     }
 }
@@ -99,7 +68,13 @@ extension AppDelegate : IterableURLDelegate {
             return false
         } else {
             // I am handling this
+            NotificationCenter.default.post(name: .handleIterableUrl, object: nil, userInfo: ["url" : url.absoluteString])
             return true
         }
     }
 }
+
+extension Notification.Name {
+    static let handleIterableUrl = Notification.Name("handleIterableUrl")
+    static let handleIterableCustomAction = Notification.Name("handleIterableCustomAction")
+}
diff --git a/host-app/ViewController.swift b/host-app/ViewController.swift
@@ -16,6 +16,9 @@ class ViewController: UIViewController {
     
     override func viewDidLoad() {
         super.viewDidLoad()
+        
+        NotificationCenter.default.addObserver(self, selector: #selector(handleNotification(_:)), name: .handleIterableUrl, object: nil)
+        NotificationCenter.default.addObserver(self, selector: #selector(handleNotification(_:)), name: .handleIterableCustomAction, object: nil)
     }
 
     override func didReceiveMemoryWarning() {
@@ -175,20 +178,39 @@ class ViewController: UIViewController {
         content.badge = NSNumber(value: 1)
 
         let messageId = UUID().uuidString
+        let uniqueUrl = "https://www.myuniqueurl.com"
+        let customActionName = "MyUniqueCustomAction"
         
         let userInfo = [
             "itbl": [
                 "campaignId" : 1234,
                 "templateId" : 4321,
                 "isGhostPush" : false,
                 "messageId" : messageId,
-                "actionButtons" : [[
-                    "identifier" : "Open Google",
-                    "buttonType" : "default",
-                    "action" : [
-                        "type" : "openUrl",
-                        "data" : "https://www.google.com"
-                    ]]
+                "actionButtons" : [
+                    [
+                        "identifier" : "Open Safari",
+                        "buttonType" : "default",
+                        "action" : [
+                            "type" : "openUrl",
+                            "data" : "https://www.google.com"
+                        ],
+                    ],
+                    [
+                        "identifier" : "Open Deeplink",
+                        "buttonType" : "default",
+                        "action" : [
+                            "type" : "openUrl",
+                            "data" : uniqueUrl,
+                        ],
+                    ],
+                    [
+                        "identifier" : "Custom Action",
+                        "buttonType" : "default",
+                        "action" : [
+                            "type" : customActionName,
+                        ],
+                    ],
                 ]
             ]
         ]
@@ -203,14 +225,36 @@ class ViewController: UIViewController {
     @available(iOS 10.0, *)
     private func registerCategories() {
         ITBInfo()
-        let tapButton1Action = UNNotificationAction(identifier: "Open Google", title: "Open Google", options: .foreground)
-        let tapButton2Action = UNNotificationAction(identifier: "Button2", title: "Tap Button 2", options: .destructive)
+        let tapButton1Action = UNNotificationAction(identifier: "Open Safari", title: "Open Safari", options: .foreground)
+        let tapButton2Action = UNNotificationAction(identifier: "Open Deeplink", title: "Open Deeplink", options: .foreground)
+        let tapButton3Action = UNNotificationAction(identifier: "Custom Action", title: "Custom Action", options: .foreground)
 
-        let category = UNNotificationCategory(identifier: "addButtonsCategory", actions: [tapButton1Action, tapButton2Action], intentIdentifiers: [])
+        let category = UNNotificationCategory(identifier: "addButtonsCategory", actions: [tapButton1Action, tapButton2Action, tapButton3Action], intentIdentifiers: [])
 
         UNUserNotificationCenter.current().setNotificationCategories([category])
     }
     
+    @objc private func handleNotification(_ notification: NSNotification) {
+        ITBInfo()
+        switch notification.name {
+        case .handleIterableUrl:
+            if let userInfo = notification.userInfo {
+                if let url = userInfo["url"] as? String {
+                    statusLbl.text = url
+                }
+            }
+            break
+        case .handleIterableCustomAction:
+            if let userInfo = notification.userInfo {
+                if let customActionName = userInfo["name"] as? String {
+                    statusLbl.text = customActionName
+                }
+            }
+            break
+        default:
+            break
+        }
+    }
 }
 
 @available(iOS 10.0, *)
diff --git a/swift-sdk/IterableAction.swift b/swift-sdk/IterableAction.swift
@@ -32,18 +32,6 @@ import Foundation
     /** The text response typed by the user */
     @objc public var userInput: String?
     
-    /**
-     * Checks whether this action is of a specific type.
-     * - parmeter type: Action type to match against
-     * - returns: Bool indicating whether the action type matches the one passed to this method
-     */
-    @objc public func isOfType(_ type: String) -> Bool {
-        return self.type == type
-    }
-    
-    /**
-     Just a shortcut for `isOfType(IterableAction.actionTypeOpenUrl)`.
-    */
     @objc public func isOpenUrl() -> Bool {
         return self.type == IterableAction.actionTypeOpenUrl
     }
