Skip to content

Commit 46b8481

Browse files
committed
Changes before merge
1 parent b11dc8b commit 46b8481

File tree

5 files changed

+18
-18
lines changed

5 files changed

+18
-18
lines changed

.swiftlint.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@ opt_in_rules:
2828
- sorted_first_last
2929
included:
3030
- Sources
31-
excluded:
3231
- Tests
33-
- Documentation
32+
excluded:
33+
- docs
3434
- Scripts
3535
closure_end_indentation:
3636
severity: error

Tests/MiniSwiftTests/RxTests/ObservableTypeTests.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ final class ObservableTypeTests: XCTestCase {
4444
.next(10, 10),
4545
.next(20, 20),
4646
.next(30, 30),
47-
.completed(40),
47+
.completed(40)
4848
]
4949
)
5050
.filterOne { $0 == 20 }
@@ -55,7 +55,7 @@ final class ObservableTypeTests: XCTestCase {
5555

5656
XCTAssertEqual(filterOneObserver.events, [
5757
.next(20, 20),
58-
.completed(20),
58+
.completed(20)
5959
])
6060
}
6161

Tests/MiniSwiftTests/RxTests/PrimitiveSequenceTypeTests.swift

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ final class PrimitiveSequenceTypeTests: XCTestCase {
151151
self.testMiddleware.actions(of: TestEmptyAction.self).count
152152
).toEventually(be(1))
153153

154-
expect(self.testMiddleware.actions(of: TestEmptyAction.self).first?.promise.isResolved).to(beTrue())
154+
expect(self.testMiddleware.actions(of: TestEmptyAction.self).first?.promise.isResolved) == true
155155
}
156156

157157
func test_empty_action_dispatch_error() {
@@ -164,10 +164,10 @@ final class PrimitiveSequenceTypeTests: XCTestCase {
164164
self.testMiddleware.actions(of: TestEmptyAction.self).count
165165
).toEventually(be(1))
166166

167-
expect(self.testMiddleware.actions(of: TestEmptyAction.self).first?.promise.isResolved).to(beTrue())
167+
expect(self.testMiddleware.actions(of: TestEmptyAction.self).first?.promise.isResolved) == true
168168

169-
expect(self.testMiddleware.actions(of: TestEmptyAction.self).first?.promise.isCompleted).to(beTrue())
169+
expect(self.testMiddleware.actions(of: TestEmptyAction.self).first?.promise.isCompleted) == true
170170

171-
expect(self.testMiddleware.actions(of: TestEmptyAction.self).first?.promise.isRejected).to(beTrue())
171+
expect(self.testMiddleware.actions(of: TestEmptyAction.self).first?.promise.isRejected) == true
172172
}
173173
}

Tests/MiniSwiftTests/XCTestManifests.swift

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
// `swift test --generate-linuxmain`
77
// to regenerate.
88
static let __allTests__ChainTests = [
9-
("test_forwarding_chain_forwards_action", test_forwarding_chain_forwards_action),
9+
("test_forwarding_chain_forwards_action", test_forwarding_chain_forwards_action)
1010
]
1111
}
1212

@@ -16,7 +16,7 @@
1616
// to regenerate.
1717
static let __allTests__DictionaryExtensionsTests = [
1818
("test_get_or_put", test_get_or_put),
19-
("test_unrapping_subscript", test_unrapping_subscript),
19+
("test_unrapping_subscript", test_unrapping_subscript)
2020
]
2121
}
2222

@@ -25,7 +25,7 @@
2525
// `swift test --generate-linuxmain`
2626
// to regenerate.
2727
static let __allTests__DispatchQueueTests = [
28-
("test_main_queue", test_main_queue),
28+
("test_main_queue", test_main_queue)
2929
]
3030
}
3131

@@ -36,7 +36,7 @@
3636
static let __allTests__DispatcherTests = [
3737
("test_add_remove_middleware", test_add_remove_middleware),
3838
("test_add_remove_service", test_add_remove_service),
39-
("test_subscription_count", test_subscription_count),
39+
("test_subscription_count", test_subscription_count)
4040
]
4141
}
4242

@@ -47,7 +47,7 @@
4747
static let __allTests__ObservableTypeTests = [
4848
("test_dispatch_action_from_store", test_dispatch_action_from_store),
4949
("test_dispatch_hashable_action_from_store", test_dispatch_hashable_action_from_store),
50-
("test_filter_one", test_filter_one),
50+
("test_filter_one", test_filter_one)
5151
]
5252
}
5353

@@ -60,7 +60,7 @@
6060
("test_completable_action_dispatch", test_completable_action_dispatch),
6161
("test_completable_action_dispatch_error", test_completable_action_dispatch_error),
6262
("test_keyed_completable_action_dispatch", test_keyed_completable_action_dispatch),
63-
("test_keyed_completable_action_dispatch_error", test_keyed_completable_action_dispatch_error),
63+
("test_keyed_completable_action_dispatch_error", test_keyed_completable_action_dispatch_error)
6464
]
6565
}
6666

@@ -79,7 +79,7 @@
7979
("test_is_rejected", test_is_rejected),
8080
("test_is_resolved", test_is_resolved),
8181
("test_promise_properties", test_promise_properties),
82-
("test_reject", test_reject),
82+
("test_reject", test_reject)
8383
]
8484
}
8585

@@ -93,7 +93,7 @@
9393
("test_reset_state", test_reset_state),
9494
("test_state_received_in_store", test_state_received_in_store),
9595
("test_subscribe_to_store_receive_actions", test_subscribe_to_store_receive_actions),
96-
("test_subscribe_to_store_receive_multiple_actions", test_subscribe_to_store_receive_multiple_actions),
96+
("test_subscribe_to_store_receive_multiple_actions", test_subscribe_to_store_receive_multiple_actions)
9797
]
9898
}
9999

@@ -106,7 +106,7 @@
106106
testCase(ObservableTypeTests.__allTests__ObservableTypeTests),
107107
testCase(PrimitiveSequenceTypeTests.__allTests__PrimitiveSequenceTypeTests),
108108
testCase(PromiseTests.__allTests__PromiseTests),
109-
testCase(ReducerTests.__allTests__ReducerTests),
109+
testCase(ReducerTests.__allTests__ReducerTests)
110110
]
111111
}
112112
#endif

bin/pre-commit.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@
33
raise 'Test failed' unless system('swift test')
44
raise 'Generate linuxmain failed' unless system('swift test --generate-linuxmain')
55
raise 'Swiftformat failed' unless system('swift run swiftformat --swiftversion 5.0 .')
6-
raise 'Swiftlint failed' unless system('swift run swiftlint autocorrect --path Sources/')
6+
raise 'Swiftlint failed' unless system('swift run swiftlint autocorrect')
77
raise 'Git add failed' unless system('git add .')

0 commit comments

Comments
 (0)