Merge fb4cdee into 7f78934

.travis.yml

@@ -3,6 +3,7 @@ language: ruby
 cache: bundler
 rvm:
   - 2.7
+  - 3.0
 
 addons:
   apt:

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

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

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)

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'

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

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