Move example webextension files to //common/extensions

SeleniumHQ · Jan 4, 2022 · 19af9f3 · 19af9f3
1 parent 6e4ffb3
commit 19af9f3
Show file tree

Hide file tree

Showing 13 changed files with 31 additions and 28 deletions.
diff --git a/common/extensions/BUILD.bazel b/common/extensions/BUILD.bazel
@@ -0,0 +1,10 @@
+filegroup(
+    name = "extensions",
+    srcs = glob([
+        "*",
+        "**/*",
+    ]),
+    visibility = [
+        "//javascript/node/selenium-webdriver:__pkg__",
+    ],
+)
diff --git a/...ver/lib/test/data/chrome/webextension.crx → ...nsions/webextensions-selenium-example.crx b/...ver/lib/test/data/chrome/webextension.crx → ...nsions/webextensions-selenium-example.crx
diff --git a/...er/lib/test/data/firefox/webextension.xpi → ...nsions/webextensions-selenium-example.xpi b/...er/lib/test/data/firefox/webextension.xpi → ...nsions/webextensions-selenium-example.xpi
diff --git a/...er/lib/test/data/firefox/webextension.zip → ...nsions/webextensions-selenium-example.zip b/...er/lib/test/data/firefox/webextension.zip → ...nsions/webextensions-selenium-example.zip
diff --git a/.../test/data/firefox/webextension/inject.js → .../webextensions-selenium-example/inject.js b/.../test/data/firefox/webextension/inject.js → .../webextensions-selenium-example/inject.js
diff --git a/...t/data/firefox/webextension/manifest.json → ...extensions-selenium-example/manifest.json b/...t/data/firefox/webextension/manifest.json → ...extensions-selenium-example/manifest.json
diff --git a/javascript/node/selenium-webdriver/BUILD.bazel b/javascript/node/selenium-webdriver/BUILD.bazel
@@ -72,6 +72,7 @@ jasmine_node_test(
     data = TEST_DATA + [
         "tools/init_jasmine.js",
         "//common/src/web",
+        "//common/extensions",
         "@npm//express",
         "@npm//multer",
         "@npm//serve-index",

diff --git a/javascript/node/selenium-webdriver/lib/test/data/chrome/download.bin b/javascript/node/selenium-webdriver/lib/test/data/chrome/download.bin
diff --git a/javascript/node/selenium-webdriver/test/chrome/devtools_test.js b/javascript/node/selenium-webdriver/test/chrome/devtools_test.js
@@ -162,18 +162,18 @@ test.suite(
         const dir = await io.tmpDir()
         await driver.setDownloadPath(dir)
 
-        const url = fileServer.whereIs('/data/firefox/webextension.xpi')
+        const url = fileServer.whereIs('/data/chrome/download.bin')
         await driver.get(`data:text/html,<!DOCTYPE html>
   <div><a download="" href="${url}">Go!</a></div>`)
 
         await driver.findElement({ css: 'a' }).click()
 
-        const downloadPath = path.join(dir, 'webextension.xpi')
+        const downloadPath = path.join(dir, 'download.bin')
         await driver.wait(() => io.exists(downloadPath), 5000)
 
         const goldenPath = path.join(
           __dirname,
-          '../../lib/test/data/firefox/webextension.xpi'
+          '../../lib/test/data/chrome/download.bin'
         )
         assert.strictEqual(
           fs.readFileSync(downloadPath, 'binary'),

diff --git a/javascript/node/selenium-webdriver/test/chrome/options_test.js b/javascript/node/selenium-webdriver/test/chrome/options_test.js
@@ -24,11 +24,10 @@ const path = require('path')
 const chrome = require('../../chrome')
 const symbols = require('../../lib/symbols')
 const test = require('../../lib/test')
+const { locate } = require('../../lib/test/resources')
 
-const WEBEXTENSION_CRX = path.join(
-  __dirname,
-  '../../lib/test/data/chrome/webextension.crx'
-)
+const WEBEXTENSION_CRX = locate(
+  'common/extensions/webextensions-selenium-example.crx')
 
 describe('chrome.Options', function () {
   describe('addArguments', function () {

diff --git a/javascript/node/selenium-webdriver/test/edge/options_test.js b/javascript/node/selenium-webdriver/test/edge/options_test.js
@@ -24,11 +24,10 @@ const path = require('path')
 const edge = require('../../edge')
 const symbols = require('../../lib/symbols')
 const test = require('../../lib/test')
+const { locate } = require('../../lib/test/resources')
 
-const WEBEXTENSION_CRX = path.join(
-  __dirname,
-  '../../lib/test/data/chrome/webextension.crx'
-)
+const WEBEXTENSION_CRX = locate(
+  'common/extensions/webextensions-selenium-example.crx')
 
 describe('edge.Options', function () {
   describe('addArguments', function () {

diff --git a/javascript/node/selenium-webdriver/test/firefox_test.js b/javascript/node/selenium-webdriver/test/firefox_test.js
@@ -25,19 +25,14 @@ const io = require('../io')
 const { Browser } = require('../')
 const { Context } = require('../firefox')
 const { Pages, suite } = require('../lib/test')
-
-const WEBEXTENSION_EXTENSION_XPI = path.join(
-  __dirname,
-  '../lib/test/data/firefox/webextension.xpi'
-)
-const WEBEXTENSION_EXTENSION_ZIP = path.join(
-  __dirname,
-  '../lib/test/data/firefox/webextension.zip'
-)
-const WEBEXTENSION_EXTENSION_DIR = path.join(
-  __dirname,
-  '../lib/test/data/firefox/webextension'
-)
+const { locate } = require('../lib/test/resources')
+
+const WEBEXTENSION_EXTENSION_XPI = locate(
+  'common/extensions/webextensions-selenium-example.xpi')
+const WEBEXTENSION_EXTENSION_ZIP = locate(
+  'common/extensions/webextensions-selenium-example.zip')
+const WEBEXTENSION_EXTENSION_DIR = locate(
+  'common/extensions/webextensions-selenium-example')
 
 const WEBEXTENSION_EXTENSION_ID =
   'webextensions-selenium-example@example.com.xpi'

diff --git a/javascript/node/selenium-webdriver/test/io/zip_test.js b/javascript/node/selenium-webdriver/test/io/zip_test.js
@@ -24,11 +24,10 @@ const path = require('path')
 const io = require('../../io')
 const zip = require('../../io/zip')
 const { InvalidArgumentError } = require('../../lib/error')
+const { locate } = require('../../lib/test/resources')
 
-const XPI_PATH = path.join(
-  __dirname,
-  '../../lib/test/data/firefox/webextension.xpi'
-)
+const XPI_PATH = locate(
+  'common/extensions/webextensions-selenium-example.xpi')
 
 describe('io/zip', function () {
   describe('unzip', function () {