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

Revise Jetpack connection agreement text to comply with our User Agreement #28403

Merged
merged 41 commits into from
Feb 27, 2023

Conversation

vikneshwar
Copy link
Contributor

@vikneshwar vikneshwar commented Jan 17, 2023

Fixes # 1202858161751496-as-1203651563192009/f

Proposed changes:

  • Update the connection agreement text for all plugins to show above the button to comply with the guidelines PCYsg-9m2-p2

Other information:

  • Have you written new tests for your changes, if applicable?
  • Have you checked the E2E test CI results, and verified that your changes do not break them?
  • Have you tested your changes on WordPress.com, if applicable (if so, you'll see a generated comment below with a script to run)?

Jetpack product discussion

p1HpG7-_kep-p2

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

Testing instructions:

  • Spin up a test site
  • Jetpack Plugin
    • Build Jetpack plugin by running jetpack build plugins/jetpack
    • Install and Navigate to the Jetpack page (wp-admin/admin.php?page=jetpack#/)
    • Confirm that Terms and condition text is displayed above the button
    • Screenshot 2023-01-17 at 2 32 44 PM
  • Jetpack ValutPress Backup plugin
    • Build Jetpack Backup plugin by running jetpack build plugins/backup
    • Install and Navigate to Jetpack Backup page (wp-admin/admin.php?page=jetpack-backup)
    • Confirm that Terms and condition text is displayed above the button
    • Screenshot 2023-01-17 at 2 37 00 PM
  • Jetpack Boost Plugin
    • Build Jetpack Boost plugin by running jetpack build plugins/boost
    • Install and Navigate to Jetpack Boost page (wp-admin/admin.php?page=jetpack-boost)
    • Confirm that Terms and condition text is displayed above the button
    • Screenshot 2023-01-17 at 2 43 27 PM
  • Jetpack Social Plugin
    • Build Jetpack Boost plugin by running jetpack build plugins/social
    • Install and Navigate to Jetpack Boost page (wp-admin/admin.php?page=jetpack-social)
    • Confirm that Terms and condition text is displayed above the button
    • Screenshot 2023-01-17 at 2 45 09 PM
  • My Jetpack - Connect your site screen
    • Build Jetpack plugin by running jetpack build plugins/jetpack

    • Install and Navigate to the My Jetpack page (wp-admin/admin.php?page=my-jetpack) and ensure you still haven't connected your site.

    • You will see the message as below and click on the button

    • Screenshot 2023-01-17 at 2 54 27 PM

    • On the connection screen confirm that Terms and condition text is displayed above the button

    • Screenshot 2023-01-17 at 3 08 19 PM


@vikneshwar vikneshwar requested a review from a team January 17, 2023 09:28
@github-actions github-actions bot added [JS Package] Connection [JS Package] Components [Plugin] Boost A feature to speed up the site and improve performance. [Plugin] Jetpack Issues about the Jetpack plugin. https://wordpress.org/plugins/jetpack/ [Plugin] Social Issues about the Jetpack Social plugin Admin Page React-powered dashboard under the Jetpack menu RNA labels Jan 17, 2023
@github-actions
Copy link
Contributor

github-actions bot commented Jan 17, 2023

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: March 7, 2023.
  • Scheduled code freeze: February 28, 2023.

Backup plugin:

  • Next scheduled release: March 7, 2023.
  • Scheduled code freeze: February 28, 2023.

Boost plugin:

  • Next scheduled release: March 7, 2023.
  • Scheduled code freeze: February 27, 2023.

Social plugin:

  • Next scheduled release: March 7, 2023.
  • Scheduled code freeze: February 28, 2023.

Videopress plugin:

  • Next scheduled release: March 7, 2023.
  • Scheduled code freeze: February 27, 2023.

@github-actions github-actions bot added the [Status] Needs Author Reply We would need you to make some changes or provide some more details about your PR. Thank you! label Jan 17, 2023
@github-actions
Copy link
Contributor

github-actions bot commented Jan 17, 2023

Are you an Automattician? You can now test your Pull Request on WordPress.com. On your sandbox, run

bin/jetpack-downloader test jetpack update/toc-text-location

to get started. More details: p9dueE-5Nn-p2

@vikneshwar vikneshwar self-assigned this Jan 17, 2023
@mattgawarecki mattgawarecki self-assigned this Jan 19, 2023
Copy link
Contributor

@jkguidaven jkguidaven left a comment

Choose a reason for hiding this comment

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

I tested the PR via a JN site, and it works as advertised 👍 . I only have one comment.

@jkguidaven
Copy link
Contributor

jkguidaven commented Jan 20, 2023

There also appears to be a problem with the social e2e testing and JS tests. Can you confirm it is not related to the changes?

@mattgawarecki mattgawarecki force-pushed the update/toc-text-location branch 2 times, most recently from 41bbcb3 to b0f9dab Compare January 20, 2023 19:47
@mattgawarecki
Copy link
Contributor

I noticed a few failing JS unit tests, so I spent time today to address those. Next up are the end-to-end tests for Social and Boost; I'll report back here with what I find.

@mattgawarecki mattgawarecki added [Status] In Progress and removed [Status] Needs Author Reply We would need you to make some changes or provide some more details about your PR. Thank you! labels Jan 20, 2023
@mattgawarecki mattgawarecki force-pushed the update/toc-text-location branch from b0f9dab to 3ec77b1 Compare January 24, 2023 13:50
@mattgawarecki
Copy link
Contributor

^ Replying to my earlier message: Boost tests were fine (i.e, I was mistaken); Social needed a small update to the connection test so that the correct 'Get Started'element was clicked. Previously only one element on the page had the text "Get Started"; but with our new terms of service notice, there's both a strong and a button. In this case, of course, we need the button.

@mattgawarecki mattgawarecki force-pushed the update/toc-text-location branch from 3ec77b1 to 749839d Compare January 24, 2023 15:59
@mattgawarecki mattgawarecki added the [Status] Needs Review To request a review from fellow Jetpack developers. Label will be renamed soon. label Jan 24, 2023
@mattgawarecki mattgawarecki requested a review from a team January 24, 2023 21:13
Matt Gawarecki and others added 17 commits February 22, 2023 14:11
@mattgawarecki mattgawarecki force-pushed the update/toc-text-location branch from fc1cd36 to 0ee901b Compare February 22, 2023 20:35
@mattgawarecki
Copy link
Contributor

Looks like we also had a failing unit test related to some link text. I went ahead and fixed that as well.

@sergeymitr
Copy link
Contributor

Thanks @mattgawarecki, I'll give it a final review first thing in the morning.

@sergeymitr sergeymitr added [Status] Needs Review To request a review from fellow Jetpack developers. Label will be renamed soon. and removed [Status] Needs Author Reply We would need you to make some changes or provide some more details about your PR. Thank you! labels Feb 23, 2023
Copy link
Contributor

@sergeymitr sergeymitr left a comment

Choose a reason for hiding this comment

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

Looks great, thanks for working on this!

I also tested on WoA.
There isn't much to test really, as you can't disconnect there, but it doesn't seem to bring any issues either.

@sergeymitr sergeymitr added [Status] Ready to Merge Go ahead, you can push that green button! and removed [Status] Needs Review To request a review from fellow Jetpack developers. Label will be renamed soon. labels Feb 25, 2023
@mattgawarecki mattgawarecki merged commit a2631f9 into trunk Feb 27, 2023
@mattgawarecki mattgawarecki deleted the update/toc-text-location branch February 27, 2023 13:27
@github-actions github-actions bot removed the [Status] Ready to Merge Go ahead, you can push that green button! label Feb 27, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Admin Page React-powered dashboard under the Jetpack menu E2E Tests [JS Package] Components [JS Package] Connection [Plugin] Backup A plugin that allows users to save every change and get back online quickly with one-click restores. [Plugin] Boost A feature to speed up the site and improve performance. [Plugin] Jetpack Issues about the Jetpack plugin. https://wordpress.org/plugins/jetpack/ [Plugin] Social Issues about the Jetpack Social plugin [Plugin] VideoPress A standalone plugin to add high-quality VideoPress videos to your site. RNA [Status] Needs Test Review
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants