mirror of
https://github.com/rails/rails.git
synced 2022-11-09 12:12:34 -05:00
Merge pull request #29859 from dwightwatson/feature/rack-test
Update rack-test dependency constraint
This commit is contained in:
commit
d9ca57ab0b
2 changed files with 71 additions and 66 deletions
135
Gemfile.lock
135
Gemfile.lock
|
@ -1,6 +1,6 @@
|
|||
GIT
|
||||
remote: https://github.com/QueueClassic/queue_classic.git
|
||||
revision: 51d56ca6fa2fdf1eeffdffd702ae1cc0940b5156
|
||||
revision: cde82d17ded2799ed726dd7b0df6ce1fd4c1b7da
|
||||
branch: master
|
||||
specs:
|
||||
queue_classic (3.2.0.RC1)
|
||||
|
@ -64,7 +64,7 @@ PATH
|
|||
actionview (= 5.2.0.alpha)
|
||||
activesupport (= 5.2.0.alpha)
|
||||
rack (~> 2.0)
|
||||
rack-test (~> 0.6.3)
|
||||
rack-test (>= 0.6.3)
|
||||
rails-dom-testing (~> 2.0)
|
||||
rails-html-sanitizer (~> 1.0, >= 1.0.2)
|
||||
actionview (5.2.0.alpha)
|
||||
|
@ -111,9 +111,9 @@ GEM
|
|||
specs:
|
||||
addressable (2.5.1)
|
||||
public_suffix (~> 2.0, >= 2.0.2)
|
||||
amq-protocol (2.1.0)
|
||||
amq-protocol (2.2.0)
|
||||
ast (2.3.0)
|
||||
backburner (1.3.1)
|
||||
backburner (1.4.1)
|
||||
beaneater (~> 1.0)
|
||||
concurrent-ruby (~> 1.0.1)
|
||||
dante (> 0.1.5)
|
||||
|
@ -135,28 +135,28 @@ GEM
|
|||
thor (~> 0.19.1)
|
||||
useragent (~> 0.16.7)
|
||||
blade-qunit_adapter (2.0.1)
|
||||
blade-sauce_labs_plugin (0.6.2)
|
||||
blade-sauce_labs_plugin (0.7.1)
|
||||
childprocess
|
||||
faraday
|
||||
selenium-webdriver
|
||||
bootsnap (1.1.0)
|
||||
bootsnap (1.1.2)
|
||||
msgpack (~> 1.0)
|
||||
builder (3.2.3)
|
||||
bunny (2.6.2)
|
||||
amq-protocol (>= 2.0.1)
|
||||
bunny (2.6.6)
|
||||
amq-protocol (>= 2.1.0)
|
||||
byebug (9.0.6)
|
||||
capybara (2.14.1)
|
||||
capybara (2.14.4)
|
||||
addressable
|
||||
mime-types (>= 1.16)
|
||||
nokogiri (>= 1.3.3)
|
||||
rack (>= 1.0.0)
|
||||
rack-test (>= 0.5.4)
|
||||
xpath (~> 2.0)
|
||||
childprocess (0.5.9)
|
||||
childprocess (0.7.1)
|
||||
ffi (~> 1.0, >= 1.0.11)
|
||||
coffee-rails (4.2.1)
|
||||
coffee-rails (4.2.2)
|
||||
coffee-script (>= 2.2.0)
|
||||
railties (>= 4.0.0, < 5.2.x)
|
||||
railties (>= 4.0.0)
|
||||
coffee-script (2.4.1)
|
||||
coffee-script-source
|
||||
execjs
|
||||
|
@ -184,16 +184,18 @@ GEM
|
|||
http_parser.rb (>= 0.6.0)
|
||||
em-socksify (0.3.1)
|
||||
eventmachine (>= 1.0.0.beta.4)
|
||||
erubi (1.6.0)
|
||||
erubi (1.6.1)
|
||||
erubis (2.7.0)
|
||||
et-orbi (1.0.5)
|
||||
tzinfo
|
||||
event_emitter (0.2.5)
|
||||
eventmachine (1.2.1)
|
||||
eventmachine (1.2.1-x64-mingw32)
|
||||
eventmachine (1.2.1-x86-mingw32)
|
||||
eventmachine (1.2.3)
|
||||
eventmachine (1.2.3-x64-mingw32)
|
||||
eventmachine (1.2.3-x86-mingw32)
|
||||
execjs (2.7.0)
|
||||
faraday (0.11.0)
|
||||
faraday (0.12.2)
|
||||
multipart-post (>= 1.2, < 3)
|
||||
faye (1.2.3)
|
||||
faye (1.2.4)
|
||||
cookiejar (>= 0.3.0)
|
||||
em-http-request (>= 0.3.0)
|
||||
eventmachine (>= 0.12.0)
|
||||
|
@ -201,33 +203,33 @@ GEM
|
|||
multi_json (>= 1.0.0)
|
||||
rack (>= 1.0.0)
|
||||
websocket-driver (>= 0.5.1)
|
||||
faye-websocket (0.10.5)
|
||||
faye-websocket (0.10.7)
|
||||
eventmachine (>= 0.12.0)
|
||||
websocket-driver (>= 0.5.1)
|
||||
ffi (1.9.17)
|
||||
ffi (1.9.17-x64-mingw32)
|
||||
ffi (1.9.17-x86-mingw32)
|
||||
ffi (1.9.18)
|
||||
ffi (1.9.18-x64-mingw32)
|
||||
ffi (1.9.18-x86-mingw32)
|
||||
globalid (0.4.0)
|
||||
activesupport (>= 4.2.0)
|
||||
hiredis (0.6.1)
|
||||
http_parser.rb (0.6.0)
|
||||
i18n (0.8.1)
|
||||
jquery-rails (4.2.2)
|
||||
i18n (0.8.6)
|
||||
jquery-rails (4.3.1)
|
||||
rails-dom-testing (>= 1, < 3)
|
||||
railties (>= 4.2.0)
|
||||
thor (>= 0.14, < 2.0)
|
||||
json (2.0.3)
|
||||
json (2.1.0)
|
||||
kindlerb (1.2.0)
|
||||
mustache
|
||||
nokogiri
|
||||
libxml-ruby (2.9.0)
|
||||
libxml-ruby (3.0.0)
|
||||
listen (3.1.5)
|
||||
rb-fsevent (~> 0.9, >= 0.9.4)
|
||||
rb-inotify (~> 0.9, >= 0.9.7)
|
||||
ruby_dep (~> 1.2)
|
||||
loofah (2.0.3)
|
||||
nokogiri (>= 1.5.9)
|
||||
mail (2.6.5)
|
||||
mail (2.6.6)
|
||||
mime-types (>= 1.16, < 4)
|
||||
metaclass (0.0.4)
|
||||
method_source (0.8.2)
|
||||
|
@ -244,11 +246,12 @@ GEM
|
|||
msgpack (1.1.0-x86-mingw32)
|
||||
multi_json (1.12.1)
|
||||
multipart-post (2.0.0)
|
||||
mustache (1.0.3)
|
||||
mysql2 (0.4.6)
|
||||
mysql2 (0.4.6-x64-mingw32)
|
||||
mysql2 (0.4.6-x86-mingw32)
|
||||
nio4r (2.0.0)
|
||||
mustache (1.0.5)
|
||||
mustermann (1.0.0)
|
||||
mysql2 (0.4.8)
|
||||
mysql2 (0.4.8-x64-mingw32)
|
||||
mysql2 (0.4.8-x86-mingw32)
|
||||
nio4r (2.1.0)
|
||||
nokogiri (1.8.0)
|
||||
mini_portile2 (~> 2.2.0)
|
||||
nokogiri (1.8.0-x64-mingw32)
|
||||
|
@ -262,39 +265,39 @@ GEM
|
|||
pg (0.19.0-x64-mingw32)
|
||||
pg (0.19.0-x86-mingw32)
|
||||
powerpack (0.1.1)
|
||||
psych (2.2.2)
|
||||
psych (2.2.4)
|
||||
public_suffix (2.0.5)
|
||||
puma (3.7.0)
|
||||
puma (3.9.1)
|
||||
qu (0.2.0)
|
||||
multi_json
|
||||
qu-redis (0.2.0)
|
||||
qu (= 0.2.0)
|
||||
redis-namespace
|
||||
simple_uuid
|
||||
que (0.12.0)
|
||||
que (0.13.1)
|
||||
racc (1.4.14)
|
||||
rack (2.0.3)
|
||||
rack-cache (1.6.1)
|
||||
rack-cache (1.7.0)
|
||||
rack (>= 0.4)
|
||||
rack-protection (2.0.0)
|
||||
rack
|
||||
rack-test (0.6.3)
|
||||
rack (>= 1.0)
|
||||
rails-dom-testing (2.0.2)
|
||||
activesupport (>= 4.2.0, < 6.0)
|
||||
nokogiri (~> 1.6)
|
||||
rack-test (0.7.0)
|
||||
rack (>= 1.0, < 3)
|
||||
rails-dom-testing (2.0.3)
|
||||
activesupport (>= 4.2.0)
|
||||
nokogiri (>= 1.6)
|
||||
rails-html-sanitizer (1.0.3)
|
||||
loofah (~> 2.0)
|
||||
rainbow (2.2.2)
|
||||
rake
|
||||
rake (12.0.0)
|
||||
rb-fsevent (0.9.8)
|
||||
rb-fsevent (0.10.2)
|
||||
rdoc (5.1.0)
|
||||
redcarpet (3.2.3)
|
||||
redis (3.3.3)
|
||||
redis-namespace (1.5.2)
|
||||
redis-namespace (1.5.3)
|
||||
redis (~> 3.0, >= 3.0.4)
|
||||
resque (1.27.0)
|
||||
resque (1.27.4)
|
||||
mono_logger (~> 1.0)
|
||||
multi_json (~> 1.0)
|
||||
redis-namespace (~> 1.3)
|
||||
|
@ -314,9 +317,9 @@ GEM
|
|||
unicode-display_width (~> 1.0, >= 1.0.1)
|
||||
ruby-progressbar (1.8.1)
|
||||
ruby_dep (1.5.0)
|
||||
rubyzip (1.2.0)
|
||||
rufus-scheduler (3.3.2)
|
||||
tzinfo
|
||||
rubyzip (1.2.1)
|
||||
rufus-scheduler (3.4.2)
|
||||
et-orbi (~> 1.0)
|
||||
sass (3.5.1)
|
||||
sass-listen (~> 4.0.0)
|
||||
sass-listen (4.0.0)
|
||||
|
@ -324,31 +327,33 @@ GEM
|
|||
rb-inotify (~> 0.9, >= 0.9.7)
|
||||
sdoc (1.0.0.rc2)
|
||||
rdoc (~> 5.0)
|
||||
selenium-webdriver (3.0.5)
|
||||
selenium-webdriver (3.4.4)
|
||||
childprocess (~> 0.5)
|
||||
rubyzip (~> 1.0)
|
||||
websocket (~> 1.0)
|
||||
sequel (4.42.1)
|
||||
sequel (4.48.0)
|
||||
serverengine (1.5.11)
|
||||
sigdump (~> 0.2.2)
|
||||
sidekiq (5.0.0)
|
||||
sidekiq (5.0.4)
|
||||
concurrent-ruby (~> 1.0)
|
||||
connection_pool (~> 2.2, >= 2.2.0)
|
||||
rack-protection (>= 1.5.0)
|
||||
redis (~> 3.3, >= 3.3.3)
|
||||
sigdump (0.2.4)
|
||||
simple_uuid (0.4.0)
|
||||
sinatra (1.0)
|
||||
rack (>= 1.0)
|
||||
sneakers (2.4.0)
|
||||
bunny (~> 2.6)
|
||||
sinatra (2.0.0)
|
||||
mustermann (~> 1.0)
|
||||
rack (~> 2.0)
|
||||
rack-protection (= 2.0.0)
|
||||
tilt (~> 2.0)
|
||||
sneakers (2.5.0)
|
||||
bunny (~> 2.6.4)
|
||||
serverengine (~> 1.5.11)
|
||||
thor
|
||||
thread (~> 0.1.7)
|
||||
sprockets (3.7.1)
|
||||
concurrent-ruby (~> 1.0)
|
||||
rack (> 1, < 3)
|
||||
sprockets-export (0.9.1)
|
||||
sprockets-export (1.0.0)
|
||||
sprockets-rails (3.2.0)
|
||||
actionpack (>= 4.0)
|
||||
activesupport (>= 4.0)
|
||||
|
@ -359,7 +364,7 @@ GEM
|
|||
stackprof (0.2.10)
|
||||
sucker_punch (2.0.2)
|
||||
concurrent-ruby (~> 1.0.0)
|
||||
thin (1.7.0)
|
||||
thin (1.7.2)
|
||||
daemons (~> 1.0, >= 1.0.9)
|
||||
eventmachine (~> 1.0, >= 1.0.4)
|
||||
rack (>= 1, < 3)
|
||||
|
@ -368,23 +373,23 @@ GEM
|
|||
tilt (2.0.8)
|
||||
turbolinks (5.0.1)
|
||||
turbolinks-source (~> 5)
|
||||
turbolinks-source (5.0.0)
|
||||
turbolinks-source (5.0.3)
|
||||
tzinfo (1.2.3)
|
||||
thread_safe (~> 0.1)
|
||||
tzinfo-data (1.2016.10)
|
||||
tzinfo-data (1.2017.2)
|
||||
tzinfo (>= 1.0.0)
|
||||
uglifier (3.0.4)
|
||||
uglifier (3.2.0)
|
||||
execjs (>= 0.3.0, < 3)
|
||||
unicode-display_width (1.2.1)
|
||||
unicode-display_width (1.3.0)
|
||||
useragent (0.16.8)
|
||||
vegas (0.1.11)
|
||||
rack (>= 1.0.0)
|
||||
w3c_validators (1.3.1)
|
||||
json (~> 2.0)
|
||||
w3c_validators (1.3.3)
|
||||
json (>= 1.8)
|
||||
nokogiri (~> 1.6)
|
||||
wdm (0.1.1)
|
||||
websocket (1.2.3)
|
||||
websocket-driver (0.6.4)
|
||||
websocket (1.2.4)
|
||||
websocket-driver (0.6.5)
|
||||
websocket-extensions (>= 0.1.0)
|
||||
websocket-extensions (0.1.2)
|
||||
xpath (2.1.0)
|
||||
|
|
|
@ -27,7 +27,7 @@ Gem::Specification.new do |s|
|
|||
s.add_dependency "activesupport", version
|
||||
|
||||
s.add_dependency "rack", "~> 2.0"
|
||||
s.add_dependency "rack-test", "~> 0.6.3"
|
||||
s.add_dependency "rack-test", ">= 0.6.3"
|
||||
s.add_dependency "rails-html-sanitizer", "~> 1.0", ">= 1.0.2"
|
||||
s.add_dependency "rails-dom-testing", "~> 2.0"
|
||||
s.add_dependency "actionview", version
|
||||
|
|
Loading…
Reference in a new issue