From 740930ee28dab97d14542d1ea7ad60e22b602ab3 Mon Sep 17 00:00:00 2001 From: Pedro Paiva Date: Thu, 4 Feb 2021 23:15:55 -0300 Subject: [PATCH 01/14] Fix warning: Using the last argument as keyword parameters is deprecated --- .../unit/active_record/create_table.rb | 2 +- spec/support/unit/helpers/model_builder.rb | 2 +- .../validate_inclusion_of_matcher_spec.rb | 30 +++++++++---------- .../active_record/association_matcher_spec.rb | 26 ++++++---------- .../have_db_column_matcher_spec.rb | 2 +- 5 files changed, 27 insertions(+), 35 deletions(-) diff --git a/spec/support/unit/active_record/create_table.rb b/spec/support/unit/active_record/create_table.rb index 3b46df61e..208207675 100644 --- a/spec/support/unit/active_record/create_table.rb +++ b/spec/support/unit/active_record/create_table.rb @@ -109,7 +109,7 @@ def add_column_to_table(table, column_name, column_specification) ) end - table.column(column_name, column_type, column_options) + table.column(column_name, column_type, **column_options) end end end diff --git a/spec/support/unit/helpers/model_builder.rb b/spec/support/unit/helpers/model_builder.rb index 4a7fae830..dffb637aa 100644 --- a/spec/support/unit/helpers/model_builder.rb +++ b/spec/support/unit/helpers/model_builder.rb @@ -44,7 +44,7 @@ def create_table(table_name, options = {}, &block) begin connection.execute("DROP TABLE IF EXISTS #{table_name}") - connection.create_table(table_name, options, &block) + connection.create_table(table_name, **options, &block) created_tables << table_name connection rescue StandardError => e diff --git a/spec/unit/shoulda/matchers/active_model/validate_inclusion_of_matcher_spec.rb b/spec/unit/shoulda/matchers/active_model/validate_inclusion_of_matcher_spec.rb index ad01d142c..80599530c 100644 --- a/spec/unit/shoulda/matchers/active_model/validate_inclusion_of_matcher_spec.rb +++ b/spec/unit/shoulda/matchers/active_model/validate_inclusion_of_matcher_spec.rb @@ -21,7 +21,7 @@ def build_object(**options, &block) build_object_with_generic_attribute( - options.merge(column_type: :integer, value: 1), + **options.merge(column_type: :integer, value: 1), &block ) end @@ -45,7 +45,7 @@ def validation_matcher_scenario_args def build_object(**options, &block) build_object_with_generic_attribute( - options.merge( + **options.merge( column_type: :integer, column_options: { limit: 2 }, value: 1, @@ -71,7 +71,7 @@ def expect_to_match_on_values(builder, values, &block) def build_object(**options, &block) build_object_with_generic_attribute( - options.merge(column_type: :float, value: 1.0), + **options.merge(column_type: :float, value: 1.0), &block ) end @@ -99,7 +99,7 @@ def validation_matcher_scenario_args def build_object(**options, &block) build_object_with_generic_attribute( - options.merge(column_type: :decimal, value: BigDecimal('1.0')), + **options.merge(column_type: :decimal, value: BigDecimal('1.0')), &block ) end @@ -130,7 +130,7 @@ def validation_matcher_scenario_args define_method :build_object do |options = {}, &block| build_object_with_generic_attribute( - options.merge(column_type: :date, value: today), + **options.merge(column_type: :date, value: today), &block ) end @@ -158,7 +158,7 @@ def validation_matcher_scenario_args define_method :build_object do |options = {}, &block| build_object_with_generic_attribute( - options.merge(column_type: :datetime, value: now), + **options.merge(column_type: :datetime, value: now), &block ) end @@ -186,7 +186,7 @@ def validation_matcher_scenario_args define_method :build_object do |options = {}, &block| build_object_with_generic_attribute( - options.merge(column_type: :time, value: default_time), + **options.merge(column_type: :time, value: default_time), &block ) end @@ -207,7 +207,7 @@ def validation_matcher_scenario_args def build_object(**options, &block) build_object_with_generic_attribute( - options.merge(column_type: :string), + **options.merge(column_type: :string), &block ) end @@ -798,7 +798,7 @@ def configure_validation_matcher(matcher) define_method :build_object do |options = {}, &block| build_object_with_generic_attribute( - options.merge(column_type: :timestamp, value: now), + **options.merge(column_type: :timestamp, value: now), &block ) end @@ -842,7 +842,7 @@ def validation_matcher_scenario_args def build_object(**options, &block) super( - options.merge(column_options: { null: true }, value: true), + **options.merge(column_options: { null: true }, value: true), &block ) end @@ -863,13 +863,13 @@ def build_object(**options, &block) end def build_object(**options, &block) - super(options.merge(column_options: { null: false }), &block) + super(**options.merge(column_options: { null: false }), &block) end end def build_object(**options, &block) build_object_with_generic_attribute( - options.merge(column_type: :boolean), + **options.merge(column_type: :boolean), &block ) end @@ -896,7 +896,7 @@ def validation_matcher_scenario_args include_context 'against a boolean attribute for true and false' def build_object(**options, &block) - build_object_with_generic_attribute(options.merge(value: true), &block) + build_object_with_generic_attribute(**options.merge(value: true), &block) end end @@ -904,7 +904,7 @@ def build_object(**options, &block) include_context 'against a boolean attribute for true and false' def build_object(**options, &block) - build_object_with_generic_attribute(options.merge(value: false), &block) + build_object_with_generic_attribute(**options.merge(value: false), &block) end end @@ -1010,7 +1010,7 @@ def define_model_validating_inclusion( column_options: column_options, }.compact - define_simple_model(model_options) do |model| + define_simple_model(**model_options) do |model| if validation_options model.validates_inclusion_of(attribute_name, validation_options) end diff --git a/spec/unit/shoulda/matchers/active_record/association_matcher_spec.rb b/spec/unit/shoulda/matchers/active_record/association_matcher_spec.rb index df694f707..a5276ab9d 100644 --- a/spec/unit/shoulda/matchers/active_record/association_matcher_spec.rb +++ b/spec/unit/shoulda/matchers/active_record/association_matcher_spec.rb @@ -714,7 +714,7 @@ def create_child_model_belonging_to_parent( define_model(:parent, parent_options) define_model :child, parent_id: :integer do - belongs_to :parent, options + belongs_to :parent, **options if block class_eval(&block) @@ -743,7 +743,7 @@ def belonging_to_with_inverse(association, inverse_association) def belonging_to_non_existent_class(model_name, assoc_name, options = {}) define_model model_name, "#{assoc_name}_id" => :integer do - belongs_to assoc_name, options + belongs_to assoc_name, **options end.new end end @@ -1156,14 +1156,14 @@ def having_many_children(options = {}) order = options.delete(:order) define_association_with_order(model, :has_many, :children, order, options) else - model.has_many :children, options + model.has_many :children, **options end end.new end def having_many_non_existent_class(model_name, assoc_name, options = {}) define_model model_name do - has_many assoc_name, options + has_many assoc_name, **options end.new end end @@ -1494,14 +1494,14 @@ def having_one_detail(options = {}) order = options.delete(:order) define_association_with_order(model, :has_one, :detail, order, options) else - model.has_one :detail, options + model.has_one :detail, **options end end.new end def having_one_non_existent(model_name, assoc_name, options = {}) define_model model_name do - has_one assoc_name, options + has_one assoc_name, **options end.new end end @@ -2124,25 +2124,17 @@ def having_and_belonging_to_many_relatives(_options = {}) def having_and_belonging_to_many_non_existent_class(model_name, assoc_name, options = {}) define_model model_name do - has_and_belongs_to_many assoc_name, options + has_and_belongs_to_many assoc_name, **options end.new end end def define_association_with_conditions(model, macro, name, conditions, _other_options = {}) - args = [] - options = {} - args << proc { where(conditions) } - args << options - model.__send__(macro, name, *args) + model.__send__(macro, name, proc { where(conditions) }, **{}) end def define_association_with_order(model, macro, name, order, _other_options = {}) - args = [] - options = {} - args << proc { order(order) } - args << options - model.__send__(macro, name, *args) + model.__send__(macro, name, proc { order(order) }, **{}) end def dependent_options diff --git a/spec/unit/shoulda/matchers/active_record/have_db_column_matcher_spec.rb b/spec/unit/shoulda/matchers/active_record/have_db_column_matcher_spec.rb index 8d56315f6..47ae006ee 100644 --- a/spec/unit/shoulda/matchers/active_record/have_db_column_matcher_spec.rb +++ b/spec/unit/shoulda/matchers/active_record/have_db_column_matcher_spec.rb @@ -112,7 +112,7 @@ def model(options = {}) def with_table(column_name, column_type, options) create_table 'employees' do |table| - table.__send__(column_type, column_name, options) + table.__send__(column_type, column_name, **options) end define_model_class('Employee').new end From 6db140c9244814f181b709039e960b7ac86bb486 Mon Sep 17 00:00:00 2001 From: Pedro Paiva Date: Sat, 6 Mar 2021 23:00:20 -0300 Subject: [PATCH 02/14] Add ruby 3.0 support --- .github/workflows/ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e8f4acd4e..d13cd57c7 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -27,6 +27,7 @@ jobs: fail-fast: false matrix: ruby: + - 3.0.0 - 2.7.2 - 2.6.6 appraisal: From 585f63c0375948090aebe193e6b3b14749e1433d Mon Sep 17 00:00:00 2001 From: Pedro Paiva Date: Sat, 6 Mar 2021 23:22:57 -0300 Subject: [PATCH 03/14] Update listen to support ruby 3.0 --- Appraisals | 6 +++--- gemfiles/rails_5_1.gemfile | 2 +- gemfiles/rails_5_1.gemfile.lock | 10 +++++----- gemfiles/rails_5_2.gemfile | 2 +- gemfiles/rails_5_2.gemfile.lock | 10 +++++----- gemfiles/rails_6_0.gemfile | 2 +- gemfiles/rails_6_0.gemfile.lock | 6 +++--- 7 files changed, 19 insertions(+), 19 deletions(-) diff --git a/Appraisals b/Appraisals index dff904d1a..7fdd82418 100644 --- a/Appraisals +++ b/Appraisals @@ -35,7 +35,7 @@ appraise 'rails_5_1' do gem 'bcrypt', '~> 3.1.7' gem 'capybara', '~> 2.13' gem 'selenium-webdriver' - gem 'listen', '~> 3.0.5' + gem 'listen', '~> 3.3.0' gem 'spring-watcher-listen', '~> 2.0.0' # Database adapters @@ -57,7 +57,7 @@ appraise 'rails_5_2' do gem 'capybara', '~> 3.1.1' gem 'selenium-webdriver' gem 'chromedriver-helper' - gem 'listen', '~> 3.0.5' + gem 'listen', '~> 3.3.0' gem 'spring-watcher-listen', '~> 2.0.0' # Database adapters @@ -77,7 +77,7 @@ appraise 'rails_6_0' do gem 'jbuilder', '~> 2.7' gem 'bcrypt', '~> 3.1.7' gem 'capybara', '>= 2.15' - gem 'listen', '~> 3.2.0' + gem 'listen', '~> 3.3.0' gem 'spring-watcher-listen', '~> 2.0.0' gem 'selenium-webdriver' gem 'webdrivers' diff --git a/gemfiles/rails_5_1.gemfile b/gemfiles/rails_5_1.gemfile index b84701e60..a5c7903f2 100644 --- a/gemfiles/rails_5_1.gemfile +++ b/gemfiles/rails_5_1.gemfile @@ -30,7 +30,7 @@ gem "jbuilder", "~> 2.5" gem "bcrypt", "~> 3.1.7" gem "capybara", "~> 2.13" gem "selenium-webdriver" -gem "listen", "~> 3.0.5" +gem "listen", "~> 3.3.0" gem "spring-watcher-listen", "~> 2.0.0" gem "pg", "~> 0.18" gem "sqlite3", "~> 1.3.6" diff --git a/gemfiles/rails_5_1.gemfile.lock b/gemfiles/rails_5_1.gemfile.lock index 6eb1f0e42..d41615170 100644 --- a/gemfiles/rails_5_1.gemfile.lock +++ b/gemfiles/rails_5_1.gemfile.lock @@ -62,7 +62,7 @@ GEM crass (1.0.6) diff-lcs (1.4.4) erubi (1.10.0) - ffi (1.14.2) + ffi (1.15.0) fssm (0.2.10) globalid (0.4.2) activesupport (>= 4.2.0) @@ -70,9 +70,9 @@ GEM concurrent-ruby (~> 1.0) jbuilder (2.11.2) activesupport (>= 5.0.0) - listen (3.0.8) - rb-fsevent (~> 0.9, >= 0.9.4) - rb-inotify (~> 0.9, >= 0.9.7) + listen (3.3.4) + rb-fsevent (~> 0.10, >= 0.10.3) + rb-inotify (~> 0.9, >= 0.9.10) loofah (2.9.0) crass (~> 1.0.2) nokogiri (>= 1.5.9) @@ -236,7 +236,7 @@ DEPENDENCIES capybara (~> 2.13) fssm jbuilder (~> 2.5) - listen (~> 3.0.5) + listen (~> 3.3.0) pg (~> 0.18) pry pry-byebug diff --git a/gemfiles/rails_5_2.gemfile b/gemfiles/rails_5_2.gemfile index 7da0cfcc3..e906b6016 100644 --- a/gemfiles/rails_5_2.gemfile +++ b/gemfiles/rails_5_2.gemfile @@ -32,7 +32,7 @@ gem "bcrypt", "~> 3.1.7" gem "capybara", "~> 3.1.1" gem "selenium-webdriver" gem "chromedriver-helper" -gem "listen", "~> 3.0.5" +gem "listen", "~> 3.3.0" gem "spring-watcher-listen", "~> 2.0.0" gem "pg", "~> 0.18" gem "sqlite3", "~> 1.3.6" diff --git a/gemfiles/rails_5_2.gemfile.lock b/gemfiles/rails_5_2.gemfile.lock index 7745900b8..1e82fd9e4 100644 --- a/gemfiles/rails_5_2.gemfile.lock +++ b/gemfiles/rails_5_2.gemfile.lock @@ -73,7 +73,7 @@ GEM crass (1.0.6) diff-lcs (1.4.4) erubi (1.10.0) - ffi (1.14.2) + ffi (1.15.0) fssm (0.2.10) globalid (0.4.2) activesupport (>= 4.2.0) @@ -82,9 +82,9 @@ GEM io-like (0.3.1) jbuilder (2.11.2) activesupport (>= 5.0.0) - listen (3.0.8) - rb-fsevent (~> 0.9, >= 0.9.4) - rb-inotify (~> 0.9, >= 0.9.7) + listen (3.3.4) + rb-fsevent (~> 0.10, >= 0.10.3) + rb-inotify (~> 0.9, >= 0.9.10) loofah (2.9.0) crass (~> 1.0.2) nokogiri (>= 1.5.9) @@ -253,7 +253,7 @@ DEPENDENCIES chromedriver-helper fssm jbuilder (~> 2.5) - listen (~> 3.0.5) + listen (~> 3.3.0) pg (~> 0.18) pry pry-byebug diff --git a/gemfiles/rails_6_0.gemfile b/gemfiles/rails_6_0.gemfile index 4887f09ac..40d094bb7 100644 --- a/gemfiles/rails_6_0.gemfile +++ b/gemfiles/rails_6_0.gemfile @@ -30,7 +30,7 @@ gem "turbolinks", "~> 5" gem "jbuilder", "~> 2.7" gem "bcrypt", "~> 3.1.7" gem "capybara", ">= 2.15" -gem "listen", "~> 3.2.0" +gem "listen", "~> 3.3.0" gem "spring-watcher-listen", "~> 2.0.0" gem "selenium-webdriver" gem "webdrivers" diff --git a/gemfiles/rails_6_0.gemfile.lock b/gemfiles/rails_6_0.gemfile.lock index 127902c5a..294ef74a5 100644 --- a/gemfiles/rails_6_0.gemfile.lock +++ b/gemfiles/rails_6_0.gemfile.lock @@ -82,7 +82,7 @@ GEM crass (1.0.6) diff-lcs (1.4.4) erubi (1.10.0) - ffi (1.14.2) + ffi (1.15.0) fssm (0.2.10) globalid (0.4.2) activesupport (>= 4.2.0) @@ -90,7 +90,7 @@ GEM concurrent-ruby (~> 1.0) jbuilder (2.11.2) activesupport (>= 5.0.0) - listen (3.2.1) + listen (3.3.4) rb-fsevent (~> 0.10, >= 0.10.3) rb-inotify (~> 0.9, >= 0.9.10) loofah (2.9.0) @@ -268,7 +268,7 @@ DEPENDENCIES capybara (>= 2.15) fssm jbuilder (~> 2.7) - listen (~> 3.2.0) + listen (~> 3.3.0) pg (>= 0.18, < 2.0) pry pry-byebug From 63435fe4379ff8461cd995f9372cabfe406168b2 Mon Sep 17 00:00:00 2001 From: Pedro Paiva Date: Sat, 20 Mar 2021 13:04:34 -0300 Subject: [PATCH 04/14] Use Ruby 3.0.0 for development --- .ruby-version | 2 +- .tool-versions | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.ruby-version b/.ruby-version index 37c2961c2..4a36342fc 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -2.7.2 +3.0.0 diff --git a/.tool-versions b/.tool-versions index 9eb38ed71..2c0c270b0 100644 --- a/.tool-versions +++ b/.tool-versions @@ -1 +1 @@ -ruby 2.7.2 +ruby 3.0.0 From 2b63004d5b087414528cdf17301df5fc6e8fef60 Mon Sep 17 00:00:00 2001 From: Pedro Paiva Date: Sat, 20 Mar 2021 15:29:52 -0300 Subject: [PATCH 05/14] Prevent CI testing Ruby 3.0 with Rails 5.x --- .github/workflows/ci.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d13cd57c7..f7da120a8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -37,6 +37,10 @@ jobs: adapter: - sqlite3 - postgresql + exclude: + - { ruby: 3.0.0, appraisal: rails_5_0 } + - { ruby: 3.0.0, appraisal: rails_5_1 } + - { ruby: 3.0.0, appraisal: rails_5_2 } env: DATABASE_ADAPTER: ${{ matrix.adapter }} BUNDLE_GEMFILE: gemfiles/${{ matrix.appraisal }}.gemfile From a9ef5a8d299dbac5512bfb1013257c93d5f3f96e Mon Sep 17 00:00:00 2001 From: Pedro Paiva Date: Sun, 21 Mar 2021 14:06:23 -0300 Subject: [PATCH 06/14] Fix action/cache key --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f7da120a8..cc8516fd0 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -54,7 +54,7 @@ jobs: - uses: actions/cache@v2 with: path: vendor/bundle - key: v1-rubygems-local-${{ runner.os }}-${{ matrix.ruby }}-${{ hashFiles(format('gemfiles/{0}.gemfile.lock', matrix.rails_appraisal)) }} + key: v1-rubygems-local-${{ runner.os }}-${{ matrix.ruby }}-${{ hashFiles(format('gemfiles/{0}.gemfile.lock', matrix.appraisal)) }} - name: Install dependencies run: bundle install --jobs=3 --retry=3 - name: Run Unit Tests From 551d0c479760d67f5c608f5441cbe83e559f35b7 Mon Sep 17 00:00:00 2001 From: Pedro Paiva Date: Sun, 21 Mar 2021 15:02:35 -0300 Subject: [PATCH 07/14] fixup! Update listen to support ruby 3.0 --- Appraisals | 4 ++-- gemfiles/rails_5_1.gemfile | 2 +- gemfiles/rails_5_1.gemfile.lock | 8 ++++---- gemfiles/rails_5_2.gemfile | 2 +- gemfiles/rails_5_2.gemfile.lock | 8 ++++---- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/Appraisals b/Appraisals index 7fdd82418..3522ff487 100644 --- a/Appraisals +++ b/Appraisals @@ -35,7 +35,7 @@ appraise 'rails_5_1' do gem 'bcrypt', '~> 3.1.7' gem 'capybara', '~> 2.13' gem 'selenium-webdriver' - gem 'listen', '~> 3.3.0' + gem 'listen', '~> 3.0.5' gem 'spring-watcher-listen', '~> 2.0.0' # Database adapters @@ -57,7 +57,7 @@ appraise 'rails_5_2' do gem 'capybara', '~> 3.1.1' gem 'selenium-webdriver' gem 'chromedriver-helper' - gem 'listen', '~> 3.3.0' + gem 'listen', '~> 3.0.5' gem 'spring-watcher-listen', '~> 2.0.0' # Database adapters diff --git a/gemfiles/rails_5_1.gemfile b/gemfiles/rails_5_1.gemfile index a5c7903f2..b84701e60 100644 --- a/gemfiles/rails_5_1.gemfile +++ b/gemfiles/rails_5_1.gemfile @@ -30,7 +30,7 @@ gem "jbuilder", "~> 2.5" gem "bcrypt", "~> 3.1.7" gem "capybara", "~> 2.13" gem "selenium-webdriver" -gem "listen", "~> 3.3.0" +gem "listen", "~> 3.0.5" gem "spring-watcher-listen", "~> 2.0.0" gem "pg", "~> 0.18" gem "sqlite3", "~> 1.3.6" diff --git a/gemfiles/rails_5_1.gemfile.lock b/gemfiles/rails_5_1.gemfile.lock index d41615170..1485bf0e0 100644 --- a/gemfiles/rails_5_1.gemfile.lock +++ b/gemfiles/rails_5_1.gemfile.lock @@ -70,9 +70,9 @@ GEM concurrent-ruby (~> 1.0) jbuilder (2.11.2) activesupport (>= 5.0.0) - listen (3.3.4) - rb-fsevent (~> 0.10, >= 0.10.3) - rb-inotify (~> 0.9, >= 0.9.10) + listen (3.0.8) + rb-fsevent (~> 0.9, >= 0.9.4) + rb-inotify (~> 0.9, >= 0.9.7) loofah (2.9.0) crass (~> 1.0.2) nokogiri (>= 1.5.9) @@ -236,7 +236,7 @@ DEPENDENCIES capybara (~> 2.13) fssm jbuilder (~> 2.5) - listen (~> 3.3.0) + listen (~> 3.0.5) pg (~> 0.18) pry pry-byebug diff --git a/gemfiles/rails_5_2.gemfile b/gemfiles/rails_5_2.gemfile index e906b6016..7da0cfcc3 100644 --- a/gemfiles/rails_5_2.gemfile +++ b/gemfiles/rails_5_2.gemfile @@ -32,7 +32,7 @@ gem "bcrypt", "~> 3.1.7" gem "capybara", "~> 3.1.1" gem "selenium-webdriver" gem "chromedriver-helper" -gem "listen", "~> 3.3.0" +gem "listen", "~> 3.0.5" gem "spring-watcher-listen", "~> 2.0.0" gem "pg", "~> 0.18" gem "sqlite3", "~> 1.3.6" diff --git a/gemfiles/rails_5_2.gemfile.lock b/gemfiles/rails_5_2.gemfile.lock index 1e82fd9e4..834ef47b5 100644 --- a/gemfiles/rails_5_2.gemfile.lock +++ b/gemfiles/rails_5_2.gemfile.lock @@ -82,9 +82,9 @@ GEM io-like (0.3.1) jbuilder (2.11.2) activesupport (>= 5.0.0) - listen (3.3.4) - rb-fsevent (~> 0.10, >= 0.10.3) - rb-inotify (~> 0.9, >= 0.9.10) + listen (3.0.8) + rb-fsevent (~> 0.9, >= 0.9.4) + rb-inotify (~> 0.9, >= 0.9.7) loofah (2.9.0) crass (~> 1.0.2) nokogiri (>= 1.5.9) @@ -253,7 +253,7 @@ DEPENDENCIES chromedriver-helper fssm jbuilder (~> 2.5) - listen (~> 3.3.0) + listen (~> 3.0.5) pg (~> 0.18) pry pry-byebug From 9721ac8e276550f6a99889c447318761a9aa0167 Mon Sep 17 00:00:00 2001 From: Pedro Paiva Date: Tue, 23 Mar 2021 21:11:17 -0300 Subject: [PATCH 08/14] Add ruby-head to ci --- .github/workflows/ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index cc8516fd0..6a23aff02 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -27,6 +27,7 @@ jobs: fail-fast: false matrix: ruby: + - head - 3.0.0 - 2.7.2 - 2.6.6 From d0d554c9b53586380504c159690ab912eae04da3 Mon Sep 17 00:00:00 2001 From: Pedro Paiva Date: Tue, 23 Mar 2021 21:20:50 -0300 Subject: [PATCH 09/14] fixup! Prevent CI testing Ruby 3.0 with Rails 5.x --- .github/workflows/ci.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6a23aff02..ca921dde2 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -39,7 +39,6 @@ jobs: - sqlite3 - postgresql exclude: - - { ruby: 3.0.0, appraisal: rails_5_0 } - { ruby: 3.0.0, appraisal: rails_5_1 } - { ruby: 3.0.0, appraisal: rails_5_2 } env: From 0088950e8b95d19de97aa2555eba1a06124687c1 Mon Sep 17 00:00:00 2001 From: Pedro Paiva Date: Tue, 23 Mar 2021 21:58:01 -0300 Subject: [PATCH 10/14] Update nokogiri --- .github/workflows/ci.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ca921dde2..0c2e27142 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -27,8 +27,7 @@ jobs: fail-fast: false matrix: ruby: - - head - - 3.0.0 + - 3.0.1 - 2.7.2 - 2.6.6 appraisal: @@ -39,8 +38,8 @@ jobs: - sqlite3 - postgresql exclude: - - { ruby: 3.0.0, appraisal: rails_5_1 } - - { ruby: 3.0.0, appraisal: rails_5_2 } + - { ruby: 3.0.1, appraisal: rails_5_1 } + - { ruby: 3.0.1, appraisal: rails_5_2 } env: DATABASE_ADAPTER: ${{ matrix.adapter }} BUNDLE_GEMFILE: gemfiles/${{ matrix.appraisal }}.gemfile From a9c1a9992050864863fef8b177405df658da7071 Mon Sep 17 00:00:00 2001 From: Pedro Paiva Date: Thu, 8 Apr 2021 17:55:51 -0300 Subject: [PATCH 11/14] Use Ruby 3.0.1 for development --- .ruby-version | 2 +- .tool-versions | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.ruby-version b/.ruby-version index 4a36342fc..cb2b00e4f 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -3.0.0 +3.0.1 diff --git a/.tool-versions b/.tool-versions index 2c0c270b0..a7e49f21b 100644 --- a/.tool-versions +++ b/.tool-versions @@ -1 +1 @@ -ruby 3.0.0 +ruby 3.0.1 From be26ce87f4b35193f66d17cc983c8215c25b750b Mon Sep 17 00:00:00 2001 From: Pedro Paiva Date: Thu, 8 Apr 2021 19:07:58 -0300 Subject: [PATCH 12/14] Add rexml gem --- spec/support/acceptance/helpers/step_helpers.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/spec/support/acceptance/helpers/step_helpers.rb b/spec/support/acceptance/helpers/step_helpers.rb index ea6f5b7f7..ee566e80d 100644 --- a/spec/support/acceptance/helpers/step_helpers.rb +++ b/spec/support/acceptance/helpers/step_helpers.rb @@ -77,6 +77,7 @@ def create_rails_application end updating_bundle do |bundle| + bundle.add_gem 'rexml' bundle.remove_gem 'turn' bundle.remove_gem 'coffee-rails' bundle.remove_gem 'uglifier' From 73be6953810c1be9f0d200981ee9d342e159bd91 Mon Sep 17 00:00:00 2001 From: Pedro Paiva Date: Fri, 9 Apr 2021 22:00:40 -0300 Subject: [PATCH 13/14] Remove rexml gem --- spec/support/acceptance/helpers/step_helpers.rb | 1 - 1 file changed, 1 deletion(-) diff --git a/spec/support/acceptance/helpers/step_helpers.rb b/spec/support/acceptance/helpers/step_helpers.rb index ee566e80d..ea6f5b7f7 100644 --- a/spec/support/acceptance/helpers/step_helpers.rb +++ b/spec/support/acceptance/helpers/step_helpers.rb @@ -77,7 +77,6 @@ def create_rails_application end updating_bundle do |bundle| - bundle.add_gem 'rexml' bundle.remove_gem 'turn' bundle.remove_gem 'coffee-rails' bundle.remove_gem 'uglifier' From d753222b6853776ae3d7c5ed0d9bd92b8022fec5 Mon Sep 17 00:00:00 2001 From: Pedro Paiva Date: Fri, 9 Apr 2021 22:14:53 -0300 Subject: [PATCH 14/14] Remove webdrivers gem --- spec/support/acceptance/helpers/step_helpers.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/spec/support/acceptance/helpers/step_helpers.rb b/spec/support/acceptance/helpers/step_helpers.rb index ea6f5b7f7..502ab173b 100644 --- a/spec/support/acceptance/helpers/step_helpers.rb +++ b/spec/support/acceptance/helpers/step_helpers.rb @@ -82,6 +82,7 @@ def create_rails_application bundle.remove_gem 'uglifier' bundle.remove_gem 'debugger' bundle.remove_gem 'byebug' + bundle.remove_gem 'webdrivers' bundle.remove_gem 'web-console' end