Merge pull request #13 from angeria/no-compose-mode

Add ability to open mail apps without compose mode
vtourraine · Oct 16, 2019 · 745e787 · 745e787
2 parents 957a195 + fceb248
commit 745e787
Show file tree

Hide file tree

Showing 4 changed files with 50 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # ThirdPartyMailer changelog
 
+## 1.6 (work in progress)
+
+- Add open client method
+
+
 ## 1.5
 
 - Add Swift Package Manager support

diff --git a/Sources/ThirdPartyMailer/ThirdPartyMailClient.swift b/Sources/ThirdPartyMailer/ThirdPartyMailClient.swift
@@ -128,5 +128,15 @@ public struct ThirdPartyMailClient {
             return URLComponents().url!
         }
     }
-}
+
+    /**
+     Returns the open URL for the mail client, based on its custom URL scheme.
 
+     - Returns: A `URL` opening the mail client.
+     */
+    public func openURL() -> URL {
+        var components = URLComponents()
+        components.scheme = URLScheme
+        return components.url!
+    }
+}
diff --git a/Sources/ThirdPartyMailer/ThirdPartyMailer.swift b/Sources/ThirdPartyMailer/ThirdPartyMailer.swift
@@ -44,6 +44,19 @@ open class ThirdPartyMailer {
         return application.canOpenURL(URL)
     }
 
+
+    /**
+     Opens a third-party mail client.
+
+     - Parameters application: The main application (usually `UIApplication.sharedApplication()`).
+     - Parameters client: The third-party client to test.
+
+     - Returns: `true` if the application opens the client; otherwise, `false`.
+     */
+    open class func application(_ application: UIApplicationOpenURLProtocol, openMailClient client: ThirdPartyMailClient) -> Bool {
+        return application.openURL(client.openURL())
+    }
+
     /**
      Opens a third-party mail client in compose mode.
 

diff --git a/Tests/ThirdPartyMailerTests/ThirdPartyMailClientsTests.swift b/Tests/ThirdPartyMailerTests/ThirdPartyMailClientsTests.swift
@@ -37,6 +37,9 @@ class ThirdPartyMailClientsTests: XCTestCase {
         let sparrow = clientWithURLScheme("sparrow")
         XCTAssertNotNil(sparrow)
 
+        _ = ThirdPartyMailer.application(application, openMailClient: sparrow!)
+        XCTAssertEqual(application.lastOpenedURL?.absoluteString, "sparrow:")
+
         _ = ThirdPartyMailer.application(application, openMailClient: sparrow!, recipient: nil, subject: nil, body: nil)
         XCTAssertEqual(application.lastOpenedURL?.absoluteString, "sparrow:")
 
@@ -51,6 +54,9 @@ class ThirdPartyMailClientsTests: XCTestCase {
         let gmail = clientWithURLScheme("googlegmail")
         XCTAssertNotNil(gmail)
 
+        _ = ThirdPartyMailer.application(application, openMailClient: gmail!)
+        XCTAssertEqual(application.lastOpenedURL?.absoluteString, "googlegmail:")
+
         _ = ThirdPartyMailer.application(application, openMailClient: gmail!, recipient: nil, subject: nil, body: nil)
         XCTAssertEqual(application.lastOpenedURL?.absoluteString, "googlegmail:///co")
 
@@ -65,6 +71,9 @@ class ThirdPartyMailClientsTests: XCTestCase {
         let dispatch = clientWithURLScheme("x-dispatch")
         XCTAssertNotNil(dispatch)
 
+        _ = ThirdPartyMailer.application(application, openMailClient: dispatch!)
+        XCTAssertEqual(application.lastOpenedURL?.absoluteString, "x-dispatch:")
+
         _ = ThirdPartyMailer.application(application, openMailClient: dispatch!, recipient: nil, subject: nil, body: nil)
         XCTAssertEqual(application.lastOpenedURL?.absoluteString, "x-dispatch:///compose")
 
@@ -79,6 +88,9 @@ class ThirdPartyMailClientsTests: XCTestCase {
         let spark = clientWithURLScheme("readdle-spark")
         XCTAssertNotNil(spark)
 
+        _ = ThirdPartyMailer.application(application, openMailClient: spark!)
+        XCTAssertEqual(application.lastOpenedURL?.absoluteString, "readdle-spark:")
+
         _ = ThirdPartyMailer.application(application, openMailClient: spark!, recipient: nil, subject: nil, body: nil)
         XCTAssertEqual(application.lastOpenedURL?.absoluteString, "readdle-spark://compose")
 
@@ -93,6 +105,9 @@ class ThirdPartyMailClientsTests: XCTestCase {
         let airmail = clientWithURLScheme("airmail")
         XCTAssertNotNil(airmail)
 
+        _ = ThirdPartyMailer.application(application, openMailClient: airmail!)
+        XCTAssertEqual(application.lastOpenedURL?.absoluteString, "airmail:")
+
         _ = ThirdPartyMailer.application(application, openMailClient: airmail!, recipient: nil, subject: nil, body: nil)
         XCTAssertEqual(application.lastOpenedURL?.absoluteString, "airmail://compose")
 
@@ -107,6 +122,9 @@ class ThirdPartyMailClientsTests: XCTestCase {
         let outlook = clientWithURLScheme("ms-outlook")
         XCTAssertNotNil(outlook)
 
+        _ = ThirdPartyMailer.application(application, openMailClient: outlook!)
+        XCTAssertEqual(application.lastOpenedURL?.absoluteString, "ms-outlook:")
+
         _ = ThirdPartyMailer.application(application, openMailClient: outlook!, recipient: nil, subject: nil, body: nil)
         XCTAssertEqual(application.lastOpenedURL?.absoluteString, "ms-outlook://compose")
 
@@ -121,6 +139,9 @@ class ThirdPartyMailClientsTests: XCTestCase {
         let yahoo = clientWithURLScheme("ymail")
         XCTAssertNotNil(yahoo)
 
+        _ = ThirdPartyMailer.application(application, openMailClient: yahoo!)
+        XCTAssertEqual(application.lastOpenedURL?.absoluteString, "ymail:")
+
         _ = ThirdPartyMailer.application(application, openMailClient: yahoo!, recipient: nil, subject: nil, body: nil)
         XCTAssertEqual(application.lastOpenedURL?.absoluteString, "ymail://mail/compose")