Thanks for your pull request. It looks like this may be your first contribution to a Google open source project (if not, look below for help). Before we can look at your pull request, you'll need to sign a Contributor License Agreement (CLA).

📝 Please visit https://cla.developers.google.com/ to sign.

Once you've signed (or fixed any issues), please reply here with @googlebot I signed it! and we'll verify it.

What to do if you already signed the CLA

Individual signers

• It's possible we don't have your GitHub username or you're using a different email address on your commit. Check your existing CLA data and verify that your email is set on your git commits.

Corporate signers

• Your company has a Point of Contact who decides which employees are authorized to participate. Ask your POC to be added to the group of authorized contributors. If you don't know who your Point of Contact is, direct the Google project maintainer to go/cla#troubleshoot (Public version).
• The email used to register you as an authorized contributor must be the email used for the Git commit. Check your existing CLA data and verify that your email is set on your git commits.
• The email used to register you as an authorized contributor must also be attached to your GitHub account.

ℹ️ Googlers: Go here for more info.

CLAs look good, thanks!

ℹ️ Googlers: Go here for more info.

@chliangGoogle I could move some of this logic to another function to add tests, let me know what your preference would be. Thanks!

@akivab Thanks for the issue and PR! Routing to @chliangGoogle for review.

EDIT: Was able to get tests to work using the Simulator target instead of Mac thanks to Paul's comment below.

Original comment:
I have tried adding some tests but having trouble with automatic signing issues for the AppHost-FirebaseMessaging-Unit-Tests target (ld: file not found: /Users/akivab/Library/Developer/Xcode/DerivedData/FirebaseMessaging-hkzirhinkydyvnexsqhhikscqmru/Build/Products/Debug-maccatalyst/AppHost-FirebaseMessaging-Unit-Tests.app/Contents/MacOS/AppHost-FirebaseMessaging-Unit-Tests)

Attaching the diff so that it might serve as an example of the tests I'm planning to add (but that I didn't want to add due to the concern of being unable to run locally)

This is the git diff between what is in this PR and what I have suggested for tests.

Thanks so much!

changes_with_tests.txt

It might be easier to test on iOS than Catalyst. You can generate an iOS dev environment with:

pod gen FirebaseMessaging.podspec --auto-open --local-sources=./ --platforms=ios

Thanks so much @paulb777 -- I've updated my PR with some simple unit tests. @chliangGoogle open to any feedback.

Thanks @chliangGoogle, addressed comments.

Thanks @chliangGoogle -- added to the CHANGELOG.md and calling teardown on the mock now

Perfect, sounds good. Contributing here has been a great experience, hoping to do more in the future.

Hi @chliangGoogle, I don't have write access to this repo so expecting that you might be able to merge in. Thanks so much.

I'll merge it now - to make sure that none of the upcoming major changes introduce a conflict.

Thanks for the PR @akivab !