Commit 82f696f5 authored by James Teow's avatar James Teow
Browse files

Bug 1836156 - Remove extraPageRegexps from search-telemetry-v2 - r=Standard8, a=RyanVM

parent d39c9154

browser/components/search/SearchSERPTelemetry.sys.mjs

+0 −5
Original line number Diff line number Diff line
@@ -295,11 +295,6 @@ class TelemetryHandler { 
          r => new RegExp(r)

        );

      }

      if (provider.extraPageRegexps) {

        newProvider.extraPageRegexps = provider.extraPageRegexps.map(

          r => new RegExp(r)

        );

      }



      newProvider.nonAdsLinkRegexps = provider.nonAdsLinkRegexps?.length

        ? provider.nonAdsLinkRegexps.map(r => new RegExp(r))

browser/components/search/test/browser/browser_search_telemetry_engagement_content.js

+0 −48
Original line number Diff line number Diff line
@@ -17,9 +17,6 @@ const TEST_PROVIDER_INFO = [ 
    telemetryId: "example",

    searchPageRegexp:

      /^https:\/\/example.org\/browser\/browser\/components\/search\/test\/browser\/searchTelemetryAd_searchbox_with_content.html/,

    extraPageRegexps: [

      /^https:\/\/example.org\/browser\/browser\/components\/search\/test\/browser\/searchTelemetryAd_searchbox.html/,

    ],

    queryParamName: "s",

    codeParamName: "abc",

    taggedCodes: ["ff"],
@@ -221,51 +218,6 @@ add_task(async function test_click_shopping() { 
  BrowserTestUtils.removeTab(tab);

});



// Tests adding another regular expression to extraPageRegexps correctly

// categorizes the page.

add_task(async function test_click_extra_page() {

  resetTelemetry();

  let url = getSERPUrl("searchTelemetryAd_searchbox_with_content.html");

  let tab = await BrowserTestUtils.openNewForegroundTab(gBrowser, url);

  await waitForPageWithAdImpressions();



  let pageLoadPromise = BrowserTestUtils.waitForLocationChange(gBrowser);

  await BrowserTestUtils.synthesizeMouseAtCenter(

    "#extra",

    {},

    tab.linkedBrowser

  );

  await pageLoadPromise;



  // This should only have one impression because the subsequent page is not

  // a search page matching the SERP Regexp, but it is another search page that

  // consumes the search term (e.g. Flights, Maps)

  await TestUtils.waitForCondition(() => {

    return Glean.serp.impression?.testGetValue()?.length == 1;

  }, "Should have one impression.");



  assertImpressionEvents([

    {

      impression: {

        provider: "example",

        tagged: "true",

        partner_code: "ff",

        source: "unknown",

        is_shopping_page: "false",

        shopping_tab_displayed: "true",

      },

      engagements: [

        {

          action: SearchSERPTelemetryUtils.ACTIONS.CLICKED,

          target: SearchSERPTelemetryUtils.COMPONENTS.NON_ADS_LINK,

        },

      ],

    },

  ]);



  BrowserTestUtils.removeTab(tab);

});



add_task(async function test_click_related_search_in_new_tab() {

  resetTelemetry();

  let url = getSERPUrl("searchTelemetryAd_searchbox_with_content.html");

browser/components/search/test/unit/test_search_telemetry_config_validation.js

+0 −10
Original line number Diff line number Diff line
@@ -48,16 +48,6 @@ add_task(async function test_search_config_validates_to_schema() { 
  );

  disallowAdditionalProperties(schema);



  // TODO: Bug 1836156. `extraPageRegexps` is being removed so we do not want

  // to add it to the schema. Add it here so that the test can pass until it

  // is removed.

  schema.properties.extraPageRegexps = {

    type: "array",

    items: {

      type: "string",

    },

  };



  let data = await RemoteSettings(TELEMETRY_SETTINGS_KEY).get();



  let validator = new JsonSchema.Validator(schema);