Merge remote-tracking branch 'origin/special_features_ruby_examples' into special_features_ruby_examples

Author: aguspe

examples/dotnet/SeleniumDocs/Browsers/InternetExplorerTest.cs

@@ -11,7 +11,7 @@ namespace SeleniumDocs.Browsers
     [EnabledOnOs("WINDOWS")]
     public class InternetExplorerTest
     {
-        private InternetExplorerDriver driver;
+        private InternetExplorerDriver _driver;
         private string _logLocation;
         private string _tempPath;
 
@@ -26,7 +26,7 @@ public void Cleanup()
             {
                 File.Delete(_tempPath);
             }
-            driver.Quit();
+            _driver.Quit();
         }
 
         [TestMethod]
@@ -35,27 +35,27 @@ public void BasicOptionsWin10()
             var options = new InternetExplorerOptions();
             options.AttachToEdgeChrome = true;
             options.EdgeExecutablePath = GetEdgeLocation();
-            driver = new InternetExplorerDriver(options);
+            _driver = new InternetExplorerDriver(options);
         }
 
         [TestMethod]
         public void BasicOptionsWin11()
         {
             var options = new InternetExplorerOptions();
-            driver = new InternetExplorerDriver(options);
+            _driver = new InternetExplorerDriver(options);
         }
 
         [TestMethod]
-        [Ignore("Not implemented")]
         public void LogsToFile()
         {
             var service = InternetExplorerDriverService.CreateDefaultService();
             service.LogFile = GetLogLocation();
 
-            driver = new InternetExplorerDriver(service);
-            driver.Quit(); // Close the Service log file before reading
+            _driver = new InternetExplorerDriver(service);
+            _driver.Quit(); // Close the Service log file before reading
             var lines = File.ReadLines(GetLogLocation());
-            Assert.IsNotNull(lines.FirstOrDefault(line => line.Contains("geckodriver	INFO	Listening on")));
+            Console.WriteLine("Lines: {0}", lines);
+            Assert.IsTrue(lines.Contains("Started InternetExplorerDriver server"));
         }
 
         [TestMethod]
@@ -70,7 +70,7 @@ public void LogsToConsole()
 
             //service.LogToConsole = true;
 
-            driver = new InternetExplorerDriver(service);
+            _driver = new InternetExplorerDriver(service);
             Assert.IsTrue(stringWriter.ToString().Contains("geckodriver	INFO	Listening on"));
             Console.SetOut(originalOutput);
             stringWriter.Dispose();
@@ -84,8 +84,8 @@ public void LogsLevel()
 
             service.LoggingLevel = InternetExplorerDriverLogLevel.Warn;
 
-            driver = new InternetExplorerDriver(service);
-            driver.Quit(); // Close the Service log file before reading
+            _driver = new InternetExplorerDriver(service);
+            _driver.Quit(); // Close the Service log file before reading
             var lines = File.ReadLines(GetLogLocation());
             Assert.IsNotNull(lines.FirstOrDefault(line => line.Contains("Invalid capability setting: timeouts is type null")));
         }
@@ -97,7 +97,7 @@ public void SupportingFilesLocation()
 
             service.LibraryExtractionPath = GetTempDirectory();
 
-            driver = new InternetExplorerDriver(service);
+            _driver = new InternetExplorerDriver(service);
             Assert.IsTrue(File.Exists(GetTempDirectory() + "/IEDriver.tmp"));
         }
 

examples/javascript/test/browser/edgeSpecificCaps.spec.js

@@ -1,7 +1,8 @@
-const {Browser} = require('selenium-webdriver');
+const {Browser, By} = require('selenium-webdriver');
 const {suite} = require('selenium-webdriver/testing');
 const edge = require('selenium-webdriver/edge');
 const options = new edge.Options();
+const assert = require("assert");
 
 suite(function (env) {
   describe('Should be able to Test Command line arguments', function () {
@@ -47,5 +48,17 @@ suite(function (env) {
       await driver.get('https://www.selenium.dev/selenium/web/blank.html');
       await driver.quit();
     });
+
+    it('Add Extension', async function () {
+      let driver = await env
+        .builder()
+        .setEdgeOptions(options.addExtensions(['./test/resources/extensions/webextensions-selenium-example.crx']))
+        .build();
+
+      await driver.get('https://www.selenium.dev/selenium/web/blank.html');
+      let injected = await driver.findElement(By.id('webextensions-selenium-example'));
+      assert.equal(await injected.getText(), `Content injected by webextensions-selenium-example`)
+      await driver.quit();
+    });
   });
 }, { browsers: [Browser.EDGE]});

