Skip to content

Commit

Permalink
ALFMOB-49: Clean-up
Browse files Browse the repository at this point in the history
  • Loading branch information
timea-v committed Dec 10, 2024
1 parent 6da9a29 commit 14f5224
Show file tree
Hide file tree
Showing 7 changed files with 14 additions and 56 deletions.
5 changes: 0 additions & 5 deletions Alfie/Alfie/Views/HomeView/HomeView.swift
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
import Models
import StyleGuide
import SwiftUI
#if DEBUG
import Mocks
#endif

struct HomeView: View {
@EnvironmentObject var coordinador: Coordinator
Expand Down Expand Up @@ -69,9 +66,7 @@ private enum Constants {
static let cancelAccessibilityId = "back-btn"
}

#if DEBUG
#Preview {
HomeView()
.environmentObject(Coordinator())
}
#endif
4 changes: 1 addition & 3 deletions Alfie/Alfie/Views/ShopView/Categories/CategoriesView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,7 @@ struct CategoriesView<ViewModel: CategoriesViewModelProtocol>: View {
errorView
}
}
.modifier(
CategoriesToolbarModifier(showToolbar: viewModel.shouldShowToolbar, title: viewModel.title)
)
.modifier(CategoriesToolbarModifier(showToolbar: viewModel.shouldShowToolbar, title: viewModel.title))
.onAppear {
viewModel.viewDidAppear()
}
Expand Down
11 changes: 2 additions & 9 deletions Alfie/Alfie/Views/ShopView/Categories/CategoriesViewModel.swift
Original file line number Diff line number Diff line change
Expand Up @@ -72,19 +72,12 @@ final class CategoriesViewModel: CategoriesViewModelProtocol {

private(set) var shouldShowToolbar: Bool

init(
navigationService: NavigationServiceProtocol,
showToolbar: Bool = false
) {
init(navigationService: NavigationServiceProtocol, showToolbar: Bool = false) {
self.navigationService = navigationService
self.shouldShowToolbar = showToolbar
}

init(
categories: [NavigationItem],
title: String,
showToolbar: Bool = true
) {
init(categories: [NavigationItem], title: String, showToolbar: Bool = true) {
self.navigationService = nil
self.state = .success(.init(categories: categories, title: title))
self.shouldShowToolbar = showToolbar
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,7 @@ final class WishListDependencyContainer: WishListDependencyContainerProtocol {
let wishListService: WishListServiceProtocol
let bagService: BagServiceProtocol

init(
wishListService: WishListServiceProtocol,
bagService: BagServiceProtocol
) {
init(wishListService: WishListServiceProtocol, bagService: BagServiceProtocol) {
self.wishListService = wishListService
self.bagService = bagService
}
Expand Down
5 changes: 1 addition & 4 deletions Alfie/AlfieTests/Features/BagViewModelTests.swift
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,7 @@ final class BagViewModelTests: XCTestCase {
override func setUpWithError() throws {
try super.setUpWithError()
mockWebViewConfigurationService = MockWebViewConfigurationService()
mockDependencies = BagDependencyContainer(
bagService: MockBagService(),
configurationService: MockConfigurationService()
)
mockDependencies = BagDependencyContainer(bagService: MockBagService())
sut = .init(dependencies: mockDependencies)
}

Expand Down
21 changes: 9 additions & 12 deletions Alfie/AlfieTests/Features/CategoriesViewModelTests.swift
Original file line number Diff line number Diff line change
Expand Up @@ -6,20 +6,16 @@ import XCTest
final class CategoriesViewModelTests: XCTestCase {
private var sut: CategoriesViewModel!
private var mockNavigationService: MockNavigationService!
private var mockConfigurationService: MockConfigurationService!

override func setUpWithError() throws {
try super.setUpWithError()
mockNavigationService = MockNavigationService()
mockConfigurationService = MockConfigurationService()

sut = .init(navigationService: mockNavigationService, configurationService: mockConfigurationService)
sut = .init(navigationService: mockNavigationService)
}

override func tearDownWithError() throws {
sut = nil
mockNavigationService = nil
mockConfigurationService = nil
try super.tearDownWithError()
}

Expand Down Expand Up @@ -149,7 +145,8 @@ final class CategoriesViewModelTests: XCTestCase {
}

func test_ignores_loads_items_from_service_when_view_appears_if_categories_init_is_used() {
sut = .init(configurationService: mockConfigurationService, categories: [], title: "")
sut = .init(categories: [], title: "")

let expectation = expectation(description: "Wait for no service call")
expectation.isInverted = true
mockNavigationService.onGetNavigationItemsCalled = { _ in
Expand All @@ -165,7 +162,7 @@ final class CategoriesViewModelTests: XCTestCase {

func test_categories_are_available_immediately_on_categories_init() {
let fixtures = NavigationItem.fixtures
sut = .init(configurationService: mockConfigurationService, categories: fixtures, title: "")
sut = .init(categories: fixtures, title: "")
XCTAssertEqual(sut.categories.count, fixtures.count)
}

Expand Down Expand Up @@ -324,7 +321,7 @@ final class CategoriesViewModelTests: XCTestCase {

func test_title_is_available_when_passed_on_categories_init() {
let title = "Some Title"
sut = .init(configurationService: mockConfigurationService, categories: [], title: title)
sut = .init(categories: [], title: title)
XCTAssertEqual(sut.title, title)
}

Expand All @@ -335,16 +332,16 @@ final class CategoriesViewModelTests: XCTestCase {
// MARK: - Toolbar

func test_show_toolbar_is_properly_set_on_init() {
sut = .init(configurationService: mockConfigurationService, categories: [], title: "", showToolbar: true)
sut = .init(categories: [], title: "", showToolbar: true)
XCTAssertTrue(sut.shouldShowToolbar)

sut = .init(configurationService: mockConfigurationService, categories: [], title: "", showToolbar: false)
sut = .init(categories: [], title: "", showToolbar: false)
XCTAssertFalse(sut.shouldShowToolbar)

sut = .init(navigationService: mockNavigationService, configurationService: mockConfigurationService, showToolbar: true)
sut = .init(navigationService: mockNavigationService, showToolbar: true)
XCTAssertTrue(sut.shouldShowToolbar)

sut = .init(navigationService: mockNavigationService, configurationService: mockConfigurationService, showToolbar: false)
sut = .init(navigationService: mockNavigationService, showToolbar: false)
XCTAssertFalse(sut.shouldShowToolbar)
}

Expand Down

This file was deleted.

0 comments on commit 14f5224

Please sign in to comment.