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

Testing: Update mocks for screenshot test #11669

Merged
merged 1 commit into from
Apr 15, 2020

Conversation

rachelmcr
Copy link
Member

As noted in #11666 the screenshot test currently fails due to errors with the mocks. This PR updates the mocks to resolve those errors so the test passes.

Only one review is needed and anyone can review.

To test:

  • Run ./gradlew :WordPress:connectedVanillaDebugAndroidTest and confirm all tests pass.
  • You can also run WPScreenshotTest (under WordPress/src/androidTest/java/org/wordpress/android/ui/screenshots/) individually to confirm it passes.

PR submission checklist:

  • I have considered adding unit tests where possible.
  • I have considered adding accessibility improvements for my changes.
  • I have considered if this change warrants user-facing release notes and have added them to RELEASE-NOTES.txt if necessary.

@peril-wordpress-mobile
Copy link

peril-wordpress-mobile bot commented Apr 15, 2020

Warnings
⚠️ PR is not assigned to a milestone.
Messages
📖

This PR contains changes in the subtree libs/mocks/. It is your responsibility to ensure these changes are merged back into wordpress-mobile/WordPressMocks. Follow these handy steps!
WARNING: Make sure your git version is 2.19.x or lower - there is currently a bug in later versions that will corrupt the subtree history!

  1. cd WordPress-Android
  2. git checkout fix/wpscreenshot-test-mocks
  3. git subtree push --prefix=libs/mocks/ https://github.com/wordpress-mobile/WordPressMocks.git merge/WordPress-Android/11669
  4. Browse to https://github.com/wordpress-mobile/WordPressMocks/pull/new/merge/WordPress-Android/11669 and open a new PR.

Generated by 🚫 dangerJS

@peril-wordpress-mobile
Copy link

You can trigger optional UI/connected tests for these changes by visiting CircleCI here.

@peril-wordpress-mobile
Copy link

You can test the changes on this Pull Request by downloading the APK here.

@rachelmcr
Copy link
Member Author

Note: I'm currently ignoring this Peril message:

This PR contains changes in the subtree libs/mocks/. It is your responsibility to ensure these changes are merged back into wordpress-mobile/WordPressMocks. Follow these handy steps!

We have discussed splitting the Android and iOS mocks, because the API calls aren't always identical and keeping them synced can be a challenge. Although we haven't started formally splitting them (e.g. removing iOS-specific mocks from Android, and vice versa) I think it's ok to start letting the Android mocks diverge from the wordpress-mobile/WordPressMocks repo. WDYT? (Internal ref: paaHJt-PH-p2)

Copy link
Contributor

@oguzkocer oguzkocer left a comment

Choose a reason for hiding this comment

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

WPScreenshotTest passed without any issues. :shipit:

I think it's ok to start letting the Android mocks diverge from the wordpress-mobile/WordPressMocks repo.

That sounds OK to me.

@oguzkocer oguzkocer merged commit e84a8cb into develop Apr 15, 2020
@oguzkocer oguzkocer deleted the fix/wpscreenshot-test-mocks branch April 15, 2020 14:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants