[rb] test more Firefox addon scenarios

common/extensions/BUILD.bazel

@@ -11,6 +11,7 @@ filegroup(
         "//java/test/org/openqa/selenium/firefox:__pkg__",
         "//javascript/node/selenium-webdriver:__pkg__",
         "//py:__pkg__",
+        "//rb:__pkg__",
     ],
 )
 

rb/BUILD.bazel

@@ -292,6 +292,9 @@ ruby_test(
         "no-sandbox",
         "requires-network",
     ],
+    data = [
+        "//common/extensions",
+    ],
     deps = [
         ":bidi",
         ":firefox",
@@ -318,6 +321,9 @@ ruby_test(
         "no-sandbox",
         "requires-network",
     ],
+    data = [
+        "//common/extensions",
+    ],
     deps = [
         ":bidi",
         ":devtools",

rb/lib/selenium/webdriver/firefox/features.rb

@@ -17,8 +17,6 @@
 # specific language governing permissions and limitations
 # under the License.
 
-require 'zip'
-
 module Selenium
   module WebDriver
     module Firefox
@@ -37,23 +35,11 @@ def commands(command)
         end
 
         def install_addon(path, temporary)
-          if File.directory?(path)
-            zip = "#{path}.zip"
-            # Delete zip file if it already exists
-            File.delete(zip) if File.file?(zip)
-
-            Zip::File.open(zip, Zip::File::CREATE) do |z_file|
-              Dir[File.join(path, "**", "**")].each do |file|
-                z_file.add(file.sub("#{path}/", ""), file)
-              end
-            end
-
-            addon = File.open(zip, 'rb') { |crx_file| Base64.strict_encode64 crx_file.read }
-            # Delete the zip file
-            File.delete(zip)
-          else
-            addon = File.open(path, 'rb') { |crx_file| Base64.strict_encode64 crx_file.read }
-          end
+          addon = if File.directory?(path)
+                    Zipper.zip(path)
+                  else
+                    File.open(path, 'rb') { |crx_file| Base64.strict_encode64 crx_file.read }
+                  end
 
           payload = {addon: addon}
           payload[:temporary] = temporary unless temporary.nil?

rb/spec/integration/selenium/webdriver/firefox/driver_spec.rb

@@ -23,8 +23,7 @@ module Selenium
   module WebDriver
     module Firefox
       describe Driver, exclusive: {browser: :firefox} do
-        let(:extension) { '../../../../../../third_party/firebug/favourite_colour-1.1-an+fx.xpi' }
-        let(:extension_dir) { '../../../../../../common/extensions/webextensions-selenium-example' }
+        let(:extensions) { '../../../../../../common/extensions/' }
 
         describe '#print_options' do
           let(:magic_number) { 'JVBER' }
@@ -66,27 +65,79 @@ module Firefox
         end
 
         describe '#install_addon' do
-          it 'with path as parameter' do
-            ext = File.expand_path(extension, __dir__)
-            driver.install_addon(ext)
+          it 'install and uninstall xpi file' do
+            ext = File.expand_path("#{extensions}/webextensions-selenium-example.xpi", __dir__)
+            id = driver.install_addon(ext)
+
+            expect(id).to eq 'webextensions-selenium-example@example.com'
+            driver.navigate.to url_for('blank.html')
+
+            injected = driver.find_element(id: "webextensions-selenium-example")
+            expect(injected.text).to eq "Content injected by webextensions-selenium-example"
+
+            driver.uninstall_addon(id)
+            driver.navigate.refresh
+            expect(driver.find_elements(id: 'webextensions-selenium-example')).to be_empty
           end
 
-          it 'with temporary as parameter' do
-            ext = File.expand_path(extension, __dir__)
-            driver.install_addon(ext, true)
+          it 'install and uninstall signed zip file' do
+            ext = File.expand_path("#{extensions}/webextensions-selenium-example.zip", __dir__)
+            id = driver.install_addon(ext)
+
+            expect(id).to eq 'webextensions-selenium-example@example.com'
+            driver.navigate.to url_for('blank.html')
+
+            injected = driver.find_element(id: "webextensions-selenium-example")
+            expect(injected.text).to eq "Content injected by webextensions-selenium-example"
+
+            driver.uninstall_addon(id)
+            driver.navigate.refresh
+            expect(driver.find_elements(id: 'webextensions-selenium-example')).to be_empty
           end
 
-          it 'with path as unpacked directory' do
-            ext = File.expand_path(extension_dir, __dir__)
-            driver.install_addon(ext, true)
+          it 'install and uninstall unsigned zip file' do
+            ext = File.expand_path("#{extensions}/webextensions-selenium-example-unsigned.zip", __dir__)
+            id = driver.install_addon(ext, true)
+
+            expect(id).to eq 'webextensions-selenium-example@example.com'
+            driver.navigate.to url_for('blank.html')
+
+            injected = driver.find_element(id: "webextensions-selenium-example")
+            expect(injected.text).to eq "Content injected by webextensions-selenium-example"
+
+            driver.uninstall_addon(id)
+            driver.navigate.refresh
+            expect(driver.find_elements(id: 'webextensions-selenium-example')).to be_empty
           end
-        end
 
-        describe '#uninstall_addon' do
-          it 'uninstalls based on id' do
-            ext = File.expand_path(extension, __dir__)
+          it 'install and uninstall signed directory' do
+            ext = File.expand_path("#{extensions}/webextensions-selenium-example-signed/", __dir__)
             id = driver.install_addon(ext)
+
+            expect(id).to eq 'webextensions-selenium-example@example.com'
+            driver.navigate.to url_for('blank.html')
+
+            injected = driver.find_element(id: "webextensions-selenium-example")
+            expect(injected.text).to eq "Content injected by webextensions-selenium-example"
+
+            driver.uninstall_addon(id)
+            driver.navigate.refresh
+            expect(driver.find_elements(id: 'webextensions-selenium-example')).to be_empty
+          end
+
+          it 'install and uninstall unsigned directory' do
+            ext = File.expand_path("#{extensions}/webextensions-selenium-example/", __dir__)
+            id = driver.install_addon(ext, true)
+
+            expect(id).to eq 'webextensions-selenium-example@example.com'
+            driver.navigate.to url_for('blank.html')
+
+            injected = driver.find_element(id: "webextensions-selenium-example")
+            expect(injected.text).to eq "Content injected by webextensions-selenium-example"
+
             driver.uninstall_addon(id)
+            driver.navigate.refresh
+            expect(driver.find_elements(id: 'webextensions-selenium-example')).to be_empty
           end
         end