mirror of
https://github.com/thoughtbot/capybara-webkit
synced 2023-03-27 23:22:28 -04:00
Bump runtime dependencies for Capybara 2.5
We're not completely compatible with the release, as Node#send_keys implementation is missing. However, we're going to release this so that people can get started with Capybara 2.5 today.
This commit is contained in:
parent
d92052fec3
commit
cb7420d792
8 changed files with 49 additions and 45 deletions
|
@ -13,15 +13,15 @@ env:
|
|||
- NOKOGIRI_USE_SYSTEM_LIBRARIES=true
|
||||
matrix:
|
||||
include:
|
||||
- rvm: 1.9.3
|
||||
gemfile: gemfiles/2.3.gemfile
|
||||
env: QMAKE=/usr/lib/x86_64-linux-gnu/qt5/bin/qmake
|
||||
- rvm: 1.9.3
|
||||
gemfile: gemfiles/2.4.gemfile
|
||||
env: QMAKE=/usr/lib/x86_64-linux-gnu/qt5/bin/qmake
|
||||
- rvm: 1.9.3
|
||||
gemfile: gemfiles/2.5.gemfile
|
||||
env: QMAKE=/usr/lib/x86_64-linux-gnu/qt5/bin/qmake
|
||||
gemfile:
|
||||
- gemfiles/2.3.gemfile
|
||||
- gemfiles/2.4.gemfile
|
||||
- gemfiles/2.5.gemfile
|
||||
before_install:
|
||||
- sh -c 'if [ -n "$QMAKE" ]; then sudo apt-add-repository -y ppa:ubuntu-sdk-team/ppa && sudo apt-get update && sudo apt-get install libqt5webkit5-dev qtdeclarative5-dev; fi'
|
||||
install: bundle
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
appraise "2.3" do
|
||||
gem "capybara", "~> 2.3.0"
|
||||
end
|
||||
|
||||
appraise "2.4" do
|
||||
gem "capybara", "~> 2.4.0"
|
||||
end
|
||||
|
||||
appraise "2.5" do
|
||||
gem "capybara", "~> 2.5.0"
|
||||
end
|
||||
|
|
14
Gemfile.lock
14
Gemfile.lock
|
@ -2,7 +2,7 @@ PATH
|
|||
remote: .
|
||||
specs:
|
||||
capybara-webkit (1.6.0)
|
||||
capybara (>= 2.3.0, < 2.5.0)
|
||||
capybara (>= 2.3.0, < 2.6.0)
|
||||
json
|
||||
|
||||
GEM
|
||||
|
@ -12,7 +12,7 @@ GEM
|
|||
appraisal (0.4.0)
|
||||
bundler
|
||||
rake
|
||||
capybara (2.4.4)
|
||||
capybara (2.5.0)
|
||||
mime-types (>= 1.16)
|
||||
nokogiri (>= 1.3.3)
|
||||
rack (>= 1.0.0)
|
||||
|
@ -24,20 +24,24 @@ GEM
|
|||
ffi (1.9.8)
|
||||
ffi (1.9.8-java)
|
||||
ffi (1.9.8-x86-mingw32)
|
||||
json (1.8.2)
|
||||
json (1.8.3)
|
||||
json (1.8.3-java)
|
||||
launchy (2.4.2)
|
||||
addressable (~> 2.3)
|
||||
launchy (2.4.2-java)
|
||||
addressable (~> 2.3)
|
||||
spoon (~> 0.0.1)
|
||||
mime-types (2.5)
|
||||
mime-types (2.6.1)
|
||||
mini_magick (3.2.1)
|
||||
subexec (~> 0.0.4)
|
||||
mini_portile (0.6.2)
|
||||
multi_json (1.11.0)
|
||||
nokogiri (1.6.6.2)
|
||||
mini_portile (~> 0.6.0)
|
||||
rack (1.5.2)
|
||||
nokogiri (1.6.6.2-java)
|
||||
nokogiri (1.6.6.2-x86-mingw32)
|
||||
mini_portile (~> 0.6.0)
|
||||
rack (1.6.4)
|
||||
rack-protection (1.3.2)
|
||||
rack
|
||||
rack-test (0.6.3)
|
||||
|
|
|
@ -19,7 +19,7 @@ Gem::Specification.new do |s|
|
|||
|
||||
s.required_ruby_version = ">= 1.9.0"
|
||||
|
||||
s.add_runtime_dependency("capybara", ">= 2.3.0", "< 2.5.0")
|
||||
s.add_runtime_dependency("capybara", ">= 2.3.0", "< 2.6.0")
|
||||
s.add_runtime_dependency("json")
|
||||
|
||||
s.add_development_dependency("rspec", "~> 2.14.0")
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
PATH
|
||||
remote: ../
|
||||
specs:
|
||||
capybara-webkit (1.5.0)
|
||||
capybara (>= 2.3.0, < 2.5.0)
|
||||
capybara-webkit (1.6.0)
|
||||
capybara (>= 2.3.0, < 2.6.0)
|
||||
json
|
||||
|
||||
GEM
|
||||
|
@ -22,7 +22,7 @@ GEM
|
|||
ffi (~> 1.0, >= 1.0.11)
|
||||
diff-lcs (1.2.5)
|
||||
ffi (1.9.8)
|
||||
json (1.8.2)
|
||||
json (1.8.3)
|
||||
launchy (2.4.2)
|
||||
addressable (~> 2.3)
|
||||
mime-types (2.4.3)
|
||||
|
|
|
@ -2,6 +2,6 @@
|
|||
|
||||
source "https://rubygems.org"
|
||||
|
||||
gem "capybara", "~> 2.3.0"
|
||||
gem "capybara", "~> 2.5.0"
|
||||
|
||||
gemspec :path=>"../"
|
|
@ -1,43 +1,42 @@
|
|||
PATH
|
||||
remote: ../
|
||||
specs:
|
||||
capybara-webkit (1.5.0)
|
||||
capybara (>= 2.3.0, < 2.5.0)
|
||||
capybara-webkit (1.6.0)
|
||||
capybara (>= 2.3.0, < 2.6.0)
|
||||
json
|
||||
|
||||
GEM
|
||||
remote: https://rubygems.org/
|
||||
specs:
|
||||
addressable (2.3.6)
|
||||
addressable (2.3.8)
|
||||
appraisal (0.4.1)
|
||||
bundler
|
||||
rake
|
||||
capybara (2.3.0)
|
||||
capybara (2.5.0)
|
||||
mime-types (>= 1.16)
|
||||
nokogiri (>= 1.3.3)
|
||||
rack (>= 1.0.0)
|
||||
rack-test (>= 0.5.4)
|
||||
xpath (~> 2.0)
|
||||
childprocess (0.5.5)
|
||||
childprocess (0.5.6)
|
||||
ffi (~> 1.0, >= 1.0.11)
|
||||
diff-lcs (1.2.5)
|
||||
ffi (1.9.8)
|
||||
json (1.8.2)
|
||||
launchy (2.4.2)
|
||||
ffi (1.9.10)
|
||||
json (1.8.3)
|
||||
launchy (2.4.3)
|
||||
addressable (~> 2.3)
|
||||
mime-types (2.3)
|
||||
mini_magick (3.7.0)
|
||||
subexec (~> 0.2.1)
|
||||
mini_portile (0.6.0)
|
||||
multi_json (1.11.0)
|
||||
nokogiri (1.6.2.1)
|
||||
mini_portile (= 0.6.0)
|
||||
rack (1.5.2)
|
||||
mime-types (2.6.1)
|
||||
mini_magick (4.2.10)
|
||||
mini_portile (0.6.2)
|
||||
multi_json (1.11.2)
|
||||
nokogiri (1.6.6.2)
|
||||
mini_portile (~> 0.6.0)
|
||||
rack (1.6.4)
|
||||
rack-protection (1.5.3)
|
||||
rack
|
||||
rack-test (0.6.2)
|
||||
rack-test (0.6.3)
|
||||
rack (>= 1.0)
|
||||
rake (10.3.2)
|
||||
rake (10.4.2)
|
||||
rspec (2.14.1)
|
||||
rspec-core (~> 2.14.0)
|
||||
rspec-expectations (~> 2.14.0)
|
||||
|
@ -47,18 +46,17 @@ GEM
|
|||
diff-lcs (>= 1.1.3, < 2.0)
|
||||
rspec-mocks (2.14.6)
|
||||
rubyzip (1.1.7)
|
||||
selenium-webdriver (2.45.0)
|
||||
selenium-webdriver (2.47.1)
|
||||
childprocess (~> 0.5)
|
||||
multi_json (~> 1.0)
|
||||
rubyzip (~> 1.0)
|
||||
websocket (~> 1.0)
|
||||
sinatra (1.4.5)
|
||||
sinatra (1.4.6)
|
||||
rack (~> 1.4)
|
||||
rack-protection (~> 1.4)
|
||||
tilt (~> 1.3, >= 1.3.4)
|
||||
subexec (0.2.3)
|
||||
tilt (1.4.1)
|
||||
websocket (1.2.1)
|
||||
tilt (>= 1.3, < 3)
|
||||
tilt (2.0.1)
|
||||
websocket (1.2.2)
|
||||
xpath (2.0.0)
|
||||
nokogiri (~> 1.3)
|
||||
|
||||
|
@ -67,7 +65,7 @@ PLATFORMS
|
|||
|
||||
DEPENDENCIES
|
||||
appraisal (~> 0.4.0)
|
||||
capybara (~> 2.3.0)
|
||||
capybara (~> 2.5.0)
|
||||
capybara-webkit!
|
||||
launchy
|
||||
mini_magick
|
|
@ -49,8 +49,10 @@ RSpec.configure do |c|
|
|||
|
||||
# We can't support outerWidth and outerHeight without a visible window.
|
||||
# We focus the next window instead of failing when closing windows.
|
||||
c.filter_run_excluding :full_description =>
|
||||
/Capybara::Session webkit Capybara::Window #(size|resize_to|maximize|close.*no_such_window_error)/
|
||||
# Node #send_keys is not yet implemented.
|
||||
c.filter_run_excluding :full_description => lambda { |description, metadata|
|
||||
description =~ /Capybara::Session webkit Capybara::Window #(size|resize_to|maximize|close.*no_such_window_error|send_keys)/ || description =~ /Capybara::Session webkit node #send_keys/
|
||||
}
|
||||
|
||||
# Capybara's integration tests expect "capybara/" in the default path
|
||||
c.around :requires => :screenshot do |example|
|
||||
|
|
Loading…
Reference in a new issue