Skip to content

Commit de63183

Browse files
authored
Merge branch 'trunk' into credential
2 parents 52e5417 + 8c9aa17 commit de63183

File tree

5 files changed

+3
-15
lines changed

5 files changed

+3
-15
lines changed

.github/workflows/ci-ruby.yml

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,6 @@ jobs:
2222
cache-key: rb-docs
2323
run: bazel run //rb:docs
2424

25-
lint:
26-
name: Lint
27-
needs: build
28-
uses: ./.github/workflows/bazel.yml
29-
with:
30-
name: Lint
31-
cache-key: rb-lint
32-
run: bazel test //rb:lint
33-
3425
unit-tests:
3526
name: Unit Tests
3627
needs: build

.skipped-tests

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,3 +57,4 @@
5757
-//rb/spec/integration/selenium/webdriver:element-chrome-bidi
5858
-//rb/spec/integration/selenium/webdriver:element-chrome-remote
5959
-//rb/spec/integration/selenium/webdriver:action_builder-firefox-beta-remote
60+
-//rb:lint

py/test/selenium/webdriver/chrome/chrome_service_tests.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,9 @@
2121

2222
import pytest
2323

24-
from selenium.common.exceptions import WebDriverException
2524
from selenium.webdriver.chrome.service import Service
2625

2726

28-
@pytest.mark.xfail_chrome(raises=WebDriverException)
2927
@pytest.mark.no_driver_after_test
3028
def test_uses_chromedriver_logging(clean_driver, driver_executable) -> None:
3129
log_file = "chromedriver.log"

py/test/selenium/webdriver/edge/edge_service_tests.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,9 @@
2121

2222
import pytest
2323

24-
from selenium.common.exceptions import WebDriverException
2524
from selenium.webdriver.edge.service import Service
2625

2726

28-
@pytest.mark.xfail_edge(raises=WebDriverException)
2927
@pytest.mark.no_driver_after_test
3028
def test_uses_edgedriver_logging(clean_driver, driver_executable) -> None:
3129
log_file = "msedgedriver.log"

rb/.rubocop.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -147,8 +147,8 @@ Style/OptionalBooleanParameter:
147147
Enabled: false
148148

149149
Lint/Debugger:
150-
IgnoredMethods:
151-
- save_screenshot
150+
Exclude:
151+
- 'lib/selenium/webdriver/common/driver_extensions/full_page_screenshot.rb'
152152

153153
Lint/UselessConstantScoping:
154154
Enabled: false

0 commit comments

Comments
 (0)