Skip to content

Commit 8c4cbde

Browse files
designatednerddesignatednerd
committed
outerResult -> result anywhere there isn't actually an inner result.
1 parent b29b681 commit 8c4cbde

9 files changed

Lines changed: 81 additions & 81 deletions

File tree

‎Sources/Apollo/GraphQLQueryWatcher.swift‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,17 +26,17 @@ public final class GraphQLQueryWatcher<Query: GraphQLQuery>: Cancellable, Apollo
2626
}
2727

2828
func fetch(cachePolicy: CachePolicy) {
29-
fetching = client?.fetch(query: query, cachePolicy: cachePolicy, context: &context) { [weak self] outerResult in
29+
fetching = client?.fetch(query: query, cachePolicy: cachePolicy, context: &context) { [weak self] result in
3030
guard let `self` = self else { return }
3131

32-
switch outerResult {
32+
switch result {
3333
case .success(let graphQLResult):
3434
self.dependentKeys = graphQLResult.dependentKeys
3535
case .failure:
3636
break
3737
}
3838

39-
self.resultHandler(outerResult)
39+
self.resultHandler(result)
4040
}
4141
}
4242

‎Tests/ApolloCacheDependentTests/FetchQueryTests.swift‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -121,10 +121,10 @@ class FetchQueryTests: XCTestCase {
121121

122122
let expectation = self.expectation(description: "Fetching query")
123123

124-
client.fetch(query: query, cachePolicy: .returnCacheDataElseFetch) { outerResult in
124+
client.fetch(query: query, cachePolicy: .returnCacheDataElseFetch) { result in
125125
defer { expectation.fulfill() }
126126

127-
switch outerResult {
127+
switch result {
128128
case .success(let graphQLResult):
129129
XCTAssertEqual(graphQLResult.data?.hero?.name, "R2-D2")
130130
case .failure(let error):
@@ -162,10 +162,10 @@ class FetchQueryTests: XCTestCase {
162162

163163
let expectation = self.expectation(description: "Fetching query")
164164

165-
client.fetch(query: query, cachePolicy: .returnCacheDataElseFetch) { outerResult in
165+
client.fetch(query: query, cachePolicy: .returnCacheDataElseFetch) { result in
166166
defer { expectation.fulfill() }
167167

168-
switch outerResult {
168+
switch result {
169169
case .success(let graphQLResult):
170170
XCTAssertEqual(graphQLResult.data?.hero?.name, "Luke Skywalker")
171171
case .failure(let error):
@@ -204,10 +204,10 @@ class FetchQueryTests: XCTestCase {
204204

205205
let expectation = self.expectation(description: "Fetching query")
206206

207-
client.fetch(query: query, cachePolicy: .returnCacheDataDontFetch) { outerResult in
207+
client.fetch(query: query, cachePolicy: .returnCacheDataDontFetch) { result in
208208
defer { expectation.fulfill() }
209209

210-
switch outerResult {
210+
switch result {
211211
case .success(let graphQLResult):
212212
XCTAssertEqual(graphQLResult.data?.hero?.name, "R2-D2")
213213
case .failure(let error):
@@ -246,10 +246,10 @@ class FetchQueryTests: XCTestCase {
246246

247247
let expectation = self.expectation(description: "Fetching query")
248248

249-
client.fetch(query: query, cachePolicy: .returnCacheDataDontFetch) { outerResult in
249+
client.fetch(query: query, cachePolicy: .returnCacheDataDontFetch) { result in
250250
defer { expectation.fulfill() }
251251

252-
switch outerResult {
252+
switch result {
253253
case .success(let graphQLResult):
254254
XCTAssertEqual(graphQLResult.data?.hero?.name, "R2-D2")
255255
case .failure(let error):
@@ -264,9 +264,9 @@ class FetchQueryTests: XCTestCase {
264264

265265
let expectation2 = self.expectation(description: "Fetching query")
266266

267-
client.fetch(query: query, cachePolicy: .returnCacheDataDontFetch) { outerResult in
267+
client.fetch(query: query, cachePolicy: .returnCacheDataDontFetch) { result in
268268
defer { expectation2.fulfill() }
269-
switch outerResult {
269+
switch result {
270270
case .success:
271271
XCTFail("This should have returned an error")
272272
case .failure(let error):
@@ -314,9 +314,9 @@ class FetchQueryTests: XCTestCase {
314314

315315
let expectation = self.expectation(description: "Fetching query")
316316

317-
client.fetch(query: query, cachePolicy: .returnCacheDataDontFetch) { outerResult in
317+
client.fetch(query: query, cachePolicy: .returnCacheDataDontFetch) { result in
318318
defer { expectation.fulfill() }
319-
switch outerResult {
319+
switch result {
320320
case .success:
321321
XCTFail("This should have returned an error!")
322322
case .failure(let error):

‎Tests/ApolloCacheDependentTests/LoadQueryFromStoreTests.swift‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ class LoadQueryFromStoreTests: XCTestCase {
1717

1818
let query = HeroNameQuery()
1919

20-
load(query: query) { outerResult in
21-
switch outerResult {
20+
load(query: query) { result in
21+
switch result {
2222
case .success(let graphQLResult):
2323
XCTAssertNil(graphQLResult.errors)
2424
XCTAssertEqual(graphQLResult.data?.hero?.name, "R2-D2")
@@ -40,8 +40,8 @@ class LoadQueryFromStoreTests: XCTestCase {
4040

4141
let query = HeroNameQuery(episode: .jedi)
4242

43-
load(query: query) { outerResult in
44-
switch outerResult {
43+
load(query: query) { result in
44+
switch result {
4545
case .success(let graphQLResult):
4646
XCTAssertNil(graphQLResult.errors)
4747
XCTAssertEqual(graphQLResult.data?.hero?.name, "R2-D2")
@@ -63,8 +63,8 @@ class LoadQueryFromStoreTests: XCTestCase {
6363

6464
let query = HeroNameQuery()
6565

66-
load(query: query) { outerResult in
67-
switch outerResult {
66+
load(query: query) { result in
67+
switch result {
6868
case .success:
6969
XCTFail("This should not have succeeded!")
7070
case .failure(let error):
@@ -90,8 +90,8 @@ class LoadQueryFromStoreTests: XCTestCase {
9090

9191
let query = HeroNameQuery()
9292

93-
load(query: query) { outerResult in
94-
switch outerResult {
93+
load(query: query) { result in
94+
switch result {
9595
case .success:
9696
XCTFail("This should not have succeeded!")
9797
case .failure(let error):
@@ -128,8 +128,8 @@ class LoadQueryFromStoreTests: XCTestCase {
128128

129129
let query = HeroAndFriendsNamesQuery(episode: .jedi)
130130

131-
load(query: query) { outerResult in
132-
switch outerResult {
131+
load(query: query) { result in
132+
switch result {
133133
case .success(let graphQLResult):
134134
XCTAssertNil(graphQLResult.errors)
135135

@@ -174,8 +174,8 @@ class LoadQueryFromStoreTests: XCTestCase {
174174

175175
let query = HeroAndFriendsNamesQuery()
176176

177-
load(query: query) { outerResult in
178-
switch outerResult {
177+
load(query: query) { result in
178+
switch result {
179179
case .success(let graphQLResult):
180180
XCTAssertNil(graphQLResult.errors)
181181

@@ -213,8 +213,8 @@ class LoadQueryFromStoreTests: XCTestCase {
213213

214214
let query = HeroAndFriendsNamesQuery()
215215

216-
load(query: query) { outerResult in
217-
switch outerResult {
216+
load(query: query) { result in
217+
switch result {
218218
case .success(let graphQLResult):
219219
XCTAssertNil(graphQLResult.errors)
220220

@@ -243,8 +243,8 @@ class LoadQueryFromStoreTests: XCTestCase {
243243

244244
let query = HeroAndFriendsNamesQuery()
245245

246-
load(query: query) { outerResult in
247-
switch outerResult {
246+
load(query: query) { result in
247+
switch result {
248248
case .success:
249249
XCTFail("This should not have succeeded!")
250250
case .failure(let error):

‎Tests/ApolloCacheDependentTests/StarWarsServerTests.swift‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -272,10 +272,10 @@ class StarWarsServerTests: XCTestCase {
272272

273273
let expectation = self.expectation(description: "Fetching query")
274274

275-
client.fetch(query: query) { outerResult in
275+
client.fetch(query: query) { result in
276276
defer { expectation.fulfill() }
277277

278-
switch outerResult {
278+
switch result {
279279
case .success(let graphQLResult):
280280
XCTAssertNil(graphQLResult.errors)
281281
guard let data = graphQLResult.data else {
@@ -301,10 +301,10 @@ class StarWarsServerTests: XCTestCase {
301301

302302
let expectation = self.expectation(description: "Performing mutation")
303303

304-
client.perform(mutation: mutation) { outerResult in
304+
client.perform(mutation: mutation) { result in
305305
defer { expectation.fulfill() }
306306

307-
switch outerResult {
307+
switch result {
308308
case .success(let graphQLResult):
309309
XCTAssertNil(graphQLResult.errors)
310310

‎Tests/ApolloCacheDependentTests/WatchQueryTests.swift‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ class WatchQueryTests: XCTestCase {
3030

3131
var verifyResult: GraphQLResultHandler<HeroNameQuery.Data>
3232

33-
verifyResult = { outerResult in
34-
switch outerResult {
33+
verifyResult = { result in
34+
switch result {
3535
case .success(let graphQLResult):
3636
XCTAssertNil(graphQLResult.errors)
3737
XCTAssertEqual(graphQLResult.data?.hero?.name, "R2-D2")
@@ -49,8 +49,8 @@ class WatchQueryTests: XCTestCase {
4949

5050
waitForExpectations(timeout: 5, handler: nil)
5151

52-
verifyResult = { outerResult in
53-
switch outerResult {
52+
verifyResult = { result in
53+
switch result {
5454
case .success(let graphQLResult):
5555
XCTAssertNil(graphQLResult.errors)
5656
XCTAssertEqual(graphQLResult.data?.hero?.name, "Artoo")
@@ -100,8 +100,8 @@ class WatchQueryTests: XCTestCase {
100100

101101
var verifyResult: GraphQLResultHandler<HeroAndFriendsNamesQuery.Data>
102102

103-
verifyResult = { outerResult in
104-
switch outerResult {
103+
verifyResult = { result in
104+
switch result {
105105
case .success(let graphQLResult):
106106
XCTAssertNil(graphQLResult.errors)
107107
guard let data = graphQLResult.data else {
@@ -126,8 +126,8 @@ class WatchQueryTests: XCTestCase {
126126

127127
waitForExpectations(timeout: 5, handler: nil)
128128

129-
verifyResult = { outerResult in
130-
switch outerResult {
129+
verifyResult = { result in
130+
switch result {
131131
case .success(let graphQLResult):
132132
XCTAssertNil(graphQLResult.errors)
133133
guard let data = graphQLResult.data else {
@@ -188,7 +188,7 @@ class WatchQueryTests: XCTestCase {
188188
let fetching = self.expectation(description: "Fetching query")
189189
var refetching: XCTestExpectation?
190190

191-
let _ = client.watch(query: query) { outerResult in
191+
let _ = client.watch(query: query) { result in
192192
guard refetching == nil else {
193193
return refetching!.fulfill()
194194
}
@@ -197,7 +197,7 @@ class WatchQueryTests: XCTestCase {
197197
fetching.fulfill()
198198
}
199199

200-
switch outerResult {
200+
switch result {
201201
case .success(let graphQLResult):
202202
XCTAssertNil(graphQLResult.errors)
203203

@@ -259,8 +259,8 @@ class WatchQueryTests: XCTestCase {
259259

260260
var verifyResult: GraphQLResultHandler<HeroNameWithIdQuery.Data>
261261

262-
verifyResult = { outerResult in
263-
switch outerResult {
262+
verifyResult = { result in
263+
switch result {
264264
case .success(let graphQLResult):
265265
XCTAssertNil(graphQLResult.errors)
266266
XCTAssertEqual(graphQLResult.data?.hero?.name, "R2-D2")
@@ -278,8 +278,8 @@ class WatchQueryTests: XCTestCase {
278278

279279
waitForExpectations(timeout: 5, handler: nil)
280280

281-
verifyResult = { outerResult in
282-
switch outerResult {
281+
verifyResult = { result in
282+
switch result {
283283
case .success(let graphQLResult):
284284
XCTAssertNil(graphQLResult.errors)
285285
XCTAssertEqual(graphQLResult.data?.hero?.name, "Luke Skywalker")
@@ -321,8 +321,8 @@ class WatchQueryTests: XCTestCase {
321321

322322
var verifyResult: GraphQLResultHandler<HeroAndFriendsNamesQuery.Data>
323323

324-
verifyResult = { outerResult in
325-
switch outerResult {
324+
verifyResult = { result in
325+
switch result {
326326
case .success(let graphQLResult):
327327
XCTAssertNil(graphQLResult.errors)
328328

@@ -362,8 +362,8 @@ class WatchQueryTests: XCTestCase {
362362
}
363363
})
364364

365-
verifyResult = { outerResult in
366-
switch outerResult {
365+
verifyResult = { result in
366+
switch result {
367367
case .success(let graphQLResult):
368368
XCTAssertNil(graphQLResult.errors)
369369
guard let data = graphQLResult.data else {

‎Tests/ApolloTests/BatchedLoadTests.swift‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -64,12 +64,12 @@ class BatchedLoadTests: XCTestCase {
6464

6565
let expectation = self.expectation(description: "Loading query from store")
6666

67-
store.load(query: query) { outerResult in
67+
store.load(query: query) { result in
6868
defer {
6969
expectation.fulfill()
7070
}
7171

72-
switch outerResult {
72+
switch result {
7373
case .success(let graphQLResult):
7474
XCTAssertNil(graphQLResult.errors)
7575

@@ -115,12 +115,12 @@ class BatchedLoadTests: XCTestCase {
115115
(1...10).forEach { number in
116116
let expectation = self.expectation(description: "Loading query #\(number) from store")
117117

118-
store.load(query: query) { outerResult in
118+
store.load(query: query) { result in
119119
defer {
120120
expectation.fulfill()
121121
}
122122

123-
switch outerResult {
123+
switch result {
124124
case .success(let graphQLResult):
125125
XCTAssertNil(graphQLResult.errors)
126126

‎Tests/ApolloWebsocketTests/MockWebSocketTests.swift‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,9 @@ class MockWebSocketTests: XCTestCase {
3333
func testLocalSingleSubscription() throws {
3434
let expectation = self.expectation(description: "Single subscription")
3535

36-
client.subscribe(subscription: ReviewAddedSubscription()) { outerResult in
36+
client.subscribe(subscription: ReviewAddedSubscription()) { result in
3737
defer { expectation.fulfill() }
38-
switch outerResult {
38+
switch result {
3939
case .success(let graphQLResult):
4040
XCTAssertEqual(graphQLResult.data?.reviewAdded?.stars, 5)
4141
case .failure(let error):
@@ -77,10 +77,10 @@ class MockWebSocketTests: XCTestCase {
7777
func testLocalErrorUnknownId() throws {
7878
let expectation = self.expectation(description: "Unknown id for subscription")
7979

80-
client.subscribe(subscription: ReviewAddedSubscription()) { outerResult in
80+
client.subscribe(subscription: ReviewAddedSubscription()) { result in
8181
defer { expectation.fulfill() }
8282

83-
switch outerResult {
83+
switch result {
8484
case .success:
8585
XCTFail("This should have caused an error!")
8686
case .failure(let error):

0 commit comments

Comments
 (0)
⚡