Skip to content
Snippets Groups Projects
Commit 60da16a6 authored by Dariusz Rybicki's avatar Dariusz Rybicki
Browse files

Rename AppDependencies key

parent 2e60cdc1
No related branches found
No related tags found
2 merge requests!126Migrate example app to ComposableArchitecture's ReducerProtocol,!102Release 1.0.0
This commit is part of merge request !102. Comments created here will be created in the context of that merge request.
......@@ -89,7 +89,7 @@ private enum AppDependenciesKey: DependencyKey {
}
extension DependencyValues {
public var appDependencies: AppDependencies {
public var app: AppDependencies {
get { self[AppDependenciesKey.self] }
set { self[AppDependenciesKey.self] = newValue }
}
......
......@@ -29,9 +29,9 @@ public struct ContactLookupComponent: ReducerProtocol {
public init() {}
@Dependency(\.appDependencies.messenger) var messenger
@Dependency(\.appDependencies.mainQueue) var mainQueue
@Dependency(\.appDependencies.bgQueue) var bgQueue
@Dependency(\.app.messenger) var messenger
@Dependency(\.app.mainQueue) var mainQueue
@Dependency(\.app.bgQueue) var bgQueue
public func reduce(into state: inout State, action: Action) -> EffectTask<Action> {
switch action {
......
......@@ -48,10 +48,10 @@ public struct SendRequestComponent: ReducerProtocol {
public init() {}
@Dependency(\.appDependencies.messenger) var messenger: Messenger
@Dependency(\.appDependencies.dbManager.getDB) var db: DBManagerGetDB
@Dependency(\.appDependencies.mainQueue) var mainQueue: AnySchedulerOf<DispatchQueue>
@Dependency(\.appDependencies.bgQueue) var bgQueue: AnySchedulerOf<DispatchQueue>
@Dependency(\.app.messenger) var messenger: Messenger
@Dependency(\.app.dbManager.getDB) var db: DBManagerGetDB
@Dependency(\.app.mainQueue) var mainQueue: AnySchedulerOf<DispatchQueue>
@Dependency(\.app.bgQueue) var bgQueue: AnySchedulerOf<DispatchQueue>
public var body: some ReducerProtocol<State, Action> {
BindingReducer()
......
......@@ -35,10 +35,10 @@ public struct VerifyContactComponent: ReducerProtocol {
public init() {}
@Dependency(\.appDependencies.messenger) var messenger: Messenger
@Dependency(\.appDependencies.dbManager.getDB) var db: DBManagerGetDB
@Dependency(\.appDependencies.mainQueue) var mainQueue: AnySchedulerOf<DispatchQueue>
@Dependency(\.appDependencies.bgQueue) var bgQueue: AnySchedulerOf<DispatchQueue>
@Dependency(\.app.messenger) var messenger: Messenger
@Dependency(\.app.dbManager.getDB) var db: DBManagerGetDB
@Dependency(\.app.mainQueue) var mainQueue: AnySchedulerOf<DispatchQueue>
@Dependency(\.app.bgQueue) var bgQueue: AnySchedulerOf<DispatchQueue>
public func reduce(into state: inout State, action: Action) -> EffectTask<Action> {
switch action {
......
......@@ -13,9 +13,9 @@ final class ContactLookupComponentTests: XCTestCase {
initialState: ContactLookupComponent.State(id: id),
reducer: ContactLookupComponent()
)
store.dependencies.appDependencies.mainQueue = .immediate
store.dependencies.appDependencies.bgQueue = .immediate
store.dependencies.appDependencies.messenger.lookupContact.run = { id in
store.dependencies.app.mainQueue = .immediate
store.dependencies.app.bgQueue = .immediate
store.dependencies.app.messenger.lookupContact.run = { id in
didLookupId.append(id)
return lookedUpContact
}
......@@ -41,9 +41,9 @@ final class ContactLookupComponentTests: XCTestCase {
initialState: ContactLookupComponent.State(id: id),
reducer: ContactLookupComponent()
)
store.dependencies.appDependencies.mainQueue = .immediate
store.dependencies.appDependencies.bgQueue = .immediate
store.dependencies.appDependencies.messenger.lookupContact.run = { _ in throw failure }
store.dependencies.app.mainQueue = .immediate
store.dependencies.app.bgQueue = .immediate
store.dependencies.app.messenger.lookupContact.run = { _ in throw failure }
store.send(.lookupTapped) {
$0.isLookingUp = true
......
......@@ -19,9 +19,9 @@ final class SendRequestComponentTests: XCTestCase {
),
reducer: SendRequestComponent()
)
store.dependencies.appDependencies.mainQueue = .immediate
store.dependencies.appDependencies.bgQueue = .immediate
store.dependencies.appDependencies.messenger.myContact.run = { includeFacts in
store.dependencies.app.mainQueue = .immediate
store.dependencies.app.bgQueue = .immediate
store.dependencies.app.messenger.myContact.run = { includeFacts in
didGetMyContact.append(includeFacts)
return myContact
}
......@@ -43,9 +43,9 @@ final class SendRequestComponentTests: XCTestCase {
),
reducer: SendRequestComponent()
)
store.dependencies.appDependencies.mainQueue = .immediate
store.dependencies.appDependencies.bgQueue = .immediate
store.dependencies.appDependencies.messenger.myContact.run = { _ in throw failure }
store.dependencies.app.mainQueue = .immediate
store.dependencies.app.bgQueue = .immediate
store.dependencies.app.messenger.myContact.run = { _ in throw failure }
store.send(.start)
......@@ -87,9 +87,9 @@ final class SendRequestComponentTests: XCTestCase {
var didBulkUpdateContacts: [DidBulkUpdateContacts] = []
var didRequestAuthChannel: [DidRequestAuthChannel] = []
store.dependencies.appDependencies.mainQueue = .immediate
store.dependencies.appDependencies.bgQueue = .immediate
store.dependencies.appDependencies.dbManager.getDB.run = {
store.dependencies.app.mainQueue = .immediate
store.dependencies.app.bgQueue = .immediate
store.dependencies.app.dbManager.getDB.run = {
var db: Database = .unimplemented
db.bulkUpdateContacts.run = { query, assignments in
didBulkUpdateContacts.append(.init(query: query, assignments: assignments))
......@@ -97,7 +97,7 @@ final class SendRequestComponentTests: XCTestCase {
}
return db
}
store.dependencies.appDependencies.messenger.e2e.get = {
store.dependencies.app.messenger.e2e.get = {
var e2e: E2E = .unimplemented
e2e.requestAuthenticatedChannel.run = { partner, myFacts in
didRequestAuthChannel.append(.init(partner: partner, myFacts: myFacts))
......@@ -156,14 +156,14 @@ final class SendRequestComponentTests: XCTestCase {
struct Failure: Error {}
let failure = Failure()
store.dependencies.appDependencies.mainQueue = .immediate
store.dependencies.appDependencies.bgQueue = .immediate
store.dependencies.appDependencies.dbManager.getDB.run = {
store.dependencies.app.mainQueue = .immediate
store.dependencies.app.bgQueue = .immediate
store.dependencies.app.dbManager.getDB.run = {
var db: Database = .unimplemented
db.bulkUpdateContacts.run = { _, _ in return 0 }
return db
}
store.dependencies.appDependencies.messenger.e2e.get = {
store.dependencies.app.messenger.e2e.get = {
var e2e: E2E = .unimplemented
e2e.requestAuthenticatedChannel.run = { _, _ in throw failure }
return e2e
......
......@@ -22,13 +22,13 @@ final class VerifyContactComponentTests: XCTestCase {
var didBulkUpdateContactsWithQuery: [XXModels.Contact.Query] = []
var didBulkUpdateContactsWithAssignments: [XXModels.Contact.Assignments] = []
store.dependencies.appDependencies.mainQueue = .immediate
store.dependencies.appDependencies.bgQueue = .immediate
store.dependencies.appDependencies.messenger.verifyContact.run = { contact in
store.dependencies.app.mainQueue = .immediate
store.dependencies.app.bgQueue = .immediate
store.dependencies.app.messenger.verifyContact.run = { contact in
didVerifyContact.append(contact)
return true
}
store.dependencies.appDependencies.dbManager.getDB.run = {
store.dependencies.app.dbManager.getDB.run = {
var db: Database = .unimplemented
db.bulkUpdateContacts.run = { query, assignments in
didBulkUpdateContactsWithQuery.append(query)
......@@ -75,13 +75,13 @@ final class VerifyContactComponentTests: XCTestCase {
var didBulkUpdateContactsWithQuery: [XXModels.Contact.Query] = []
var didBulkUpdateContactsWithAssignments: [XXModels.Contact.Assignments] = []
store.dependencies.appDependencies.mainQueue = .immediate
store.dependencies.appDependencies.bgQueue = .immediate
store.dependencies.appDependencies.messenger.verifyContact.run = { contact in
store.dependencies.app.mainQueue = .immediate
store.dependencies.app.bgQueue = .immediate
store.dependencies.app.messenger.verifyContact.run = { contact in
didVerifyContact.append(contact)
return false
}
store.dependencies.appDependencies.dbManager.getDB.run = {
store.dependencies.app.dbManager.getDB.run = {
var db: Database = .unimplemented
db.bulkUpdateContacts.run = { query, assignments in
didBulkUpdateContactsWithQuery.append(query)
......@@ -130,10 +130,10 @@ final class VerifyContactComponentTests: XCTestCase {
var didBulkUpdateContactsWithQuery: [XXModels.Contact.Query] = []
var didBulkUpdateContactsWithAssignments: [XXModels.Contact.Assignments] = []
store.dependencies.appDependencies.mainQueue = .immediate
store.dependencies.appDependencies.bgQueue = .immediate
store.dependencies.appDependencies.messenger.verifyContact.run = { _ in throw error }
store.dependencies.appDependencies.dbManager.getDB.run = {
store.dependencies.app.mainQueue = .immediate
store.dependencies.app.bgQueue = .immediate
store.dependencies.app.messenger.verifyContact.run = { _ in throw error }
store.dependencies.app.dbManager.getDB.run = {
var db: Database = .unimplemented
db.bulkUpdateContacts.run = { query, assignments in
didBulkUpdateContactsWithQuery.append(query)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment