Test against Ruby 2.7

railsadminteam · Dec 27, 2019 · 397f31d · 397f31d
1 parent 774da69
commit 397f31d
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 10 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -23,7 +23,8 @@ env:
     - JRUBY_OPTS="$JRUBY_OPTS --debug"
 
 rvm:
-  - 2.6.3
+  - 2.6.5
+  - 2.7.0
 
 gemfile:
   - gemfiles/rails_6.0.gemfile
@@ -50,30 +51,30 @@ matrix:
     - rvm: 2.3.8
       env: CI_ORM=active_record CI_DB_ADAPTER=sqlite3
       gemfile: gemfiles/rails_5.1.gemfile
-    - rvm: 2.4.5
+    - rvm: 2.4.9
       env: CI_ORM=mongoid
       gemfile: gemfiles/rails_5.2.gemfile
-    - rvm: 2.4.5
+    - rvm: 2.4.9
       env: CI_ORM=active_record CI_DB_ADAPTER=sqlite3
       gemfile: gemfiles/rails_5.2.gemfile
-    - rvm: 2.5.5
+    - rvm: 2.5.7
       env: CI_ORM=mongoid
       gemfile: gemfiles/rails_5.2.gemfile
-    - rvm: 2.5.5
+    - rvm: 2.5.7
       env: CI_ORM=active_record CI_DB_ADAPTER=sqlite3
       gemfile: gemfiles/rails_5.2.gemfile
-    - rvm: 2.6.3
+    - rvm: 2.6.5
       env: CI_ORM=active_record CI_DB_ADAPTER=mysql2
       gemfile: gemfiles/rails_6.0.gemfile
-    - rvm: 2.6.3
+    - rvm: 2.6.5
       env: CI_ORM=active_record CI_DB_ADAPTER=postgresql CI_DB_USERNAME=postgres
       gemfile: gemfiles/rails_6.0.gemfile
     - rvm: ruby-head
       env: CI_ORM=mongoid
       gemfile: gemfiles/rails_5.2.gemfile
     - rvm: ruby-head
       env: CI_ORM=active_record CI_DB_ADAPTER=sqlite3
-      gemfile: gemfiles/rails_5.2.gemfile
+      gemfile: gemfiles/rails_6.0.gemfile
     - rvm: jruby-9.2.7.0
       env: CI_ORM=mongoid
       gemfile: gemfiles/rails_5.2.gemfile
@@ -84,7 +85,10 @@ matrix:
       env: CI_ORM=active_record CI_DB_ADAPTER=sqlite3
       gemfile: gemfiles/rails_5.2.gemfile
   exclude:
-    - rvm: 2.6.3
+    - rvm: 2.6.5
+      env: CI_ORM=mongoid
+      gemfile: gemfiles/rails_6.0.gemfile
+    - rvm: 2.7.0
       env: CI_ORM=mongoid
       gemfile: gemfiles/rails_6.0.gemfile
   allow_failures:

diff --git a/lib/rails_admin/support/csv_converter.rb b/lib/rails_admin/support/csv_converter.rb
@@ -73,7 +73,7 @@ def generate_csv_string(options)
       generator_options = (options[:generator] || {}).symbolize_keys.delete_if { |_, value| value.blank? }
       method = @objects.respond_to?(:find_each) ? :find_each : :each
 
-      CSV.generate(generator_options) do |csv|
+      CSV.generate(**generator_options) do |csv|
         csv << generate_csv_header unless options[:skip_header]
 
         @objects.send(method) do |object|