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

Adapt to uBO's scriptletGlobals change from Map to object #35679

Closed
antonok-edm opened this issue Jan 29, 2024 · 6 comments · Fixed by brave/brave-core#21813
Closed

Adapt to uBO's scriptletGlobals change from Map to object #35679

antonok-edm opened this issue Jan 29, 2024 · 6 comments · Fixed by brave/brave-core#21813
Assignees
@antonok-edm
Labels
feature/shields/adblock Blocking ads & trackers with Shields OS/Android Fixes related to Android browser functionality OS/Desktop QA Pass - Android ARM QA Pass - Android Tab QA Pass-Linux QA Pass-macOS QA Pass-Win64 QA/Test-All-Platforms QA/Yes release-notes/exclude uBO-parity
Milestone
1.62.x - Release #4

Comments

@antonok-edm
Copy link
Collaborator

In gorhill/uBlock@869a653#diff-b006827b72fe768a6cb08f3123783752a4a23ccc95c55467f24b77addac88a29R282, scriptletGlobals was modified to become a plain JS object instead of a Map.

As mentioned here, we'll need to use a Proxy object to restore compatibility with the older Map methods to ensure that users can migrate gracefully to the newer resource versions when we release them.
@antonok-edm antonok-edm added feature/shields/adblock Blocking ads & trackers with Shields QA/Yes release-notes/exclude uBO-parity OS/Android Fixes related to Android browser functionality OS/Desktop labels Jan 29, 2024
@antonok-edm antonok-edm self-assigned this Jan 29, 2024
@antonok-edm antonok-edm mentioned this issue Jan 30, 2024
Merged
24 tasks
@brave-builds brave-builds added this to the 1.64.x - Nightly milestone Jan 31, 2024
This was referenced Jan 31, 2024
Merged
Merged
@kjozwiak
Copy link
Member

kjozwiak commented Feb 2, 2024

The above requires 1.62.159 or higher for 1.62.x verification(s) 👍

@cuba cuba mentioned this issue Feb 2, 2024
Closed
@MadhaviSeelam MadhaviSeelam added the QA/In-Progress Indicates that QA is currently in progress for that particular issue label Feb 6, 2024
@LaurenWags
Copy link
Member

LaurenWags commented Feb 6, 2024 •
edited
Loading

Verified with

Brave | 1.62.161 Chromium: 121.0.6167.139 (Official Build) (x86_64)
-- | --
Revision | 9afaacd1500fdbd60ed4500b63b9ab85597ef933
OS | macOS Version 13.6.4 (Build 22G513)

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.62.156 1.62.161
156 161

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

Screen.Recording.2024-02-06.at.2.37.55.PM.mov

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.62.156 1.62.161
156 161

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
1 2

Live - PASSED

