Skip to content

Commit 627d940

Browse files
author
Daniel Browne
committed
Enable 'unneeded_parentheses_in_closure_argument' SwiftLint rule
1 parent 94f4f0d commit 627d940

File tree

5 files changed

+25
-24
lines changed

5 files changed

+25
-24
lines changed

‎.swiftlint.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ opt_in_rules:
1313
- prefer_self_type_over_type_of_self
1414
- sorted_imports
1515
- test_case_accessibility
16+
- unneeded_parentheses_in_closure_argument
1617
- vertical_whitespace_between_cases
1718
- vertical_whitespace_closing_braces
1819

‎Tests/Unit/Helpers/PusherEventFactory+DecryptionTests.swift

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ class PusherEventFactoryDecryptionTests: XCTestCase {
132132
}
133133
""".toJsonDict()
134134

135-
XCTAssertThrowsError(try eventFactory.makeEvent(fromJSON: jsonDict, withDecryptionKey: nil)) { (error) in
135+
XCTAssertThrowsError(try eventFactory.makeEvent(fromJSON: jsonDict, withDecryptionKey: nil)) { error in
136136
XCTAssertEqual(error as? PusherEventError, PusherEventError.invalidDecryptionKey)
137137
}
138138
}
@@ -154,7 +154,7 @@ class PusherEventFactoryDecryptionTests: XCTestCase {
154154
}
155155
""".toJsonDict()
156156

157-
XCTAssertThrowsError(try eventFactory.makeEvent(fromJSON: jsonDict, withDecryptionKey: nil)) { (error) in
157+
XCTAssertThrowsError(try eventFactory.makeEvent(fromJSON: jsonDict, withDecryptionKey: nil)) { error in
158158
XCTAssertEqual(error as? PusherEventError, PusherEventError.invalidDecryptionKey)
159159
}
160160
}
@@ -177,7 +177,7 @@ class PusherEventFactoryDecryptionTests: XCTestCase {
177177
}
178178
""".toJsonDict()
179179

180-
XCTAssertThrowsError(try eventFactory.makeEvent(fromJSON: jsonDict, withDecryptionKey: decryptionKey)) { (error) in
180+
XCTAssertThrowsError(try eventFactory.makeEvent(fromJSON: jsonDict, withDecryptionKey: decryptionKey)) { error in
181181
XCTAssertEqual(error as? PusherEventError, PusherEventError.invalidEncryptedData)
182182
}
183183
}
@@ -199,7 +199,7 @@ class PusherEventFactoryDecryptionTests: XCTestCase {
199199
}
200200
""".toJsonDict()
201201

202-
XCTAssertThrowsError(try eventFactory.makeEvent(fromJSON: jsonDict, withDecryptionKey: decryptionKey)) { (error) in
202+
XCTAssertThrowsError(try eventFactory.makeEvent(fromJSON: jsonDict, withDecryptionKey: decryptionKey)) { error in
203203
XCTAssertEqual(error as? PusherEventError, PusherEventError.invalidEncryptedData)
204204
}
205205
}
@@ -221,7 +221,7 @@ class PusherEventFactoryDecryptionTests: XCTestCase {
221221
}
222222
""".toJsonDict()
223223

224-
XCTAssertThrowsError(try eventFactory.makeEvent(fromJSON: jsonDict, withDecryptionKey: decryptionKey)) { (error) in
224+
XCTAssertThrowsError(try eventFactory.makeEvent(fromJSON: jsonDict, withDecryptionKey: decryptionKey)) { error in
225225
XCTAssertEqual(error as? PusherEventError, PusherEventError.invalidEncryptedData)
226226
}
227227
}
@@ -280,7 +280,7 @@ class PusherEventFactoryDecryptionTests: XCTestCase {
280280
}
281281
""".toJsonDict()
282282

283-
XCTAssertThrowsError(try eventFactory.makeEvent(fromJSON: jsonDict, withDecryptionKey: decryptionKey)) { (error) in
283+
XCTAssertThrowsError(try eventFactory.makeEvent(fromJSON: jsonDict, withDecryptionKey: decryptionKey)) { error in
284284
XCTAssertEqual(error as? PusherEventError, PusherEventError.invalidDecryptionKey)
285285
}
286286
}
@@ -304,7 +304,7 @@ class PusherEventFactoryDecryptionTests: XCTestCase {
304304
}
305305
""".toJsonDict()
306306

307-
XCTAssertThrowsError(try eventFactory.makeEvent(fromJSON: jsonDict, withDecryptionKey: decryptionKey)) { (error) in
307+
XCTAssertThrowsError(try eventFactory.makeEvent(fromJSON: jsonDict, withDecryptionKey: decryptionKey)) { error in
308308
XCTAssertEqual(error as? PusherEventError, PusherEventError.invalidDecryptionKey)
309309
}
310310
}
@@ -328,7 +328,7 @@ class PusherEventFactoryDecryptionTests: XCTestCase {
328328
}
329329
""".toJsonDict()
330330

