[rb] move browser-specific web extension tests into per-browser driver specs

Author: titusfortner

rb/spec/integration/selenium/webdriver/chrome/BUILD.bazel

@@ -19,10 +19,24 @@ filegroup(
     )
     for file in glob(
         ["*_spec.rb"],
-        exclude = ["service_spec.rb"],
+        exclude = [
+            "driver_spec.rb",
+            "service_spec.rb",
+        ],
     )
 ]
 
+rb_integration_test(
+    name = "driver",
+    srcs = ["driver_spec.rb"],
+    bidi = True,
+    browsers = [
+        "chrome",
+        "chrome-beta",
+    ],
+    data = ["//common/extensions"],
+)
+
 rb_integration_test(
     name = "service",
     srcs = ["service_spec.rb"],

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

@@ -17,6 +17,8 @@
 # specific language governing permissions and limitations
 # under the License.
 
+require 'tmpdir'
+
 require_relative '../spec_helper'
 
 module Selenium
@@ -184,6 +186,36 @@ def get_permission(name)
           expect(get_permission('clipboard-write')).to eq('prompt')
         end
       end
+
+      describe Driver, skip_unless: [{bidi: true, reason: 'web extensions install over the webExtension BiDi command'},
+                                     {browser: :chrome}] do
+        let(:directory) do
+          File.expand_path('../../../../../../common/extensions/webextensions-selenium-example', __dir__)
+        end
+
+        describe '#install_web_extension' do
+          it 'installs a packed archive',
+             pending_if: {exception: {class: Error::UnsupportedOperationError},
+                          reason: 'chromium-bidi installs only unpacked directories (SeleniumHQ/selenium#16541)'} do
+            Dir.mktmpdir do |dir|
+              archive = File.join(dir, 'extension.zip')
+              File.binwrite(archive, Base64.decode64(Zipper.zip_root(directory)))
+
+              extension = driver.install_web_extension(archive)
+              expect(extension.id).not_to be_empty
+              driver.uninstall_web_extension(extension)
+            end
+          end
+
+          it 'installs base64-encoded bytes',
+             pending_if: {exception: {class: Error::UnsupportedOperationError},
+                          reason: 'chromium-bidi installs only unpacked directories (SeleniumHQ/selenium#16541)'} do
+            extension = driver.install_web_extension(Zipper.zip_root(directory))
+            expect(extension.id).not_to be_empty
+            driver.uninstall_web_extension(extension)
+          end
+        end
+      end
     end # Chrome
   end # WebDriver
 end # Selenium

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

@@ -370,91 +370,18 @@ module WebDriver
         after { |example| reset_driver!(example: example) }
 
         describe '#install_web_extension' do
-          context 'with an unpacked directory' do
-            it 'installs and removes the extension on any browser' do
-              ext = File.expand_path("#{extensions}/webextensions-selenium-example-signed", __dir__)
-              extension = driver.install_web_extension(ext)
-              expect(extension.id).not_to be_empty
-
-              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_web_extension(extension)
-              driver.navigate.refresh
-              expect(driver.find_elements(id: 'webextensions-selenium-example')).to be_empty
-            end
-          end
-
-          context 'with a packed archive' do
-            it 'installs and removes an xpi file',
-               pending_if: {browser_family: :chromium,
-                            exception: {class: Error::UnsupportedOperationError},
-                            reason: 'chromium-bidi installs only unpacked directories (SeleniumHQ/selenium#16541)'} do
-              ext = File.expand_path("#{extensions}/webextensions-selenium-example.xpi", __dir__)
-              extension = driver.install_web_extension(ext)
-              expect(extension.id).to eq 'webextensions-selenium-example-v3@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_web_extension(extension)
-            end
-          end
-
-          context 'with base64-encoded bytes' do
-            it 'installs and removes base64-encoded bytes',
-               pending_if: {browser_family: :chromium,
-                            exception: {class: Error::UnsupportedOperationError},
-                            reason: 'chromium-bidi installs only unpacked directories (SeleniumHQ/selenium#16541)'} do
-              xpi = File.expand_path("#{extensions}/webextensions-selenium-example.xpi", __dir__)
-              extension = driver.install_web_extension(Base64.strict_encode64(File.binread(xpi)))
-              expect(extension.id).to eq 'webextensions-selenium-example-v3@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_web_extension(extension)
-            end
-          end
-
-          context 'when the browser is Firefox', skip_unless: {browser: :firefox} do
-            it 'installs an unsigned directory with permanent: false' do
-              ext = File.expand_path("#{extensions}/webextensions-selenium-example", __dir__)
-              extension = driver.install_web_extension(ext, permanent: false)
-              expect(extension.id).to eq 'webextensions-selenium-example-v3@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_web_extension(extension)
-            end
-
-            context 'with allow_private_browsing enabled' do
-              let(:ext) { File.expand_path("#{extensions}/webextensions-selenium-example-signed", __dir__) }
-
-              it 'runs in a private window when allowed' do
-                reset_driver!(prefs: {'browser.privatebrowsing.autostart': true}) do |driver|
-                  driver.install_web_extension(ext, allow_private_browsing: true)
-                  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'
-                end
-              end
-
-              it 'does not run in a private window by default' do
-                reset_driver!(prefs: {'browser.privatebrowsing.autostart': true}) do |driver|
-                  driver.install_web_extension(ext)
-                  driver.navigate.to url_for('blank.html')
-
-                  expect(driver.find_elements(id: 'webextensions-selenium-example')).to be_empty
-                end
-              end
-            end
+          it 'installs and removes an unpacked directory on any browser' do
+            ext = File.expand_path("#{extensions}/webextensions-selenium-example-signed", __dir__)
+            extension = driver.install_web_extension(ext)
+            expect(extension.id).not_to be_empty
+
+            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_web_extension(extension)
+            driver.navigate.refresh
+            expect(driver.find_elements(id: 'webextensions-selenium-example')).to be_empty
           end
         end
       end

rb/spec/integration/selenium/webdriver/edge/BUILD.bazel

@@ -16,10 +16,21 @@ filegroup(
     )
     for file in glob(
         ["*_spec.rb"],
-        exclude = ["service_spec.rb"],
+        exclude = [
+            "driver_spec.rb",
+            "service_spec.rb",
+        ],
     )
 ]
 