Steps:

  • clicked on Live (https://www.youtube.com/channel/UC4R8DWoMoI7CAwX8_LjQHig)
  • clicked on WATCH LIVE Lexus Pipe Pro presented by YETI 2024 - Day 2 - https://www.youtube.com/watch?v=eWKucDh3Z1k

Confirmed no pre-roll ads

Screenshot 2024-02-06 at 3 00 29 PM

Movies & TV - PASSED

Steps:

  • clicked on Movies & TV
  • clicked on Little Giants - https://www.youtube.com/watch?v=9hK5KmLESd0
  • clicked Allow to install Widevine

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

(no screenshots due to widevine conent)

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 ...
1 2 3 4 5 6

@MadhaviSeelam
Copy link

MadhaviSeelam commented Feb 6, 2024 •
edited
Loading

Verification PASSED using

Brave | 1.62.161 Chromium: 121.0.6167.139 (Official Build) (64-bit)
-- | --
Revision | 9afaacd1500fdbd60ed4500b63b9ab85597ef933
OS | Windows 11 Version 23H2 (Build 22631.3085)

Youtube.com home page - PASSED

  • opened home page
  • Navigated away and came back to youtube without logged in
  • Navigated away and came back to youtube with logged in
  • no ads are shown
1.62.156 1.62.161 w/out login 1.62.161 w login
image image image

No pre-roll/skip-ad buttons - PASSED

2024-02-06_11h39_00.mp4

News sites search - PASSED

  • Visited several news sites. No ads are shown
CNN BBC
image image

Movies & TV - PASSED

example example
image image

Direct navigation (from URL) - PASSED

1.62.151 1.62.156
image image

Live - PASSED

image

Searches - PASSED

example example
image image

Shields Down/Up - PASSED

  • loaded youtube.com
  • disabled Shields by setting them to Down
  • Home page shown ads
  • clicked on random videos, from different locations
  • confirmed I saw various types of ads (pre-roll, interstitial, and non-video static ads on the homepage and search results)
  • reenabled Shields by setting them to Up
  • Confirmed no further ads seen after Shields were Up
  • Ads are shown on the home page when shields are Down but no longer shown when Shields Up as expected
Shields Down Shields Up
image image

@MadhaviSeelam
Copy link

MadhaviSeelam commented Feb 6, 2024 •
edited
Loading

Verification PASSED using

Brave	1.62.161 Chromium: 121.0.6167.139 (Official Build) (64-bit) 
Revision	9afaacd1500fdbd60ed4500b63b9ab85597ef933
OS	Linux

Youtube.com home page - PASSED

  • opened YT home page
  • Navigated away and came back to youtube without logged in
  • Navigated away and came back to youtube with logged in
  • confirmed no ads are shown
1.62.156 1.62.161(w/out login) 1.62.161(w/login)
image image image

No pre-roll/skip-ad buttons - PASSED

2024-02-06_15h09_33.mp4

News - PASSED

image

Movies & TV - PASSED

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

example example
Screenshot from 2024-02-06 15-50-43 Screenshot from 2024-02-06 15-51-20

Direct navigation (from URL) - PASSED

image

Live - PASSED

Confirmed no pre-roll ads

example example
image image

Searches - PASSED

example example
image image

Shields Down/Up - PASSED

  • loaded youtube.com
  • disabled Shields by setting them to Down
  • Home page shown ads
  • clicked on random videos, from different locations
  • confirmed I saw various types of ads (pre-roll, interstitial, and non-video static ads on the homepage and search results)
  • reenabled Shields by setting them to Up
  • Confirmed no further ads seen after Shields were Up

Ads are shown on the home page when shields are Down but no longer shown when Shields Up as expected

Shields Down Shields Up
image image

@MadhaviSeelam MadhaviSeelam added QA Pass-Win64 QA Pass-Linux and removed QA/In-Progress Indicates that QA is currently in progress for that particular issue labels Feb 6, 2024
@kjozwiak
Copy link
Member

kjozwiak commented Feb 7, 2024

Verification PASSED on Samsung Galaxy Tab S8 Ultra running Android 14 using the following build(s):

Brave | 1.62.162 Chromium: 121.0.6167.164 (Official Build) (64-bit)
--- | ---
Revision | c18c9cc62d2b4376a5ada5b98b673dfc7994f20d
OS | Android 14; Build/UP1A.231005.007; 34; REL

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.62.156 1.62.161
Screenshot_20240207_121805_Brave Screenshot_20240207_121330_Brave

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

Screen_Recording_20240207_122559_Brave.mp4

Direct navigations (from URL) - PASSED

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

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

1.62.156 1.62.161
Screenshot_20240207_123134_Brave Screenshot_20240207_123454_Brave

Searches - PASSED

Steps:

  • searched for stormgate builds
    • https://www.youtube.com/results?search_query=stormgate+builds
  • clicked on search results

Confirmed no ads in or around the search results

Example Example
Screenshot_20240207_124501_Brave Screenshot_20240207_124520_Brave

Live - PASSED

Steps:

  • clicked on Live via https://www.youtube.com/channel/UC4R8DWoMoI7CAwX8_LjQHig
  • clicked on [LIVE | AFC ASIAN CUP QATAR 2023™ | Semi Finals | Islamic Republic Of Iran vs Qatar]
    • https://www.youtube.com/watch?v=pUiAOS6xzs8

Confirmed no pre-roll ads

Example Example
Screenshot_20240207_125029_Brave Screenshot_20240207_125036_Brave

Movies & TV - PASSED

Steps:

  • clicked on Movies & TV
  • clicked on Happily N'ever After 2: Snow White - https://www.youtube.com/watch?v=y5dxhCxANgY
  • clicked Allow to install Widevine

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

Note: screenshots appear blank due to Widevine (can't take screenshots of media being played using Widevine)

Example Example Example
Screenshot_20240207_125438_Brave Screenshot_20240207_125450_Brave Screenshot_20240207_125457_Brave

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. re-enabled Shields by setting them to Up

Confirmed no further ads seen after Shields were Up

Shields Disabled

Example Example
Screenshot_20240207_130105_Brave Screenshot_20240207_130124_Brave

Shields Enabled

Example Example Example
Screenshot_20240207_130432_Brave Screenshot_20240207_130439_Brave Screenshot_20240207_130456_Brave

@Uni-verse
Copy link
Contributor

Verified on Samsung Galaxy S21 using version:

Brave	1.62.162 Chromium: 121.0.6167.164 (Official Build) (64-bit) 
Revision	c18c9cc62d2b4376a5ada5b98b673dfc7994f20d
OS	Android 13; Build/TP1A.220624.014; 33; REL

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

Example Example
Screenshot 2024-02-07 at 3 22 03 PM Screenshot 2024-02-07 at 3 22 29 PM

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

Screenshot 2024-02-07 at 3 27 29 PM

Direct navigations (from URL) - PASSED

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

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

Example Example
Screenshot 2024-02-07 at 3 31 54 PM Screenshot 2024-02-07 at 3 32 14 PM

Searches - PASSED

Steps:

  • searched for news
  • clicked on search results

Confirmed no ads in or around the search results

Example Example
Screenshot 2024-02-07 at 3 33 34 PM Screenshot 2024-02-07 at 3 33 48 PM

Live - PASSED

Steps:

  • Clicked on Live video

Confirmed no pre-roll ads

Screenshot 2024-02-07 at 3 34 05 PM

Movies & TV - PASSED

Steps:

  • Searched for movies
  • Played movie from search results

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

Example Example
Screenshot 2024-02-07 at 3 44 26 PM Screenshot 2024-02-07 at 3 44 31 PM

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. re-enabled Shields by setting them to Up

Confirmed no further ads seen after Shields were Up

Shields Disabled

Example Example
Screenshot 2024-02-07 at 3 28 04 PM Screenshot 2024-02-07 at 3 28 01 PM

Shields Enabled

Example Example
Screenshot 2024-02-07 at 3 49 12 PM Screenshot 2024-02-07 at 3 49 20 PM

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

@antonok-edm antonok-edm

Labels
feature/shields/adblock Blocking ads & trackers with Shields OS/Android Fixes related to Android browser functionality OS/Desktop QA Pass - Android ARM QA Pass - Android Tab QA Pass-Linux QA Pass-macOS QA Pass-Win64 QA/Test-All-Platforms QA/Yes release-notes/exclude uBO-parity
Projects
None yet
Milestone
1.62.x - Release #4
Development

Successfully merging a pull request may close this issue.

Support upcoming scriptletGlobals change in upstream uBO brave/brave-core
6 participants
@kjozwiak @Uni-verse @antonok-edm @LaurenWags @brave-builds @MadhaviSeelam