Fix tests by ensuring UX controls only appear after being set (EFForg#13912)

Hainish · web-flow · commit f9fe700e9068 · 2017-12-08T19:05:34.000-08:00
* Change version of geckodriver in dev environment to be standard with tests

* Move scripts back to header
diff --git a/chromium/popup.html b/chromium/popup.html
@@ -5,20 +5,23 @@
     <title data-i18n="about_ext_name"></title>
 
     <link href="popup.css" rel="stylesheet">
+    <script src="popup.js"></script>
+    <script src="translation.js"></script>
+    <script src="send-message.js"></script>
   </head>
   <body>
     <header>
       <h1 data-i18n="about_ext_name"></h1>
     </header>
 
-    <section id="disableButton" class="options">
+    <section id="disableButton" class="options" style="visibility: hidden;">
       <div class="onoffswitch">
         <input id="onoffswitch" type="checkbox" checked>
         <label data-i18n="menu_globalEnable" for="onoffswitch"></label>
       </div>
     </section>
 
-    <section id="HttpNowhere" class="options">
+    <section id="HttpNowhere" class="options" style="visibility: hidden;">
       <input id="http-nowhere-checkbox" type="checkbox">
       <label data-i18n="menu_blockUnencryptedRequests" for="http-nowhere-checkbox"></label>
     </section>
@@ -69,8 +72,5 @@ <h3 data-i18n="chrome_experimental_rules"></h3>
       <p><small>(<span data-i18n="about_version">Version</span>: <span id="current-version"></span>)</small></p>
     </footer>
 
-    <script src="popup.js"></script>
-    <script src="translation.js"></script>
-    <script src="send-message.js"></script>
   </body>
 </html>
diff --git a/chromium/popup.js b/chromium/popup.js
@@ -89,15 +89,15 @@ function showHttpNowhereUI() {
     if (item.httpNowhere) {
       e('http-nowhere-checkbox').checked = true;
     }
-    show(e('HttpNowhere'));
+    e('HttpNowhere').style.visibility = "visible";
   });
 };
 
 // Change the UI to reflect extension enabled/disabled
 function updateEnabledDisabledUI() {
   getOption_('globalEnabled', true, function(item) {
     document.getElementById('onoffswitch').checked = item.globalEnabled;
-    show(e('disableButton'));
+    e('disableButton').style.visibility = "visible";
     // Hide or show the rules sections
     if (item.globalEnabled) {
       document.body.className = ""
diff --git a/install-dev-dependencies.sh b/install-dev-dependencies.sh
@@ -39,9 +39,9 @@ if type apt-get >/dev/null ; then
     python-dev $BROWSERS zip sqlite3 python-pip libcurl4-openssl-dev xvfb \
     libssl-dev git curl $CHROMEDRIVER
   if ! type geckodriver >/dev/null; then
-    curl -LO "https://github.com/mozilla/geckodriver/releases/download/v0.16.1/geckodriver-v0.16.1-linux64.tar.gz"
-    tar -zxvf "geckodriver-v0.16.1-linux64.tar.gz"
-    rm -f "geckodriver-v0.16.1-linux64.tar.gz"
+    curl -LO "https://github.com/mozilla/geckodriver/releases/download/v0.17.0/geckodriver-v0.17.0-linux64.tar.gz"
+    tar -zxvf "geckodriver-v0.17.0-linux64.tar.gz"
+    rm -f "geckodriver-v0.17.0-linux64.tar.gz"
     $SUDO_SHIM mv geckodriver /usr/bin/geckodriver
     $SUDO_SHIM chown root /usr/bin/geckodriver
     $SUDO_SHIM chmod 755 /usr/bin/geckodriver
@@ -73,9 +73,9 @@ elif type dnf >/dev/null ; then
     $SUDO_SHIM chmod 755 /usr/bin/chromedriver
   fi
   if ! type geckodriver >/dev/null; then
-    curl -LO "https://github.com/mozilla/geckodriver/releases/download/v0.16.1/geckodriver-v0.16.1-macos.tar.gz"
-    tar -zxvf "geckodriver-v0.16.1-macos.tar.gz"
-    rm -f "geckodriver-v0.16.1-macos.tar.gz"
+    curl -LO "https://github.com/mozilla/geckodriver/releases/download/v0.17.0/geckodriver-v0.17.0-macos.tar.gz"
+    tar -zxvf "geckodriver-v0.17.0-macos.tar.gz"
+    rm -f "geckodriver-v0.17.0-macos.tar.gz"
     $SUDO_SHIM mv geckodriver /usr/bin/geckodriver
     $SUDO_SHIM chown root /usr/bin/geckodriver
     $SUDO_SHIM chmod 755 /usr/bin/geckodriver
diff --git a/test/selenium/shim.py b/test/selenium/shim.py
@@ -68,8 +68,7 @@ def install_ext_on_ff(driver, extension_path):
     included in Selenium. See https://github.com/SeleniumHQ/selenium/issues/4215
     '''
     command = 'addonInstall'
-    driver.command_executor._commands[command] = ('POST', '/session/$sessionId/moz/addon/install')
-    driver.execute(command, params={'path': extension_path, 'temporary': True})
+    driver.install_addon(extension_path, temporary = True)
     time.sleep(2)
 
 
