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.

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

Fixes for Xcode 7.3 / Swift 2.2 #244

Merged
merged 6 commits into from
Feb 3, 2016
Merged

Fixes for Xcode 7.3 / Swift 2.2 #244

merged 6 commits into from
Feb 3, 2016

Conversation

briancroom
Copy link
Member

This build on top of @NachoSoto's work in #243 (Sorry I'm not sure if there's a better way to do this besides opening a new PR like I am here!)

I'm essentially keeping FileString as String in ObjC environments, and moving away from XCTFail. This requires the use of XCTestObservationCenter to track the current test case.

This gets everything building on both Xcode 7.2 and 7.3, however there are a few test failures on 7.3 that seem to be due to behavior changes in the stringifiers. I'm not sure how to approach those failures and was thinking that should be dealt with separately.

@NachoSoto @ratkins could you see if this works for you?

@@ -35,6 +35,24 @@ class NimbleXCTestUnavailableHandler : AssertionHandler {
}
}

#if _runtime(_ObjC)
/// Helper class providing access to the currently executing XCTestCase instance, if any
@objc internal class CurrentTestCaseTracker: NSObject, XCTestObservation {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe make this class final since it's not meant to be subclassed?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good idea. Done!

@NachoSoto
Copy link
Contributor

This build on top of @NachoSoto's work in #243 (Sorry I'm not sure if there's a better way to do this besides opening a new PR like I am here!)

Yeah this is fine, thank you!

This makes sense! :shipit:

@NachoSoto NachoSoto mentioned this pull request Jan 31, 2016
jeffh added a commit that referenced this pull request Feb 3, 2016
Fixes for Xcode 7.3 / Swift 2.2
@jeffh jeffh merged commit 8d3c5b0 into Quick:master Feb 3, 2016
@jeffh
Copy link
Member

jeffh commented Feb 3, 2016

Thanks @NachoSoto and @briancroom! I'll cut a new release soon.

@briancroom briancroom deleted the swift-2.2 branch February 6, 2016 06:07
Megal pushed a commit to Megal/Nimble that referenced this pull request Jul 31, 2019
Fixes for Xcode 7.3 / Swift 2.2
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants