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

Add support for .andFulfill(expectation) #421

Merged
merged 1 commit into from
Dec 4, 2020

Conversation

dmaclach
Copy link
Contributor

Suggested implementation for #420

erikdoe added a commit that referenced this pull request May 24, 2020
At this stage I am not sure whether to merge a few more (#419, #404, #398) and release as 3.6.1 or whether to include #421 (and maybe a variation on #394) and then release as 3.7.
@erikdoe erikdoe added the blocked label Jun 4, 2020
@erikdoe
Copy link
Owner

erikdoe commented Jun 4, 2020

This is good to go. I'm still making my mind up whether to release OCMock 3.6.1 with some of the fixes and developer experience improvements, or whether I do 3.7 straight away with new features. This is obviously a new feature. Marking it blocked until 3.7 is definitely the next release.

@erikdoe
Copy link
Owner

erikdoe commented Nov 28, 2020

This PR introduces a dependency on XCTest. As discussed in #420 this is not a problem. (In fact, it will help get off some deprecated API.) However, when I merged this PR I noticed the following warning:

ld: warning: dylib (/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/Library/Frameworks/XCTest.framework/XCTest) was built for newer macOS version (10.15) than being linked (10.10)

It looks like XCTest is built for the current SDK (I'm not on Big Sur yet) while OCMock is built with 10.10 as deployment target. Anyone think this a problem?

Something else I noticed: how did you add XCTest for watchOS? When I tried this earlier I could not see XCTest for the watchOS target. It showed up for all other targets in the dialog that appears when you add a framework in the link build phase, but not for watchOS. Re-checked now and it's still the case for me.

@dmaclach
Copy link
Contributor Author

I don't think mixing OCMock at 10.10 with the newest XCTest is going to be a problem, otherwise you couldn't mix XCTest with any code that had a lower deployment target.

I must admit I didn't test building the watchOS version. You are correct that watchOS doesn't have XCTest support (for reasons that I never quite understood). I have added guards around the calls appropriately assuming that we want to support watchOS even if there is no official XCTest support for it.

@erikdoe erikdoe merged commit 1774cde into erikdoe:master Dec 4, 2020
@dmaclach dmaclach deleted the expectations branch January 2, 2021 17:53
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

2 participants