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.

Sign up for GitHub

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

Jump to bottom

Study CookieListDefaultStudy #615

Merged
merged 2 commits into from
Jun 8, 2023
Merged

Study CookieListDefaultStudy #615

merged 2 commits into from
Jun 8, 2023

Conversation

github-actions[bot]
Copy link
Contributor

@github-actions github-actions bot commented May 1, 2023 •
edited
Loading

production: #616

@github-actions github-actions bot requested a review from a team as a code owner May 1, 2023 03:45
@github-actions github-actions bot mentioned this pull request May 1, 2023
Merged
@antonok-edm
Copy link
Collaborator

For testing, refer to the Test Plan sections of the following PRs:

  1. Add bubble for enabling cookie consent blocking brave-core#14148. The opt-in dialog should not be displayed.
  2. Tweak behavior of #brave-adblock-cookie-list-default flag brave-core#11621. Only the steps where the flag is enabled are relevant.

@antonok-edm
Copy link
Collaborator

Rebasing details (for my own reference)

There are additional changes here due to the formatter from upsert-study not being enforced across other PRs. These changes are likely to cause merge conflicts over time if other PRs are merged as well.

I've used the following steps to rebase the PR following others' changes: 

> git fetch
> git checkout pr-main-4848227882-1
> git rebase -i origin/main
# encounter merge conflicts
> git restore --staged seed/seed.json
> git restore seed/seed.json
> .github/ci/griffin-study-utils.py upsert_study CookieListDefaultStudy BraveAdblockCookieListDefault 100 RELEASE,BETA,NIGHTLY WINDOWS,MAC,LINUX,ANDROID
> git add seed/seed.json
> git rebase --continue
> git push -f

For #616, replace the branch names of the first checkout and rebase commands accordingly.

kjozwiak
kjozwiak approved these changes Jun 8, 2023
View reviewed changes
Copy link
Member

@kjozwiak kjozwiak left a comment

Choose a reason for hiding this comment

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

LGTM 👍 Merging into main (staging) so QA can run through the STR/Cases mentioned via #615 (comment) before uplifting #616 into production.

@kjozwiak kjozwiak merged commit 52751c8 into main Jun 8, 2023
@kjozwiak kjozwiak deleted the pr-main-4848227882-1 branch June 8, 2023 19:09
@kjozwiak
Copy link
Member

kjozwiak commented Jun 13, 2023 •
edited
Loading

Verification PASSED on Win 11 x64 using the following STR/Cases:

Nightly - CookieListDefaultStudy:Enabled