331-
XCTAssertThrowsError(try eventFactory.makeEvent(fromJSON: jsonDict, withDecryptionKey: decryptionKey)) { (error) in
331+
XCTAssertThrowsError(try eventFactory.makeEvent(fromJSON: jsonDict, withDecryptionKey: decryptionKey)) { error in
332332
XCTAssertEqual(error as? PusherEventError, PusherEventError.invalidDecryptionKey)
333333
}
334334
}

‎Tests/Unit/Helpers/PusherEventFactoryTests.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,7 @@ class PusherEventFactoryTests: XCTestCase {
210210
}
211211
""".toJsonDict()
212212

213-
XCTAssertThrowsError(try eventFactory.makeEvent(fromJSON: jsonDict, withDecryptionKey: nil)) { (error) in
213+
XCTAssertThrowsError(try eventFactory.makeEvent(fromJSON: jsonDict, withDecryptionKey: nil)) { error in
214214
XCTAssertEqual(error as? PusherEventError, PusherEventError.invalidFormat)
215215
}
216216
}

‎Tests/Unit/Services/PusherEventQueue+DecryptionTests.swift

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ class PusherEventQueueDecryptionTests: XCTestCase {
5959

6060
let ex = expectation(description: "should call didReceiveEvent")
6161

62-
eventQueueDelegate.didReceiveEvent = { (eventQueue, event, channelName) in
62+
eventQueueDelegate.didReceiveEvent = { eventQueue, event, channelName in
6363
XCTAssertEqual(event.data, expectedDecryptedPayload)
6464
XCTAssertEqual("private-encrypted-channel", channelName)
6565
ex.fulfill()
@@ -91,7 +91,7 @@ class PusherEventQueueDecryptionTests: XCTestCase {
9191

9292
let ex = expectation(description: "should call didFailToDecryptEvent")
9393

94-
eventQueueDelegate.didFailToDecryptEvent = { (eventQueue, payload, channelName) in
94+
eventQueueDelegate.didFailToDecryptEvent = { eventQueue, payload, channelName in
9595
let equal = NSDictionary(dictionary: jsonDict).isEqual(to: payload)
9696
XCTAssertTrue(equal)
9797
XCTAssertEqual("private-encrypted-channel", channelName)
@@ -135,13 +135,13 @@ class PusherEventQueueDecryptionTests: XCTestCase {
135135
let reloadEx = expectation(description: "should attempt to reload key")
136136
let receivedEv = expectation(description: "should call didReceiveEvent")
137137

138-
eventQueueDelegate.reloadDecryptionKeySync = { (eventQueue, channelToReload) in
138+
eventQueueDelegate.reloadDecryptionKeySync = { eventQueue, channelToReload in
139139
XCTAssertEqual(channel, channelToReload)
140140
channelToReload.decryptionKey = correctDecryptionKey
141141
reloadEx.fulfill()
142142
}
143143

144-
eventQueueDelegate.didReceiveEvent = { (eventQueue, event, channelName) in
144+
eventQueueDelegate.didReceiveEvent = { eventQueue, event, channelName in
145145
XCTAssertEqual(event.data, expectedDecryptedPayload)
146146
XCTAssertEqual("private-encrypted-channel", channelName)
147147
receivedEv.fulfill()
@@ -177,13 +177,13 @@ class PusherEventQueueDecryptionTests: XCTestCase {
177177
let reloadEx = expectation(description: "should attempt to reload key")
178178
let failedEv = expectation(description: "should fail to decrypt message")
179179

180-
eventQueueDelegate.reloadDecryptionKeySync = { (eventQueue, channelToReload) in
180+
eventQueueDelegate.reloadDecryptionKeySync = { eventQueue, channelToReload in
181181
XCTAssertEqual(channel, channelToReload)
182182
channelToReload.decryptionKey = wrongDecryptionKey1
183183
reloadEx.fulfill()
184184
}
185185

186-
eventQueueDelegate.didFailToDecryptEvent = { (event, payload, channelName) in
186+
eventQueueDelegate.didFailToDecryptEvent = { event, payload, channelName in
187187
let equal = NSDictionary(dictionary: jsonDict).isEqual(to: payload)
188188
XCTAssertTrue(equal)
189189
XCTAssertEqual("private-encrypted-channel", channelName)
@@ -243,20 +243,20 @@ class PusherEventQueueDecryptionTests: XCTestCase {
243243
let failedEx = expectation(description: "should fail to decrypt message")
244244
let successEx = expectation(description: "should succeed in decrypting message")
245245

246-
eventQueueDelegate.reloadDecryptionKeySync = { (eventQueue, channelToReload) in
246+
eventQueueDelegate.reloadDecryptionKeySync = { eventQueue, channelToReload in
247247
XCTAssertEqual(channel, channelToReload)
248248
channelToReload.decryptionKey = correctDecryptionKey
249249
reloadEx.fulfill()
250250
}
251251

252-
eventQueueDelegate.didFailToDecryptEvent = { (event, payload, channelName) in
252+
eventQueueDelegate.didFailToDecryptEvent = { event, payload, channelName in
253253
let equal = NSDictionary(dictionary: undecryptableEvent).isEqual(to: payload)
254254
XCTAssertTrue(equal)
255255
XCTAssertEqual("private-encrypted-channel", channelName)
256256
failedEx.fulfill()
257257
}
258258

259-
eventQueueDelegate.didReceiveEvent = { (eventQueue, event, channelName) in
259+
eventQueueDelegate.didReceiveEvent = { eventQueue, event, channelName in
260260
XCTAssertEqual(expectedDecryptedPayload, event.data)
261261
XCTAssertEqual("private-encrypted-channel", channelName)
262262
successEx.fulfill()
@@ -319,20 +319,20 @@ class PusherEventQueueDecryptionTests: XCTestCase {
319319
let failedEx = expectation(description: "should fail to decrypt message")
320320
let successEx = expectation(description: "should succeed in decrypting message")
321321

322-
eventQueueDelegate.reloadDecryptionKeySync = { (eventQueue, channelToReload) in
322+
eventQueueDelegate.reloadDecryptionKeySync = { eventQueue, channelToReload in
323323
XCTAssertEqual(undecryptableChannel, channelToReload)
324324
channelToReload.decryptionKey = wrongDecryptionKey
325325
reloadEx.fulfill()
326326
}
327327

328-
eventQueueDelegate.didFailToDecryptEvent = { (event, payload, channelName) in
328+
eventQueueDelegate.didFailToDecryptEvent = { event, payload, channelName in
329329
let equal = NSDictionary(dictionary: undecryptableEvent).isEqual(to: payload)
330330
XCTAssertTrue(equal)
331331
XCTAssertEqual(undecryptableChannel.name, channelName)
332332
failedEx.fulfill()
333333
}
334334

335-
eventQueueDelegate.didReceiveEvent = { (eventQueue, event, channelName) in
335+
eventQueueDelegate.didReceiveEvent = { eventQueue, event, channelName in
336336
XCTAssertEqual(expectedDecryptedPayload, event.data)
337337
XCTAssertEqual(decryptableChannel.name, channelName)
338338
successEx.fulfill()

‎Tests/Unit/Services/PusherEventQueueTests.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ class PusherEventQueueTests: XCTestCase {
7070
""".toJsonDict()
7171

