Skip to content

Admin Menu: Make API tests compatible with WPCOM - #21850

Merged
jeherve merged 3 commits into
masterfrom
fix/admin-menu-tests-wpcom-2
Nov 24, 2021
Merged

Admin Menu: Make API tests compatible with WPCOM#21850
jeherve merged 3 commits into
masterfrom
fix/admin-menu-tests-wpcom-2

Conversation

@obenland

@obenland obenland commented Nov 22, 2021 •
edited
Loading

Copy link
Copy Markdown
Member

Changes proposed in this Pull Request:

  • Creates a test that other tests can depend on to get a successful API response to work with
  • Uses admin_url() to generate URLs based on the current environment.

Jetpack product discussion

p9dueE-3LL-p2

Does this pull request change what data or activity we track or use?

No

Testing instructions:

Should be covered by automated tests. No changes in production code.

On dotcom:

  • Apply D70265-code to your sandbox.
  • Apply D70462-code to your sandbox.
  • Run cd bin/tests/jetpack-unit && phpunit --filter=WP_Test_WPCOM_REST_API_V2_Endpoint_Admin_Menu

@obenland
obenland requested a review from mmtr November 22, 2021 19:27
@matticbot

matticbot commented Nov 22, 2021

Copy link
Copy Markdown
Contributor

Caution: This PR has changes that must be merged to WordPress.com
Hello obenland! These changes need to be synced to WordPress.com - If you 're an a11n, please commandeer and confirm D70462-code works as expected before merging this PR. Once this PR is merged, please commit the changes to WP.com. Thank you!
This revision will be updated with each commit to this PR

@github-actions github-actions Bot added the [Plugin] Jetpack Issues about the Jetpack plugin. https://wordpress.org/plugins/jetpack/ label Nov 22, 2021
@github-actions

github-actions Bot commented Nov 22, 2021 •
edited
Loading

Copy link
Copy Markdown
Contributor

Thank you for your PR!

When contributing to Jetpack, we have a few suggestions that can help us test and review your patch:

  • ✅ Include a description of your PR changes.
  • ✅ All commits were linted before commit.
  • ✅ Add a "[Status]" label (In Progress, Needs Team Review, ...).
  • ✅ Add testing instructions.
  • ✅ Specify whether this PR includes any changes to data or privacy.
  • ✅ Add changelog entries to affected projects

This comment will be updated as you work on your PR and make changes. If you think that some of those checks are not needed for your PR, please explain why you think so. Thanks for cooperation 🤖

The e2e test report can be found here. Please note that it can take a few minutes after the e2e tests checks are complete for the report to be available.

Once your PR is ready for review, check one last time that all required checks (other than "Required review") appearing at the bottom of this PR are passing or skipped.
Then, add the "[Status] Needs Team review" label and ask someone from your team review the code.
Once you’ve done so, switch to the "[Status] Needs Review" label; someone from Jetpack Crew will then review this PR and merge it to be included in the next Jetpack release.

Jetpack plugin:

  • Next scheduled release: December 7, 2021.
  • Scheduled code freeze: November 30, 2021.

mmtr
mmtr reviewed Nov 23, 2021
View reviewed changes

@mmtr mmtr left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Nice, TIL about @depends! Sadly, seems we still need more changes to adapt the tests to WP.com.

I got some failures after running cd bin/tests/jetpack-unit && phpunit --testsuite=core-api --filter=WP_Test_WPCOM_REST_API_V2_Endpoint_Admin_Menu --debug on my sandbox:

1) WP_Test_WPCOM_REST_API_V2_Endpoint_Admin_Menu::test_successful_request
Failed asserting that 401 is identical to 200.

/home/wpcom/public_html/bin/tests/jetpack-unit/suites/core-api/wpcom-endpoints/test-class-wpcom-rest-api-v2-endpoint-admin-menu.php:86

@mmtr mmtr added [Status] Needs Author Reply We need more details from you. This label will be auto-added until the PR meets all requirements. and removed [Status] Needs Team Review Obsolete. Use Needs Review instead. labels Nov 23, 2021
@obenland

