Merge remote-tracking branch 'origin/update_ruby_examples_for_ie' int…

…o update_ruby_examples_for_ie
SeleniumHQ · Jun 16, 2024 · 29a3ecd · 29a3ecd
2 parents f7e0e4b + 8735936
commit 29a3ecd
Show file tree

Hide file tree

Showing 16 changed files with 81 additions and 56 deletions.
diff --git a/examples/dotnet/SeleniumDocs/BaseTest.cs b/examples/dotnet/SeleniumDocs/BaseTest.cs
@@ -17,7 +17,7 @@ public class BaseTest
         protected IWebDriver driver;
         protected Uri GridUrl;
         private Process _webserverProcess;
-        private const string ServerJarName = "selenium-server-4.20.0.jar";
+        private const string ServerJarName = "selenium-server-4.21.0.jar";
         private static readonly string BaseDirectory = AppContext.BaseDirectory;
         private const string RelativePathToGrid = "../../../../../";
         private readonly string _examplesDirectory = Path.GetFullPath(Path.Combine(BaseDirectory, RelativePathToGrid));

diff --git a/examples/dotnet/SeleniumDocs/Extensions/webextensions-selenium-example.xpi b/examples/dotnet/SeleniumDocs/Extensions/webextensions-selenium-example.xpi
diff --git a/examples/dotnet/SeleniumDocs/Extensions/webextensions-selenium-example/manifest.json b/examples/dotnet/SeleniumDocs/Extensions/webextensions-selenium-example/manifest.json
@@ -1,17 +1,22 @@
 {
-  "manifest_version": 2,
+  "manifest_version": 3,
   "name": "webextensions-selenium-example",
-  "description": "Inject a div with id webextensions-selenium-example to verify that WebExtensions work in Firefox/Selenium" ,
+  "description": "Inject a div with id webextensions-selenium-example to verify that WebExtensions work in Firefox/Selenium",
   "version": "0.1",
   "content_scripts": [
     {
-      "matches": ["https://*/*","http://*/*"],
-      "js": ["inject.js"]
+      "matches": [
+        "https://*/*",
+        "http://*/*"
+      ],
+      "js": [
+        "inject.js"
+      ]
     }
   ],
-  "applications": {
-   "gecko": {
-     "id": "[email protected]"
-   }
- }
-}
+  "browser_specific_settings": {
+    "gecko": {
+      "id": "webextensions-selenium-example-v3@example.com"
+    }
+  }
+}
diff --git a/examples/java/src/test/java/dev/selenium/browsers/FirefoxTest.java b/examples/java/src/test/java/dev/selenium/browsers/FirefoxTest.java
@@ -28,7 +28,7 @@ public class FirefoxTest extends BaseTest {
   @AfterEach
   public void clearProperties() {
     System.clearProperty(GeckoDriverService.GECKO_DRIVER_LOG_PROPERTY);
-    System.clearProperty(GeckoDriverService.GECKO_DRIVER_LOG_LEVEL_PROPERTY);
+    System.clearProperty(GeckoDriverService.GECKO_DRIVER_LOG_LEVEL_PROPERTY);driver.quit();
   }
 
   @Test

diff --git a/examples/java/src/test/resources/extensions/selenium-example.xpi b/examples/java/src/test/resources/extensions/selenium-example.xpi
diff --git a/examples/java/src/test/resources/extensions/selenium-example/manifest.json b/examples/java/src/test/resources/extensions/selenium-example/manifest.json
@@ -1,17 +1,22 @@
 {
-  "manifest_version": 2,
+  "manifest_version": 3,
   "name": "webextensions-selenium-example",
-  "description": "Inject a div with id webextensions-selenium-example to verify that WebExtensions work in Firefox/Selenium" ,
+  "description": "Inject a div with id webextensions-selenium-example to verify that WebExtensions work in Firefox/Selenium",
   "version": "0.1",
   "content_scripts": [
     {
-      "matches": ["https://*/*","http://*/*"],
-      "js": ["inject.js"]
+      "matches": [
+        "https://*/*",
+        "http://*/*"
+      ],
+      "js": [
+        "inject.js"
+      ]
     }
   ],
-  "applications": {
-   "gecko": {
-     "id": "[email protected]"
-   }
- }
-}
+  "browser_specific_settings": {
+    "gecko": {
+      "id": "webextensions-selenium-example-v3@example.com"
+    }
+  }
+}
diff --git a/examples/javascript/test/resources/extensions/selenium-example.xpi b/examples/javascript/test/resources/extensions/selenium-example.xpi
diff --git a/examples/javascript/test/resources/extensions/selenium-example/manifest.json b/examples/javascript/test/resources/extensions/selenium-example/manifest.json
@@ -1,17 +1,22 @@
 {
-  "manifest_version": 2,
+  "manifest_version": 3,
   "name": "webextensions-selenium-example",
-  "description": "Inject a div with id webextensions-selenium-example to verify that WebExtensions work in Firefox/Selenium" ,
+  "description": "Inject a div with id webextensions-selenium-example to verify that WebExtensions work in Firefox/Selenium",
   "version": "0.1",
   "content_scripts": [
     {
-      "matches": ["https://*/*","http://*/*"],
-      "js": ["inject.js"]
+      "matches": [
+        "https://*/*",
+        "http://*/*"
+      ],
+      "js": [
+        "inject.js"
+      ]
     }
   ],
-  "applications": {
-   "gecko": {
-     "id": "[email protected]"
-   }
- }
-}
+  "browser_specific_settings": {
+    "gecko": {
+      "id": "webextensions-selenium-example-v3@example.com"
+    }
+  }
+}
diff --git a/examples/kotlin/pom.xml b/examples/kotlin/pom.xml
@@ -17,7 +17,7 @@
         <junit5.version>5.10.2</junit5.version>
         <wdm.version>5.2.3</wdm.version>
 
