Merge pull request #695 from rgoldberg/596-testing

Improve testing

.swiftlint.yml

@@ -8,7 +8,6 @@
 opt_in_rules:
   - all
 disabled_rules:
-  - balanced_xctest_lifecycle
   - closure_body_length
   - contrasted_opening_brace
   - explicit_acl
@@ -17,7 +16,6 @@ disabled_rules:
   - explicit_type_interface
   - file_header
   - file_name
-  - final_test_case
   - force_unwrapping
   - function_body_length
   - inert_defer
@@ -26,7 +24,6 @@ disabled_rules:
   - no_grouping_extension
   - number_separator
   - one_declaration_per_file
-  - prefer_nimble
   - prefixed_toplevel_constant
   - quick_discouraged_call
   - quick_discouraged_pending_test

Tests/masTests/.swiftlint.yml

@@ -9,4 +9,5 @@ disabled_rules:
   - force_cast
   - force_try
   - implicitly_unwrapped_optional
+  - large_tuple
   - no_magic_numbers

Tests/masTests/Commands/AccountSpec.swift

@@ -11,19 +11,15 @@ import Quick
 
 @testable import mas
 
-/// Deprecated test.
-public class AccountSpec: QuickSpec {
+public final class AccountSpec: QuickSpec {
     override public func spec() {
         beforeSuite {
             MAS.initialize()
         }
-        // account command disabled since macOS 12 Monterey https://github.com/mas-cli/mas#known-issues
-        describe("Account command") {
-            it("displays active account") {
-                expect {
-                    try MAS.Account.parse([]).run()
-                }
-                .to(throwError(MASError.notSupported))
+        describe("account command") {
+            it("displays not supported warning") {
+                expect(consequencesOf(try MAS.Account.parse([]).run()))
+                    == (error: MASError.notSupported, stdout: "", stderr: "")
             }
         }
     }

Tests/masTests/Commands/HomeSpec.swift

@@ -11,17 +11,15 @@ import Quick
 
 @testable import mas
 
-public class HomeSpec: QuickSpec {
+public final class HomeSpec: QuickSpec {
     override public func spec() {
         beforeSuite {
             MAS.initialize()
         }
         describe("home command") {
             it("can't find app with unknown ID") {
-                expect {
-                    try MAS.Home.parse(["999"]).run(searcher: MockAppStoreSearcher())
-                }
-                .to(throwError(MASError.unknownAppID(999)))
+                expect(consequencesOf(try MAS.Home.parse(["999"]).run(searcher: MockAppStoreSearcher())))
+                    == (MASError.unknownAppID(999), "", "")
             }
         }
     }

Tests/masTests/Commands/InfoSpec.swift

@@ -6,23 +6,20 @@
 //  Copyright © 2018 mas-cli. All rights reserved.
 //
 
-import Foundation
 import Nimble
 import Quick
 
 @testable import mas
 
-public class InfoSpec: QuickSpec {
+public final class InfoSpec: QuickSpec {
     override public func spec() {
         beforeSuite {
             MAS.initialize()
         }
         describe("Info command") {
             it("can't find app with unknown ID") {
-                expect {
-                    try MAS.Info.parse(["999"]).run(searcher: MockAppStoreSearcher())
-                }
-                .to(throwError(MASError.unknownAppID(999)))
+                expect(consequencesOf(try MAS.Info.parse(["999"]).run(searcher: MockAppStoreSearcher())))
+                    == (MASError.unknownAppID(999), "", "")
             }
             it("displays app details") {
                 let mockResult = SearchResult(
@@ -36,21 +33,25 @@ public class InfoSpec: QuickSpec {
                     trackViewUrl: "https://awesome.app",
                     version: "1.0"
                 )
-                expect {
-                    try captureStream(stdout) {
+                expect(
+                    consequencesOf(
                         try MAS.Info.parse([String(mockResult.trackId)])
                             .run(searcher: MockAppStoreSearcher([mockResult.trackId: mockResult]))
-                    }
-                }
-                    == """
-                    Awesome App 1.0 [$2.00]
-                    By: Awesome Dev
-                    Released: 2019-01-07
-                    Minimum OS: 10.14
-                    Size: 1 KB
-                    From: https://awesome.app
+                    )
+                )
+                    == (
+                        nil,
+                        """
+                        Awesome App 1.0 [$2.00]
+                        By: Awesome Dev
+                        Released: 2019-01-07
+                        Minimum OS: 10.14
+                        Size: 1 KB
+                        From: https://awesome.app
 
-                    """
+                        """,
+                        ""
+                    )
             }
         }
     }

Tests/masTests/Commands/InstallSpec.swift

@@ -11,17 +11,19 @@ import Quick
 
 @testable import mas
 
-public class InstallSpec: QuickSpec {
+public final class InstallSpec: QuickSpec {
     override public func spec() {
         beforeSuite {
             MAS.initialize()
         }
         xdescribe("install command") {
-            xit("installs apps") {
-                expect {
-                    try MAS.Install.parse([]).run(appLibrary: MockAppLibrary(), searcher: MockAppStoreSearcher())
-                }
-                .toNot(throwError())
+            it("installs apps") {
+                expect(
+                    consequencesOf(
+                        try MAS.Install.parse([]).run(appLibrary: MockAppLibrary(), searcher: MockAppStoreSearcher())
+                    )
+                )
+                    == (nil, "", "")
             }
         }
     }

Tests/masTests/Commands/ListSpec.swift

@@ -6,25 +6,20 @@
 //  Copyright © 2018 mas-cli. All rights reserved.
 //
 
-import Foundation
 import Nimble
 import Quick
 
 @testable import mas
 
-public class ListSpec: QuickSpec {
+public final class ListSpec: QuickSpec {
     override public func spec() {
         beforeSuite {
             MAS.initialize()
         }
         describe("list command") {
             it("lists apps") {
-                expect {
-                    try captureStream(stderr) {
-                        try MAS.List.parse([]).run(appLibrary: MockAppLibrary())
-                    }
-                }
-                    == "Error: No installed apps found\n"
+                expect(consequencesOf(try MAS.List.parse([]).run(appLibrary: MockAppLibrary())))
+                    == (nil, "", "Error: No installed apps found\n")
             }
         }
     }

Tests/masTests/Commands/LuckySpec.swift

@@ -11,7 +11,7 @@ import Quick
 
 @testable import mas
 
-public class LuckySpec: QuickSpec {
+public final class LuckySpec: QuickSpec {
     override public func spec() {
         let networkSession = MockFromFileNetworkSession(responseFile: "search/slack.json")
         let searcher = ITunesSearchAppStoreSearcher(networkManager: NetworkManager(session: networkSession))
@@ -20,11 +20,11 @@ public class LuckySpec: QuickSpec {
             MAS.initialize()
         }
         xdescribe("lucky command") {
-            xit("installs the first app matching a search") {
-                expect {
-                    try MAS.Lucky.parse(["Slack"]).run(appLibrary: MockAppLibrary(), searcher: searcher)
-                }
-                .toNot(throwError())
+            it("installs the first app matching a search") {
+                expect(
+                    consequencesOf(try MAS.Lucky.parse(["Slack"]).run(appLibrary: MockAppLibrary(), searcher: searcher))
+                )
+                    == (nil, "", "")
             }
         }
     }

Tests/masTests/Commands/OpenSpec.swift

@@ -6,23 +6,20 @@
 //  Copyright © 2019 mas-cli. All rights reserved.
 //
 
-import Foundation
 import Nimble
 import Quick
 
 @testable import mas
 
-public class OpenSpec: QuickSpec {
+public final class OpenSpec: QuickSpec {
     override public func spec() {
         beforeSuite {
             MAS.initialize()
         }
         describe("open command") {
             it("can't find app with unknown ID") {
-                expect {
-                    try MAS.Open.parse(["999"]).run(searcher: MockAppStoreSearcher())
-                }
-                .to(throwError(MASError.unknownAppID(999)))
+                expect(consequencesOf(try MAS.Open.parse(["999"]).run(searcher: MockAppStoreSearcher())))
+                    == (MASError.unknownAppID(999), "", "")
             }
         }
     }

Tests/masTests/Commands/OutdatedSpec.swift

@@ -12,7 +12,7 @@ import Quick
 
 @testable import mas
 
-public class OutdatedSpec: QuickSpec {
+public final class OutdatedSpec: QuickSpec {
     override public func spec() {
         beforeSuite {
             MAS.initialize()
@@ -32,8 +32,8 @@ public class OutdatedSpec: QuickSpec {
                         version: "1.28"
                     )
 
-                expect {
-                    try captureStream(stdout) {
+                expect(
+                    consequencesOf(
                         try MAS.Outdated.parse([])
                             .run(
                                 appLibrary: MockAppLibrary(
@@ -47,9 +47,9 @@ public class OutdatedSpec: QuickSpec {
                                 ),
                                 searcher: MockAppStoreSearcher([mockSearchResult.trackId: mockSearchResult])
                             )
-                    }
-                }
-                    == "490461369 Bandwidth+ (1.27 -> 1.28)\n"
+                    )
+                )
+                    == (nil, "490461369 Bandwidth+ (1.27 -> 1.28)\n", "")
             }
         }
     }

Tests/masTests/Commands/PurchaseSpec.swift

@@ -11,17 +11,20 @@ import Quick
 
 @testable import mas
 
-public class PurchaseSpec: QuickSpec {
+public final class PurchaseSpec: QuickSpec {
     override public func spec() {
         beforeSuite {
             MAS.initialize()
         }
         xdescribe("purchase command") {
-            xit("purchases apps") {
-                expect {
-                    try MAS.Purchase.parse(["999"]).run(appLibrary: MockAppLibrary(), searcher: MockAppStoreSearcher())
-                }
-                .toNot(throwError())
+            it("purchases apps") {
+                expect(
+                    consequencesOf(
+                        try MAS.Purchase.parse(["999"])
+                            .run(appLibrary: MockAppLibrary(), searcher: MockAppStoreSearcher())
+                    )
+                )
+                    == (nil, "", "")
             }
         }
     }

Tests/masTests/Commands/SearchSpec.swift

@@ -6,13 +6,12 @@
 //  Copyright © 2018 mas-cli. All rights reserved.
 //
 
-import Foundation
 import Nimble
 import Quick
 
 @testable import mas
 
-public class SearchSpec: QuickSpec {
+public final class SearchSpec: QuickSpec {
     override public func spec() {
         beforeSuite {
             MAS.initialize()
@@ -25,19 +24,17 @@ public class SearchSpec: QuickSpec {
                     trackViewUrl: "mas preview url",
                     version: "0.0"
                 )
-                expect {
-                    try captureStream(stdout) {
+                expect(
+                    consequencesOf(
                         try MAS.Search.parse(["slack"])
                             .run(searcher: MockAppStoreSearcher([mockResult.trackId: mockResult]))
-                    }
-                }
-                    == "        1111  slack  (0.0)\n"
+                    )
+                )
+                    == (nil, "        1111  slack  (0.0)\n", "")
             }
             it("fails when searching for nonexistent app") {
-                expect {
-                    try MAS.Search.parse(["nonexistent"]).run(searcher: MockAppStoreSearcher())
-                }
-                .to(throwError(MASError.noSearchResultsFound))
+                expect(consequencesOf(try MAS.Search.parse(["nonexistent"]).run(searcher: MockAppStoreSearcher())))
+                    == (MASError.noSearchResultsFound, "", "")
             }
         }
     }