obenland commented Nov 23, 2021

Copy link
Copy Markdown
Member Author

Ah, apologies, D70265-code will fix that, I forgot to add that to the instructions.

@obenland obenland added [Status] Needs Team Review Obsolete. Use Needs Review instead. and removed [Status] Needs Author Reply We need more details from you. This label will be auto-added until the PR meets all requirements. labels Nov 23, 2021
@mmtr

mmtr commented Nov 24, 2021

Copy link
Copy Markdown
Member

Ah, apologies, D70265-code will fix that, I forgot to add that to the instructions.

Brilliant, that did the trick.

@mmtr mmtr added this to the jetpack/10.4 milestone Nov 24, 2021
@mmtr mmtr added [Status] Ready to Merge Go ahead, you can push that green button! and removed [Status] Needs Team Review Obsolete. Use Needs Review instead. labels Nov 24, 2021
@jeherve
jeherve merged commit dc85704 into master Nov 24, 2021
@jeherve
jeherve deleted the fix/admin-menu-tests-wpcom-2 branch November 24, 2021 16:23
@github-actions github-actions Bot removed the [Status] Ready to Merge Go ahead, you can push that green button! label Nov 24, 2021
@github-actions

github-actions Bot commented Nov 24, 2021

Copy link
Copy Markdown
Contributor

Great news! One last step: head over to your WordPress.com diff, D70462-code, and commit it.
Once you've done so, come back to this PR and add a comment with your changeset ID.

Thank you!

@obenland

obenland commented Nov 24, 2021

Copy link
Copy Markdown
Member Author

r235591-wpcom

davidlonjon added a commit that referenced this pull request Nov 25, 2021
@davidlonjon
Merge branch 'master' into add/boost-e2e-tests
7b19032 
# By Jeremy Herve (5) and others
# Via GitHub
* master: (26 commits)
  Colors: update Primary green reference to match latest brand book (#21741)
  JS Connection: Moves registerSite logic to the store (#21732)
  Search: Add essential scaffolding for package (#21814)
  Search: avoid registering the widget when the module is not active (#21588)
  Add Video Tracks Support to VideoPress Block (#21578)
  Add deprecated to VideoPress block (#21802)
  Admin Menu: Make API tests compatible with WPCOM (#21850)
  External Media: Short-circuit requests earlier in the stack (#21854)
  Add Busy State to License Activation Flow Button (#21861)
  Fixed an issue with screen resolutions of under 783px that caused the content to not be properly displayed when the nav-unification is expanded on wp-admin. (#21869)
  E2E tests: migrate from Jest to Playwright runner (#21848)
  Update reCAPTCHA constants to match Google's Verbage (#12289)
  JITM: Sideload Jetpack Boost functionality  (#21860)
  Connection: properly add GET-parameters for the `fetchAuthorizationUrl` API call (#21750)
  License Flow: Assorted Styling Improvements (#21859)
  JITM: Sideload Jetpack Backup (#21719)
  Widget Visibility: Apply widget filtering to customizer preview (#21505)
  jetpack: Avoid generating unused JS for static-site-generator assets (#21789)
  Nav Unification: Support absolute URLs in upsell nudges (#21821)
  RePublicize: Enable the block editor UI by default (#21855)
  ...

# Conflicts:
#	projects/plugins/boost/tests/e2e/lib/env/prerequisites.js
#	projects/plugins/boost/tests/e2e/lib/setupTests.js
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@mmtr mmtr mmtr approved these changes

Assignees

@obenland obenland

Labels

nav-unification [Plugin] Jetpack Issues about the Jetpack plugin. https://wordpress.org/plugins/jetpack/ Touches WP.com Files Unit Tests

Projects

None yet

Milestone

jetpack/10.4

Development

Successfully merging this pull request may close these issues.

5 participants

@obenland @matticbot @mmtr @jeherve @sdixon194