+rb_integration_test(
+    name = "driver",
+    srcs = ["driver_spec.rb"],
+    bidi = True,
+    browsers = ["edge"],
+    data = ["//common/extensions"],
+)
+
 rb_integration_test(
     name = "service",
     srcs = ["service_spec.rb"],

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

@@ -17,6 +17,8 @@
 # specific language governing permissions and limitations
 # under the License.
 
+require 'tmpdir'
+
 require_relative '../spec_helper'
 
 module Selenium
@@ -114,6 +116,36 @@ module Edge
           end
         end
       end
+
+      describe Driver, skip_unless: [{bidi: true, reason: 'web extensions install over the webExtension BiDi command'},
+                                     {browser: :edge}] do
+        let(:directory) do
+          File.expand_path('../../../../../../common/extensions/webextensions-selenium-example', __dir__)
+        end
+
+        describe '#install_web_extension' do
+          it 'installs a packed archive',
+             pending_if: {exception: {class: Error::UnsupportedOperationError},
+                          reason: 'chromium-bidi installs only unpacked directories (SeleniumHQ/selenium#16541)'} do
+            Dir.mktmpdir do |dir|
+              archive = File.join(dir, 'extension.zip')
+              File.binwrite(archive, Base64.decode64(Zipper.zip_root(directory)))
+
+              extension = driver.install_web_extension(archive)
+              expect(extension.id).not_to be_empty
+              driver.uninstall_web_extension(extension)
+            end
+          end
+
+          it 'installs base64-encoded bytes',
+             pending_if: {exception: {class: Error::UnsupportedOperationError},
+                          reason: 'chromium-bidi installs only unpacked directories (SeleniumHQ/selenium#16541)'} do
+            extension = driver.install_web_extension(Zipper.zip_root(directory))
+            expect(extension.id).not_to be_empty
+            driver.uninstall_web_extension(extension)
+          end
+        end
+      end
     end # Edge
   end # WebDriver
 end # Selenium

rb/spec/integration/selenium/webdriver/firefox/BUILD.bazel

@@ -19,10 +19,24 @@ filegroup(
     )
     for file in glob(
         ["*_spec.rb"],
-        exclude = ["service_spec.rb"],
+        exclude = [
+            "driver_spec.rb",
+            "service_spec.rb",
+        ],
     )
 ]
 