examples/ruby/Gemfile.lock

@@ -39,18 +39,18 @@ GEM
       rubocop-ast (>= 1.31.1, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.31.2)
-      parser (>= 3.3.0.4)
+    rubocop-ast (1.31.3)
+      parser (>= 3.3.1.0)
     rubocop-capybara (2.20.0)
       rubocop (~> 1.41)
     rubocop-factory_bot (2.25.1)
       rubocop (~> 1.41)
-    rubocop-rspec (2.29.1)
+    rubocop-rspec (2.29.2)
       rubocop (~> 1.40)
       rubocop-capybara (~> 2.17)
       rubocop-factory_bot (~> 2.22)
       rubocop-rspec_rails (~> 2.28)
-    rubocop-rspec_rails (2.28.2)
+    rubocop-rspec_rails (2.28.3)
       rubocop (~> 1.40)
     ruby-progressbar (1.13.0)
     rubyzip (2.3.2)

examples/ruby/README.md

@@ -20,7 +20,7 @@ cd seleniumhq.github.io/examples/ruby
 bundler install
 ```
 
-4. Run all all tests
+4. Run all tests
 
 ```
 bundle exec rspec

examples/ruby/spec/browsers/edge_spec.rb

@@ -29,11 +29,11 @@
 
     it 'add extensions' do
       extension_file_path = File.expand_path('../spec_support/extensions/webextensions-selenium-example.crx', __dir__)
-      options = Selenium::WebDriver::Options.chrome
+      options = Selenium::WebDriver::Options.edge
 
       options.add_extension(extension_file_path)
 
-      @driver = Selenium::WebDriver.for :chrome, options: options
+      @driver = Selenium::WebDriver.for :edge, options: options
       @driver.get('https://www.selenium.dev/selenium/web/blank.html')
       injected = @driver.find_element(:id, 'webextensions-selenium-example')
       expect(injected.text).to eq 'Content injected by webextensions-selenium-example'

website_and_docs/content/documentation/webdriver/browsers/edge.en.md

@@ -64,7 +64,7 @@ Add an argument to options:
 {{< gh-codeblock path="/examples/ruby/spec/browsers/edge_spec.rb#L17" >}}
 {{< /tab >}}
 {{< tab header="JavaScript" >}}
-{{< gh-codeblock path="/examples/javascript/test/browser/edgeSpecificCaps.spec.js#L11">}}
+{{< gh-codeblock path="/examples/javascript/test/browser/edgeSpecificCaps.spec.js#L12">}}
 {{< /tab >}}
 {{< tab header="Kotlin" >}}
 {{< badge-code >}}
@@ -121,7 +121,7 @@ Add an extension to options:
 {{< gh-codeblock path="/examples/ruby/spec/browsers/edge_spec.rb#L34" >}}
 {{< /tab >}}
 {{< tab header="JavaScript" >}}
-{{< badge-code >}}
+{{< gh-codeblock path="/examples/javascript/test/browser/edgeSpecificCaps.spec.js#L55">}}
 {{< /tab >}}
 {{< tab header="Kotlin" >}}
 {{< badge-code >}}
@@ -147,7 +147,7 @@ so long as the quit command is not sent to the driver.
 {{< gh-codeblock path="/examples/ruby/spec/browsers/edge_spec.rb#L45" >}}
 {{< /tab >}}
 {{< tab header="JavaScript" >}}
-{{< badge-code >}}
+{{< gh-codeblock path="/examples/javascript/test/browser/edgeSpecificCaps.spec.js#L32">}}
 {{< /tab >}}
 {{< tab header="Kotlin" >}}
 {{< badge-code >}}

website_and_docs/content/documentation/webdriver/browsers/edge.ja.md

@@ -66,7 +66,7 @@ There are two excellent resources for investigating these arguments:
 {{< gh-codeblock path="/examples/ruby/spec/browsers/edge_spec.rb#L17" >}}
 {{< /tab >}}
 {{< tab header="JavaScript" >}}
-{{< gh-codeblock path="/examples/javascript/test/browser/edgeSpecificCaps.spec.js#L11">}}
+{{< gh-codeblock path="/examples/javascript/test/browser/edgeSpecificCaps.spec.js#L12">}}
 {{< /tab >}}
 {{< tab header="Kotlin" >}}
 {{< badge-code >}}
@@ -123,7 +123,7 @@ Add an extension to options:
 {{< gh-codeblock path="/examples/ruby/spec/browsers/edge_spec.rb#L34" >}}
 {{< /tab >}}
 {{< tab header="JavaScript" >}}
