Commit 995fadce authored by Daisuke Akatsuka's avatar Daisuke Akatsuka
Browse files

Bug 1833975: Use rs instead of _test_rs r=adw 

Differential Revision: https://phabricator.services.mozilla.com/D178792
parent 70e1870b

browser/components/urlbar/private/QuickSuggestRemoteSettings.sys.mjs

+0 −4
Original line number Diff line number Diff line
@@ -257,10 +257,6 @@ class _QuickSuggestRemoteSettings { 
    this.#emitter.emit("config-set");

  }



  get _test_rs() {

    return this.#rs;

  }



  // The `RemoteSettings` client.

  #rs = null;

browser/components/urlbar/tests/quicksuggest/unit/test_quicksuggest.js

+10 −10
Original line number Diff line number Diff line
@@ -815,7 +815,7 @@ add_task(async function setupAndTeardown() { 
  UrlbarPrefs.set("suggest.quicksuggest.nonsponsored", false);

  UrlbarPrefs.set("suggest.quicksuggest.sponsored", false);

  Assert.ok(

    !QuickSuggestRemoteSettings._test_rs,

    !QuickSuggestRemoteSettings.rs,

    "Settings client is null after disabling suggest prefs"

  );
@@ -824,49 +824,49 @@ add_task(async function setupAndTeardown() { 
  // task).

  UrlbarPrefs.set("suggest.quicksuggest.nonsponsored", true);

  Assert.ok(

    QuickSuggestRemoteSettings._test_rs,

    QuickSuggestRemoteSettings.rs,

    "Settings client is non-null after enabling suggest.quicksuggest.nonsponsored"

  );



  UrlbarPrefs.set("suggest.quicksuggest.nonsponsored", false);

  Assert.ok(

    !QuickSuggestRemoteSettings._test_rs,

    !QuickSuggestRemoteSettings.rs,

    "Settings client is null after disabling suggest.quicksuggest.nonsponsored"

  );



  UrlbarPrefs.set("suggest.quicksuggest.sponsored", true);

  Assert.ok(

    QuickSuggestRemoteSettings._test_rs,

    QuickSuggestRemoteSettings.rs,

    "Settings client is non-null after enabling suggest.quicksuggest.sponsored"

  );



  UrlbarPrefs.set("suggest.quicksuggest.nonsponsored", true);

  Assert.ok(

    QuickSuggestRemoteSettings._test_rs,

    QuickSuggestRemoteSettings.rs,

    "Settings client remains non-null after enabling suggest.quicksuggest.nonsponsored"

  );



  UrlbarPrefs.set("suggest.quicksuggest.nonsponsored", false);

  Assert.ok(

    QuickSuggestRemoteSettings._test_rs,

    QuickSuggestRemoteSettings.rs,

    "Settings client remains non-null after disabling suggest.quicksuggest.nonsponsored"

  );



  UrlbarPrefs.set("suggest.quicksuggest.sponsored", false);

  Assert.ok(

    !QuickSuggestRemoteSettings._test_rs,

    !QuickSuggestRemoteSettings.rs,

    "Settings client is null after disabling suggest.quicksuggest.sponsored"

  );



  UrlbarPrefs.set("suggest.quicksuggest.nonsponsored", true);

  Assert.ok(

    QuickSuggestRemoteSettings._test_rs,

    QuickSuggestRemoteSettings.rs,

    "Settings client is non-null after enabling suggest.quicksuggest.nonsponsored"

  );



  UrlbarPrefs.set("quicksuggest.enabled", false);

  Assert.ok(

    !QuickSuggestRemoteSettings._test_rs,

    !QuickSuggestRemoteSettings.rs,

    "Settings client is null after disabling quicksuggest.enabled"

  );
@@ -875,7 +875,7 @@ add_task(async function setupAndTeardown() { 
  UrlbarPrefs.clear("suggest.quicksuggest.sponsored");

  UrlbarPrefs.set("quicksuggest.enabled", true);

  Assert.ok(

    !QuickSuggestRemoteSettings._test_rs,

    !QuickSuggestRemoteSettings.rs,

    "Settings client remains null at end of task"

  );

});