Brave | 1.54.53 Chromium: 114.0.5735.110 (Official Build) nightly (64-bit)
-- | --
Revision | 1c828682b85bbc70230a48f5e345489ec447373e-refs/branch-heads/5735_90@{#13}
OS | Windows 11 Version 22H2 (Build 22621.1778)

Test Case #1 - Ensuring feature being enabled via Griffin

  • downloaded/installed 1.54.53 Chromium: 114.0.5735.110 and started Brave using the following
    • brave.exe --enable-logging=stderr --variations-server-url=https://variations.bravesoftware.com/seed
  • ensured that CookieListDefaultStudy isn't visible under brave://version

image

  • restarted Brave using brave.exe --enable-logging=stderr --variations-server-url=https://variations.bravesoftware.com/seed
  • ensured that CookieListDefaultStudy:Enabled via brave://version
  • ensured that EasyList Cookies is enabled via brave://settings/shields/filters
Example Example
image image

Test Case #2 - BraveAdblockCookieListOptInReleaseStudy Disabled

As per brave/brave-core#14148, ensured that BraveAdblockCookieListOptInReleaseStudy has been removed and the opt-in isn't being displayed anymore.

  • run through the same STR/Cases outlined via Test Case #1 - Ensuring feature being enabled via Griffin
  • ensured that CookieListDefaultStudy:Enabled via brave://version
  • ensured that BraveAdblockCookieListOptInReleaseStudy doesn't appear under brave://version
  • restarted Brave several times and ensured that the Cookie Consent opt-in panel isn't being displayed

image

Test Case #3 - brave/brave-core#11621

As per #615 (comment), only went through the cases when #brave-adblock-cookie-list-default was enabled.

  • run through the same STR/Cases outlined via Test Case #1 - Ensuring feature being enabled via Griffin
  • ensured that CookieListDefaultStudy:Enabled via brave://version
  • ensured that visiting https://digikey.com doesn't display the cookie notice
Example Example
image image

BETA - CookieListDefaultStudy:Enabled

Brave | 1.53.92 Chromium: 114.0.5735.110 (Official Build) beta (64-bit)
-- | --
Revision | 1c828682b85bbc70230a48f5e345489ec447373e-refs/branch-heads/5735_90@{#13}
OS | Windows 11 Version 22H2 (Build 22621.1778)

Test Case #1 - Ensuring feature being enabled via Griffin

  • downloaded/installed 1.53.92 Chromium: 114.0.5735.110 and started Brave using the following
    • brave.exe --enable-logging=stderr --variations-server-url=https://variations.bravesoftware.com/seed
  • ensured that CookieListDefaultStudy isn't visible under brave://version

image

  • restarted Brave using brave.exe --enable-logging=stderr --variations-server-url=https://variations.bravesoftware.com/seed
  • ensured that CookieListDefaultStudy:Enabled via brave://version
  • ensured that EasyList Cookies is enabled via brave://settings/shields/filters
Example Example
image image

Test Case #2 - BraveAdblockCookieListOptInReleaseStudy Disabled

As per brave/brave-core#14148, ensured that BraveAdblockCookieListOptInReleaseStudy has been removed and the opt-in isn't being displayed anymore.

  • run through the same STR/Cases outlined via Test Case #1 - Ensuring feature being enabled via Griffin
  • ensured that CookieListDefaultStudy:Enabled via brave://version
  • ensured that BraveAdblockCookieListOptInReleaseStudy doesn't appear under brave://version
  • restarted Brave several times and ensured that the Cookie Consent opt-in panel isn't being displayed

image

Test Case #3 - brave/brave-core#11621

As per #615 (comment), only went through the cases when #brave-adblock-cookie-list-default was enabled.

  • run through the same STR/Cases outlined via Test Case #1 - Ensuring feature being enabled via Griffin
  • ensured that CookieListDefaultStudy:Enabled via brave://version
  • ensured that visiting https://digikey.com doesn't display the cookie notice
Example Example
image image

Release - CookieListDefaultStudy:Enabled

Brave | 1.52.122 Chromium: 114.0.5735.110 (Official Build) (64-bit)
-- | --
Revision | 1c828682b85bbc70230a48f5e345489ec447373e-refs/branch-heads/5735_90@{#13}
OS | Windows 11 Version 22H2 (Build 22621.1778)

Test Case #1 - Ensuring feature being enabled via Griffin

  • downloaded/installed 1.52.122 Chromium: 114.0.5735.110 and started Brave using the following
    • brave.exe --enable-logging=stderr --variations-server-url=https://variations.bravesoftware.com/seed
  • ensured that CookieListDefaultStudy isn't visible under brave://version

image

  • restarted Brave using brave.exe --enable-logging=stderr --variations-server-url=https://variations.bravesoftware.com/seed
  • ensured that CookieListDefaultStudy:Enabled via brave://version
  • ensured that EasyList Cookies is enabled via brave://settings/shields/filters
Example Example
image image

Test Case #2 - BraveAdblockCookieListOptInReleaseStudy Disabled

As per brave/brave-core#14148, ensured that BraveAdblockCookieListOptInReleaseStudy has been removed and the opt-in isn't being displayed anymore.

  • run through the same STR/Cases outlined via Test Case #1 - Ensuring feature being enabled via Griffin
  • ensured that CookieListDefaultStudy:Enabled via brave://version
  • ensured that BraveAdblockCookieListOptInReleaseStudy doesn't appear under brave://version
  • restarted Brave several times and ensured that the Cookie Consent opt-in panel isn't being displayed

image

Test Case #3 - brave/brave-core#11621

As per #615 (comment), only went through the cases when #brave-adblock-cookie-list-default was enabled.

  • run through the same STR/Cases outlined via Test Case #1 - Ensuring feature being enabled via Griffin
  • ensured that CookieListDefaultStudy:Enabled via brave://version
  • ensured that visiting https://digikey.com doesn't display the cookie notice
Example Example
image image

@kjozwiak
Copy link
Member

kjozwiak commented Jun 14, 2023 •
edited
Loading

Verification PASSED on Pixel 6 running Android 14 using the following STR/Cases:

Went through the STR/Cases mentioned via brave/brave-core#10408 (comment) and ensured that Brave was using https://variations.bravesoftware.com/seed which is the staging URL.

image

Nightly - CookieListDefaultStudy:Enabled

Brave | 1.54.59 Chromium: 114.0.5735.110 (Official Build) canary (64-bit)
--- | ---
Revision | 1c828682b85bbc70230a48f5e345489ec447373e-refs/branch-heads/5735_90@{#13}
OS | Android 14; Build/UPB3.230519.008; 34; REL

Test Case #1 - Ensuring feature being enabled via Griffin

  • downloaded/installed 1.54.59 Chromium: 114.0.5735.110
  • ensured that CookieListDefaultStudy isn't visible under brave://version

Screenshot_20230614-134402

  • restarted Brave and ensured that CookieListDefaultStudy:Enabled via brave://version
  • ensured that EasyList Cookies is enabled via brave://adblock
Example Example
Screenshot_20230614-134425 Screenshot_20230614-134451

Test Case #2 - BraveAdblockCookieListOptInReleaseStudy Disabled

As per brave/brave-core#14148, ensured that BraveAdblockCookieListOptInReleaseStudy has been removed and the opt-in isn't being displayed anymore.

  • run through the same STR/Cases outlined via Test Case #1 - Ensuring feature being enabled via Griffin
  • ensured that CookieListDefaultStudy:Enabled via brave://version
  • ensured that BraveAdblockCookieListOptInReleaseStudy doesn't appear under brave://version
  • restarted Brave several times and ensured that the Cookie Consent opt-in panel isn't being displayed
  • ensured that the Block cookie consent notices setting isn't appearing/displaying under Brave Shields & privacy
Example Example Example
Screenshot_20230614-134948 Screenshot_20230614-142705 Screenshot_20230614-142832

Test Case #3 - brave/brave-core#11621

As per #615 (comment), only went through the cases when #brave-adblock-cookie-list-default was enabled.

  • run through the same STR/Cases outlined via Test Case #1 - Ensuring feature being enabled via Griffin
  • ensured that CookieListDefaultStudy:Enabled via brave://version
  • ensured that visiting https://digikey.com doesn't display the cookie notice
Example Example
Screenshot_20230614-135922 Screenshot_20230614-140135

BETA - CookieListDefaultStudy:Enabled

Brave | 1.53.93 Chromium: 114.0.5735.110 (Official Build) beta (64-bit)
--- | ---
Revision | 1c828682b85bbc70230a48f5e345489ec447373e-refs/branch-heads/5735_90@{#13}
OS | Android 14; Build/UPB3.230519.008; 34; REL

Test Case #1 - Ensuring feature being enabled via Griffin

  • downloaded/installed 1.53.93 Chromium: 114.0.5735.110
  • ensured that CookieListDefaultStudy isn't visible under brave://version

Screenshot_20230614-145043

  • restarted Brave and ensured that CookieListDefaultStudy:Enabled via brave://version
  • ensured that EasyList Cookies is enabled via brave://adblock
Example Example
Screenshot_20230614-145107 Screenshot_20230614-145120

Test Case #2 - BraveAdblockCookieListOptInReleaseStudy Disabled

As per brave/brave-core#14148, ensured that BraveAdblockCookieListOptInReleaseStudy has been removed and the opt-in isn't being displayed anymore.

  • run through the same STR/Cases outlined via Test Case #1 - Ensuring feature being enabled via Griffin
  • ensured that CookieListDefaultStudy:Enabled via brave://version
  • ensured that BraveAdblockCookieListOptInReleaseStudy doesn't appear under brave://version
  • restarted Brave several times and ensured that the Cookie Consent opt-in panel isn't being displayed
  • ensured that the Block cookie consent notices setting isn't appearing/displaying under Brave Shields & privacy
Example Example Example
Screenshot_20230614-145803 Screenshot_20230614-150422 Screenshot_20230614-145823

Test Case #3 - brave/brave-core#11621

As per #615 (comment), only went through the cases when #brave-adblock-cookie-list-default was enabled.

  • run through the same STR/Cases outlined via Test Case #1 - Ensuring feature being enabled via Griffin
  • ensured that CookieListDefaultStudy:Enabled via brave://version
  • ensured that visiting https://digikey.com doesn't display the cookie notice
Example Example
Screenshot_20230614-151216 Screenshot_20230614-151036

Release - CookieListDefaultStudy:Enabled

Brave | 1.52.126 Chromium: 114.0.5735.133 (Official Build) (32-bit)
--- |---
Revision | fbfa2ce68d01b2201d8c667c2e73f648a61c4f4a-refs/branch-heads/5735@{#1270}
OS | Android 14; Build/UPB3.230519.008; 34; REL

Test Case #1 - Ensuring feature being enabled via Griffin

  • downloaded/installed 1.52.126 Chromium: 114.0.5735.133
  • ensured that CookieListDefaultStudy isn't visible under brave://version

Screenshot_20230614-155654

  • restarted Brave and ensured that CookieListDefaultStudy:Enabled via brave://version
  • ensured that EasyList Cookies is enabled via brave://adblock
Example Example
Screenshot_20230614-160204 Screenshot_20230614-160942

Test Case #2 - BraveAdblockCookieListOptInReleaseStudy Disabled

As per brave/brave-core#14148, ensured that BraveAdblockCookieListOptInReleaseStudy has been removed and the opt-in isn't being displayed anymore.

  • run through the same STR/Cases outlined via Test Case #1 - Ensuring feature being enabled via Griffin
  • ensured that CookieListDefaultStudy:Enabled via brave://version
  • ensured that BraveAdblockCookieListOptInReleaseStudy doesn't appear under brave://version
  • restarted Brave several times and ensured that the Cookie Consent opt-in panel isn't being displayed
  • ensured that the Block cookie consent notices setting isn't appearing/displaying under Brave Shields & privacy
Example Example Example
Screenshot_20230614-160931 Screenshot_20230614-155735 Screenshot_20230614-160342

Test Case #3 - brave/brave-core#11621

As per #615 (comment), only went through the cases when #brave-adblock-cookie-list-default was enabled.

  • run through the same STR/Cases outlined via Test Case #1 - Ensuring feature being enabled via Griffin
  • ensured that CookieListDefaultStudy:Enabled via brave://version
  • ensured that visiting https://digikey.com doesn't display the cookie notice
Example Example
Screenshot_20230614-155850 Screenshot_20230614-160327

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@kjozwiak kjozwiak kjozwiak approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@antonok-edm @kjozwiak