-{{< badge-code >}}
+{{< gh-codeblock path="/examples/javascript/test/browser/edgeSpecificCaps.spec.js#L55">}}
 {{< /tab >}}
 {{< tab header="Kotlin" >}}
 {{< badge-code >}}
@@ -149,7 +149,7 @@ so long as the quit command is not sent to the driver.
 {{< gh-codeblock path="/examples/ruby/spec/browsers/edge_spec.rb#L45" >}}
 {{< /tab >}}
 {{< tab header="JavaScript" >}}
-{{< badge-code >}}
+{{< gh-codeblock path="/examples/javascript/test/browser/edgeSpecificCaps.spec.js#L32">}}
 {{< /tab >}}
 {{< tab header="Kotlin" >}}
 {{< badge-code >}}

website_and_docs/content/documentation/webdriver/browsers/edge.pt-br.md

@@ -66,7 +66,7 @@ Adicione uma opção:
 {{< gh-codeblock path="/examples/ruby/spec/browsers/edge_spec.rb#L17" >}}
 {{< /tab >}}
 {{< tab header="JavaScript" >}}
-{{< gh-codeblock path="/examples/javascript/test/browser/edgeSpecificCaps.spec.js#L11">}}
+{{< gh-codeblock path="/examples/javascript/test/browser/edgeSpecificCaps.spec.js#L12">}}
 {{< /tab >}}
 {{< tab header="Kotlin" >}}
 {{< badge-code >}}
@@ -123,7 +123,7 @@ Add an extension to options:
 {{< gh-codeblock path="/examples/ruby/spec/browsers/edge_spec.rb#L34" >}}
 {{< /tab >}}
 {{< tab header="JavaScript" >}}
-{{< badge-code >}}
+{{< gh-codeblock path="/examples/javascript/test/browser/edgeSpecificCaps.spec.js#L55">}}
 {{< /tab >}}
 {{< tab header="Kotlin" >}}
 {{< badge-code >}}
@@ -149,7 +149,7 @@ so long as the quit command is not sent to the driver.
 {{< gh-codeblock path="/examples/ruby/spec/browsers/edge_spec.rb#L45" >}}
 {{< /tab >}}
 {{< tab header="JavaScript" >}}
-{{< badge-code >}}
+{{< gh-codeblock path="/examples/javascript/test/browser/edgeSpecificCaps.spec.js#L32">}}
 {{< /tab >}}
 {{< tab header="Kotlin" >}}
 {{< badge-code >}}

website_and_docs/content/documentation/webdriver/browsers/edge.zh-cn.md

@@ -66,7 +66,7 @@ Add an argument to options:
 {{< gh-codeblock path="/examples/ruby/spec/browsers/edge_spec.rb#L17" >}}
 {{< /tab >}}
 {{< tab header="JavaScript" >}}
-{{< gh-codeblock path="/examples/javascript/test/browser/edgeSpecificCaps.spec.js#L11">}}
+{{< gh-codeblock path="/examples/javascript/test/browser/edgeSpecificCaps.spec.js#L12">}}
 {{< /tab >}}
 {{< tab header="Kotlin" >}}
 {{< badge-code >}}
@@ -123,7 +123,7 @@ Add an extension to options:
 {{< gh-codeblock path="/examples/ruby/spec/browsers/edge_spec.rb#L34" >}}
 {{< /tab >}}
 {{< tab header="JavaScript" >}}
-{{< badge-code >}}
+{{< gh-codeblock path="/examples/javascript/test/browser/edgeSpecificCaps.spec.js#L55">}}
 {{< /tab >}}
 {{< tab header="Kotlin" >}}
 {{< badge-code >}}
@@ -149,7 +149,7 @@ so long as the quit command is not sent to the driver.
 {{< gh-codeblock path="/examples/ruby/spec/browsers/edge_spec.rb#L45" >}}
 {{< /tab >}}
 {{< tab header="JavaScript" >}}
-{{< badge-code >}}
+{{< gh-codeblock path="/examples/javascript/test/browser/edgeSpecificCaps.spec.js#L32">}}
 {{< /tab >}}
 {{< tab header="Kotlin" >}}
 {{< badge-code >}}

website_and_docs/data/sponsors.yml

@@ -1,19 +1,23 @@
-selenium:
-  # Set to false if no items are present
+development:
   enable: true
   item:
-    # Sponsorship start date: April 16, 2024
-    - logo: "/images/sponsors/bright-data.png"
-      url: "https://brightdata.com/?utm_source=brand&utm_campaign=brnd-mkt_partners_selenium"
-      name: "Bright Data"
-    # Sponsorship start date: July 30, 2014 - Renewed April 2024 under the "Development" level
+      # Sponsorship start date: July 30, 2014 - Renewed April 2024 under the "Development" level
     - logo: "/images/sponsors/browserstack.png"