7272
let ex = expectation(description: "should call didReceiveEvent")
73-
eventQueueDelegate.didReceiveEvent = { (eventQueue, event, channelName) in
73+
eventQueueDelegate.didReceiveEvent = { eventQueue, event, channelName in
7474
let equal = NSDictionary(dictionary: jsonDict).isEqual(to: event.raw)
7575
XCTAssertTrue(equal)
7676
XCTAssertEqual(channel.name, channelName)
@@ -97,7 +97,7 @@ class PusherEventQueueTests: XCTestCase {
9797
""".toJsonDict()
9898

9999
let ex = expectation(description: "should call didReceiveEvent")
100-
eventQueueDelegate.didReceiveEvent = { (eventQueue, event, channelName) in
100+
eventQueueDelegate.didReceiveEvent = { eventQueue, event, channelName in
101101
let equal = NSDictionary(dictionary: jsonDict).isEqual(to: event.raw)
102102
XCTAssertTrue(equal)
103103
XCTAssertNil(channelName)
@@ -123,7 +123,7 @@ class PusherEventQueueTests: XCTestCase {
123123
""".toJsonDict()
124124

125125
let ex = expectation(description: "should call didReceiveInvalidEvent")
126-
eventQueueDelegate.didReceiveInvalidEvent = { (eventQueue, payload) in
126+
eventQueueDelegate.didReceiveInvalidEvent = { eventQueue, payload in
127127
let equal = NSDictionary(dictionary: jsonDict).isEqual(to: payload)
128128
XCTAssertTrue(equal)
129129
ex.fulfill()

0 commit comments

Comments
 (0)