Skip to content
This repository has been archived by the owner on Dec 12, 2021. It is now read-only.

Commit

Permalink
Improve #23
Browse files Browse the repository at this point in the history
  • Loading branch information
inamiy committed Jun 9, 2019
1 parent bc7cf7c commit 20aa521
Show file tree
Hide file tree
Showing 6 changed files with 29 additions and 18 deletions.
2 changes: 1 addition & 1 deletion Cartfile.resolved
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
github "Quick/Nimble" "v8.0.1"
github "Quick/Nimble" "v8.0.2"
github "Quick/Quick" "v2.1.0"
github "ReactiveX/RxSwift" "5.0.1"
github "mrackwitz/xcconfigs" "3.0"
Expand Down
2 changes: 1 addition & 1 deletion Carthage/Checkouts/Nimble
Submodule Nimble updated 44 files
+1 −1 .hound.yml
+39 −34 .travis.yml
+1 −1 Gemfile
+14 −14 Gemfile.lock
+6 −2 Nimble.podspec
+24 −11 Nimble.xcodeproj/project.pbxproj
+1 −1 Nimble.xcodeproj/xcshareddata/xcschemes/Nimble-iOS.xcscheme
+1 −1 Nimble.xcodeproj/xcshareddata/xcschemes/Nimble-macOS.xcscheme
+1 −1 Nimble.xcodeproj/xcshareddata/xcschemes/Nimble-tvOS.xcscheme
+5 −2 Package.swift
+21 −0 Package@swift-4.2.swift
+23 −0 README.md
+18 −18 Sources/Nimble/Adapters/NMBExpectation.swift
+2 −2 Sources/Nimble/Expression.swift
+10 −6 Sources/Nimble/Matchers/BeCloseTo.swift
+6 −4 Sources/Nimble/Matchers/BeGreaterThan.swift
+6 −4 Sources/Nimble/Matchers/BeGreaterThanOrEqualTo.swift
+2 −11 Sources/Nimble/Matchers/BeIdenticalTo.swift
+6 −4 Sources/Nimble/Matchers/BeLessThan.swift
+6 −4 Sources/Nimble/Matchers/BeLessThanOrEqual.swift
+5 −3 Sources/Nimble/Matchers/MatcherProtocols.swift
+42 −13 Sources/Nimble/Matchers/PostNotification.swift
+13 −10 Sources/Nimble/Matchers/RaisesException.swift
+6 −0 Sources/Nimble/Matchers/SatisfyAllOf.swift
+6 −0 Sources/Nimble/Matchers/SatisfyAnyOf.swift
+1 −5 Sources/Nimble/Utils/Await.swift
+2 −13 Sources/Nimble/Utils/Stringers.swift
+1 −1 Tests/NimbleTests/Helpers/utils.swift
+2 −2 Tests/NimbleTests/Matchers/BeAKindOfTest.swift
+1 −1 Tests/NimbleTests/Matchers/BeAnInstanceOfTest.swift
+3 −3 Tests/NimbleTests/Matchers/BeEmptyTest.swift
+0 −2 Tests/NimbleTests/Matchers/BeGreaterThanOrEqualToTest.swift
+1 −1 Tests/NimbleTests/Matchers/BeIdenticalToTest.swift
+0 −2 Tests/NimbleTests/Matchers/BeLessThanOrEqualToTest.swift
+0 −2 Tests/NimbleTests/Matchers/BeginWithTest.swift
+1 −1 Tests/NimbleTests/Matchers/ContainTest.swift
+0 −2 Tests/NimbleTests/Matchers/EndWithTest.swift
+1 −11 Tests/NimbleTests/Matchers/EqualTest.swift
+2 −2 Tests/NimbleTests/Matchers/MatchErrorTest.swift
+7 −11 Tests/NimbleTests/Matchers/PostNotificationTest.swift
+1 −1 Tests/NimbleTests/Matchers/RaisesExceptionTest.swift
+1 −1 Tests/NimbleTests/Matchers/ThrowAssertionTest.swift
+1 −1 script/release
+5 −5 test
2 changes: 1 addition & 1 deletion Carthage/Checkouts/RxSwift
Submodule RxSwift updated 360 files
16 changes: 8 additions & 8 deletions Package.resolved
Original file line number Diff line number Diff line change
Expand Up @@ -3,29 +3,29 @@
"pins": [
{
"package": "Nimble",
"repositoryURL": "https://github.com/Quick/Nimble",
"repositoryURL": "https://github.com/Quick/Nimble.git",
"state": {
"branch": null,
"revision": "e9d769113660769a4d9dd3afb855562c0b7ae7b0",
"version": "7.3.4"
"revision": "f8657642dfdec9973efc79cc68bcef43a653a2bc",
"version": "8.0.2"
}
},
{
"package": "Quick",
"repositoryURL": "https://github.com/Quick/Quick",
"repositoryURL": "https://github.com/Quick/Quick.git",
"state": {
"branch": null,
"revision": "f2b5a06440ea87eba1a167cab37bf6496646c52e",
"version": "1.3.4"
"revision": "94df9b449508344667e5afc7e80f8bcbff1e4c37",
"version": "2.1.0"
}
},
{
"package": "RxSwift",
"repositoryURL": "https://github.com/ReactiveX/RxSwift.git",
"state": {
"branch": null,
"revision": "a2348cef2a28fca5a1a5fa26b3ce62e6831c0a49",
"version": "4.4.1"
"revision": "b3e888b4972d9bc76495dd74d30a8c7fad4b9395",
"version": "5.0.1"
}
}
]
Expand Down
23 changes: 17 additions & 6 deletions Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -11,17 +11,28 @@ let package = Package(
targets: ["RxAutomaton"]),
],
dependencies: [
.package(url: "https://github.com/ReactiveX/RxSwift.git", from: "4.0.0"),
.package(url: "https://github.com/Quick/Quick", from: "1.0.0"),
.package(url: "https://github.com/Quick/Nimble", from: "7.0.0")
.package(url: "https://github.com/ReactiveX/RxSwift.git", from: "5.0.0"),
],
targets: [
.target(
name: "RxAutomaton",
dependencies: ["RxSwift", "RxCocoa"],
path: "Sources"),
.testTarget(
name: "RxAutomatonTests",
dependencies: ["RxAutomaton", "RxTest", "Quick", "Nimble"]),
]
)

// `$ RXAUTOMATON_SPM_TEST=1 swift test`
if ProcessInfo.processInfo.environment.keys.contains("RXAUTOMATON_SPM_TEST") {
package.targets.append(
.testTarget(
name: "RxAutomatonTests",
dependencies: ["RxAutomaton", "RxTest", "Quick", "Nimble"])
)

package.dependencies.append(
contentsOf: [
.package(url: "https://github.com/Quick/Quick.git", from: "2.1.0"),
.package(url: "https://github.com/Quick/Nimble.git", from: "8.0.0"),
]
)
}
2 changes: 1 addition & 1 deletion Tests/RxAutomatonTests/EffectMappingSpec.swift
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,7 @@ class EffectMappingSpec: QuickSpec
let loginOKProducer =
Observable<AuthInput>.create { observer in
effectCallCount += 1
return testScheduler.scheduleRelative((), dueTime: 0.1, action: { () -> Disposable in
return testScheduler.scheduleRelative((), dueTime: .milliseconds(100), action: { () -> Disposable in
observer.send(next: .loginOK)
observer.sendCompleted()
return Disposables.create()
Expand Down

0 comments on commit 20aa521

Please sign in to comment.