Added support for Ruby 3.1.

Author: dblock

.github/workflows/test-mongodb.yml

@@ -10,6 +10,7 @@ jobs:
           - { ruby: 2.6.2, mongoid: 6.4.8, mongodb: 4.4 }
           - { ruby: 2.6.2, mongoid: 7.2.3, mongodb: 4.4 }
           - { ruby: 2.6.2, mongoid: 7.3.0, mongodb: 4.4 }
+          - { ruby: 3.1.1, mongoid: 7.3.0, mongodb: 4.4 }
     name: test (ruby=${{ matrix.entry.ruby }}, mongoid=${{ matrix.entry.mongoid }}, mongodb=${{ matrix.entry.mongodb }})
     steps:
       - uses: actions/checkout@v2

.github/workflows/test-postgresql.yml

@@ -8,6 +8,7 @@ jobs:
       matrix:
         entry:
           - { ruby: 2.6.2, postgresql: 11 }
+          - { ruby: 3.1.1, postgresql: 11 }
     name: test (ruby=${{ matrix.entry.ruby }}, postgresql=${{ matrix.entry.postgresql }})
     steps:
       - uses: actions/checkout@v2

.gitignore

@@ -6,5 +6,6 @@ log
 .env
 *.swp
 Gemfile.lock
+Gemfile.danger.lock
 .ruby-version
 pkg

CHANGELOG.md

@@ -2,6 +2,7 @@
 
 #### 1.2.2 (Next)
 
+* [#145](https://github.com/slack-ruby/slack-ruby-bot-server/pull/145): Added support for ruby 3.1 - [@dblock](https://github.com/dblock).
 * Your contribution here.
 
 #### 1.2.1 (2022/03/06)

Gemfile

@@ -7,9 +7,9 @@ when 'mongoid' then
   gem 'mongoid-scroll'
   gem 'mongoid-shell'
 when 'activerecord' then
-  gem 'activerecord', '~> 5.0.0'
-  gem 'otr-activerecord', '~> 1.2.1'
-  gem 'cursor_pagination' # rubocop:disable Bundler/OrderedGems
+  gem 'activerecord', '~> 6.0.0'
+  gem 'otr-activerecord'
+  gem 'cursor_pagination', github: 'dblock/cursor_pagination', branch: 'misc' # rubocop:disable Bundler/OrderedGems
   gem 'pg'
 when nil
   warn "Missing ENV['DATABASE_ADAPTER']."
@@ -22,7 +22,7 @@ gemspec
 group :development, :test do
   gem 'bundler'
   gem 'byebug'
-  gem 'capybara', '~> 2.15.1'
+  gem 'capybara', '~> 3.36.0'
   gem 'database_cleaner', '~> 1.8.5'
   gem 'fabrication'
   gem 'faker'
@@ -33,7 +33,7 @@ group :development, :test do
   gem 'rake'
   gem 'rspec'
   gem 'rubocop', '0.81.0'
-  gem 'selenium-webdriver', '~> 3.4.4'
+  gem 'selenium-webdriver', '~> 4.1.0'
   gem 'vcr'
   gem 'webmock'
   gem 'webrick', '~> 1.6.1'

spec/api/endpoints/teams_endpoint_spec.rb

@@ -85,7 +85,7 @@
       end
 
       it 'includes optional state parameter' do
-        expect(SlackRubyBotServer::Service.instance).to receive(:create!).with(instance_of(Team), state: 'property')
+        expect(SlackRubyBotServer::Service.instance).to receive(:create!).with(instance_of(Team), { state: 'property' })
         client.teams._post(code: 'code', state: 'property')
       end
 
@@ -194,7 +194,7 @@
       end
 
       it 'includes optional state parameter' do
-        expect(SlackRubyBotServer::Service.instance).to receive(:create!).with(instance_of(Team), state: 'property')
+        expect(SlackRubyBotServer::Service.instance).to receive(:create!).with(instance_of(Team), { state: 'property' })
         client.teams._post(code: 'code', state: 'property')
       end
 
@@ -307,7 +307,7 @@
       end
 
       it 'includes optional state parameter' do
-        expect(SlackRubyBotServer::Service.instance).to receive(:create!).with(instance_of(Team), state: 'property')
+        expect(SlackRubyBotServer::Service.instance).to receive(:create!).with(instance_of(Team), { state: 'property' })
         client.teams._post(code: 'code', state: 'property')
       end
 

spec/database_adapters/activerecord/activerecord.rb

@@ -1,8 +1,10 @@
-db_config = YAML.safe_load(
-  ERB.new(File.read(
-            File.expand_path('config/postgresql.yml', __dir__)
-          )).result, [], [], true
-)[ENV['RACK_ENV']]
+yml = ERB.new(File.read(File.expand_path('config/postgresql.yml', __dir__))).result
+db_config = if Gem::Version.new(Psych::VERSION) >= Gem::Version.new('3.1.0.pre1')
+              ::YAML.safe_load(yml, aliases: true)[ENV['RACK_ENV']]
+            else
+              ::YAML.safe_load(yml, [], [], true)[ENV['RACK_ENV']]
+            end
 ActiveRecord::Tasks::DatabaseTasks.create(db_config)
 ActiveRecord::Base.establish_connection(db_config)
+ActiveRecord::Base.logger ||= Logger.new(STDOUT)
 ActiveRecord::Base.logger.level = :info

spec/integration/teams_spec.rb

@@ -28,7 +28,7 @@
         end.to change(Team, :count).by(1)
       end
       it 'includes optional parameter' do
-        expect(SlackRubyBotServer::Service.instance).to receive(:create!).with(instance_of(Team), state: 'property')
+        expect(SlackRubyBotServer::Service.instance).to receive(:create!).with(instance_of(Team), { state: 'property' })
         visit '/?v1&code=code&state=property'
       end
     end
@@ -58,7 +58,7 @@
         end.to change(Team, :count).by(1)
       end
       it 'includes optional parameter' do
-        expect(SlackRubyBotServer::Service.instance).to receive(:create!).with(instance_of(Team), state: 'property')
+        expect(SlackRubyBotServer::Service.instance).to receive(:create!).with(instance_of(Team), { state: 'property' })
         visit '/?v2&code=code&state=property'
       end
     end

spec/support/capybara.rb

@@ -3,4 +3,5 @@
 Capybara.configure do |config|
   config.app = SlackRubyBotServer::Api::Middleware.instance
   config.server_port = 9293
+  config.server = :webrick
 end