diff --git a/.bundle/install.log b/.bundle/install.log index a241036..07eb91c 100644 --- a/.bundle/install.log +++ b/.bundle/install.log @@ -74,3 +74,27 @@ I, [2014-02-17T23:12:36.287508 #5357] INFO -- : 1: pry (0.9.12.2) from /opt/bo I, [2014-02-17T23:12:36.288217 #5358] INFO -- : 2: rspec (2.14.1) from /opt/boxen/rbenv/versions/2.1.0-github1/lib/ruby/gems/2.1.0/specifications/rspec-2.14.1.gemspec I, [2014-02-17T23:12:36.288289 #5360] INFO -- : 4: webmock (1.7.10) from /opt/boxen/rbenv/versions/2.1.0-github1/lib/ruby/gems/2.1.0/specifications/webmock-1.7.10.gemspec I, [2014-02-17T23:12:36.576065 #5359] INFO -- : 3: selenium-webdriver (2.40.0.rc2) from /Users/fijabakk/src/selenium-travis/selenium-webdriver/selenium-webdriver.gemspec +I, [2014-02-19T22:33:03.494228 #24791] INFO -- : 1: addressable (2.3.3) from /opt/boxen/rbenv/versions/2.1.0-github1/lib/ruby/gems/2.1.0/specifications/addressable-2.3.3.gemspec +I, [2014-02-19T22:33:03.494623 #24793] INFO -- : 3: builder (3.2.0) from /opt/boxen/rbenv/versions/2.1.0-github1/lib/ruby/gems/2.1.0/specifications/builder-3.2.0.gemspec +I, [2014-02-19T22:33:03.494228 #24792] INFO -- : 2: rake (0.9.2.2) from /opt/boxen/rbenv/versions/2.1.0-github1/lib/ruby/gems/2.1.0/specifications/rake-0.9.2.2.gemspec +I, [2014-02-19T22:33:03.496737 #24790] INFO -- : 0: ffi (1.9.3) from /opt/boxen/rbenv/versions/2.1.0-github1/lib/ruby/gems/2.1.0/specifications/ffi-1.9.3.gemspec +I, [2014-02-19T22:33:03.497315 #24793] INFO -- : 3: coderay (1.0.9) from /opt/boxen/rbenv/versions/2.1.0-github1/lib/ruby/gems/2.1.0/specifications/coderay-1.0.9.gemspec +I, [2014-02-19T22:33:03.497573 #24791] INFO -- : 1: diff-lcs (1.2.2) from /opt/boxen/rbenv/versions/2.1.0-github1/lib/ruby/gems/2.1.0/specifications/diff-lcs-1.2.2.gemspec +I, [2014-02-19T22:33:03.497918 #24792] INFO -- : 2: crack (0.3.2) from /opt/boxen/rbenv/versions/2.1.0-github1/lib/ruby/gems/2.1.0/specifications/crack-0.3.2.gemspec +I, [2014-02-19T22:33:03.498401 #24790] INFO -- : 0: json (1.7.7) from /opt/boxen/rbenv/versions/2.1.0-github1/lib/ruby/gems/2.1.0/specifications/json-1.7.7.gemspec +I, [2014-02-19T22:33:03.498369 #24793] INFO -- : 3: method_source (0.8.1) from /opt/boxen/rbenv/versions/2.1.0-github1/lib/ruby/gems/2.1.0/specifications/method_source-0.8.1.gemspec +I, [2014-02-19T22:33:03.498874 #24791] INFO -- : 1: multi_json (1.8.4) from /opt/boxen/rbenv/versions/2.1.0-github1/lib/ruby/gems/2.1.0/specifications/multi_json-1.8.4.gemspec +I, [2014-02-19T22:33:03.499292 #24790] INFO -- : 0: rack (1.5.2) from /opt/boxen/rbenv/versions/2.1.0-github1/lib/ruby/gems/2.1.0/specifications/rack-1.5.2.gemspec +I, [2014-02-19T22:33:03.499445 #24792] INFO -- : 2: slop (3.4.4) from /opt/boxen/rbenv/versions/2.1.0-github1/lib/ruby/gems/2.1.0/specifications/slop-3.4.4.gemspec +I, [2014-02-19T22:33:03.499805 #24793] INFO -- : 3: rspec-core (2.13.1) from /opt/boxen/rbenv/versions/2.1.0-github1/lib/ruby/gems/2.1.0/specifications/rspec-core-2.13.1.gemspec +I, [2014-02-19T22:33:03.500360 #24791] INFO -- : 1: rspec-mocks (2.13.1) from /opt/boxen/rbenv/versions/2.1.0-github1/lib/ruby/gems/2.1.0/specifications/rspec-mocks-2.13.1.gemspec +I, [2014-02-19T22:33:03.500620 #24790] INFO -- : 0: rubyzip (1.1.0) from /opt/boxen/rbenv/versions/2.1.0-github1/lib/ruby/gems/2.1.0/specifications/rubyzip-1.1.0.gemspec +I, [2014-02-19T22:33:03.501063 #24792] INFO -- : 2: websocket (1.0.7) from /opt/boxen/rbenv/versions/2.1.0-github1/lib/ruby/gems/2.1.0/specifications/websocket-1.0.7.gemspec +I, [2014-02-19T22:33:03.501100 #24793] INFO -- : 3: bundler (1.5.1) from /opt/boxen/rbenv/versions/2.1.0-github1/lib/ruby/gems/2.1.0/specifications/bundler-1.5.1.gemspec +I, [2014-02-19T22:33:03.502408 #24791] INFO -- : 1: ci_reporter (1.6.9) from /opt/boxen/rbenv/versions/2.1.0-github1/lib/ruby/gems/2.1.0/specifications/ci_reporter-1.6.9.gemspec +I, [2014-02-19T22:33:03.502604 #24792] INFO -- : 2: rspec-expectations (2.13.0) from /opt/boxen/rbenv/versions/2.1.0-github1/lib/ruby/gems/2.1.0/specifications/rspec-expectations-2.13.0.gemspec +I, [2014-02-19T22:33:03.502840 #24793] INFO -- : 3: webmock (1.7.10) from /opt/boxen/rbenv/versions/2.1.0-github1/lib/ruby/gems/2.1.0/specifications/webmock-1.7.10.gemspec +I, [2014-02-19T22:33:03.502406 #24790] INFO -- : 0: childprocess (0.5.1) from /opt/boxen/rbenv/versions/2.1.0-github1/lib/ruby/gems/2.1.0/specifications/childprocess-0.5.1.gemspec +I, [2014-02-19T22:33:03.503974 #24791] INFO -- : 1: pry (0.9.12) from /opt/boxen/rbenv/versions/2.1.0-github1/lib/ruby/gems/2.1.0/specifications/pry-0.9.12.gemspec +I, [2014-02-19T22:33:03.504271 #24793] INFO -- : 3: rspec (2.13.0) from /opt/boxen/rbenv/versions/2.1.0-github1/lib/ruby/gems/2.1.0/specifications/rspec-2.13.0.gemspec +I, [2014-02-19T22:33:04.281691 #24792] INFO -- : 2: selenium-webdriver (2.40.0) from /Users/jari/src/selenium-travis/selenium-webdriver/selenium-webdriver.gemspec diff --git a/build/java/server/test/org/openqa/selenium/server-with-tests-standalone.jar b/build/java/server/test/org/openqa/selenium/server-with-tests-standalone.jar index b77f0e7..c0caa26 100644 Binary files a/build/java/server/test/org/openqa/selenium/server-with-tests-standalone.jar and b/build/java/server/test/org/openqa/selenium/server-with-tests-standalone.jar differ diff --git a/rb/spec/integration/selenium/webdriver/safari/custom_extension_spec.rb b/rb/spec/integration/selenium/webdriver/safari/custom_extension_spec.rb index 2b928fc..dfd4bd4 100644 --- a/rb/spec/integration/selenium/webdriver/safari/custom_extension_spec.rb +++ b/rb/spec/integration/selenium/webdriver/safari/custom_extension_spec.rb @@ -2,7 +2,7 @@ module Selenium module WebDriver module Safari - describe 'with custom extension', focus: true do + describe 'with custom extension' do before { GlobalTestEnv.quit_driver } after { @driver.quit if @driver } diff --git a/selenium-webdriver/CHANGES b/selenium-webdriver/CHANGES index f9e8e99..cb46c97 100644 --- a/selenium-webdriver/CHANGES +++ b/selenium-webdriver/CHANGES @@ -1,11 +1,13 @@ -2.40.0 (???) -============ +2.40.0 (2014-02-19) +=================== * Fix bug where FileReaper would not reap files added in a child process * Document AbstractEventListener (#5994) * Safari: * Add Safari::Options + clean up Safari extension handling (#6382) * Add support for user extensions (#6815) +* Firefox: + * Support native events for Firefox 27 + removed native event support for Firefox 25 2.39.0 (2013-12-17) =================== diff --git a/selenium-webdriver/lib/selenium/webdriver/firefox/extension/webdriver.xpi b/selenium-webdriver/lib/selenium/webdriver/firefox/extension/webdriver.xpi index b898018..2f9e3de 100644 Binary files a/selenium-webdriver/lib/selenium/webdriver/firefox/extension/webdriver.xpi and b/selenium-webdriver/lib/selenium/webdriver/firefox/extension/webdriver.xpi differ diff --git a/selenium-webdriver/lib/selenium/webdriver/safari/bridge.rb b/selenium-webdriver/lib/selenium/webdriver/safari/bridge.rb index 595e190..46fe5a5 100644 --- a/selenium-webdriver/lib/selenium/webdriver/safari/bridge.rb +++ b/selenium-webdriver/lib/selenium/webdriver/safari/bridge.rb @@ -32,7 +32,7 @@ def quit @server.stop @safari.stop - @extensions && @extensions.uninstall + @extensions.uninstall end def driver_extensions diff --git a/selenium-webdriver/lib/selenium/webdriver/safari/extensions.rb b/selenium-webdriver/lib/selenium/webdriver/safari/extensions.rb index b788b88..3ad66e5 100644 --- a/selenium-webdriver/lib/selenium/webdriver/safari/extensions.rb +++ b/selenium-webdriver/lib/selenium/webdriver/safari/extensions.rb @@ -100,6 +100,8 @@ def uninstall install_directory.rmtree if install_directory.exist? @backup.restore_all + + nil ensure @installed = false end diff --git a/selenium-webdriver/selenium-webdriver.gemspec b/selenium-webdriver/selenium-webdriver.gemspec index b04efa0..a941fec 100644 --- a/selenium-webdriver/selenium-webdriver.gemspec +++ b/selenium-webdriver/selenium-webdriver.gemspec @@ -3,11 +3,11 @@ Gem::Specification.new do |s| s.name = %q{selenium-webdriver} - s.version = "2.40.0.rc2" + s.version = "2.40.0" - s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version= + s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version= s.authors = ["Jari Bakken"] - s.date = %q{2014-02-17} + s.date = %q{2014-02-19} s.description = %q{WebDriver is a tool for writing automated tests of websites. It aims to mimic the behaviour of a real user, and as such interacts with the HTML of the application.} s.email = %q{jari.bakken@gmail.com} s.files = ["lib/selenium", "lib/selenium-client.rb", "lib/selenium-webdriver.rb", "lib/selenium/client", "lib/selenium/client.rb", "lib/selenium/rake", "lib/selenium/server.rb", "lib/selenium/webdriver", "lib/selenium/webdriver.rb", "lib/selenium/client/base.rb", "lib/selenium/client/driver.rb", "lib/selenium/client/errors.rb", "lib/selenium/client/extensions.rb", "lib/selenium/client/idiomatic.rb", "lib/selenium/client/javascript_expression_builder.rb", "lib/selenium/client/javascript_frameworks", "lib/selenium/client/legacy_driver.rb", "lib/selenium/client/protocol.rb", "lib/selenium/client/selenium_helper.rb", "lib/selenium/client/javascript_frameworks/jquery.rb", "lib/selenium/client/javascript_frameworks/prototype.rb", "lib/selenium/rake/server_task.rb", "lib/selenium/webdriver/android", "lib/selenium/webdriver/android.rb", "lib/selenium/webdriver/chrome", "lib/selenium/webdriver/chrome.rb", "lib/selenium/webdriver/common", "lib/selenium/webdriver/common.rb", "lib/selenium/webdriver/firefox", "lib/selenium/webdriver/firefox.rb", "lib/selenium/webdriver/ie", "lib/selenium/webdriver/ie.rb", "lib/selenium/webdriver/iphone", "lib/selenium/webdriver/iphone.rb", "lib/selenium/webdriver/opera", "lib/selenium/webdriver/opera.rb", "lib/selenium/webdriver/phantomjs", "lib/selenium/webdriver/phantomjs.rb", "lib/selenium/webdriver/remote", "lib/selenium/webdriver/remote.rb", "lib/selenium/webdriver/safari", "lib/selenium/webdriver/safari.rb", "lib/selenium/webdriver/support", "lib/selenium/webdriver/support.rb", "lib/selenium/webdriver/android/bridge.rb", "lib/selenium/webdriver/chrome/bridge.rb", "lib/selenium/webdriver/chrome/profile.rb", "lib/selenium/webdriver/chrome/service.rb", "lib/selenium/webdriver/common/action_builder.rb", "lib/selenium/webdriver/common/alert.rb", "lib/selenium/webdriver/common/bridge_helper.rb", "lib/selenium/webdriver/common/core_ext", "lib/selenium/webdriver/common/driver.rb", "lib/selenium/webdriver/common/driver_extensions", "lib/selenium/webdriver/common/element.rb", "lib/selenium/webdriver/common/error.rb", "lib/selenium/webdriver/common/file_reaper.rb", "lib/selenium/webdriver/common/html5", "lib/selenium/webdriver/common/json_helper.rb", "lib/selenium/webdriver/common/keyboard.rb", "lib/selenium/webdriver/common/keys.rb", "lib/selenium/webdriver/common/log_entry.rb", "lib/selenium/webdriver/common/logs.rb", "lib/selenium/webdriver/common/mouse.rb", "lib/selenium/webdriver/common/navigation.rb", "lib/selenium/webdriver/common/options.rb", "lib/selenium/webdriver/common/platform.rb", "lib/selenium/webdriver/common/port_prober.rb", "lib/selenium/webdriver/common/profile_helper.rb", "lib/selenium/webdriver/common/proxy.rb", "lib/selenium/webdriver/common/search_context.rb", "lib/selenium/webdriver/common/socket_poller.rb", "lib/selenium/webdriver/common/target_locator.rb", "lib/selenium/webdriver/common/timeouts.rb", "lib/selenium/webdriver/common/touch_action_builder.rb", "lib/selenium/webdriver/common/touch_screen.rb", "lib/selenium/webdriver/common/wait.rb", "lib/selenium/webdriver/common/window.rb", "lib/selenium/webdriver/common/zipper.rb", "lib/selenium/webdriver/common/core_ext/base64.rb", "lib/selenium/webdriver/common/core_ext/dir.rb", "lib/selenium/webdriver/common/core_ext/string.rb", "lib/selenium/webdriver/common/driver_extensions/has_browser_connection.rb", "lib/selenium/webdriver/common/driver_extensions/has_input_devices.rb", "lib/selenium/webdriver/common/driver_extensions/has_location.rb", "lib/selenium/webdriver/common/driver_extensions/has_remote_status.rb", "lib/selenium/webdriver/common/driver_extensions/has_session_id.rb", "lib/selenium/webdriver/common/driver_extensions/has_touch_screen.rb", "lib/selenium/webdriver/common/driver_extensions/has_web_storage.rb", "lib/selenium/webdriver/common/driver_extensions/rotatable.rb", "lib/selenium/webdriver/common/driver_extensions/takes_screenshot.rb", "lib/selenium/webdriver/common/driver_extensions/uploads_files.rb", "lib/selenium/webdriver/common/html5/local_storage.rb", "lib/selenium/webdriver/common/html5/location.rb", "lib/selenium/webdriver/common/html5/session_storage.rb", "lib/selenium/webdriver/common/html5/shared_web_storage.rb", "lib/selenium/webdriver/firefox/binary.rb", "lib/selenium/webdriver/firefox/bridge.rb", "lib/selenium/webdriver/firefox/extension", "lib/selenium/webdriver/firefox/extension.rb", "lib/selenium/webdriver/firefox/launcher.rb", "lib/selenium/webdriver/firefox/native", "lib/selenium/webdriver/firefox/profile.rb", "lib/selenium/webdriver/firefox/profiles_ini.rb", "lib/selenium/webdriver/firefox/socket_lock.rb", "lib/selenium/webdriver/firefox/util.rb", "lib/selenium/webdriver/firefox/extension/prefs.json", "lib/selenium/webdriver/firefox/extension/webdriver.xpi", "lib/selenium/webdriver/firefox/native/linux", "lib/selenium/webdriver/firefox/native/linux/amd64", "lib/selenium/webdriver/firefox/native/linux/x86", "lib/selenium/webdriver/firefox/native/linux/amd64/x_ignore_nofocus.so", "lib/selenium/webdriver/firefox/native/linux/x86/x_ignore_nofocus.so", "lib/selenium/webdriver/ie/bridge.rb", "lib/selenium/webdriver/ie/server.rb", "lib/selenium/webdriver/iphone/bridge.rb", "lib/selenium/webdriver/opera/bridge.rb", "lib/selenium/webdriver/opera/service.rb", "lib/selenium/webdriver/phantomjs/bridge.rb", "lib/selenium/webdriver/phantomjs/service.rb", "lib/selenium/webdriver/remote/bridge.rb", "lib/selenium/webdriver/remote/capabilities.rb", "lib/selenium/webdriver/remote/commands.rb", "lib/selenium/webdriver/remote/http", "lib/selenium/webdriver/remote/response.rb", "lib/selenium/webdriver/remote/server_error.rb", "lib/selenium/webdriver/remote/http/common.rb", "lib/selenium/webdriver/remote/http/curb.rb", "lib/selenium/webdriver/remote/http/default.rb", "lib/selenium/webdriver/remote/http/persistent.rb", "lib/selenium/webdriver/safari/bridge.rb", "lib/selenium/webdriver/safari/browser.rb", "lib/selenium/webdriver/safari/extensions.rb", "lib/selenium/webdriver/safari/options.rb", "lib/selenium/webdriver/safari/resources", "lib/selenium/webdriver/safari/server.rb", "lib/selenium/webdriver/safari/resources/client.js", "lib/selenium/webdriver/safari/resources/SafariDriver.safariextz", "lib/selenium/webdriver/support/abstract_event_listener.rb", "lib/selenium/webdriver/support/block_event_listener.rb", "lib/selenium/webdriver/support/color.rb", "lib/selenium/webdriver/support/event_firing_bridge.rb", "lib/selenium/webdriver/support/select.rb", "CHANGES", "README.md", "COPYING"]