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

Support upcoming scriptletGlobals change in upstream uBO #21813

Merged
merged 1 commit into from
Jan 31, 2024

Conversation

antonok-edm
Copy link
Collaborator

@antonok-edm antonok-edm commented Jan 30, 2024

Resolves brave/brave-browser#35679

Submitter Checklist:

  • I confirm that no security/privacy review is needed and no other type of reviews are needed, or that I have requested them
  • There is a ticket for my issue
  • Used Github auto-closing keywords in the PR description above
  • Wrote a good PR/commit description
  • Squashed any review feedback or "fixup" commits before merge, so that history is a record of what happened in the repo, not your PR
  • Added appropriate labels (QA/Yes or QA/No; release-notes/include or release-notes/exclude; OS/...) to the associated issue
  • Checked the PR locally:
    • npm run test -- brave_browser_tests, npm run test -- brave_unit_tests wiki
    • npm run lint, npm run presubmit wiki, npm run gn_check, npm run tslint
  • Ran git rebase master (if needed)

Reviewer Checklist:

  • A security review is not needed, or a link to one is included in the PR description
  • New files have MPL-2.0 license header
  • Adequate test coverage exists to prevent regressions
  • Major classes, functions and non-trivial code blocks are well-commented
  • Changes in component dependencies are properly reflected in gn
  • Code follows the style guide
  • Test plan is specified in PR before merging

After-merge Checklist:

Test Plan:

Visit https://youtube.com and confirm adblock is still working correctly

@antonok-edm antonok-edm self-assigned this Jan 30, 2024
@antonok-edm antonok-edm requested a review from a team as a code owner January 30, 2024 03:20
@antonok-edm antonok-edm merged commit 3a3aa0b into master Jan 31, 2024
20 checks passed
@antonok-edm antonok-edm deleted the scriptletGlobals-proxy branch January 31, 2024 19:34
@github-actions github-actions bot added this to the 1.64.x - Nightly milestone Jan 31, 2024
brave-builds added a commit that referenced this pull request Jan 31, 2024
brave-builds added a commit that referenced this pull request Jan 31, 2024
@stephendonner
Copy link
Contributor

stephendonner commented Feb 1, 2024

Verification PASSED using

Brave | 1.64.41 Chromium: 121.0.6167.139 (Official Build) nightly (64-bit)
-- | --
Revision | 1c56846eb16cec835298c09cd75ec45fc425507b
OS | Windows 10 Version 22H2 (Build 19045.3996)

YouTube.com homepage - PASSED

Steps:

  1. new profile
  2. load youtube.com
  3. stay logged out
  4. click around
  5. return to youtube.com

Confirmed no visible ads when returning to youtube.com after navigating away

1.64.41 1.62.156
image image

No pre-roll/skip-ad buttons (screencast) - PASSED

2024-02-05_16h12_16.mp4

Direct navigations (from URL) - PASSED

loaded https://www.youtube.com/watch?v=uXrvgHwVKEo

Confirmed no pre-roll ads, or ads in-between seek positions

1.64.41 1.62.156
image image

Searches - PASSED

Steps:

  • searched for lexus 500h f sport performance (https://www.youtube.com/results?search_query=lexus+500h+f+sport+performance)
  • clicked on search results

Confirmed no ads in or around the search results

example example
image image

Live - PASSED

Steps:

  • clicked on Live (https://www.youtube.com/channel/UC4R8DWoMoI7CAwX8_LjQHig)
  • clicked on LIVE - DR DISRESPECT - TARKOV - LEVEL 9 IN THE GUTTER - https://www.youtube.com/watch?v=NX2vRrjKevk

Confirmed no pre-roll ads

image

Movies & TV - PASSED

Steps:

  • clicked on Movies & TV
  • clicked on Brewster's Millions - https://www.youtube.com/watch?v=Ous_BwnCvUw
  • clicked Allow to install Widevine

Confirmed no pre-roll ads, or ads in-between seek positions

example example
image image

Toggle Shields off (and then back on, again) - PASSED

Steps:

  1. loaded youtube.com
  2. disabled Shields by setting them to Down
  3. clicked on random videos, from different locations
  4. confirmed I saw various types of ads (pre-roll, interstitial, and non-video static ads on the homepage and search results)
  5. renabled Shields by setting them to Up

Confirmed no further ads seen after Shields were Up

Shields OFF ... ... ... Shields ON ...
image image image image image image

@kjozwiak
Copy link
Member

kjozwiak commented Feb 2, 2024

Verification PASSED on Win 11 x64 using the following build(s):

Brave | 1.64.40 Chromium: 121.0.6167.139 (Official Build) nightly (64-bit)
-- | --
Revision | e6cf92e9be4d20334958003689451d8763fa199e
OS | Windows 11 Version 23H2 (Build 22631.3085)

Been using YT for a few hours throughout the day and watched a bunch of videos and haven't ran into any issues re: ads leaking/appearing at the start/during or end of the videos. Seems to be working well. @stephendonner nicely done with #21813 (comment).

kjozwiak pushed a commit that referenced this pull request Feb 2, 2024
kjozwiak pushed a commit that referenced this pull request Feb 2, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Adapt to uBO's scriptletGlobals change from Map to object
4 participants