Skip to content

Commit

Permalink
Merge branch 'trunk' into add-dom-mutation-support-java
Browse files Browse the repository at this point in the history
  • Loading branch information
pujagani authored Jul 25, 2024
2 parents 4c30215 + 48ebf7d commit 472d40e
Show file tree
Hide file tree
Showing 7 changed files with 8 additions and 8 deletions.
1 change: 1 addition & 0 deletions java/src/org/openqa/selenium/remote/RemoteScript.java
Original file line number Diff line number Diff line change
Expand Up @@ -131,4 +131,5 @@ public String pin(String script) {
public void unpin(String id) {
this.script.removePreloadScript(id);
}

}
1 change: 1 addition & 0 deletions java/test/org/openqa/selenium/WebScriptTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -288,4 +288,5 @@ void canUnpinScript() throws ExecutionException, InterruptedException, TimeoutEx

((RemoteWebDriver) driver).script().removeConsoleMessageHandler(id);
}

}
2 changes: 1 addition & 1 deletion py/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ compile_pip_requirements(
],
)

SE_VERSION = "4.23.1"
SE_VERSION = "4.24.0.dev202407241614"

BROWSER_VERSIONS = [
"v85",
Expand Down
4 changes: 2 additions & 2 deletions py/docs/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -56,9 +56,9 @@
# built documents.
#
# The short X.Y version.
version = '4.23'
version = '4.24'
# The full version, including alpha/beta/rc tags.
release = '4.23.1'
release = '4.24.0.dev202407241614'

# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
Expand Down
2 changes: 1 addition & 1 deletion py/selenium/webdriver/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
from .wpewebkit.service import Service as WPEWebKitService # noqa
from .wpewebkit.webdriver import WebDriver as WPEWebKit # noqa

__version__ = "4.23.1"
__version__ = "4.24.0.dev202407241614"

# We need an explicit __all__ because the above won't otherwise be exported.
__all__ = [
Expand Down
2 changes: 1 addition & 1 deletion py/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
setup_args = {
'cmdclass': {'install': install},
'name': 'selenium',
'version': "4.23.1",
'version': "4.24.0.dev202407241614",
'license': 'Apache 2.0',
'description': 'Official Python bindings for Selenium WebDriver.',
'long_description': open(join(abspath(dirname(__file__)), "README.rst")).read(),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -202,9 +202,7 @@ module WebDriver
expect(element.attribute(:value)).to eq('Clicked')
end

it 'moves to element with offset', except: {browser: :firefox,
platform: %i[windows macosx],
reason: 'Some issues with resolution?'} do
it 'moves to element with offset' do
driver.navigate.to url_for('javascriptPage.html')
origin = driver.find_element(id: 'keyUpArea')
destination = driver.find_element(id: 'clickField')
Expand Down

0 comments on commit 472d40e

Please sign in to comment.