+rb_integration_test(
+    name = "driver",
+    srcs = ["driver_spec.rb"],
+    bidi = True,
+    browsers = [
+        "firefox",
+        "firefox-beta",
+    ],
+    data = ["//common/extensions"],
+)
+
 rb_integration_test(
     name = "service",
     srcs = ["service_spec.rb"],

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

@@ -77,7 +77,7 @@ module Firefox
           end
         end
 
-        describe '#install_addon' do
+        describe '#install_addon', skip_unless: {bidi: false, reason: 'classic moz/addon endpoint'} do
           it 'install and uninstall xpi file' do
             ext = File.expand_path("#{extensions}/webextensions-selenium-example.xpi", __dir__)
             id = nil
@@ -158,7 +158,7 @@ module Firefox
           end
         end
 
-        describe '#install_web_extension' do
+        describe '#install_web_extension', skip_unless: {bidi: false, reason: 'classic moz/addon fallback'} do
           it 'installs and uninstalls without BiDi enabled' do
             ext = File.expand_path("#{extensions}/webextensions-selenium-example.xpi", __dir__)
             extension = driver.install_web_extension(ext)
@@ -207,6 +207,69 @@ module Firefox
             end
           end
         end
+
+        describe '#install_web_extension', skip_unless: {bidi: true, reason: 'moz webExtension BiDi command'} do
+          after { |example| reset_driver!(example: example) }
+
+          it 'installs and removes an xpi file' do
+            ext = File.expand_path("#{extensions}/webextensions-selenium-example.xpi", __dir__)
+            extension = driver.install_web_extension(ext)
+            expect(extension.id).to eq 'webextensions-selenium-example-v3@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_web_extension(extension)
+          end
+
+          it 'installs and removes base64-encoded bytes' do
+            xpi = File.expand_path("#{extensions}/webextensions-selenium-example.xpi", __dir__)
+            extension = driver.install_web_extension(Base64.strict_encode64(File.binread(xpi)))
+            expect(extension.id).to eq 'webextensions-selenium-example-v3@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_web_extension(extension)
+          end
+
+          it 'installs an unsigned directory with permanent: false' do
+            ext = File.expand_path("#{extensions}/webextensions-selenium-example", __dir__)
+            extension = driver.install_web_extension(ext, permanent: false)
+            expect(extension.id).to eq 'webextensions-selenium-example-v3@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_web_extension(extension)
+          end
+
+          context 'with allow_private_browsing enabled' do
+            let(:ext) { File.expand_path("#{extensions}/webextensions-selenium-example-signed", __dir__) }
+
+            it 'runs in a private window when allowed' do
+              reset_driver!(prefs: {'browser.privatebrowsing.autostart': true}) do |driver|
+                driver.install_web_extension(ext, allow_private_browsing: true)
+                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'
+              end
+            end
+
+            it 'does not run in a private window by default' do
+              reset_driver!(prefs: {'browser.privatebrowsing.autostart': true}) do |driver|
+                driver.install_web_extension(ext)
+                driver.navigate.to url_for('blank.html')
+
+                expect(driver.find_elements(id: 'webextensions-selenium-example')).to be_empty
+              end
+            end
+          end
+        end
       end
     end # Firefox
   end # WebDriver