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

[camera] Remove OCMock from AvailableCamerasTests, CameraOrientationTests and ThreadSafeEventChannelTests #8363

Open
wants to merge 24 commits into
base: main
Choose a base branch
from

Conversation

mchudy
Copy link
Contributor

@mchudy mchudy commented Jan 2, 2025

Follow-up on #8342. This should be merged after #8351

  • Removes OCMock dependency in AvailableCamerasTests.m, CameraOrientationTests.m and ThreadSafeEventChannelTests.m
  • Introduces new protocol wrappers to enable mocking FLTEventChannel and FLTCameraDeviceDiscovering

Pre-launch Checklist

If you need help, consider asking for advice on the #hackers-new channel on Discord.

@mchudy mchudy requested a review from hellohuanlin January 7, 2025 11:55
@@ -1,3 +1,11 @@
## 0.9.17+8
Copy link
Contributor

Choose a reason for hiding this comment

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

I haven't seen 2 released in a single PR before. This is probably not a standard practice (@stuartmorgan will know)

May worth splitting into 2 PRs, which can make the review easier/faster.

Copy link
Contributor

Choose a reason for hiding this comment

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

CI won't allow this; it can either be two PRs, or it can be one PR with a single version bump.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

So this PR was meant to be merged after #8351 (it includes changes from that PR), that's why there are two new versions. So either we merge them one after the other or we close #8351 and only merge this one. Sorry for making it confusing.

Copy link
Contributor

Choose a reason for hiding this comment

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

There's a trick that you can set base branch your previous branch first, and after that gets landed, change the base branch back to main.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Good idea, but I believe that I can only set the base branch as a branch that exists in the main repo, it doesn't list branches from my fork

Copy link
Contributor

Choose a reason for hiding this comment

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

oh i will review after the previous PR is in then. otherwise it's hard to tell which part is new change.

error:(NSError **)error;
@end

@interface AVCaptureDevice (FLTCaptureDeviceControlling) <FLTCaptureDeviceControlling>
Copy link
Contributor

Choose a reason for hiding this comment

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

I'd just call the protocol FLTCaptureDevice since it's a noun (rather than a capability), as discussed in the design doc

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Done

@mchudy mchudy requested a review from hellohuanlin January 14, 2025 10:05
@stuartmorgan stuartmorgan added the triage-ios Should be looked at in iOS triage label Jan 15, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants