From 23934b8a4da496ed0184e21587d1e3b79447c537 Mon Sep 17 00:00:00 2001
From: Hiroyuki Ikezoe <hikezoe.birchill@mozilla.com>
Date: Mon, 21 Nov 2022 03:10:06 +0000
Subject: [PATCH] Bug 1794070 - Use `await SpecialPowers.popPrefEnv()`
 explicitly at the end of each test. r=tnikkel

Otherwise prefs set in the previous test case will persist. In fact
some of test cases were lacking "browser.swipe.navigation-icon-move-distance".

Differential Revision: https://phabricator.services.mozilla.com/D161751
---
 widget/tests/browser/browser_test_swipe_gesture.js | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/widget/tests/browser/browser_test_swipe_gesture.js b/widget/tests/browser/browser_test_swipe_gesture.js
index b5f5cab1f81d..89888d0326ee 100644
--- a/widget/tests/browser/browser_test_swipe_gesture.js
+++ b/widget/tests/browser/browser_test_swipe_gesture.js
@@ -256,6 +256,7 @@ add_task(async () => {
   is(tab.linkedBrowser.currentURI.spec, secondPage);
 
   BrowserTestUtils.removeTab(tab);
+  await SpecialPowers.popPrefEnv();
 });
 
 add_task(async () => {
@@ -381,6 +382,7 @@ add_task(async () => {
   ok(gBrowser.webNavigation.canGoForward);
 
   BrowserTestUtils.removeTab(tab);
+  await SpecialPowers.popPrefEnv();
 });
 
 // Same test as above but whole-page-pixel-size is increased and the multipliers passed to panLeftToRight correspondingly increased.
@@ -392,6 +394,7 @@ add_task(async () => {
     set: [
       ["browser.gesture.swipe.left", "Browser:BackOrBackDuplicate"],
       ["browser.gesture.swipe.right", "Browser:ForwardOrForwardDuplicate"],
+      ["browser.swipe.navigation-icon-move-distance", 0],
       ["widget.disable-swipe-tracker", false],
       ["widget.swipe.velocity-twitch-tolerance", 0.0000001],
       // Set the velocity-contribution to 0 so we can exactly control the
@@ -480,6 +483,7 @@ add_task(async () => {
   ok(gBrowser.webNavigation.canGoForward);
 
   BrowserTestUtils.removeTab(tab);
+  await SpecialPowers.popPrefEnv();
 });
 
 add_task(async () => {
@@ -490,6 +494,7 @@ add_task(async () => {
     set: [
       ["browser.gesture.swipe.left", "Browser:BackOrBackDuplicate"],
       ["browser.gesture.swipe.right", "Browser:ForwardOrForwardDuplicate"],
+      ["browser.swipe.navigation-icon-move-distance", 0],
       ["widget.disable-swipe-tracker", false],
       ["widget.swipe.velocity-twitch-tolerance", 0.0000001],
       // Set the velocity-contribution to 1 (default 0.05f) so velocity is a
@@ -581,6 +586,7 @@ add_task(async () => {
     numTries--;
   }
   ok(numTries > 0, "never ran the test");
+  await SpecialPowers.popPrefEnv();
 });
 
 add_task(async () => {
@@ -644,6 +650,7 @@ add_task(async () => {
   );
 
   BrowserTestUtils.removeTab(tab);
+  await SpecialPowers.popPrefEnv();
 });
 
 add_task(async () => {
@@ -766,6 +773,7 @@ add_task(async () => {
   gBrowser.tabbox.removeEventListener("MozSwipeGestureEnd", anObserver, true);
 
   BrowserTestUtils.removeTab(tab);
+  await SpecialPowers.popPrefEnv();
 });
 
 add_task(async () => {
@@ -837,6 +845,7 @@ add_task(async () => {
   });
 
   BrowserTestUtils.removeTab(tab);
+  await SpecialPowers.popPrefEnv();
 });
 
 // A simple test case on RTL.
@@ -905,4 +914,5 @@ add_task(async () => {
   ok(newWin.gBrowser.webNavigation.canGoBack);
 
   await BrowserTestUtils.closeWindow(newWin);
+  await SpecialPowers.popPrefEnv();
 });