Add Ruby 3.1 to CI matrix. Lock to Nokogiri < 1.13 for webrat compatibility
This commit is contained in:
parent
025b1c8734
commit
3c5acaf531
|
@ -23,7 +23,8 @@ jobs:
|
||||||
- 2.5
|
- 2.5
|
||||||
- 2.6
|
- 2.6
|
||||||
- 2.7
|
- 2.7
|
||||||
- 3.0
|
- '3.0'
|
||||||
|
- 3.1
|
||||||
env:
|
env:
|
||||||
- DEVISE_ORM=active_record
|
- DEVISE_ORM=active_record
|
||||||
- DEVISE_ORM=mongoid
|
- DEVISE_ORM=mongoid
|
||||||
|
@ -94,16 +95,32 @@ jobs:
|
||||||
gemfile: gemfiles/Gemfile-rails-5-1
|
gemfile: gemfiles/Gemfile-rails-5-1
|
||||||
- ruby: 2.7
|
- ruby: 2.7
|
||||||
gemfile: gemfiles/Gemfile-rails-5-2
|
gemfile: gemfiles/Gemfile-rails-5-2
|
||||||
- ruby: 3.0
|
- ruby: '3.0'
|
||||||
gemfile: gemfiles/Gemfile-rails-4-1
|
gemfile: gemfiles/Gemfile-rails-4-1
|
||||||
- ruby: 3.0
|
- ruby: '3.0'
|
||||||
gemfile: gemfiles/Gemfile-rails-4-2
|
gemfile: gemfiles/Gemfile-rails-4-2
|
||||||
- ruby: 3.0
|
- ruby: '3.0'
|
||||||
gemfile: gemfiles/Gemfile-rails-5-0
|
gemfile: gemfiles/Gemfile-rails-5-0
|
||||||
- ruby: 3.0
|
- ruby: '3.0'
|
||||||
gemfile: gemfiles/Gemfile-rails-5-1
|
gemfile: gemfiles/Gemfile-rails-5-1
|
||||||
- ruby: 3.0
|
- ruby: '3.0'
|
||||||
gemfile: gemfiles/Gemfile-rails-5-2
|
gemfile: gemfiles/Gemfile-rails-5-2
|
||||||
|
- ruby: 3.1
|
||||||
|
gemfile: gemfiles/Gemfile-rails-5-1
|
||||||
|
- ruby: 3.1
|
||||||
|
gemfile: gemfiles/Gemfile-rails-5-2
|
||||||
|
- ruby: 3.1
|
||||||
|
gemfile: gemfiles/Gemfile-rails-4-1
|
||||||
|
- ruby: 3.1
|
||||||
|
gemfile: gemfiles/Gemfile-rails-4-2
|
||||||
|
- ruby: 3.1
|
||||||
|
gemfile: gemfiles/Gemfile-rails-5-0
|
||||||
|
- ruby: 3.1
|
||||||
|
gemfile: gemfiles/Gemfile-rails-5-1
|
||||||
|
- ruby: 3.1
|
||||||
|
gemfile: gemfiles/Gemfile-rails-5-2
|
||||||
|
- ruby: 3.1
|
||||||
|
gemfile: gemfiles/Gemfile-rails-6-0
|
||||||
- env: DEVISE_ORM=mongoid
|
- env: DEVISE_ORM=mongoid
|
||||||
gemfile: Gemfile
|
gemfile: Gemfile
|
||||||
- env: DEVISE_ORM=mongoid
|
- env: DEVISE_ORM=mongoid
|
||||||
|
|
1
Gemfile
1
Gemfile
|
@ -14,6 +14,7 @@ gem "rails-controller-testing", github: "rails/rails-controller-testing"
|
||||||
gem "responders", "~> 3.0"
|
gem "responders", "~> 3.0"
|
||||||
|
|
||||||
group :test do
|
group :test do
|
||||||
|
gem "nokogiri", "< 1.13"
|
||||||
gem "omniauth-facebook"
|
gem "omniauth-facebook"
|
||||||
gem "omniauth-openid"
|
gem "omniauth-openid"
|
||||||
gem "rexml"
|
gem "rexml"
|
||||||
|
|
178
Gemfile.lock
178
Gemfile.lock
|
@ -1,6 +1,6 @@
|
||||||
GIT
|
GIT
|
||||||
remote: https://github.com/rails/rails-controller-testing.git
|
remote: https://github.com/rails/rails-controller-testing.git
|
||||||
revision: 36e84822ee997d69c971f03f3f3759ee4f4bdc37
|
revision: 351c0162df0771c0c48e6a5a886c4c2f0a5d1a74
|
||||||
specs:
|
specs:
|
||||||
rails-controller-testing (1.0.5)
|
rails-controller-testing (1.0.5)
|
||||||
actionpack (>= 5.0.1.rc1)
|
actionpack (>= 5.0.1.rc1)
|
||||||
|
@ -20,61 +20,67 @@ PATH
|
||||||
GEM
|
GEM
|
||||||
remote: https://rubygems.org/
|
remote: https://rubygems.org/
|
||||||
specs:
|
specs:
|
||||||
actioncable (7.0.0)
|
actioncable (7.0.2.2)
|
||||||
actionpack (= 7.0.0)
|
actionpack (= 7.0.2.2)
|
||||||
activesupport (= 7.0.0)
|
activesupport (= 7.0.2.2)
|
||||||
nio4r (~> 2.0)
|
nio4r (~> 2.0)
|
||||||
websocket-driver (>= 0.6.1)
|
websocket-driver (>= 0.6.1)
|
||||||
actionmailbox (7.0.0)
|
actionmailbox (7.0.2.2)
|
||||||
actionpack (= 7.0.0)
|
actionpack (= 7.0.2.2)
|
||||||
activejob (= 7.0.0)
|
activejob (= 7.0.2.2)
|
||||||
activerecord (= 7.0.0)
|
activerecord (= 7.0.2.2)
|
||||||
activestorage (= 7.0.0)
|
activestorage (= 7.0.2.2)
|
||||||
activesupport (= 7.0.0)
|
activesupport (= 7.0.2.2)
|
||||||
mail (>= 2.7.1)
|
mail (>= 2.7.1)
|
||||||
actionmailer (7.0.0)
|
net-imap
|
||||||
actionpack (= 7.0.0)
|
net-pop
|
||||||
actionview (= 7.0.0)
|
net-smtp
|
||||||
activejob (= 7.0.0)
|
actionmailer (7.0.2.2)
|
||||||
activesupport (= 7.0.0)
|
actionpack (= 7.0.2.2)
|
||||||
|
actionview (= 7.0.2.2)
|
||||||
|
activejob (= 7.0.2.2)
|
||||||
|
activesupport (= 7.0.2.2)
|
||||||
mail (~> 2.5, >= 2.5.4)
|
mail (~> 2.5, >= 2.5.4)
|
||||||
|
net-imap
|
||||||
|
net-pop
|
||||||
|
net-smtp
|
||||||
rails-dom-testing (~> 2.0)
|
rails-dom-testing (~> 2.0)
|
||||||
actionpack (7.0.0)
|
actionpack (7.0.2.2)
|
||||||
actionview (= 7.0.0)
|
actionview (= 7.0.2.2)
|
||||||
activesupport (= 7.0.0)
|
activesupport (= 7.0.2.2)
|
||||||
rack (~> 2.0, >= 2.2.0)
|
rack (~> 2.0, >= 2.2.0)
|
||||||
rack-test (>= 0.6.3)
|
rack-test (>= 0.6.3)
|
||||||
rails-dom-testing (~> 2.0)
|
rails-dom-testing (~> 2.0)
|
||||||
rails-html-sanitizer (~> 1.0, >= 1.2.0)
|
rails-html-sanitizer (~> 1.0, >= 1.2.0)
|
||||||
actiontext (7.0.0)
|
actiontext (7.0.2.2)
|
||||||
actionpack (= 7.0.0)
|
actionpack (= 7.0.2.2)
|
||||||
activerecord (= 7.0.0)
|
activerecord (= 7.0.2.2)
|
||||||
activestorage (= 7.0.0)
|
activestorage (= 7.0.2.2)
|
||||||
activesupport (= 7.0.0)
|
activesupport (= 7.0.2.2)
|
||||||
globalid (>= 0.6.0)
|
globalid (>= 0.6.0)
|
||||||
nokogiri (>= 1.8.5)
|
nokogiri (>= 1.8.5)
|
||||||
actionview (7.0.0)
|
actionview (7.0.2.2)
|
||||||
activesupport (= 7.0.0)
|
activesupport (= 7.0.2.2)
|
||||||
builder (~> 3.1)
|
builder (~> 3.1)
|
||||||
erubi (~> 1.4)
|
erubi (~> 1.4)
|
||||||
rails-dom-testing (~> 2.0)
|
rails-dom-testing (~> 2.0)
|
||||||
rails-html-sanitizer (~> 1.1, >= 1.2.0)
|
rails-html-sanitizer (~> 1.1, >= 1.2.0)
|
||||||
activejob (7.0.0)
|
activejob (7.0.2.2)
|
||||||
activesupport (= 7.0.0)
|
activesupport (= 7.0.2.2)
|
||||||
globalid (>= 0.3.6)
|
globalid (>= 0.3.6)
|
||||||
activemodel (7.0.0)
|
activemodel (7.0.2.2)
|
||||||
activesupport (= 7.0.0)
|
activesupport (= 7.0.2.2)
|
||||||
activerecord (7.0.0)
|
activerecord (7.0.2.2)
|
||||||
activemodel (= 7.0.0)
|
activemodel (= 7.0.2.2)
|
||||||
activesupport (= 7.0.0)
|
activesupport (= 7.0.2.2)
|
||||||
activestorage (7.0.0)
|
activestorage (7.0.2.2)
|
||||||
actionpack (= 7.0.0)
|
actionpack (= 7.0.2.2)
|
||||||
activejob (= 7.0.0)
|
activejob (= 7.0.2.2)
|
||||||
activerecord (= 7.0.0)
|
activerecord (= 7.0.2.2)
|
||||||
activesupport (= 7.0.0)
|
activesupport (= 7.0.2.2)
|
||||||
marcel (~> 1.0)
|
marcel (~> 1.0)
|
||||||
mini_mime (>= 1.1.0)
|
mini_mime (>= 1.1.0)
|
||||||
activesupport (7.0.0)
|
activesupport (7.0.2.2)
|
||||||
concurrent-ruby (~> 1.0, >= 1.0.2)
|
concurrent-ruby (~> 1.0, >= 1.0.2)
|
||||||
i18n (>= 1.6, < 2)
|
i18n (>= 1.6, < 2)
|
||||||
minitest (>= 5.1)
|
minitest (>= 5.1)
|
||||||
|
@ -83,33 +89,20 @@ GEM
|
||||||
builder (3.2.4)
|
builder (3.2.4)
|
||||||
concurrent-ruby (1.1.9)
|
concurrent-ruby (1.1.9)
|
||||||
crass (1.0.6)
|
crass (1.0.6)
|
||||||
|
digest (3.1.0)
|
||||||
erubi (1.10.0)
|
erubi (1.10.0)
|
||||||
faraday (1.8.0)
|
faraday (2.2.0)
|
||||||
faraday-em_http (~> 1.0)
|
faraday-net_http (~> 2.0)
|
||||||
faraday-em_synchrony (~> 1.0)
|
|
||||||
faraday-excon (~> 1.1)
|
|
||||||
faraday-httpclient (~> 1.0.1)
|
|
||||||
faraday-net_http (~> 1.0)
|
|
||||||
faraday-net_http_persistent (~> 1.1)
|
|
||||||
faraday-patron (~> 1.0)
|
|
||||||
faraday-rack (~> 1.0)
|
|
||||||
multipart-post (>= 1.2, < 3)
|
|
||||||
ruby2_keywords (>= 0.0.4)
|
ruby2_keywords (>= 0.0.4)
|
||||||
faraday-em_http (1.0.0)
|
faraday-net_http (2.0.1)
|
||||||
faraday-em_synchrony (1.0.0)
|
|
||||||
faraday-excon (1.1.0)
|
|
||||||
faraday-httpclient (1.0.1)
|
|
||||||
faraday-net_http (1.0.1)
|
|
||||||
faraday-net_http_persistent (1.2.0)
|
|
||||||
faraday-patron (1.0.0)
|
|
||||||
faraday-rack (1.0.0)
|
|
||||||
globalid (1.0.0)
|
globalid (1.0.0)
|
||||||
activesupport (>= 5.0)
|
activesupport (>= 5.0)
|
||||||
hashie (5.0.0)
|
hashie (5.0.0)
|
||||||
i18n (1.8.11)
|
i18n (1.10.0)
|
||||||
concurrent-ruby (~> 1.0)
|
concurrent-ruby (~> 1.0)
|
||||||
|
io-wait (0.2.1)
|
||||||
jwt (2.3.0)
|
jwt (2.3.0)
|
||||||
loofah (2.13.0)
|
loofah (2.14.0)
|
||||||
crass (~> 1.0.2)
|
crass (~> 1.0.2)
|
||||||
nokogiri (>= 1.5.9)
|
nokogiri (>= 1.5.9)
|
||||||
mail (2.7.1)
|
mail (2.7.1)
|
||||||
|
@ -122,13 +115,27 @@ GEM
|
||||||
mocha (1.13.0)
|
mocha (1.13.0)
|
||||||
multi_json (1.15.0)
|
multi_json (1.15.0)
|
||||||
multi_xml (0.6.0)
|
multi_xml (0.6.0)
|
||||||
multipart-post (2.1.1)
|
net-imap (0.2.3)
|
||||||
|
digest
|
||||||
|
net-protocol
|
||||||
|
strscan
|
||||||
|
net-pop (0.1.1)
|
||||||
|
digest
|
||||||
|
net-protocol
|
||||||
|
timeout
|
||||||
|
net-protocol (0.1.2)
|
||||||
|
io-wait
|
||||||
|
timeout
|
||||||
|
net-smtp (0.3.1)
|
||||||
|
digest
|
||||||
|
net-protocol
|
||||||
|
timeout
|
||||||
nio4r (2.5.8)
|
nio4r (2.5.8)
|
||||||
nokogiri (1.12.5)
|
nokogiri (1.12.5)
|
||||||
mini_portile2 (~> 2.6.1)
|
mini_portile2 (~> 2.6.1)
|
||||||
racc (~> 1.4)
|
racc (~> 1.4)
|
||||||
oauth2 (1.4.7)
|
oauth2 (1.4.9)
|
||||||
faraday (>= 0.8, < 2.0)
|
faraday (>= 0.17.3, < 3.0)
|
||||||
jwt (>= 1.0, < 3.0)
|
jwt (>= 1.0, < 3.0)
|
||||||
multi_json (~> 1.3)
|
multi_json (~> 1.3)
|
||||||
multi_xml (~> 0.5)
|
multi_xml (~> 0.5)
|
||||||
|
@ -146,43 +153,46 @@ GEM
|
||||||
omniauth (>= 1.0, < 3.0)
|
omniauth (>= 1.0, < 3.0)
|
||||||
rack-openid (~> 1.4.0)
|
rack-openid (~> 1.4.0)
|
||||||
orm_adapter (0.5.0)
|
orm_adapter (0.5.0)
|
||||||
|
psych (4.0.3)
|
||||||
|
stringio
|
||||||
racc (1.6.0)
|
racc (1.6.0)
|
||||||
rack (2.2.3)
|
rack (2.2.3)
|
||||||
rack-openid (1.4.2)
|
rack-openid (1.4.2)
|
||||||
rack (>= 1.1.0)
|
rack (>= 1.1.0)
|
||||||
ruby-openid (>= 2.1.8)
|
ruby-openid (>= 2.1.8)
|
||||||
rack-protection (2.1.0)
|
rack-protection (2.2.0)
|
||||||
rack
|
rack
|
||||||
rack-test (1.1.0)
|
rack-test (1.1.0)
|
||||||
rack (>= 1.0, < 3)
|
rack (>= 1.0, < 3)
|
||||||
rails (7.0.0)
|
rails (7.0.2.2)
|
||||||
actioncable (= 7.0.0)
|
actioncable (= 7.0.2.2)
|
||||||
actionmailbox (= 7.0.0)
|
actionmailbox (= 7.0.2.2)
|
||||||
actionmailer (= 7.0.0)
|
actionmailer (= 7.0.2.2)
|
||||||
actionpack (= 7.0.0)
|
actionpack (= 7.0.2.2)
|
||||||
actiontext (= 7.0.0)
|
actiontext (= 7.0.2.2)
|
||||||
actionview (= 7.0.0)
|
actionview (= 7.0.2.2)
|
||||||
activejob (= 7.0.0)
|
activejob (= 7.0.2.2)
|
||||||
activemodel (= 7.0.0)
|
activemodel (= 7.0.2.2)
|
||||||
activerecord (= 7.0.0)
|
activerecord (= 7.0.2.2)
|
||||||
activestorage (= 7.0.0)
|
activestorage (= 7.0.2.2)
|
||||||
activesupport (= 7.0.0)
|
activesupport (= 7.0.2.2)
|
||||||
bundler (>= 1.15.0)
|
bundler (>= 1.15.0)
|
||||||
railties (= 7.0.0)
|
railties (= 7.0.2.2)
|
||||||
rails-dom-testing (2.0.3)
|
rails-dom-testing (2.0.3)
|
||||||
activesupport (>= 4.2.0)
|
activesupport (>= 4.2.0)
|
||||||
nokogiri (>= 1.6)
|
nokogiri (>= 1.6)
|
||||||
rails-html-sanitizer (1.4.2)
|
rails-html-sanitizer (1.4.2)
|
||||||
loofah (~> 2.3)
|
loofah (~> 2.3)
|
||||||
railties (7.0.0)
|
railties (7.0.2.2)
|
||||||
actionpack (= 7.0.0)
|
actionpack (= 7.0.2.2)
|
||||||
activesupport (= 7.0.0)
|
activesupport (= 7.0.2.2)
|
||||||
method_source
|
method_source
|
||||||
rake (>= 12.2)
|
rake (>= 12.2)
|
||||||
thor (~> 1.0)
|
thor (~> 1.0)
|
||||||
zeitwerk (~> 2.5)
|
zeitwerk (~> 2.5)
|
||||||
rake (13.0.6)
|
rake (13.0.6)
|
||||||
rdoc (6.3.3)
|
rdoc (6.4.0)
|
||||||
|
psych (>= 4.0.0)
|
||||||
responders (3.0.1)
|
responders (3.0.1)
|
||||||
actionpack (>= 5.0)
|
actionpack (>= 5.0)
|
||||||
railties (>= 5.0)
|
railties (>= 5.0)
|
||||||
|
@ -190,8 +200,11 @@ GEM
|
||||||
ruby-openid (2.9.2)
|
ruby-openid (2.9.2)
|
||||||
ruby2_keywords (0.0.5)
|
ruby2_keywords (0.0.5)
|
||||||
sqlite3 (1.4.2)
|
sqlite3 (1.4.2)
|
||||||
thor (1.1.0)
|
stringio (3.0.1)
|
||||||
|
strscan (3.0.1)
|
||||||
|
thor (1.2.1)
|
||||||
timecop (0.9.4)
|
timecop (0.9.4)
|
||||||
|
timeout (0.2.0)
|
||||||
tzinfo (2.0.4)
|
tzinfo (2.0.4)
|
||||||
concurrent-ruby (~> 1.0)
|
concurrent-ruby (~> 1.0)
|
||||||
warden (1.2.9)
|
warden (1.2.9)
|
||||||
|
@ -203,7 +216,7 @@ GEM
|
||||||
websocket-driver (0.7.5)
|
websocket-driver (0.7.5)
|
||||||
websocket-extensions (>= 0.1.0)
|
websocket-extensions (>= 0.1.0)
|
||||||
websocket-extensions (0.1.5)
|
websocket-extensions (0.1.5)
|
||||||
zeitwerk (2.5.1)
|
zeitwerk (2.5.4)
|
||||||
|
|
||||||
PLATFORMS
|
PLATFORMS
|
||||||
ruby
|
ruby
|
||||||
|
@ -211,6 +224,7 @@ PLATFORMS
|
||||||
DEPENDENCIES
|
DEPENDENCIES
|
||||||
devise!
|
devise!
|
||||||
mocha (~> 1.1)
|
mocha (~> 1.1)
|
||||||
|
nokogiri (< 1.13)
|
||||||
omniauth
|
omniauth
|
||||||
omniauth-facebook
|
omniauth-facebook
|
||||||
omniauth-oauth2
|
omniauth-oauth2
|
||||||
|
@ -225,4 +239,4 @@ DEPENDENCIES
|
||||||
webrat (= 0.7.3)
|
webrat (= 0.7.3)
|
||||||
|
|
||||||
BUNDLED WITH
|
BUNDLED WITH
|
||||||
2.2.33
|
2.3.4
|
||||||
|
|
|
@ -14,6 +14,7 @@ gem "rails-controller-testing"
|
||||||
gem "responders", "~> 2.1"
|
gem "responders", "~> 2.1"
|
||||||
|
|
||||||
group :test do
|
group :test do
|
||||||
|
gem "nokogiri", "< 1.13"
|
||||||
gem "omniauth-facebook"
|
gem "omniauth-facebook"
|
||||||
gem "omniauth-openid"
|
gem "omniauth-openid"
|
||||||
gem "timecop"
|
gem "timecop"
|
||||||
|
|
|
@ -12,6 +12,7 @@ gem "rails-controller-testing"
|
||||||
gem "responders", "~> 2.1"
|
gem "responders", "~> 2.1"
|
||||||
|
|
||||||
group :test do
|
group :test do
|
||||||
|
gem "nokogiri", "< 1.13"
|
||||||
gem "omniauth-facebook"
|
gem "omniauth-facebook"
|
||||||
gem "omniauth-openid"
|
gem "omniauth-openid"
|
||||||
gem "timecop"
|
gem "timecop"
|
||||||
|
|
|
@ -12,6 +12,7 @@ gem "rails-controller-testing"
|
||||||
gem "responders", "~> 2.1"
|
gem "responders", "~> 2.1"
|
||||||
|
|
||||||
group :test do
|
group :test do
|
||||||
|
gem "nokogiri", "< 1.13"
|
||||||
gem "omniauth-facebook"
|
gem "omniauth-facebook"
|
||||||
gem "omniauth-openid"
|
gem "omniauth-openid"
|
||||||
gem "timecop"
|
gem "timecop"
|
||||||
|
|
|
@ -12,6 +12,7 @@ gem "rails-controller-testing", github: "rails/rails-controller-testing"
|
||||||
gem "responders", "~> 3.0"
|
gem "responders", "~> 3.0"
|
||||||
|
|
||||||
group :test do
|
group :test do
|
||||||
|
gem "nokogiri", "< 1.13"
|
||||||
gem "omniauth-facebook"
|
gem "omniauth-facebook"
|
||||||
gem "omniauth-openid"
|
gem "omniauth-openid"
|
||||||
gem "rexml"
|
gem "rexml"
|
||||||
|
|
|
@ -13,7 +13,14 @@ gem "rails-controller-testing", github: "rails/rails-controller-testing"
|
||||||
|
|
||||||
gem "responders", "~> 3.0"
|
gem "responders", "~> 3.0"
|
||||||
|
|
||||||
|
if Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new("3.1")
|
||||||
|
gem "net-smtp", require: false
|
||||||
|
gem "net-imap", require: false
|
||||||
|
gem "net-pop", require: false
|
||||||
|
end
|
||||||
|
|
||||||
group :test do
|
group :test do
|
||||||
|
gem "nokogiri", "< 1.13"
|
||||||
gem "omniauth-facebook"
|
gem "omniauth-facebook"
|
||||||
gem "omniauth-openid"
|
gem "omniauth-openid"
|
||||||
gem "rexml"
|
gem "rexml"
|
||||||
|
|
|
@ -14,6 +14,7 @@ gem "rails-controller-testing", github: "rails/rails-controller-testing"
|
||||||
gem "responders", "~> 3.0"
|
gem "responders", "~> 3.0"
|
||||||
|
|
||||||
group :test do
|
group :test do
|
||||||
|
gem "nokogiri", "< 1.13"
|
||||||
gem "omniauth-facebook"
|
gem "omniauth-facebook"
|
||||||
gem "omniauth-openid"
|
gem "omniauth-openid"
|
||||||
gem "rexml"
|
gem "rexml"
|
||||||
|
|
Loading…
Reference in New Issue