Skip to content

Commit 6b08dee

Browse files
committed
Merge remote-tracking branch 'origin/special_features_ruby_examples' into special_features_ruby_examples
2 parents 158de77 + a560a98 commit 6b08dee

File tree

14 files changed

+78
-43
lines changed

14 files changed

+78
-43
lines changed

examples/dotnet/SeleniumDocs/Browsers/InternetExplorerTest.cs

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ namespace SeleniumDocs.Browsers
1111
[EnabledOnOs("WINDOWS")]
1212
public class InternetExplorerTest
1313
{
14-
private InternetExplorerDriver driver;
14+
private InternetExplorerDriver _driver;
1515
private string _logLocation;
1616
private string _tempPath;
1717

@@ -26,7 +26,7 @@ public void Cleanup()
2626
{
2727
File.Delete(_tempPath);
2828
}
29-
driver.Quit();
29+
_driver.Quit();
3030
}
3131

3232
[TestMethod]
@@ -35,27 +35,27 @@ public void BasicOptionsWin10()
3535
var options = new InternetExplorerOptions();
3636
options.AttachToEdgeChrome = true;
3737
options.EdgeExecutablePath = GetEdgeLocation();
38-
driver = new InternetExplorerDriver(options);
38+
_driver = new InternetExplorerDriver(options);
3939
}
4040

4141
[TestMethod]
4242
public void BasicOptionsWin11()
4343
{
4444
var options = new InternetExplorerOptions();
45-
driver = new InternetExplorerDriver(options);
45+
_driver = new InternetExplorerDriver(options);
4646
}
4747

4848
[TestMethod]
49-
[Ignore("Not implemented")]
5049
public void LogsToFile()
5150
{
5251
var service = InternetExplorerDriverService.CreateDefaultService();
5352
service.LogFile = GetLogLocation();
5453

55-
driver = new InternetExplorerDriver(service);
56-
driver.Quit(); // Close the Service log file before reading
54+
_driver = new InternetExplorerDriver(service);
55+
_driver.Quit(); // Close the Service log file before reading
5756
var lines = File.ReadLines(GetLogLocation());
58-
Assert.IsNotNull(lines.FirstOrDefault(line => line.Contains("geckodriver INFO Listening on")));
57+
Console.WriteLine("Lines: {0}", lines);
58+
Assert.IsTrue(lines.Contains("Started InternetExplorerDriver server"));
5959
}
6060

6161
[TestMethod]
@@ -70,7 +70,7 @@ public void LogsToConsole()
7070

7171
//service.LogToConsole = true;
7272

73-
driver = new InternetExplorerDriver(service);
73+
_driver = new InternetExplorerDriver(service);
7474
Assert.IsTrue(stringWriter.ToString().Contains("geckodriver INFO Listening on"));
7575
Console.SetOut(originalOutput);
7676
stringWriter.Dispose();
@@ -84,8 +84,8 @@ public void LogsLevel()
8484

8585
service.LoggingLevel = InternetExplorerDriverLogLevel.Warn;
8686

87-
driver = new InternetExplorerDriver(service);
88-
driver.Quit(); // Close the Service log file before reading
87+
_driver = new InternetExplorerDriver(service);
88+
_driver.Quit(); // Close the Service log file before reading
8989
var lines = File.ReadLines(GetLogLocation());
9090
Assert.IsNotNull(lines.FirstOrDefault(line => line.Contains("Invalid capability setting: timeouts is type null")));
9191
}
@@ -97,7 +97,7 @@ public void SupportingFilesLocation()
9797

9898
service.LibraryExtractionPath = GetTempDirectory();
9999

100-
driver = new InternetExplorerDriver(service);
100+
_driver = new InternetExplorerDriver(service);
101101
Assert.IsTrue(File.Exists(GetTempDirectory() + "/IEDriver.tmp"));
102102
}
103103

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

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
1-
const {Browser} = require('selenium-webdriver');
1+
const {Browser, By} = require('selenium-webdriver');
22
const {suite} = require('selenium-webdriver/testing');
33
const edge = require('selenium-webdriver/edge');
44
const options = new edge.Options();
5+
const assert = require("assert");
56

67
suite(function (env) {
78
describe('Should be able to Test Command line arguments', function () {
@@ -47,5 +48,17 @@ suite(function (env) {
4748
await driver.get('https://www.selenium.dev/selenium/web/blank.html');
4849
await driver.quit();
4950
});
51+
52+
it('Add Extension', async function () {
53+
let driver = await env
54+
.builder()
55+
.setEdgeOptions(options.addExtensions(['./test/resources/extensions/webextensions-selenium-example.crx']))
56+
.build();
57+
58+
await driver.get('https://www.selenium.dev/selenium/web/blank.html');
59+
let injected = await driver.findElement(By.id('webextensions-selenium-example'));
60+
assert.equal(await injected.getText(), `Content injected by webextensions-selenium-example`)
61+
await driver.quit();
62+
});
5063
});
5164
}, { browsers: [Browser.EDGE]});

