[rb] use addon instead of path for moz/addon/install to avoid needing to use upload

titusfortner · titusfortner · commit b511a7dff84c · 2021-11-26T16:38:54.000-06:00
diff --git a/rb/lib/selenium/webdriver/firefox/features.rb b/rb/lib/selenium/webdriver/firefox/features.rb
@@ -35,12 +35,9 @@ def commands(command)
         end
 
         def install_addon(path, temporary)
-          if @file_detector
-            local_file = @file_detector.call(path)
-            path = upload(local_file) if local_file
-          end
+          addon = File.open(path, 'rb') { |crx_file| Base64.strict_encode64 crx_file.read }
 
-          payload = {path: path}
+          payload = {addon: addon}
           payload[:temporary] = temporary unless temporary.nil?
           execute :install_addon, {}, payload
         end
diff --git a/rb/spec/integration/selenium/webdriver/firefox/driver_spec.rb b/rb/spec/integration/selenium/webdriver/firefox/driver_spec.rb
@@ -42,32 +42,48 @@ module Firefox
                                      page: {width: 30})).to include(magic_number)
           end
 
-          it 'can add and remove addons' do
-            ext = File.expand_path('../../../../../../third_party/firebug/favourite_colour-1.1-an+fx.xpi', __dir__)
-            driver.install_addon(ext)
-            driver.uninstall_addon('favourite-colour-examples@mozilla.org')
-          end
-
           it 'should print full page' do
             path = "#{Dir.tmpdir}/test#{SecureRandom.urlsafe_base64}.png"
             screenshot = driver.save_full_page_screenshot(path)
             expect(IO.read(screenshot)[0x10..0x18].unpack('NN').last).to be > 2600
           ensure
             File.delete(path) if File.exist?(path)
           end
+        end
+
+        describe '#install_addon' do
+          let(:extension) { '../../../../../../third_party/firebug/favourite_colour-1.1-an+fx.xpi' }
+
+          it 'with path as parameter' do
+            ext = File.expand_path(extension, __dir__)
+            driver.install_addon(ext)
+          end
+
+          it 'with temporary as parameter' do
+            ext = File.expand_path(extension, __dir__)
+            driver.install_addon(ext, true)
+          end
+        end
+
+        describe '#uninstall_addon' do
+          it 'uninstalls based on id' do
+            ext = File.expand_path('../../../../../../third_party/firebug/favourite_colour-1.1-an+fx.xpi', __dir__)
+            id = driver.install_addon(path: ext)
+            driver.uninstall_addon(id)
+          end
+        end
 
-          it 'can get and set context' do
-            options = Options.new(prefs: {'browser.download.dir': 'foo/bar'})
-            create_driver!(capabilities: options) do |driver|
-              expect(driver.context).to eq 'content'
+        it 'can get and set context' do
+          options = Options.new(prefs: {'browser.download.dir': 'foo/bar'})
+          create_driver!(capabilities: options) do |driver|
+            expect(driver.context).to eq 'content'
 
-              driver.context = 'chrome'
-              expect(driver.context).to eq 'chrome'
+            driver.context = 'chrome'
+            expect(driver.context).to eq 'chrome'
 
-              # This call can not be made when context is set to 'content'
-              dir = driver.execute_script("return Services.prefs.getStringPref('browser.download.dir')")
-              expect(dir).to eq 'foo/bar'
-            end
+            # This call can not be made when context is set to 'content'
+            dir = driver.execute_script("return Services.prefs.getStringPref('browser.download.dir')")
+            expect(dir).to eq 'foo/bar'
           end
         end
       end
