From fb4cdeeb7fd67f7d9188ab46bd2246292e354d18 Mon Sep 17 00:00:00 2001 From: miks Date: Mon, 25 Jan 2021 11:15:01 +0200 Subject: [PATCH] Add ruby 3.0 support --- .travis.yml | 1 + Gemfile | 2 +- lib/releaf/rspec/features_matchers.rb | 8 ++++---- .../builders/releaf/builders/table_builder.rb | 1 - releaf-core/releaf-core.gemspec | 2 +- .../releaf/builders/table_builder_spec.rb | 11 +---------- releaf.gemspec | 16 ++++++++-------- 7 files changed, 16 insertions(+), 25 deletions(-) diff --git a/.travis.yml b/.travis.yml index dc3f532d1..42a20c772 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,6 +3,7 @@ language: ruby cache: bundler rvm: - 2.7 + - 3.0 addons: apt: diff --git a/Gemfile b/Gemfile index 770310284..6ad5f7fca 100644 --- a/Gemfile +++ b/Gemfile @@ -26,7 +26,7 @@ gemspec # gem 'debugger' case config["database"]["type"] when 'mysql' - gem 'mysql2', '~> 0.5', platform: :ruby + gem 'mysql2', platform: :ruby when 'postgresql' gem 'pg', '~> 0.15' end diff --git a/lib/releaf/rspec/features_matchers.rb b/lib/releaf/rspec/features_matchers.rb index cd0df8fef..0d3bb8583 100644 --- a/lib/releaf/rspec/features_matchers.rb +++ b/lib/releaf/rspec/features_matchers.rb @@ -12,12 +12,12 @@ def has_cells_text?(cells, options = {}) has_selector?(type, count: cells_count) && has_text?(cells.join("")) end - def has_header?(*args) - has_css?("#{primary_header_css_rule} h1", *args) + def has_header?(**args) + has_css?("#{primary_header_css_rule} h1", **args) end - def has_no_header?(*args) - has_no_css?("#{primary_header_css_rule} h1", *args) + def has_no_header?(**args) + has_no_css?("#{primary_header_css_rule} h1", **args) end # Allows to match againg validation errors within forms diff --git a/releaf-core/app/builders/releaf/builders/table_builder.rb b/releaf-core/app/builders/releaf/builders/table_builder.rb index 5159fa21d..62f7a7380 100644 --- a/releaf-core/app/builders/releaf/builders/table_builder.rb +++ b/releaf-core/app/builders/releaf/builders/table_builder.rb @@ -174,7 +174,6 @@ def format_datetime_content(resource, column) I18n.l(value, format: format) unless value.nil? end - def format_time_content(resource, column) value = column_value(resource, column) format = Releaf::Builders::Utilities::DateFields.date_or_time_default_format(:time) diff --git a/releaf-core/releaf-core.gemspec b/releaf-core/releaf-core.gemspec index 97967208b..cc2a41e75 100644 --- a/releaf-core/releaf-core.gemspec +++ b/releaf-core/releaf-core.gemspec @@ -30,7 +30,7 @@ Gem::Specification.new do |s| s.add_dependency 'ckeditor_rails', '~> 4.0' s.add_dependency 'acts_as_list', '~> 0.8' s.add_dependency 'will_paginate', '~> 3.1' - s.add_dependency 'font-awesome-rails', '~> 4.6' + s.add_dependency 'font-awesome-rails', '~> 4.0' s.add_dependency 'globalize', '~> 6.0' s.add_dependency 'rack-cache', '~> 1.0' s.add_dependency 'virtus', '~> 1.0' diff --git a/releaf-core/spec/builders/releaf/builders/table_builder_spec.rb b/releaf-core/spec/builders/releaf/builders/table_builder_spec.rb index df6935a11..d1138b9ad 100644 --- a/releaf-core/spec/builders/releaf/builders/table_builder_spec.rb +++ b/releaf-core/spec/builders/releaf/builders/table_builder_spec.rb @@ -437,9 +437,6 @@ def custom_title(resource); end allow(subject).to receive(:column_value).with(resource, :birth_date) .and_return(value) - expect(I18n).to receive(:l).with(value, format: :default) - .and_call_original - expect(subject.format_date_content(resource, :birth_date)).to eq("2012-12-29") end end @@ -450,10 +447,7 @@ def custom_title(resource); end allow(subject).to receive(:column_value).with(resource, :created_at) .and_return(value) - allow(I18n).to receive(:l).with(value, format: "%Y-%m-%d %H:%M") - .and_return("2012-12-29 17:12:07") - - expect(subject.format_datetime_content(resource, :created_at)).to eq("2012-12-29 17:12:07") + expect(subject.format_datetime_content(resource, :created_at)).to eq("2012-12-29 17:12") end end @@ -463,9 +457,6 @@ def custom_title(resource); end allow(subject).to receive(:column_value).with(resource, :created_at) .and_return(value) - allow(I18n).to receive(:l).with(value, format: "%H:%M") - .and_return("17:12") - expect(subject.format_time_content(resource, :created_at)).to eq("17:12") end end diff --git a/releaf.gemspec b/releaf.gemspec index 5a8b087c7..232b3dab2 100644 --- a/releaf.gemspec +++ b/releaf.gemspec @@ -21,22 +21,22 @@ Gem::Specification.new do |s| s.add_development_dependency 'rspec-rails', '~> 4.0' s.add_development_dependency 'rails-controller-testing' - s.add_development_dependency 'listen', '~> 3.2.1' - s.add_development_dependency 'capybara', '~> 3.32' - s.add_development_dependency 'selenium-webdriver', '~> 3.142' + s.add_development_dependency 'listen', '~>3.0' + s.add_development_dependency 'capybara', '~> 3.0' + s.add_development_dependency 'selenium-webdriver', '~> 3.0' s.add_development_dependency 'factory_bot', '~> 5.2' s.add_development_dependency 'syntax' - s.add_development_dependency 'simplecov', '~> 0.16.1' + s.add_development_dependency 'simplecov', '~> 0.16' s.add_development_dependency 'simplecov-rcov' - s.add_development_dependency 'database_cleaner', '~> 1.8' - s.add_development_dependency 'shoulda-matchers', '~> 4.3' + s.add_development_dependency 'database_cleaner', '~> 1.0' + s.add_development_dependency 'shoulda-matchers', '~> 4.0' s.add_development_dependency 'db-query-matchers' s.add_development_dependency 'coveralls', '~> 0.8' s.add_development_dependency 'timecop' - s.add_development_dependency 'with_model', '~> 2.1' + s.add_development_dependency 'with_model', '~> 2.0' s.add_development_dependency 'pry' s.add_development_dependency 'roo' - s.add_development_dependency 'puma', '~> 4.3' + s.add_development_dependency 'puma' s.required_ruby_version = '>= 2.5.0' end