From e8cbc4e6c3d95c27f2903787741cc8c1f35b0791 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Piotr=20Nie=C5=82acny?= Date: Sat, 18 Apr 2020 15:01:33 +0200 Subject: [PATCH] Add ability to test master branch to detect regression Tests for gem will be executed periodically. In this way we can detect regression in new version of rails and fix it as soon as possible. There was also update for `rdoc` and version `> 6.2.0` only support ruby `2.4.0`. I downgraded rdoc for this test suite. --- .travis.yml | 13 +-- Appraisals | 19 ++++- Gemfile | 15 ++-- Gemfile.lock | 117 ++++++++++---------------- gemfiles/rails_3.2.gemfile | 2 +- gemfiles/rails_3.2.gemfile.lock | 62 +++++++------- gemfiles/rails_4.2.11.gemfile | 3 +- gemfiles/rails_4.2.11.gemfile.lock | 77 +++++++++-------- gemfiles/rails_5.2.gemfile | 2 +- gemfiles/rails_5.2.gemfile.lock | 112 +++++++++++++------------ gemfiles/rails_6.0.gemfile | 8 +- gemfiles/rails_6.0.gemfile.lock | 128 +++++++++++++++-------------- gemfiles/rails_master.gemfile | 19 +++++ 13 files changed, 298 insertions(+), 279 deletions(-) create mode 100644 gemfiles/rails_master.gemfile diff --git a/.travis.yml b/.travis.yml index 566e3b352..f36a0f8aa 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,18 +6,21 @@ matrix: gemfile: gemfiles/rails_3.2.gemfile - rvm: 2.3.8 gemfile: gemfiles/rails_4.2.11.gemfile - - rvm: 2.6.3 + - rvm: 2.7 gemfile: gemfiles/rails_5.2.gemfile - - rvm: 2.6.3 + - rvm: 2.7 gemfile: gemfiles/rails_6.0.gemfile - - rvm: ruby-head + - rvm: 2.7 gemfile: gemfiles/rails_5.2.gemfile - - rvm: ruby-head + - rvm: 2.7 gemfile: gemfiles/rails_6.0.gemfile + - rvm: 2.7 + gemfile: gemfiles/rails_master.gemfile + - rvm: ruby-head + gemfile: gemfiles/rails_master.gemfile before_install: - gem update --system - gem install bundler - cache: - bundler - directories: diff --git a/Appraisals b/Appraisals index d8bc5285e..be66fbce6 100644 --- a/Appraisals +++ b/Appraisals @@ -12,6 +12,7 @@ appraise "rails-4.2.11" do gem "activerecord", "~> 4.2.11" gem "activesupport", "~> 4.2.11" gem "railties", "~> 4.2.11" + gem "rdoc", "6.2.0" group :development do gem 'sqlite3', '~> 1.3.6' @@ -29,11 +30,23 @@ appraise 'rails-5.2' do end appraise 'rails-6.0' do - gem 'activerecord', '~> 6.0.0.rc1' - gem 'activesupport', '~> 6.0.0.rc1' - gem 'railties', '~> 6.0.0.rc1' + gem 'activerecord', '~> 6' + gem 'activesupport', '~> 6' + gem 'railties', '~> 6' group :development do gem 'sqlite3', '~> 1.4.0' end end + +appraise 'rails-master' do + git 'https://github.com/rails/rails.git', branch: :master do + gem 'activerecord' + gem 'activesupport' + gem 'railties' + end + + group :development do + gem 'sqlite3' + end +end diff --git a/Gemfile b/Gemfile index 6b28f8398..3add6b0b4 100644 --- a/Gemfile +++ b/Gemfile @@ -1,14 +1,11 @@ source 'http://rubygems.org' -gem 'activerecord', '>= 3.0.0' -gem 'activesupport', '>= 3.0.0' -gem 'ancestry', '>= 1.3.0' -gem 'railties', '>= 3.0.0' +gem "ancestry" group :development do - gem 'appraisal' - gem 'coveralls', require: false - gem 'jeweler' - gem 'rspec' - gem 'sqlite3' + gem "appraisal" + gem "coveralls", require: false + gem "jeweler" + gem "rspec" + gem "sqlite3" end diff --git a/Gemfile.lock b/Gemfile.lock index e932f0ebb..176fc25b1 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,30 +1,17 @@ GEM remote: http://rubygems.org/ specs: - actionpack (5.2.3) - actionview (= 5.2.3) - activesupport (= 5.2.3) - rack (~> 2.0) - rack-test (>= 0.6.3) - rails-dom-testing (~> 2.0) - rails-html-sanitizer (~> 1.0, >= 1.0.2) - actionview (5.2.3) - activesupport (= 5.2.3) - builder (~> 3.1) - erubi (~> 1.4) - rails-dom-testing (~> 2.0) - rails-html-sanitizer (~> 1.0, >= 1.0.3) - activemodel (5.2.3) - activesupport (= 5.2.3) - activerecord (5.2.3) - activemodel (= 5.2.3) - activesupport (= 5.2.3) - arel (>= 9.0) - activesupport (5.2.3) + activemodel (6.0.2.2) + activesupport (= 6.0.2.2) + activerecord (6.0.2.2) + activemodel (= 6.0.2.2) + activesupport (= 6.0.2.2) + activesupport (6.0.2.2) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 0.7, < 2) minitest (~> 5.1) tzinfo (~> 1.1) + zeitwerk (~> 2.2) addressable (2.4.0) ancestry (3.0.7) activerecord (>= 3.2.0) @@ -32,24 +19,22 @@ GEM bundler rake thor (>= 0.14.0) - arel (9.0.0) - builder (3.2.3) - concurrent-ruby (1.1.5) + builder (3.2.4) + concurrent-ruby (1.1.6) coveralls (0.8.23) json (>= 1.8, < 3) simplecov (~> 0.16.1) term-ansicolor (~> 1.3) thor (>= 0.19.4, < 2.0) tins (~> 1.6) - crass (1.0.6) descendants_tracker (0.0.4) thread_safe (~> 0.3, >= 0.3.1) diff-lcs (1.3) - docile (1.3.1) - erubi (1.8.0) + docile (1.3.2) faraday (0.9.2) multipart-post (>= 1.2, < 3) - git (1.5.0) + git (1.6.0) + rchardet (~> 1.8) github_api (0.16.0) addressable (~> 2.4.0) descendants_tracker (~> 0.0.4) @@ -57,9 +42,9 @@ GEM hashie (>= 3.4) mime-types (>= 1.16, < 3.0) oauth2 (~> 1.0) - hashie (3.6.0) - highline (2.0.2) - i18n (1.6.0) + hashie (4.1.0) + highline (2.0.3) + i18n (1.8.2) concurrent-ruby (~> 1.0) jeweler (2.3.9) builder @@ -72,84 +57,68 @@ GEM rake rdoc semver2 - json (2.2.0) + json (2.3.0) jwt (2.2.1) - loofah (2.5.0) - crass (~> 1.0.2) - nokogiri (>= 1.5.9) - method_source (0.9.2) mime-types (2.99.3) mini_portile2 (2.4.0) - minitest (5.11.3) - multi_json (1.13.1) + minitest (5.14.0) + multi_json (1.14.1) multi_xml (0.6.0) multipart-post (2.1.1) nokogiri (1.10.9) mini_portile2 (~> 2.4.0) - oauth2 (1.4.1) - faraday (>= 0.8, < 0.16.0) + oauth2 (1.4.4) + faraday (>= 0.8, < 2.0) jwt (>= 1.0, < 3.0) multi_json (~> 1.3) multi_xml (~> 0.5) rack (>= 1.2, < 3) psych (3.1.0) - rack (2.0.7) - rack-test (1.1.0) - rack (>= 1.0, < 3) - rails-dom-testing (2.0.3) - activesupport (>= 4.2.0) - nokogiri (>= 1.6) - rails-html-sanitizer (1.0.4) - loofah (~> 2.2, >= 2.2.2) - railties (5.2.3) - actionpack (= 5.2.3) - activesupport (= 5.2.3) - method_source - rake (>= 0.8.7) - thor (>= 0.19.0, < 2.0) + rack (2.2.2) rake (13.0.1) - rdoc (6.1.1) - rspec (3.8.0) - rspec-core (~> 3.8.0) - rspec-expectations (~> 3.8.0) - rspec-mocks (~> 3.8.0) - rspec-core (3.8.0) - rspec-support (~> 3.8.0) - rspec-expectations (3.8.3) + rchardet (1.8.0) + rdoc (6.2.1) + rspec (3.9.0) + rspec-core (~> 3.9.0) + rspec-expectations (~> 3.9.0) + rspec-mocks (~> 3.9.0) + rspec-core (3.9.1) + rspec-support (~> 3.9.1) + rspec-expectations (3.9.1) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.8.0) - rspec-mocks (3.8.0) + rspec-support (~> 3.9.0) + rspec-mocks (3.9.1) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.8.0) - rspec-support (3.8.0) + rspec-support (~> 3.9.0) + rspec-support (3.9.2) semver2 (3.4.2) simplecov (0.16.1) docile (~> 1.1) json (>= 1.8, < 3) simplecov-html (~> 0.10.0) simplecov-html (0.10.2) - sqlite3 (1.4.1) + sqlite3 (1.4.2) + sync (0.5.0) term-ansicolor (1.7.1) tins (~> 1.0) - thor (0.20.3) + thor (1.0.1) thread_safe (0.3.6) - tins (1.20.3) - tzinfo (1.2.5) + tins (1.24.1) + sync + tzinfo (1.2.7) thread_safe (~> 0.1) + zeitwerk (2.3.0) PLATFORMS ruby DEPENDENCIES - activerecord (>= 3.0.0) - activesupport (>= 3.0.0) - ancestry (>= 1.3.0) + ancestry appraisal coveralls jeweler - railties (>= 3.0.0) rspec sqlite3 BUNDLED WITH - 2.0.1 + 2.0.2 diff --git a/gemfiles/rails_3.2.gemfile b/gemfiles/rails_3.2.gemfile index 442c0eee2..1dbdded06 100644 --- a/gemfiles/rails_3.2.gemfile +++ b/gemfiles/rails_3.2.gemfile @@ -2,9 +2,9 @@ source "http://rubygems.org" +gem "ancestry" gem "activerecord", "~> 3.2.22" gem "activesupport", "~> 3.2.22" -gem "ancestry", ">= 1.3.0" gem "railties", "~> 3.2.22" group :development do diff --git a/gemfiles/rails_3.2.gemfile.lock b/gemfiles/rails_3.2.gemfile.lock index d16938aeb..507a47a25 100644 --- a/gemfiles/rails_3.2.gemfile.lock +++ b/gemfiles/rails_3.2.gemfile.lock @@ -23,7 +23,7 @@ GEM i18n (~> 0.6, >= 0.6.4) multi_json (~> 1.0) addressable (2.4.0) - ancestry (3.0.6) + ancestry (3.0.7) activerecord (>= 3.2.0) appraisal (2.2.0) bundler @@ -31,7 +31,7 @@ GEM thor (>= 0.14.0) arel (3.0.3) builder (3.0.4) - concurrent-ruby (1.1.5) + concurrent-ruby (1.1.6) coveralls (0.8.23) json (>= 1.8, < 3) simplecov (~> 0.16.1) @@ -41,11 +41,12 @@ GEM descendants_tracker (0.0.4) thread_safe (~> 0.3, >= 0.3.1) diff-lcs (1.3) - docile (1.3.1) + docile (1.3.2) erubis (2.7.0) faraday (0.9.2) multipart-post (>= 1.2, < 3) - git (1.5.0) + git (1.6.0) + rchardet (~> 1.8) github_api (0.16.0) addressable (~> 2.4.0) descendants_tracker (~> 0.0.4) @@ -53,8 +54,8 @@ GEM hashie (>= 3.4) mime-types (>= 1.16, < 3.0) oauth2 (~> 1.0) - hashie (3.6.0) - highline (2.0.2) + hashie (4.1.0) + highline (2.0.3) hike (1.2.3) i18n (0.9.5) concurrent-ruby (~> 1.0) @@ -70,24 +71,24 @@ GEM rdoc semver2 journey (1.0.4) - json (2.2.0) + json (2.3.0) jwt (2.2.1) mime-types (2.99.3) mini_portile2 (2.4.0) - multi_json (1.13.1) + multi_json (1.14.1) multi_xml (0.6.0) multipart-post (2.1.1) - nokogiri (1.10.3) + nokogiri (1.10.9) mini_portile2 (~> 2.4.0) - oauth2 (1.4.1) - faraday (>= 0.8, < 0.16.0) + oauth2 (1.4.4) + faraday (>= 0.8, < 2.0) jwt (>= 1.0, < 3.0) multi_json (~> 1.3) multi_xml (~> 0.5) rack (>= 1.2, < 3) psych (3.1.0) rack (1.4.7) - rack-cache (1.9.0) + rack-cache (1.11.1) rack (>= 0.4) rack-ssl (1.3.4) rack @@ -100,21 +101,22 @@ GEM rake (>= 0.8.7) rdoc (~> 3.4) thor (>= 0.14.6, < 2.0) - rake (12.3.2) + rake (13.0.1) + rchardet (1.8.0) rdoc (3.9.5) - rspec (3.8.0) - rspec-core (~> 3.8.0) - rspec-expectations (~> 3.8.0) - rspec-mocks (~> 3.8.0) - rspec-core (3.8.0) - rspec-support (~> 3.8.0) - rspec-expectations (3.8.3) + rspec (3.9.0) + rspec-core (~> 3.9.0) + rspec-expectations (~> 3.9.0) + rspec-mocks (~> 3.9.0) + rspec-core (3.9.1) + rspec-support (~> 3.9.1) + rspec-expectations (3.9.1) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.8.0) - rspec-mocks (3.8.0) + rspec-support (~> 3.9.0) + rspec-mocks (3.9.1) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.8.0) - rspec-support (3.8.0) + rspec-support (~> 3.9.0) + rspec-support (3.9.2) semver2 (3.4.2) simplecov (0.16.1) docile (~> 1.1) @@ -127,13 +129,15 @@ GEM rack (~> 1.0) tilt (~> 1.1, != 1.3.0) sqlite3 (1.3.13) + sync (0.5.0) term-ansicolor (1.7.1) tins (~> 1.0) - thor (0.20.3) + thor (1.0.1) thread_safe (0.3.6) tilt (1.4.1) - tins (1.20.3) - tzinfo (0.3.55) + tins (1.24.1) + sync + tzinfo (0.3.56) PLATFORMS ruby @@ -141,7 +145,7 @@ PLATFORMS DEPENDENCIES activerecord (~> 3.2.22) activesupport (~> 3.2.22) - ancestry (>= 1.3.0) + ancestry appraisal coveralls jeweler @@ -150,4 +154,4 @@ DEPENDENCIES sqlite3 (~> 1.3.6) BUNDLED WITH - 2.0.1 + 2.0.2 diff --git a/gemfiles/rails_4.2.11.gemfile b/gemfiles/rails_4.2.11.gemfile index c953ce487..df515764c 100644 --- a/gemfiles/rails_4.2.11.gemfile +++ b/gemfiles/rails_4.2.11.gemfile @@ -2,10 +2,11 @@ source "http://rubygems.org" +gem "ancestry" gem "activerecord", "~> 4.2.11" gem "activesupport", "~> 4.2.11" -gem "ancestry", ">= 1.3.0" gem "railties", "~> 4.2.11" +gem "rdoc", "6.2.0" group :development do gem "appraisal" diff --git a/gemfiles/rails_4.2.11.gemfile.lock b/gemfiles/rails_4.2.11.gemfile.lock index b341c9903..db59020d1 100644 --- a/gemfiles/rails_4.2.11.gemfile.lock +++ b/gemfiles/rails_4.2.11.gemfile.lock @@ -27,30 +27,31 @@ GEM thread_safe (~> 0.3, >= 0.3.4) tzinfo (~> 1.1) addressable (2.4.0) - ancestry (3.0.6) + ancestry (3.0.7) activerecord (>= 3.2.0) appraisal (2.2.0) bundler rake thor (>= 0.14.0) arel (6.0.4) - builder (3.2.3) - concurrent-ruby (1.1.5) + builder (3.2.4) + concurrent-ruby (1.1.6) coveralls (0.8.23) json (>= 1.8, < 3) simplecov (~> 0.16.1) term-ansicolor (~> 1.3) thor (>= 0.19.4, < 2.0) tins (~> 1.6) - crass (1.0.4) + crass (1.0.6) descendants_tracker (0.0.4) thread_safe (~> 0.3, >= 0.3.1) diff-lcs (1.3) - docile (1.3.1) + docile (1.3.2) erubis (2.7.0) faraday (0.9.2) multipart-post (>= 1.2, < 3) - git (1.5.0) + git (1.6.0) + rchardet (~> 1.8) github_api (0.16.0) addressable (~> 2.4.0) descendants_tracker (~> 0.0.4) @@ -58,8 +59,8 @@ GEM hashie (>= 3.4) mime-types (>= 1.16, < 3.0) oauth2 (~> 1.0) - hashie (3.6.0) - highline (2.0.2) + hashie (4.1.0) + highline (2.0.3) i18n (0.9.5) concurrent-ruby (~> 1.0) jeweler (2.3.9) @@ -73,27 +74,27 @@ GEM rake rdoc semver2 - json (2.2.0) + json (2.3.0) jwt (2.2.1) - loofah (2.2.3) + loofah (2.5.0) crass (~> 1.0.2) nokogiri (>= 1.5.9) mime-types (2.99.3) mini_portile2 (2.4.0) - minitest (5.11.3) - multi_json (1.13.1) + minitest (5.14.0) + multi_json (1.14.1) multi_xml (0.6.0) multipart-post (2.1.1) - nokogiri (1.10.3) + nokogiri (1.10.9) mini_portile2 (~> 2.4.0) - oauth2 (1.4.1) - faraday (>= 0.8, < 0.16.0) + oauth2 (1.4.4) + faraday (>= 0.8, < 2.0) jwt (>= 1.0, < 3.0) multi_json (~> 1.3) multi_xml (~> 0.5) rack (>= 1.2, < 3) psych (3.1.0) - rack (1.6.11) + rack (1.6.13) rack-test (0.6.3) rack (>= 1.0) rails-deprecated_sanitizer (1.0.3) @@ -102,28 +103,29 @@ GEM activesupport (>= 4.2.0, < 5.0) nokogiri (~> 1.6) rails-deprecated_sanitizer (>= 1.0.1) - rails-html-sanitizer (1.0.4) - loofah (~> 2.2, >= 2.2.2) + rails-html-sanitizer (1.3.0) + loofah (~> 2.3) railties (4.2.11.1) actionpack (= 4.2.11.1) activesupport (= 4.2.11.1) rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) - rake (12.3.2) - rdoc (6.1.1) - rspec (3.8.0) - rspec-core (~> 3.8.0) - rspec-expectations (~> 3.8.0) - rspec-mocks (~> 3.8.0) - rspec-core (3.8.0) - rspec-support (~> 3.8.0) - rspec-expectations (3.8.3) + rake (13.0.1) + rchardet (1.8.0) + rdoc (6.2.0) + rspec (3.9.0) + rspec-core (~> 3.9.0) + rspec-expectations (~> 3.9.0) + rspec-mocks (~> 3.9.0) + rspec-core (3.9.1) + rspec-support (~> 3.9.1) + rspec-expectations (3.9.1) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.8.0) - rspec-mocks (3.8.0) + rspec-support (~> 3.9.0) + rspec-mocks (3.9.1) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.8.0) - rspec-support (3.8.0) + rspec-support (~> 3.9.0) + rspec-support (3.9.2) semver2 (3.4.2) simplecov (0.16.1) docile (~> 1.1) @@ -131,12 +133,14 @@ GEM simplecov-html (~> 0.10.0) simplecov-html (0.10.2) sqlite3 (1.3.13) + sync (0.5.0) term-ansicolor (1.7.1) tins (~> 1.0) - thor (0.20.3) + thor (1.0.1) thread_safe (0.3.6) - tins (1.20.3) - tzinfo (1.2.5) + tins (1.24.1) + sync + tzinfo (1.2.7) thread_safe (~> 0.1) PLATFORMS @@ -145,13 +149,14 @@ PLATFORMS DEPENDENCIES activerecord (~> 4.2.11) activesupport (~> 4.2.11) - ancestry (>= 1.3.0) + ancestry appraisal coveralls jeweler railties (~> 4.2.11) + rdoc (= 6.2.0) rspec sqlite3 (~> 1.3.6) BUNDLED WITH - 2.0.1 + 2.0.2 diff --git a/gemfiles/rails_5.2.gemfile b/gemfiles/rails_5.2.gemfile index a02a5aae0..856eb7287 100644 --- a/gemfiles/rails_5.2.gemfile +++ b/gemfiles/rails_5.2.gemfile @@ -2,9 +2,9 @@ source "http://rubygems.org" +gem "ancestry" gem "activerecord", "~> 5.2.0" gem "activesupport", "~> 5.2.0" -gem "ancestry", ">= 1.3.0" gem "railties", "~> 5.2.0" group :development do diff --git a/gemfiles/rails_5.2.gemfile.lock b/gemfiles/rails_5.2.gemfile.lock index b37796ce4..feab5c865 100644 --- a/gemfiles/rails_5.2.gemfile.lock +++ b/gemfiles/rails_5.2.gemfile.lock @@ -1,55 +1,56 @@ GEM remote: http://rubygems.org/ specs: - actionpack (5.2.3) - actionview (= 5.2.3) - activesupport (= 5.2.3) - rack (~> 2.0) + actionpack (5.2.4.2) + actionview (= 5.2.4.2) + activesupport (= 5.2.4.2) + rack (~> 2.0, >= 2.0.8) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.2) - actionview (5.2.3) - activesupport (= 5.2.3) + actionview (5.2.4.2) + activesupport (= 5.2.4.2) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) rails-html-sanitizer (~> 1.0, >= 1.0.3) - activemodel (5.2.3) - activesupport (= 5.2.3) - activerecord (5.2.3) - activemodel (= 5.2.3) - activesupport (= 5.2.3) + activemodel (5.2.4.2) + activesupport (= 5.2.4.2) + activerecord (5.2.4.2) + activemodel (= 5.2.4.2) + activesupport (= 5.2.4.2) arel (>= 9.0) - activesupport (5.2.3) + activesupport (5.2.4.2) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 0.7, < 2) minitest (~> 5.1) tzinfo (~> 1.1) addressable (2.4.0) - ancestry (3.0.6) + ancestry (3.0.7) activerecord (>= 3.2.0) appraisal (2.2.0) bundler rake thor (>= 0.14.0) arel (9.0.0) - builder (3.2.3) - concurrent-ruby (1.1.5) + builder (3.2.4) + concurrent-ruby (1.1.6) coveralls (0.8.23) json (>= 1.8, < 3) simplecov (~> 0.16.1) term-ansicolor (~> 1.3) thor (>= 0.19.4, < 2.0) tins (~> 1.6) - crass (1.0.4) + crass (1.0.6) descendants_tracker (0.0.4) thread_safe (~> 0.3, >= 0.3.1) diff-lcs (1.3) - docile (1.3.1) - erubi (1.8.0) + docile (1.3.2) + erubi (1.9.0) faraday (0.9.2) multipart-post (>= 1.2, < 3) - git (1.5.0) + git (1.6.0) + rchardet (~> 1.8) github_api (0.16.0) addressable (~> 2.4.0) descendants_tracker (~> 0.0.4) @@ -57,9 +58,9 @@ GEM hashie (>= 3.4) mime-types (>= 1.16, < 3.0) oauth2 (~> 1.0) - hashie (3.6.0) - highline (2.0.2) - i18n (1.6.0) + hashie (4.1.0) + highline (2.0.3) + i18n (1.8.2) concurrent-ruby (~> 1.0) jeweler (2.3.9) builder @@ -72,56 +73,57 @@ GEM rake rdoc semver2 - json (2.2.0) + json (2.3.0) jwt (2.2.1) - loofah (2.2.3) + loofah (2.5.0) crass (~> 1.0.2) nokogiri (>= 1.5.9) - method_source (0.9.2) + method_source (1.0.0) mime-types (2.99.3) mini_portile2 (2.4.0) - minitest (5.11.3) - multi_json (1.13.1) + minitest (5.14.0) + multi_json (1.14.1) multi_xml (0.6.0) multipart-post (2.1.1) - nokogiri (1.10.3) + nokogiri (1.10.9) mini_portile2 (~> 2.4.0) - oauth2 (1.4.1) - faraday (>= 0.8, < 0.16.0) + oauth2 (1.4.4) + faraday (>= 0.8, < 2.0) jwt (>= 1.0, < 3.0) multi_json (~> 1.3) multi_xml (~> 0.5) rack (>= 1.2, < 3) psych (3.1.0) - rack (2.0.7) + rack (2.2.2) rack-test (1.1.0) rack (>= 1.0, < 3) rails-dom-testing (2.0.3) activesupport (>= 4.2.0) nokogiri (>= 1.6) - rails-html-sanitizer (1.0.4) - loofah (~> 2.2, >= 2.2.2) - railties (5.2.3) - actionpack (= 5.2.3) - activesupport (= 5.2.3) + rails-html-sanitizer (1.3.0) + loofah (~> 2.3) + railties (5.2.4.2) + actionpack (= 5.2.4.2) + activesupport (= 5.2.4.2) method_source rake (>= 0.8.7) thor (>= 0.19.0, < 2.0) - rake (12.3.2) - rdoc (6.1.1) - rspec (3.8.0) - rspec-core (~> 3.8.0) - rspec-expectations (~> 3.8.0) - rspec-mocks (~> 3.8.0) - rspec-core (3.8.0) - rspec-support (~> 3.8.0) - rspec-expectations (3.8.3) + rake (13.0.1) + rchardet (1.8.0) + rdoc (6.2.1) + rspec (3.9.0) + rspec-core (~> 3.9.0) + rspec-expectations (~> 3.9.0) + rspec-mocks (~> 3.9.0) + rspec-core (3.9.1) + rspec-support (~> 3.9.1) + rspec-expectations (3.9.1) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.8.0) - rspec-mocks (3.8.0) + rspec-support (~> 3.9.0) + rspec-mocks (3.9.1) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.8.0) - rspec-support (3.8.0) + rspec-support (~> 3.9.0) + rspec-support (3.9.2) semver2 (3.4.2) simplecov (0.16.1) docile (~> 1.1) @@ -129,12 +131,14 @@ GEM simplecov-html (~> 0.10.0) simplecov-html (0.10.2) sqlite3 (1.3.13) + sync (0.5.0) term-ansicolor (1.7.1) tins (~> 1.0) - thor (0.20.3) + thor (1.0.1) thread_safe (0.3.6) - tins (1.20.3) - tzinfo (1.2.5) + tins (1.24.1) + sync + tzinfo (1.2.7) thread_safe (~> 0.1) PLATFORMS @@ -143,7 +147,7 @@ PLATFORMS DEPENDENCIES activerecord (~> 5.2.0) activesupport (~> 5.2.0) - ancestry (>= 1.3.0) + ancestry appraisal coveralls jeweler @@ -152,4 +156,4 @@ DEPENDENCIES sqlite3 (~> 1.3.6) BUNDLED WITH - 2.0.1 + 2.0.2 diff --git a/gemfiles/rails_6.0.gemfile b/gemfiles/rails_6.0.gemfile index 166fcd01d..5a61e1a7f 100644 --- a/gemfiles/rails_6.0.gemfile +++ b/gemfiles/rails_6.0.gemfile @@ -2,10 +2,10 @@ source "http://rubygems.org" -gem "activerecord", "~> 6.0.0.rc1" -gem "activesupport", "~> 6.0.0.rc1" -gem "ancestry", ">= 1.3.0" -gem "railties", "~> 6.0.0.rc1" +gem "ancestry" +gem "activerecord", "~> 6" +gem "activesupport", "~> 6" +gem "railties", "~> 6" group :development do gem "appraisal" diff --git a/gemfiles/rails_6.0.gemfile.lock b/gemfiles/rails_6.0.gemfile.lock index ea947a4dd..be9612d6e 100644 --- a/gemfiles/rails_6.0.gemfile.lock +++ b/gemfiles/rails_6.0.gemfile.lock @@ -1,54 +1,55 @@ GEM remote: http://rubygems.org/ specs: - actionpack (6.0.0.rc1) - actionview (= 6.0.0.rc1) - activesupport (= 6.0.0.rc1) - rack (~> 2.0) + actionpack (6.0.2.2) + actionview (= 6.0.2.2) + activesupport (= 6.0.2.2) + rack (~> 2.0, >= 2.0.8) rack-test (>= 0.6.3) rails-dom-testing (~> 2.0) - rails-html-sanitizer (~> 1.0, >= 1.0.2) - actionview (6.0.0.rc1) - activesupport (= 6.0.0.rc1) + rails-html-sanitizer (~> 1.0, >= 1.2.0) + actionview (6.0.2.2) + activesupport (= 6.0.2.2) builder (~> 3.1) erubi (~> 1.4) rails-dom-testing (~> 2.0) - rails-html-sanitizer (~> 1.0, >= 1.0.3) - activemodel (6.0.0.rc1) - activesupport (= 6.0.0.rc1) - activerecord (6.0.0.rc1) - activemodel (= 6.0.0.rc1) - activesupport (= 6.0.0.rc1) - activesupport (6.0.0.rc1) + rails-html-sanitizer (~> 1.1, >= 1.2.0) + activemodel (6.0.2.2) + activesupport (= 6.0.2.2) + activerecord (6.0.2.2) + activemodel (= 6.0.2.2) + activesupport (= 6.0.2.2) + activesupport (6.0.2.2) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 0.7, < 2) minitest (~> 5.1) tzinfo (~> 1.1) - zeitwerk (~> 2.1, >= 2.1.4) + zeitwerk (~> 2.2) addressable (2.4.0) - ancestry (3.0.6) + ancestry (3.0.7) activerecord (>= 3.2.0) appraisal (2.2.0) bundler rake thor (>= 0.14.0) - builder (3.2.3) - concurrent-ruby (1.1.5) + builder (3.2.4) + concurrent-ruby (1.1.6) coveralls (0.8.23) json (>= 1.8, < 3) simplecov (~> 0.16.1) term-ansicolor (~> 1.3) thor (>= 0.19.4, < 2.0) tins (~> 1.6) - crass (1.0.4) + crass (1.0.6) descendants_tracker (0.0.4) thread_safe (~> 0.3, >= 0.3.1) diff-lcs (1.3) - docile (1.3.1) - erubi (1.8.0) + docile (1.3.2) + erubi (1.9.0) faraday (0.9.2) multipart-post (>= 1.2, < 3) - git (1.5.0) + git (1.6.0) + rchardet (~> 1.8) github_api (0.16.0) addressable (~> 2.4.0) descendants_tracker (~> 0.0.4) @@ -56,9 +57,9 @@ GEM hashie (>= 3.4) mime-types (>= 1.16, < 3.0) oauth2 (~> 1.0) - hashie (3.6.0) - highline (2.0.2) - i18n (1.6.0) + hashie (4.1.0) + highline (2.0.3) + i18n (1.8.2) concurrent-ruby (~> 1.0) jeweler (2.3.9) builder @@ -71,85 +72,88 @@ GEM rake rdoc semver2 - json (2.2.0) + json (2.3.0) jwt (2.2.1) - loofah (2.2.3) + loofah (2.5.0) crass (~> 1.0.2) nokogiri (>= 1.5.9) - method_source (0.9.2) + method_source (1.0.0) mime-types (2.99.3) mini_portile2 (2.4.0) - minitest (5.11.3) - multi_json (1.13.1) + minitest (5.14.0) + multi_json (1.14.1) multi_xml (0.6.0) multipart-post (2.1.1) - nokogiri (1.10.3) + nokogiri (1.10.9) mini_portile2 (~> 2.4.0) - oauth2 (1.4.1) - faraday (>= 0.8, < 0.16.0) + oauth2 (1.4.4) + faraday (>= 0.8, < 2.0) jwt (>= 1.0, < 3.0) multi_json (~> 1.3) multi_xml (~> 0.5) rack (>= 1.2, < 3) psych (3.1.0) - rack (2.0.7) + rack (2.2.2) rack-test (1.1.0) rack (>= 1.0, < 3) rails-dom-testing (2.0.3) activesupport (>= 4.2.0) nokogiri (>= 1.6) - rails-html-sanitizer (1.0.4) - loofah (~> 2.2, >= 2.2.2) - railties (6.0.0.rc1) - actionpack (= 6.0.0.rc1) - activesupport (= 6.0.0.rc1) + rails-html-sanitizer (1.3.0) + loofah (~> 2.3) + railties (6.0.2.2) + actionpack (= 6.0.2.2) + activesupport (= 6.0.2.2) method_source rake (>= 0.8.7) thor (>= 0.20.3, < 2.0) - rake (12.3.2) - rdoc (6.1.1) - rspec (3.8.0) - rspec-core (~> 3.8.0) - rspec-expectations (~> 3.8.0) - rspec-mocks (~> 3.8.0) - rspec-core (3.8.0) - rspec-support (~> 3.8.0) - rspec-expectations (3.8.3) + rake (13.0.1) + rchardet (1.8.0) + rdoc (6.2.1) + rspec (3.9.0) + rspec-core (~> 3.9.0) + rspec-expectations (~> 3.9.0) + rspec-mocks (~> 3.9.0) + rspec-core (3.9.1) + rspec-support (~> 3.9.1) + rspec-expectations (3.9.1) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.8.0) - rspec-mocks (3.8.0) + rspec-support (~> 3.9.0) + rspec-mocks (3.9.1) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.8.0) - rspec-support (3.8.0) + rspec-support (~> 3.9.0) + rspec-support (3.9.2) semver2 (3.4.2) simplecov (0.16.1) docile (~> 1.1) json (>= 1.8, < 3) simplecov-html (~> 0.10.0) simplecov-html (0.10.2) - sqlite3 (1.4.1) + sqlite3 (1.4.2) + sync (0.5.0) term-ansicolor (1.7.1) tins (~> 1.0) - thor (0.20.3) + thor (1.0.1) thread_safe (0.3.6) - tins (1.20.3) - tzinfo (1.2.5) + tins (1.24.1) + sync + tzinfo (1.2.7) thread_safe (~> 0.1) - zeitwerk (2.1.6) + zeitwerk (2.3.0) PLATFORMS ruby DEPENDENCIES - activerecord (~> 6.0.0.rc1) - activesupport (~> 6.0.0.rc1) - ancestry (>= 1.3.0) + activerecord (~> 6) + activesupport (~> 6) + ancestry appraisal coveralls jeweler - railties (~> 6.0.0.rc1) + railties (~> 6) rspec sqlite3 (~> 1.4.0) BUNDLED WITH - 2.0.1 + 2.0.2 diff --git a/gemfiles/rails_master.gemfile b/gemfiles/rails_master.gemfile new file mode 100644 index 000000000..37743f024 --- /dev/null +++ b/gemfiles/rails_master.gemfile @@ -0,0 +1,19 @@ +# This file was generated by Appraisal + +source "http://rubygems.org" + +git "https://github.com/rails/rails.git", branch: :master do + gem "activerecord" + gem "activesupport" + gem "railties" +end + +gem "ancestry" + +group :development do + gem "appraisal" + gem "coveralls", require: false + gem "jeweler" + gem "rspec" + gem "sqlite3" +end