From e4fb7d91e2cfa8b663f3d211e8b068adb2448713 Mon Sep 17 00:00:00 2001 From: Florian Schweizer Date: Thu, 18 Nov 2021 12:56:40 +0100 Subject: [PATCH] Remove dummy tests, Remove ActionButtonModel --- Package.swift | 3 -- Sources/ActionButton.swift | 10 ++++-- Sources/Model/ActionButtonModel.swift | 15 -------- Sources/Model/ActionButtonState.swift | 34 +++++-------------- .../ActionButtonTests/ActionButtonTests.swift | 11 ------ 5 files changed, 16 insertions(+), 57 deletions(-) delete mode 100644 Sources/Model/ActionButtonModel.swift delete mode 100644 Tests/ActionButtonTests/ActionButtonTests.swift diff --git a/Package.swift b/Package.swift index 87a0c33..5c57fc2 100644 --- a/Package.swift +++ b/Package.swift @@ -23,8 +23,5 @@ let package = Package( name: "ActionButton", dependencies: [], path: "Sources"), - .testTarget( - name: "ActionButtonTests", - dependencies: ["ActionButton"]), ] ) diff --git a/Sources/ActionButton.swift b/Sources/ActionButton.swift index 190b5d4..bce8905 100644 --- a/Sources/ActionButton.swift +++ b/Sources/ActionButton.swift @@ -105,8 +105,12 @@ struct ActionButton_Previews: PreviewProvider { static var previews: some View { - ActionButton(state: .constant(.enabled(.init( - title: "New Draft", - systemImage: "plus.circle"))), onTap: {}, backgroundColor: .red) + ActionButton( + state: .constant(.enabled( + title: "New Draft", + systemImage: "plus.circle")), + onTap: {}, + backgroundColor: .red + ) } } diff --git a/Sources/Model/ActionButtonModel.swift b/Sources/Model/ActionButtonModel.swift deleted file mode 100644 index 6521dd5..0000000 --- a/Sources/Model/ActionButtonModel.swift +++ /dev/null @@ -1,15 +0,0 @@ -public struct ActionButtonModel { - - // MARK: Lifecycle - - public init(title: String, systemImage: String) { - - self.title = title - self.systemImage = systemImage - } - - // MARK: Internal - - var title: String - var systemImage: String -} diff --git a/Sources/Model/ActionButtonState.swift b/Sources/Model/ActionButtonState.swift index 70951ba..6a7370d 100644 --- a/Sources/Model/ActionButtonState.swift +++ b/Sources/Model/ActionButtonState.swift @@ -1,26 +1,18 @@ public enum ActionButtonState { - case enabled(ActionButtonModel) - case disabled(ActionButtonModel) - case loading(ActionButtonModel) + case enabled(title: String, systemImage: String) + case disabled(title: String, systemImage: String) + case loading(title: String, systemImage: String) // MARK: Internal var title: String { switch self { - - case let .enabled(content): - - return content.title - - case let .disabled(content): - - return content.title - - case let .loading(content): - - return content.title + + case .enabled(let title, _), .disabled(let title, _), .loading(let title, _): + + return title } } @@ -28,17 +20,9 @@ public enum ActionButtonState { switch self { - case let .enabled(content): - - return content.systemImage - - case let .disabled(content): - - return content.systemImage - - case let .loading(content): + case .enabled(_, let systemImage), .disabled(_, let systemImage), .loading(_, let systemImage): - return content.systemImage + return systemImage } } diff --git a/Tests/ActionButtonTests/ActionButtonTests.swift b/Tests/ActionButtonTests/ActionButtonTests.swift deleted file mode 100644 index 9fd85bc..0000000 --- a/Tests/ActionButtonTests/ActionButtonTests.swift +++ /dev/null @@ -1,11 +0,0 @@ - import XCTest - @testable import ActionButton - - final class ActionButtonTests: XCTestCase { - func testExample() { - // This is an example of a functional test case. - // Use XCTAssert and related functions to verify your tests produce the correct - // results. - XCTAssertEqual(ActionButton().text, "Hello, World!") - } - }