From 2591ee318e94380cb2d0b52a6f088917afc5cf3f Mon Sep 17 00:00:00 2001 From: Alexis Hancock Date: Wed, 20 Feb 2019 16:57:55 -0800 Subject: [PATCH 1/2] Add patch for Chrome run time issue for defining 'item' --- chromium/pages/options/ux.js | 4 ++++ test/selenium/test_options.py | 5 ++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/chromium/pages/options/ux.js b/chromium/pages/options/ux.js index 9ffb4cc3c533..e6e75722db4e 100644 --- a/chromium/pages/options/ux.js +++ b/chromium/pages/options/ux.js @@ -20,6 +20,10 @@ document.addEventListener("DOMContentLoaded", () => { }; sendMessage("get_option", defaultOptions, item => { + // Sometimes item does not define on runtime in Chrome + if( !item ){ + item = defaultOptions; + } showCounter.checked = item.showCounter; autoUpdateRulesets.checked = item.autoUpdateRulesets; enableMixedRulesets.checked = item.enableMixedRulesets; diff --git a/test/selenium/test_options.py b/test/selenium/test_options.py index 21bd454082be..d96f48a355f2 100644 --- a/test/selenium/test_options.py +++ b/test/selenium/test_options.py @@ -11,8 +11,8 @@ def test_options(self): self.assertEqual(self.driver.current_url, self.shim.options_url) def test_show_counter(self): - if self.shim.browser_type == 'chrome': - raise unittest.SkipTest('broken on chrome') + # if self.shim.browser_type == 'chrome': + # raise unittest.SkipTest('broken on chrome') selector = '#showCounter' self.load_options() sleep(3) @@ -22,7 +22,6 @@ def test_show_counter(self): el.click() self.driver.refresh() - sleep(3) el = self.query_selector(selector) self.assertFalse(el.is_selected()) el.click() From 692e87b9913f87791bc4550eba5b2e8fb6d21951 Mon Sep 17 00:00:00 2001 From: Alexis Hancock Date: Thu, 21 Feb 2019 16:26:50 -0800 Subject: [PATCH 2/2] Patch ES Lint syntax --- chromium/pages/options/ux.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chromium/pages/options/ux.js b/chromium/pages/options/ux.js index e6e75722db4e..0ad138cab314 100644 --- a/chromium/pages/options/ux.js +++ b/chromium/pages/options/ux.js @@ -21,7 +21,7 @@ document.addEventListener("DOMContentLoaded", () => { sendMessage("get_option", defaultOptions, item => { // Sometimes item does not define on runtime in Chrome - if( !item ){ + if(!item) { item = defaultOptions; } showCounter.checked = item.showCounter;