-        <maven-surefire-plugin.version>3.2.5</maven-surefire-plugin.version>
+        <maven-surefire-plugin.version>3.3.0</maven-surefire-plugin.version>
 
         <java.version>1.8</java.version>
         <selenium.version>4.21.0</selenium.version>

diff --git a/examples/python/tests/conftest.py b/examples/python/tests/conftest.py
@@ -130,7 +130,7 @@ def server_old(request):
                 os.path.abspath(__file__)
             )
         ),
-        "selenium-server-4.20.0.jar",
+        "selenium-server-4.21.0.jar",
     )
 
     def wait_for_server(url, timeout):
@@ -188,7 +188,7 @@ def server():
                 )
             )
         ),
-        "selenium-server-4.20.0.jar",
+        "selenium-server-4.21.0.jar",
     )
 
     args = [

diff --git a/examples/python/tests/extensions/webextensions-selenium-example.xpi b/examples/python/tests/extensions/webextensions-selenium-example.xpi
diff --git a/examples/python/tests/extensions/webextensions-selenium-example/manifest.json b/examples/python/tests/extensions/webextensions-selenium-example/manifest.json
@@ -1,17 +1,22 @@
 {
-  "manifest_version": 2,
+  "manifest_version": 3,
   "name": "webextensions-selenium-example",
-  "description": "Inject a div with id webextensions-selenium-example to verify that WebExtensions work in Firefox/Selenium" ,
+  "description": "Inject a div with id webextensions-selenium-example to verify that WebExtensions work in Firefox/Selenium",
   "version": "0.1",
   "content_scripts": [
     {
-      "matches": ["https://*/*","http://*/*"],
-      "js": ["inject.js"]
+      "matches": [
+        "https://*/*",
+        "http://*/*"
+      ],
+      "js": [
+        "inject.js"
+      ]
     }
   ],
-  "applications": {
-   "gecko": {
-     "id": "[email protected]"
-   }
- }
-}
+  "browser_specific_settings": {
+    "gecko": {
+      "id": "webextensions-selenium-example-v3@example.com"
+    }
+  }
+}
diff --git a/examples/ruby/Gemfile.lock b/examples/ruby/Gemfile.lock
@@ -46,7 +46,7 @@ GEM
       rubocop (~> 1.41)
     rubocop-factory_bot (2.25.1)
       rubocop (~> 1.41)
-    rubocop-rspec (2.30.0)
+    rubocop-rspec (2.31.0)
       rubocop (~> 1.40)
       rubocop-capybara (~> 2.17)
       rubocop-factory_bot (~> 2.22)

diff --git a/examples/ruby/spec/spec_support/extensions/webextensions-selenium-example.xpi b/examples/ruby/spec/spec_support/extensions/webextensions-selenium-example.xpi
diff --git a/examples/ruby/spec/spec_support/extensions/webextensions-selenium-example/manifest.json b/examples/ruby/spec/spec_support/extensions/webextensions-selenium-example/manifest.json
@@ -1,17 +1,22 @@
 {
-  "manifest_version": 2,
+  "manifest_version": 3,
   "name": "webextensions-selenium-example",
-  "description": "Inject a div with id webextensions-selenium-example to verify that WebExtensions work in Firefox/Selenium" ,
+  "description": "Inject a div with id webextensions-selenium-example to verify that WebExtensions work in Firefox/Selenium",
   "version": "0.1",
   "content_scripts": [
     {
-      "matches": ["https://*/*","http://*/*"],
-      "js": ["inject.js"]
+      "matches": [
+        "https://*/*",
+        "http://*/*"
+      ],
+      "js": [
+        "inject.js"
+      ]
     }
   ],
-  "applications": {
-   "gecko": {
-     "id": "[email protected]"
-   }
- }
-}
+  "browser_specific_settings": {
+    "gecko": {
+      "id": "webextensions-selenium-example-v3@example.com"
+    }
+  }
+}
diff --git a/examples/selenium-server-4.20.0.jar → examples/selenium-server-4.21.0.jar b/examples/selenium-server-4.20.0.jar → examples/selenium-server-4.21.0.jar