examples/ruby/Gemfile.lock

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,18 +39,18 @@ GEM
3939
rubocop-ast (>= 1.31.1, < 2.0)
4040
ruby-progressbar (~> 1.7)
4141
unicode-display_width (>= 2.4.0, < 3.0)
42-
rubocop-ast (1.31.2)
43-
parser (>= 3.3.0.4)
42+
rubocop-ast (1.31.3)
43+
parser (>= 3.3.1.0)
4444
rubocop-capybara (2.20.0)
4545
rubocop (~> 1.41)
4646
rubocop-factory_bot (2.25.1)
4747
rubocop (~> 1.41)
48-
rubocop-rspec (2.29.1)
48+
rubocop-rspec (2.29.2)
4949
rubocop (~> 1.40)
5050
rubocop-capybara (~> 2.17)
5151
rubocop-factory_bot (~> 2.22)
5252
rubocop-rspec_rails (~> 2.28)
53-
rubocop-rspec_rails (2.28.2)
53+
rubocop-rspec_rails (2.28.3)
5454
rubocop (~> 1.40)
5555
ruby-progressbar (1.13.0)
5656
rubyzip (2.3.2)

examples/ruby/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ cd seleniumhq.github.io/examples/ruby
2020
bundler install
2121
```
2222

23-
4. Run all all tests
23+
4. Run all tests
2424

2525
```
2626
bundle exec rspec

examples/ruby/spec/browsers/edge_spec.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,11 @@
2929

3030
it 'add extensions' do
3131
extension_file_path = File.expand_path('../spec_support/extensions/webextensions-selenium-example.crx', __dir__)
32-
options = Selenium::WebDriver::Options.chrome
32+
options = Selenium::WebDriver::Options.edge
3333

3434
options.add_extension(extension_file_path)
3535

