Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update Quick and Nimble #89

Merged
merged 1 commit into from
Feb 9, 2017
+18 −6
Merged

Update Quick and Nimble #89

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions .Package.test.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
import PackageDescription

let package = Package(
name: "ReactiveTask",
dependencies: [
.Package(url: "https://github.com/ReactiveCocoa/ReactiveSwift", majorVersion: 1),
.Package(url: "https://github.com/Quick/Quick", majorVersion: 1, minor: 1),
.Package(url: "https://github.com/Quick/Nimble", majorVersion: 6),
]
)
2 changes: 2 additions & 0 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,9 @@ matrix:
- os: osx
osx_image: xcode8.2
script:
- mv .Package.test.swift Package.swift
- swift build
- swift test
env: JOB=SWIFTPM_DARWIN
notifications:
email: false
Expand Down
4 changes: 2 additions & 2 deletions Cartfile.private
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
github "jspahrsummers/xcconfigs" "3d9d996"
github "Quick/Quick" ~> 1.0
github "Quick/Nimble" ~> 5.0
github "Quick/Quick" ~> 1.1
github "Quick/Nimble" ~> 6.0
4 changes: 2 additions & 2 deletions Cartfile.resolved
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
github "Quick/Nimble" "v5.1.1"
github "Quick/Quick" "v1.0.0"
github "Quick/Nimble" "v6.0.1"
github "Quick/Quick" "v1.1.0"
github "antitypical/Result" "3.1.0"
github "jspahrsummers/xcconfigs" "3d9d99634cae6d586e272543d527681283b33eb0"
github "ReactiveCocoa/ReactiveSwift" "1.0.0"
2 changes: 1 addition & 1 deletion Carthage/Checkouts/Nimble
Open in desktop
Submodule Nimble updated 77 files
+36 −0 .github/ISSUE_TEMPLATE
+14 −0 .github/PULL_REQUEST_TEMPLATE
+2 −0 .hound.yml
+16 −0 .swiftlint.yml
+1 −1 LICENSE
+2 −2 Nimble.podspec
+74 −5 Nimble.xcodeproj/project.pbxproj
+105 −2 README.md
+9 −9 Sources/Lib/CwlPreconditionTesting/CwlPreconditionTesting/CwlBadInstructionException.swift
+20 −21 Sources/Lib/CwlPreconditionTesting/CwlPreconditionTesting/CwlCatchBadInstruction.swift
+3 −3 Sources/Lib/CwlPreconditionTesting/CwlPreconditionTesting/CwlCatchBadInstructionPOSIX.swift
+1 −1 Sources/Lib/CwlPreconditionTesting/CwlPreconditionTesting/CwlDarwinDefinitions.swift
+0 −1 Sources/Nimble/Adapters/AssertionDispatcher.swift
+2 −2 Sources/Nimble/Adapters/AssertionRecorder.swift
+3 −3 Sources/Nimble/Adapters/NMBExpectation.swift
+1 −1 Sources/Nimble/Adapters/NMBObjCMatcher.swift
+7 −8 Sources/Nimble/Adapters/NimbleXCTestHandler.swift
+3 −3 Sources/Nimble/DSL+Wait.swift
+5 −10 Sources/Nimble/Expectation.swift
+1 −1 Sources/Nimble/Expression.swift
+1 −1 Sources/Nimble/FailureMessage.swift
+14 −20 Sources/Nimble/Matchers/AllPass.swift
+7 −12 Sources/Nimble/Matchers/AsyncMatcherWrapper.swift
+18 −8 Sources/Nimble/Matchers/BeAKindOf.swift
+15 −5 Sources/Nimble/Matchers/BeAnInstanceOf.swift
+2 −2 Sources/Nimble/Matchers/BeCloseTo.swift
+0 −1 Sources/Nimble/Matchers/BeEmpty.swift
+1 −2 Sources/Nimble/Matchers/BeGreaterThan.swift
+2 −3 Sources/Nimble/Matchers/BeIdenticalTo.swift
+1 −1 Sources/Nimble/Matchers/BeLessThan.swift
+3 −3 Sources/Nimble/Matchers/BeVoid.swift
+1 −3 Sources/Nimble/Matchers/BeginWith.swift
+2 −4 Sources/Nimble/Matchers/Contain.swift
+59 −0 Sources/Nimble/Matchers/ContainElementSatisfying.swift
+2 −5 Sources/Nimble/Matchers/EndWith.swift
+5 −5 Sources/Nimble/Matchers/Equal.swift
+1 −1 Sources/Nimble/Matchers/Match.swift
+2 −2 Sources/Nimble/Matchers/MatcherProtocols.swift
+2 −2 Sources/Nimble/Matchers/PostNotification.swift
+2 −2 Sources/Nimble/Matchers/RaisesException.swift
+10 −13 Sources/Nimble/Matchers/SatisfyAnyOf.swift
+5 −5 Sources/Nimble/Matchers/ThrowAssertion.swift
+2 −2 Sources/Nimble/Matchers/ThrowError.swift
+3 −3 Sources/Nimble/Utils/Async.swift
+1 −2 Sources/Nimble/Utils/Errors.swift
+4 −4 Sources/Nimble/Utils/SourceLocation.swift
+5 −6 Sources/Nimble/Utils/Stringers.swift
+4 −0 Sources/NimbleObjectiveC/DSL.h
+4 −0 Sources/NimbleObjectiveC/DSL.m
+1 −1 Sources/NimbleObjectiveC/NMBExceptionCapture.h
+1 −1 Tests/LinuxMain.swift
+6 −6 Tests/NimbleTests/AsynchronousTest.swift
+1 −1 Tests/NimbleTests/Helpers/XCTestCaseProvider.swift
+1 −1 Tests/NimbleTests/Helpers/utils.swift
+15 −15 Tests/NimbleTests/Matchers/AllPassTest.swift
+56 −23 Tests/NimbleTests/Matchers/BeAKindOfTest.swift
+37 −16 Tests/NimbleTests/Matchers/BeAnInstanceOfTest.swift
+8 −8 Tests/NimbleTests/Matchers/BeCloseToTest.swift
+5 −5 Tests/NimbleTests/Matchers/BeEmptyTest.swift
+1 −1 Tests/NimbleTests/Matchers/BeGreaterThanTest.swift
+4 −4 Tests/NimbleTests/Matchers/BeIdenticalToObjectTest.swift
+1 −1 Tests/NimbleTests/Matchers/BeIdenticalToTest.swift
+7 −7 Tests/NimbleTests/Matchers/BeLogicalTest.swift
+1 −1 Tests/NimbleTests/Matchers/BeNilTest.swift
+86 −0 Tests/NimbleTests/Matchers/ContainElementSatisfyingTest.swift
+1 −1 Tests/NimbleTests/Matchers/ContainTest.swift
+55 −55 Tests/NimbleTests/Matchers/EqualTest.swift
+1 −1 Tests/NimbleTests/Matchers/HaveCountTest.swift
+4 −4 Tests/NimbleTests/Matchers/MatchTest.swift
+1 −1 Tests/NimbleTests/Matchers/RaisesExceptionTest.swift
+4 −4 Tests/NimbleTests/Matchers/SatisfyAnyOfTest.swift
+1 −1 Tests/NimbleTests/Matchers/ThrowAssertionTest.swift
+8 −8 Tests/NimbleTests/Matchers/ThrowErrorTest.swift
+12 −13 Tests/NimbleTests/SynchronousTests.swift
+9 −9 Tests/NimbleTests/UserDescriptionTest.swift
+64 −0 Tests/NimbleTests/objc/ObjCContainElementSatisfying.m
+1 −1 Tests/NimbleTests/objc/ObjCRaiseExceptionTest.m
2 changes: 1 addition & 1 deletion Carthage/Checkouts/Quick
Open in desktop
Submodule Quick updated 52 files
+29 −9 .Package.test.swift
+0 −3 .swiftlint.yml
+4 −0 .travis.yml
+53 −0 Dangerfile
+3 −0 Documentation/en-us/SettingUpYourXcodeProject.md
+2 −2 Documentation/en-us/SharedExamples.md
+116 −0 Documentation/pt-br/SharedExamples.md
+1 −1 Externals/Nimble
+2 −0 Gemfile
+72 −26 Gemfile.lock
+28 −8 Package.swift
+1 −1 Quick Templates/Quick Configuration Class.xctemplate/Swift/___FILEBASENAME___.swift
+1 −1 Quick.podspec
+100 −92 Quick.xcodeproj/project.pbxproj
+6 −6 Quick.xcodeproj/xcshareddata/xcschemes/Quick-iOS.xcscheme
+6 −6 Quick.xcodeproj/xcshareddata/xcschemes/Quick-macOS.xcscheme
+6 −6 Quick.xcodeproj/xcshareddata/xcschemes/Quick-tvOS.xcscheme
+14 −11 README.md
+8 −6 Sources/Quick/Callsite.swift
+1 −1 Sources/Quick/Configuration/Configuration.swift
+32 −1 Sources/Quick/Configuration/QuickConfiguration.swift
+26 −12 Sources/Quick/DSL/DSL.swift
+17 −11 Sources/Quick/DSL/World+DSL.swift
+10 −8 Sources/Quick/Example.swift
+5 −5 Sources/Quick/ExampleGroup.swift
+3 −3 Sources/Quick/Hooks/Closures.swift
+2 −2 Sources/Quick/Hooks/ExampleHooks.swift
+9 −0 Sources/Quick/NSBundle+CurrentTestBundle.swift
+33 −0 Sources/Quick/NSString+C99ExtendedIdentifier.swift
+11 −6 Sources/Quick/QuickMain.swift
+1 −2 Sources/Quick/QuickSelectedTestSuiteBuilder.swift
+77 −3 Sources/Quick/QuickSpec.swift
+5 −4 Sources/Quick/World.swift
+0 −17 Sources/QuickObjectiveC/NSString+QCKSelectorName.h
+0 −37 Sources/QuickObjectiveC/NSString+QCKSelectorName.m
+9 −38 Sources/QuickObjectiveC/QuickSpec.m
+55 −0 Sources/QuickSpecBase/QuickSpecBase.m
+11 −0 Sources/QuickSpecBase/include/QuickSpecBase.h
+4 −4 Tests/LinuxMain.swift
+12 −6 Tests/QuickTests/QuickFocusedTests/FocusedTests.swift
+2 −2 Tests/QuickTests/QuickTestHelpers/XCTestCaseProvider.swift
+3 −3 Tests/QuickTests/QuickTests/FunctionalTests/AfterEachTests.swift
+2 −2 Tests/QuickTests/QuickTests/FunctionalTests/BeforeEachTests.swift
+1 −1 Tests/QuickTests/QuickTests/FunctionalTests/BeforeSuiteTests.swift
+30 −0 Tests/QuickTests/QuickTests/FunctionalTests/BundleModuleNameTests.swift
+1 −1 Tests/QuickTests/QuickTests/FunctionalTests/Configuration/AfterEach/Configuration+AfterEachTests.swift
+1 −1 Tests/QuickTests/QuickTests/FunctionalTests/Configuration/BeforeEach/Configuration+BeforeEachTests.swift
+1 −1 Tests/QuickTests/QuickTests/FunctionalTests/DescribeTests.swift
+1 −1 Tests/QuickTests/QuickTests/FunctionalTests/ItTests.swift
+1 −1 Tests/QuickTests/QuickTests/FunctionalTests/PendingTests.swift
+1 −1 Tests/QuickTests/QuickTests/FunctionalTests/SharedExamples+BeforeEachTests.swift
+1 −1 Tests/QuickTests/QuickTests/FunctionalTests/SharedExamplesTests.swift