-      url: "http://www.browserstack.com/automate/?utm_campaign=open-source-sponsor&utm_source=seleniumorg&utm_medium=referral"
+      url: "https://www.browserstack.com/automate?utm_campaign=open-source-sponsor&utm_campaigncode=701OW000009sQwVYAU&utm_medium=partnered&utm_source=seleniumorg"
       name: "BrowserStack"
     # Sponsorship start date: August 23, 2014 - Renewed April 2024 under the "Development" level
     - logo: "/images/sponsors/saucelabs.png"
       url: "https://saucelabs.com/resources/topic-hub/selenium?utm_source=selenium&utm_medium=website&utm_campaign=selenium-sponsorship-fy25"
       name: "Sauce Labs"
+
+selenium:
+  # Set to false if no items are present
+  enable: true
+  item:
+    # Sponsorship start date: April 16, 2024
+    - logo: "/images/sponsors/bright-data.png"
+      url: "https://brightdata.com/?utm_source=brand&utm_campaign=brnd-mkt_partners_selenium"
+      name: "Bright Data"
     # Sponsorship start date: June 24, 2015, updated July 2023 (only logo, not the agreement)
     - logo: "/images/sponsors/Digital.ai.jpg"
       url: "http://bit.ly/36uZ7ad"

website_and_docs/layouts/home.html

@@ -2,6 +2,7 @@
 {{ with .Content }}
 {{ . }}
 
+{{ partial "development-level-sponsors.html" (dict "Data" $.Site.Data) }}
 {{ partial "selenium-level-sponsors.html" (dict "Data" $.Site.Data) }}
 {{ partial "platinum-level-sponsors.html" (dict "Data" $.Site.Data) }}
 {{ partial "news-feed.html" (dict "regular_pages" $.Site.RegularPages) }}

website_and_docs/layouts/partials/development-level-sponsors.html

@@ -0,0 +1,14 @@
+{{ if .Data.sponsors.selenium.enable }}
+<div class="row justify-content-center p-5">
+  <h2 class="selenium text-center">Development Partners</h2>
+</div>
+<div class="row justify-content-around pt-4 pb-5 px-5">
+  {{ range .Data.sponsors.development.item }}
+  <div class="col-lg-3 col-md-6 mb-4 mb-lg-0 align-self-center px-5 py-3">
+    <a href="{{ .url }}" class="border-0">
+      <img class="w-100 shadow-1-strong rounded selenium-backer-logo" src="{{ .logo }}" alt="{{ .name }}" />
+    </a>
+  </div>
+  {{ end }}
+</div>
+{{ end }}

website_and_docs/layouts/partials/footer.html

@@ -1,5 +1,6 @@
 {{/* Avoiding showing extra sections for home page and sponsors */}}
 {{ if and (ne .Kind "home") (ne .Section "sponsors" ) }}
+{{ partial "development-level-sponsors.html" (dict "Data" $.Site.Data) }}
 {{ partial "selenium-level-sponsors.html" (dict "Data" $.Site.Data) }}
 {{ partial "selenium-container.html" (dict "title" "Support the Selenium Project" "text" "Learn more or view the full list of sponsors." "color_bg" "selenium-cyan" "color_btn" "selenium-white-cyan" "btn_text" "Learn more") }}
 {{ end }}

website_and_docs/layouts/sponsors/list.html

@@ -2,9 +2,10 @@
 
 <a class="td-offset-anchor"></a>
 <div class="td-content">
-	{{ .Content }}
+  {{ .Content }}
 </div>
 
+{{ partial "development-level-sponsors.html" (dict "Data" $.Site.Data) }}
 {{ partial "selenium-level-sponsors.html" (dict "Data" $.Site.Data) }}
 {{ partial "platinum-level-sponsors.html" (dict "Data" $.Site.Data) }}
 {{ partial "gold-level-sponsors.html" (dict "Data" $.Site.Data) }}
@@ -16,8 +17,9 @@
     <div class="card-body">
       <h2 class="card-title">Sponsoring</h2>
       <p class="card-text pb-4 w-lg-75">
-				Would you like your company to be listed on this page? <a href="/sponsor">Learn more about sponsoring Selenium.</a>
-			</p>
+        Would you like your company to be listed on this page? <a href="/sponsor">Learn more about sponsoring
+          Selenium.</a>
+      </p>
     </div>
   </div>
 </div>