36-
@driver = Selenium::WebDriver.for :chrome, options: options
36+
@driver = Selenium::WebDriver.for :edge, options: options
3737
@driver.get('https://www.selenium.dev/selenium/web/blank.html')
3838
injected = @driver.find_element(:id, 'webextensions-selenium-example')
3939
expect(injected.text).to eq 'Content injected by webextensions-selenium-example'

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ Add an argument to options:
6464
{{< gh-codeblock path="/examples/ruby/spec/browsers/edge_spec.rb#L17" >}}
6565
{{< /tab >}}
6666
{{< tab header="JavaScript" >}}
67-
{{< gh-codeblock path="/examples/javascript/test/browser/edgeSpecificCaps.spec.js#L11">}}
67+
{{< gh-codeblock path="/examples/javascript/test/browser/edgeSpecificCaps.spec.js#L12">}}
6868
{{< /tab >}}
6969
{{< tab header="Kotlin" >}}
7070
{{< badge-code >}}
@@ -121,7 +121,7 @@ Add an extension to options:
121121
{{< gh-codeblock path="/examples/ruby/spec/browsers/edge_spec.rb#L34" >}}
122122
{{< /tab >}}
123123
{{< tab header="JavaScript" >}}
124-
{{< badge-code >}}
124+
{{< gh-codeblock path="/examples/javascript/test/browser/edgeSpecificCaps.spec.js#L55">}}
125125
{{< /tab >}}
126126
{{< tab header="Kotlin" >}}
127127
{{< badge-code >}}
@@ -147,7 +147,7 @@ so long as the quit command is not sent to the driver.
147147
{{< gh-codeblock path="/examples/ruby/spec/browsers/edge_spec.rb#L45" >}}
148148
{{< /tab >}}
149149
{{< tab header="JavaScript" >}}
150-
{{< badge-code >}}
150+
{{< gh-codeblock path="/examples/javascript/test/browser/edgeSpecificCaps.spec.js#L32">}}
151151
{{< /tab >}}
152152
{{< tab header="Kotlin" >}}
153153
{{< badge-code >}}

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ There are two excellent resources for investigating these arguments:
6666
{{< gh-codeblock path="/examples/ruby/spec/browsers/edge_spec.rb#L17" >}}
6767
{{< /tab >}}
6868
{{< tab header="JavaScript" >}}
69-
{{< gh-codeblock path="/examples/javascript/test/browser/edgeSpecificCaps.spec.js#L11">}}
69+
{{< gh-codeblock path="/examples/javascript/test/browser/edgeSpecificCaps.spec.js#L12">}}
7070
{{< /tab >}}
7171
{{< tab header="Kotlin" >}}
7272
{{< badge-code >}}
@@ -123,7 +123,7 @@ Add an extension to options:
123123
{{< gh-codeblock path="/examples/ruby/spec/browsers/edge_spec.rb#L34" >}}
124124
{{< /tab >}}
125125
{{< tab header="JavaScript" >}}
126-
{{< badge-code >}}
126+
{{< gh-codeblock path="/examples/javascript/test/browser/edgeSpecificCaps.spec.js#L55">}}
127127
{{< /tab >}}
128128
{{< tab header="Kotlin" >}}
129129
{{< badge-code >}}
@@ -149,7 +149,7 @@ so long as the quit command is not sent to the driver.
149149
{{< gh-codeblock path="/examples/ruby/spec/browsers/edge_spec.rb#L45" >}}
150150
{{< /tab >}}
151151
{{< tab header="JavaScript" >}}
152-
{{< badge-code >}}
152+
{{< gh-codeblock path="/examples/javascript/test/browser/edgeSpecificCaps.spec.js#L32">}}
153153
{{< /tab >}}
154154
{{< tab header="Kotlin" >}}
155155
{{< badge-code >}}

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ Adicione uma opção:
6666
{{< gh-codeblock path="/examples/ruby/spec/browsers/edge_spec.rb#L17" >}}
6767
{{< /tab >}}
6868
{{< tab header="JavaScript" >}}
69-
{{< gh-codeblock path="/examples/javascript/test/browser/edgeSpecificCaps.spec.js#L11">}}
69+
{{< gh-codeblock path="/examples/javascript/test/browser/edgeSpecificCaps.spec.js#L12">}}
7070
{{< /tab >}}
7171
{{< tab header="Kotlin" >}}
7272
{{< badge-code >}}
@@ -123,7 +123,7 @@ Add an extension to options:
123123
{{< gh-codeblock path="/examples/ruby/spec/browsers/edge_spec.rb#L34" >}}
124124
{{< /tab >}}
125125
{{< tab header="JavaScript" >}}
126-
{{< badge-code >}}
126+
{{< gh-codeblock path="/examples/javascript/test/browser/edgeSpecificCaps.spec.js#L55">}}
127127
{{< /tab >}}
128128
{{< tab header="Kotlin" >}}
129129
{{< badge-code >}}
@@ -149,7 +149,7 @@ so long as the quit command is not sent to the driver.
149149
{{< gh-codeblock path="/examples/ruby/spec/browsers/edge_spec.rb#L45" >}}
150150
{{< /tab >}}
151151
{{< tab header="JavaScript" >}}
152-
{{< badge-code >}}
152+
{{< gh-codeblock path="/examples/javascript/test/browser/edgeSpecificCaps.spec.js#L32">}}
153153
{{< /tab >}}
154154
{{< tab header="Kotlin" >}}
155155
{{< badge-code >}}

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ Add an argument to options:
6666
{{< gh-codeblock path="/examples/ruby/spec/browsers/edge_spec.rb#L17" >}}
6767
{{< /tab >}}
6868
{{< tab header="JavaScript" >}}
69-
{{< gh-codeblock path="/examples/javascript/test/browser/edgeSpecificCaps.spec.js#L11">}}
69+
{{< gh-codeblock path="/examples/javascript/test/browser/edgeSpecificCaps.spec.js#L12">}}
7070
{{< /tab >}}
7171
{{< tab header="Kotlin" >}}
7272
{{< badge-code >}}
@@ -123,7 +123,7 @@ Add an extension to options:
123123
{{< gh-codeblock path="/examples/ruby/spec/browsers/edge_spec.rb#L34" >}}
124124
{{< /tab >}}
125125
{{< tab header="JavaScript" >}}
126-
{{< badge-code >}}
126+
{{< gh-codeblock path="/examples/javascript/test/browser/edgeSpecificCaps.spec.js#L55">}}
127127
{{< /tab >}}
128128
{{< tab header="Kotlin" >}}
129129
{{< badge-code >}}
@@ -149,7 +149,7 @@ so long as the quit command is not sent to the driver.
149149
{{< gh-codeblock path="/examples/ruby/spec/browsers/edge_spec.rb#L45" >}}
150150
{{< /tab >}}
151151
{{< tab header="JavaScript" >}}
152-
{{< badge-code >}}
152+
{{< gh-codeblock path="/examples/javascript/test/browser/edgeSpecificCaps.spec.js#L32">}}
153153
{{< /tab >}}
154154
{{< tab header="Kotlin" >}}
155155
{{< badge-code >}}

website_and_docs/data/sponsors.yml

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,23 @@
1-
selenium:
2-
# Set to false if no items are present
1+
development:
32
enable: true
43
item:
5-
# Sponsorship start date: April 16, 2024
6-
- logo: "/images/sponsors/bright-data.png"
7-
url: "https://brightdata.com/?utm_source=brand&utm_campaign=brnd-mkt_partners_selenium"
8-
name: "Bright Data"
9-
# Sponsorship start date: July 30, 2014 - Renewed April 2024 under the "Development" level
4+
# Sponsorship start date: July 30, 2014 - Renewed April 2024 under the "Development" level
105
- logo: "/images/sponsors/browserstack.png"
11-
url: "http://www.browserstack.com/automate/?utm_campaign=open-source-sponsor&utm_source=seleniumorg&utm_medium=referral"
6+
url: "https://www.browserstack.com/automate?utm_campaign=open-source-sponsor&utm_campaigncode=701OW000009sQwVYAU&utm_medium=partnered&utm_source=seleniumorg"
127
name: "BrowserStack"
138
# Sponsorship start date: August 23, 2014 - Renewed April 2024 under the "Development" level
149
- logo: "/images/sponsors/saucelabs.png"
1510
url: "https://saucelabs.com/resources/topic-hub/selenium?utm_source=selenium&utm_medium=website&utm_campaign=selenium-sponsorship-fy25"
1611
name: "Sauce Labs"
12+
13+
selenium:
14+
# Set to false if no items are present
15+
enable: true
16+
item:
17+
# Sponsorship start date: April 16, 2024
18+
- logo: "/images/sponsors/bright-data.png"
19+
url: "https://brightdata.com/?utm_source=brand&utm_campaign=brnd-mkt_partners_selenium"
20+
name: "Bright Data"
1721
# Sponsorship start date: June 24, 2015, updated July 2023 (only logo, not the agreement)
1822
- logo: "/images/sponsors/Digital.ai.jpg"
1923
url: "http://bit.ly/36uZ7ad"

website_and_docs/layouts/home.html

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
{{ with .Content }}
33
{{ . }}
44

5+
{{ partial "development-level-sponsors.html" (dict "Data" $.Site.Data) }}
56
{{ partial "selenium-level-sponsors.html" (dict "Data" $.Site.Data) }}
67
{{ partial "platinum-level-sponsors.html" (dict "Data" $.Site.Data) }}
78
{{ partial "news-feed.html" (dict "regular_pages" $.Site.RegularPages) }}
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
{{ if .Data.sponsors.selenium.enable }}
2+
<div class="row justify-content-center p-5">
3+
<h2 class="selenium text-center">Development Partners</h2>
4+
</div>
5+
<div class="row justify-content-around pt-4 pb-5 px-5">
6+
{{ range .Data.sponsors.development.item }}
7+
<div class="col-lg-3 col-md-6 mb-4 mb-lg-0 align-self-center px-5 py-3">
8+
<a href="{{ .url }}" class="border-0">
9+
<img class="w-100 shadow-1-strong rounded selenium-backer-logo" src="{{ .logo }}" alt="{{ .name }}" />
10+
</a>
11+
</div>
12+
{{ end }}
13+
</div>
14+
{{ end }}

website_and_docs/layouts/partials/footer.html

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
{{/* Avoiding showing extra sections for home page and sponsors */}}
22
{{ if and (ne .Kind "home") (ne .Section "sponsors" ) }}
3+
{{ partial "development-level-sponsors.html" (dict "Data" $.Site.Data) }}
34
{{ partial "selenium-level-sponsors.html" (dict "Data" $.Site.Data) }}
45
{{ 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") }}
56
{{ end }}

website_and_docs/layouts/sponsors/list.html

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,10 @@
22

33
<a class="td-offset-anchor"></a>
44
<div class="td-content">
5-
{{ .Content }}
5+
{{ .Content }}
66
</div>
77

8+
{{ partial "development-level-sponsors.html" (dict "Data" $.Site.Data) }}
89
{{ partial "selenium-level-sponsors.html" (dict "Data" $.Site.Data) }}
910
{{ partial "platinum-level-sponsors.html" (dict "Data" $.Site.Data) }}
1011
{{ partial "gold-level-sponsors.html" (dict "Data" $.Site.Data) }}
@@ -16,8 +17,9 @@
1617
<div class="card-body">
1718
<h2 class="card-title">Sponsoring</h2>
1819
<p class="card-text pb-4 w-lg-75">
19-
Would you like your company to be listed on this page? <a href="/sponsor">Learn more about sponsoring Selenium.</a>
20-
</p>
20+
Would you like your company to be listed on this page? <a href="/sponsor">Learn more about sponsoring
21+
Selenium.</a>
22+
</p>
2123
</div>
2224
</div>
2325
</div>

0 commit comments

Comments
 (0)