sorbet-rails 0.7.3 → 0.7.19

data/spec/bin/run_spec.sh

@@ -6,7 +6,7 @@ wd="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 current_dir=$(pwd)
 
 if [[ -z $RAILS_VERSION ]]; then
-  rails_dir="$wd/../support/v5.2"
+  rails_dir="$wd/../support/v6.0"
 else
   rails_dir="$wd/../support/v$RAILS_VERSION"
 fi
@@ -15,7 +15,10 @@ fi
 rm $wd/../../Gemfile.lock 2>/dev/null # clean up Gemfile.lock first
 bundle install
 
+echo "===================================================================="
+echo "Run test for folder:"
 echo $rails_dir
+echo "===================================================================="
 
 # update gems in rails_dir
 cd $rails_dir

data/spec/generators/rails-template.rb

@@ -127,7 +127,7 @@ def create_models
 
   # A nasty hack to add has_one_attached and has_many_attached to the models/wizard.rb file.
   attachments = nil
-  if ['5.2', '6.0'].include?(ENV["RAILS_VERSION"])
+  if ['5.2', '6.0', '6.1'].include?(ENV["RAILS_VERSION"])
     attachments = "has_one_attached :school_photo\n  has_many_attached :hats"
   end
 
@@ -313,11 +313,8 @@ def create_migrations
         add_column :wands, :broken_at,      :datetime, null: true
         add_column :wands, :chosen_at_date, :date
         add_column :wands, :chosen_at_time, :time
-        # JSON column type is only supported on 5.2 or higher
-        unless ['5.0', '5.1'].include?(ENV['RAILS_VERSION'])
-          add_column :wands, :spell_history,  :json
-          add_column :wands, :maker_info,     :json,    null: false, default: '{}'
-        end
+        add_column :wands, :spell_history,  :json
+        add_column :wands, :maker_info,     :json,    null: false, default: '{}'
       end
     end
   RUBY
@@ -507,20 +504,6 @@ end
 # Main setup
 source_paths
 
-if ['5.0'].include?(ENV["RAILS_VERSION"])
-  File.open('Gemfile', 'r+') do |f|
-    out = ""
-    f.each do |line|
-      # We remove sdoc and web-console because they misbehave.
-      # sqlite needs to be limited to 1.3.x or it won't work.
-      out << line.gsub("gem 'sqlite3'", "gem 'sqlite3', '~> 1.3.6'") unless line =~ /gem \'(sdoc|web-console)\'.*/
-    end
-    f.pos = 0
-    f.print out
-    f.truncate(f.pos)
-  end
-end
-
 add_gems
 
 after_bundle do

data/spec/generators/sorbet_test_cases.rb

@@ -121,12 +121,17 @@ T.assert_type!(Wizard.all.find_each, T::Enumerator[Wizard])
 Wizard.all.find_in_batches { |w| T.assert_type!(w, T::Array[Wizard]) }
 T.assert_type!(Wizard.all.find_in_batches, T::Enumerator[T::Array[Wizard]])
 Wizard.all.in_batches { |w| T.assert_type!(w, Wizard::ActiveRecord_Relation) }
-T.assert_type!(Wizard.all.in_batches, T::Enumerable[Wizard::ActiveRecord_Relation])
+T.assert_type!(Wizard.all.in_batches, ActiveRecord::Batches::BatchEnumerator)
 # T.assert_type!(Wizard.all.destroy_all, T::Array[Wizard]) # Ignored until we add support
 T.assert_type!(Wizard.all.any?, T::Boolean)
 T.assert_type!(Wizard.all.many?, T::Boolean)
 T.assert_type!(Wizard.all.none?, T::Boolean)
 T.assert_type!(Wizard.all.one?, T::Boolean)
+T.assert_type!(Wizard.all.any? { |r| r.id > 1 }, T::Boolean)
+T.assert_type!(Wizard.all.many? { |r| r.id > 1 }, T::Boolean)
+T.assert_type!(Wizard.all.none? { |r| r.id > 1 }, T::Boolean)
+T.assert_type!(Wizard.all.one? { |r| r.id > 1 }, T::Boolean)
+
 # T.assert_type!(Wizard.all.update_all(name: 'Harry Potter'), Integer) # Ignored until we add support
 # T.assert_type!(Wizard.all.delete_all, Integer) # Ignored until we add support
 # Query methods
@@ -185,12 +190,16 @@ T.assert_type!(spell_books.find_each, T::Enumerator[SpellBook])
 spell_books.find_in_batches { |s| T.assert_type!(s, T::Array[SpellBook]) }
 T.assert_type!(spell_books.find_in_batches, T::Enumerator[T::Array[SpellBook]])
 spell_books.in_batches { |s| T.assert_type!(s, SpellBook::ActiveRecord_AssociationRelation) }
-T.assert_type!(spell_books.in_batches, T::Enumerable[SpellBook::ActiveRecord_AssociationRelation])
+T.assert_type!(spell_books.in_batches, ActiveRecord::Batches::BatchEnumerator)
 # T.assert_type!(spell_books.destroy_all, T::Array[SpellBook]) # Ignored until we add support
 T.assert_type!(spell_books.any?, T::Boolean)
 T.assert_type!(spell_books.many?, T::Boolean)
 T.assert_type!(spell_books.none?, T::Boolean)
 T.assert_type!(spell_books.one?, T::Boolean)
+T.assert_type!(spell_books.any? { |r| r.id > 1 }, T::Boolean)
+T.assert_type!(spell_books.many? { |r| r.id > 1 }, T::Boolean)
+T.assert_type!(spell_books.none? { |r| r.id > 1 }, T::Boolean)
+T.assert_type!(spell_books.one? { |r| r.id > 1 }, T::Boolean)
 # T.assert_type!(spell_books.update_all(name: 'Fantastic Beasts'), Integer) # Ignored until we add support
 # T.assert_type!(spell_books.delete_all, Integer) # Ignored until we add support
 # Query methods
@@ -257,12 +266,16 @@ T.assert_type!(spell_books_query.find_each, T::Enumerator[SpellBook])
 spell_books_query.find_in_batches { |s| T.assert_type!(s, T::Array[SpellBook]) }
 T.assert_type!(spell_books_query.find_in_batches, T::Enumerator[T::Array[SpellBook]])
 spell_books_query.in_batches { |s| T.assert_type!(s, SpellBook::ActiveRecord_AssociationRelation) }
-T.assert_type!(spell_books_query.in_batches, T::Enumerable[SpellBook::ActiveRecord_AssociationRelation])
+T.assert_type!(spell_books_query.in_batches, ActiveRecord::Batches::BatchEnumerator)
 # T.assert_type!(spell_books_query.destroy_all, T::Array[SpellBook]) # Ignored until we add support
 T.assert_type!(spell_books_query.any?, T::Boolean)
 T.assert_type!(spell_books_query.many?, T::Boolean)
 T.assert_type!(spell_books_query.none?, T::Boolean)
 T.assert_type!(spell_books_query.one?, T::Boolean)
+T.assert_type!(spell_books_query.any? { |r| r.id > 1 }, T::Boolean)
+T.assert_type!(spell_books_query.many? { |r| r.id > 1 }, T::Boolean)
+T.assert_type!(spell_books_query.none? { |r| r.id > 1 }, T::Boolean)
+T.assert_type!(spell_books_query.one? { |r| r.id > 1 }, T::Boolean)
 # T.assert_type!(spell_books_query.update_all(name: 'Fantastic Beasts'), Integer) # Ignored until we add support
 # T.assert_type!(spell_books_query.delete_all, Integer) # Ignored until we add support
 # Query methods
@@ -316,7 +329,7 @@ T.assert_type!(
 )
 T.assert_type!(
   wizard.patronus_characteristics,
-  T.nilable(T.any(T::Array[T.untyped], T::Boolean, Float, T::Hash[String, T.untyped], Integer, String))
+  T.nilable(ActiveRecord::Coders::JSON),
 )
 T.assert_type!(wizard.pets, T.nilable(T::Array[T.untyped]))
 

data/spec/rails_helper.rb

@@ -13,14 +13,14 @@ rails_version = ENV["RAILS_VERSION"] || "default"
 
 rails_folder =
   case rails_version
-  when "5.0"
-    "v5.0"
-  when "5.1"
-    "v5.1"
+  when "5.2"
+    "v5.2"
   when "6.0"
     "v6.0"
+  when "6.1"
+    "v6.1"
   else
-    "v5.2"
+    "v6.0"
   end
 
 TEST_DATA_FOLDER = "spec/test_data/#{rails_folder}"
@@ -36,7 +36,6 @@ RSpec.configure do |config|
     next if ENV["DISABLE_DATABASE_CLEANER"] == 'true'
     DatabaseCleaner.clean_with(:truncation, {
       pre_count: true,
-      reset_ids: false,
       except: %w(ar_internal_metadata),
     })
   end
@@ -46,10 +45,7 @@ RSpec.configure do |config|
       example.run
       next
     end
-    DatabaseCleaner.strategy = :truncation, {
-      pre_count: true,
-      reset_ids: false,
-    }
+    DatabaseCleaner.strategy = :truncation, { pre_count: true }
     DatabaseCleaner.start
     example.run
     DatabaseCleaner.clean

data/spec/rake_rails_rbi_models_spec.rb

@@ -29,12 +29,19 @@ RSpec.describe 'rake rails_rbi:models', type: :task do
       ]
     )
     if Object.const_defined?('ActiveStorage')
+      files = [
+        'attachment.rbi',
+        'blob.rbi',
+      ]
+      if ENV["RAILS_VERSION"] == '6.1'
+        files += [
+          'record.rbi',
+          'variant_record.rbi',
+        ]
+      end
       expect_files(
         base_dir: generated_dir_path.join('active_storage'),
-        files: [
-          'attachment.rbi',
-          'blob.rbi',
-        ],
+        files: files,
       )
     end
     if Object.const_defined?('ActiveRecord::InternalMetadata')

data/spec/sorbet_spec.rb

@@ -79,7 +79,8 @@ RSpec.describe 'sorbet' do
 
   it 'returns expected sorbet tc result' do
     stdout, stderr, status = Open3.capture3(
-      'bundle', 'exec', 'srb', 'tc',
+      # 'bundle', 'exec', 'srb', 'tc',
+      'srb', 'tc',
       chdir: Rails.root.to_path,
     )
     expected_file_path = 'expected_srb_tc_output.txt'

data/spec/support/v5.2/Gemfile

@@ -1,8 +1,6 @@
 source 'https://rubygems.org'
 git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 
-ruby '2.5.5'
-
 # Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
 gem 'rails', '~> 5.2.4', '>= 5.2.4.2'
 # Use sqlite3 as the database for Active Record
@@ -36,4 +34,4 @@ gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby]
 
 gem 'sorbet-rails', path: '../../../.'
 gem 'sorbet'
-gem 'sorbet-runtime'
+gem 'sorbet-runtime'

data/spec/support/v5.2/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../../..
   specs:
-    sorbet-rails (0.7.3)
+    sorbet-rails (0.7.5)
       method_source (>= 0.9.2)
       parlour (>= 4.0.1)
       parser (>= 2.7)
@@ -11,151 +11,152 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (5.2.4.2)
-      actionpack (= 5.2.4.2)
+    actioncable (5.2.6)
+      actionpack (= 5.2.6)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailer (5.2.4.2)
-      actionpack (= 5.2.4.2)
-      actionview (= 5.2.4.2)
-      activejob (= 5.2.4.2)
+    actionmailer (5.2.6)
+      actionpack (= 5.2.6)
+      actionview (= 5.2.6)
+      activejob (= 5.2.6)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (5.2.4.2)
-      actionview (= 5.2.4.2)
-      activesupport (= 5.2.4.2)
+    actionpack (5.2.6)
+      actionview (= 5.2.6)
+      activesupport (= 5.2.6)
       rack (~> 2.0, >= 2.0.8)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (5.2.4.2)
-      activesupport (= 5.2.4.2)
+    actionview (5.2.6)
+      activesupport (= 5.2.6)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    activejob (5.2.4.2)
-      activesupport (= 5.2.4.2)
+    activejob (5.2.6)
+      activesupport (= 5.2.6)
       globalid (>= 0.3.6)
-    activemodel (5.2.4.2)
-      activesupport (= 5.2.4.2)
-    activerecord (5.2.4.2)
-      activemodel (= 5.2.4.2)
-      activesupport (= 5.2.4.2)
+    activemodel (5.2.6)
+      activesupport (= 5.2.6)
+    activerecord (5.2.6)
+      activemodel (= 5.2.6)
+      activesupport (= 5.2.6)
       arel (>= 9.0)
-    activestorage (5.2.4.2)
-      actionpack (= 5.2.4.2)
-      activerecord (= 5.2.4.2)
-      marcel (~> 0.3.1)
-    activesupport (5.2.4.2)
+    activestorage (5.2.6)
+      actionpack (= 5.2.6)
+      activerecord (= 5.2.6)
+      marcel (~> 1.0.0)
+    activesupport (5.2.6)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
     arel (9.0.0)
-    ast (2.4.1)
+    ast (2.4.2)
     bindex (0.8.1)
     builder (3.2.4)
-    byebug (11.1.1)
-    commander (4.5.2)
+    byebug (11.1.3)
+    commander (4.6.0)
       highline (~> 2.0.0)
-    concurrent-ruby (1.1.6)
+    concurrent-ruby (1.1.9)
     crass (1.0.6)
-    erubi (1.9.0)
+    erubi (1.10.0)
     globalid (0.4.2)
       activesupport (>= 4.2.0)
     highline (2.0.3)
-    i18n (1.8.2)
+    i18n (1.8.10)
       concurrent-ruby (~> 1.0)
-    jbuilder (2.10.0)
+    jbuilder (2.11.2)
       activesupport (>= 5.0.0)
-    loofah (2.4.0)
+    loofah (2.10.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     mail (2.7.1)
       mini_mime (>= 0.1.1)
-    marcel (0.3.3)
-      mimemagic (~> 0.3.2)
+    marcel (1.0.1)
     method_source (1.0.0)
-    mimemagic (0.3.4)
-    mini_mime (1.0.2)
-    mini_portile2 (2.4.0)
-    minitest (5.14.0)
-    nio4r (2.5.2)
-    nokogiri (1.10.9)
-      mini_portile2 (~> 2.4.0)
-    parlour (5.0.0)
+    mini_mime (1.1.0)
+    mini_portile2 (2.5.3)
+    minitest (5.14.4)
+    nio4r (2.5.7)
+    nokogiri (1.11.7)
+      mini_portile2 (~> 2.5.0)
+      racc (~> 1.4)
+    nokogiri (1.11.7-x86_64-darwin)
+      racc (~> 1.4)
+    parlour (6.0.1)
       commander (~> 4.5)
       parser
       rainbow (~> 3.0)
       sorbet-runtime (>= 0.5)
-    parser (3.0.0.0)
+    parser (3.0.2.0)
       ast (~> 2.4.1)
     polyfill (1.9.0)
     puma (3.12.6)
+    racc (1.5.2)
     rack (2.2.3)
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
-    rails (5.2.4.2)
-      actioncable (= 5.2.4.2)
-      actionmailer (= 5.2.4.2)
-      actionpack (= 5.2.4.2)
-      actionview (= 5.2.4.2)
-      activejob (= 5.2.4.2)
-      activemodel (= 5.2.4.2)
-      activerecord (= 5.2.4.2)
-      activestorage (= 5.2.4.2)
-      activesupport (= 5.2.4.2)
+    rails (5.2.6)
+      actioncable (= 5.2.6)
+      actionmailer (= 5.2.6)
+      actionpack (= 5.2.6)
+      actionview (= 5.2.6)
+      activejob (= 5.2.6)
+      activemodel (= 5.2.6)
+      activerecord (= 5.2.6)
+      activestorage (= 5.2.6)
+      activesupport (= 5.2.6)
       bundler (>= 1.3.0)
-      railties (= 5.2.4.2)
+      railties (= 5.2.6)
       sprockets-rails (>= 2.0.0)
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
     rails-html-sanitizer (1.3.0)
       loofah (~> 2.3)
-    railties (5.2.4.2)
-      actionpack (= 5.2.4.2)
-      activesupport (= 5.2.4.2)
+    railties (5.2.6)
+      actionpack (= 5.2.6)
+      activesupport (= 5.2.6)
       method_source
       rake (>= 0.8.7)
       thor (>= 0.19.0, < 2.0)
     rainbow (3.0.0)
-    rake (13.0.1)
+    rake (13.0.6)
     safe_type (1.1.1)
-    sorbet (0.5.5480)
-      sorbet-static (= 0.5.5480)
-    sorbet-coerce (0.3.0)
+    sorbet (0.5.6519)
+      sorbet-static (= 0.5.6519)
+    sorbet-coerce (0.5.0)
       polyfill (~> 1.8)
       safe_type (~> 1.1, >= 1.1.1)
-      sorbet (>= 0.4.4704)
       sorbet-runtime (>= 0.4.4704)
-    sorbet-runtime (0.5.5480)
-    sorbet-static (0.5.5480-universal-darwin-19)
-    sprockets (4.0.0)
+    sorbet-runtime (0.5.6519)
+    sorbet-static (0.5.6519-universal-darwin-20)
+    sprockets (4.0.2)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
-    sprockets-rails (3.2.1)
+    sprockets-rails (3.2.2)
       actionpack (>= 4.0)
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
     sqlite3 (1.4.2)
-    thor (1.0.1)
+    thor (1.1.0)
     thread_safe (0.3.6)
-    tzinfo (1.2.6)
+    tzinfo (1.2.9)
       thread_safe (~> 0.1)
     web-console (3.7.0)
       actionview (>= 5.0)
       activemodel (>= 5.0)
       bindex (>= 0.4.0)
       railties (>= 5.0)
-    websocket-driver (0.7.1)
+    websocket-driver (0.7.5)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.5)
 
 PLATFORMS
   ruby
-  x86_64-darwin-19
+  x86_64-darwin-20
 
 DEPENDENCIES
   byebug
@@ -169,8 +170,5 @@ DEPENDENCIES
   tzinfo-data
   web-console (>= 3.3.0)
 
-RUBY VERSION
-   ruby 2.5.5p157
-
 BUNDLED WITH
-   2.2.0
+   2.2.24

data/spec/support/v5.2/app/controllers/application_controller.rb

@@ -1,3 +1,3 @@
-# typed: strong
+# typed: ignore
 class ApplicationController < ActionController::Base
 end

data/spec/support/v5.2/app/mailers/application_mailer.rb

@@ -1,4 +1,4 @@
-# typed: strict
+# typed: ignore
 class ApplicationMailer < ActionMailer::Base
   default from: 'from@example.com'
   layout 'mailer'

data/spec/support/v5.2/app/mailers/daily_prophet_mailer.rb

@@ -1,4 +1,4 @@
-# typed: strong
+# typed: ignore
 class DailyProphetMailer < ApplicationMailer
   extend T::Sig
 

data/spec/support/v5.2/app/mailers/hogwarts_acceptance_mailer.rb

@@ -1,4 +1,4 @@
-# typed: false
+# typed: ignore
 class HogwartsAcceptanceMailer < ApplicationMailer
   extend T::Sig
 

data/spec/support/v5.2/app/models/spell_book.rb

@@ -1,4 +1,4 @@
-# typed: strict
+# typed: false
 class SpellBook < ApplicationRecord
   validates :name, length: { minimum: 5 }, presence: true
 

data/spec/support/v5.2/app/models/wand.rb

@@ -1,4 +1,4 @@
-# typed: true
+# typed: false
 class Wand < ApplicationRecord
   include Mythical
 

data/spec/support/v5.2/app/models/wizard.rb

@@ -1,4 +1,4 @@
-# typed: strict
+# typed: false
 class Wizard < ApplicationRecord
   validates :name, length: { minimum: 5 }, presence: true
   # simulate conditional validation

data/spec/support/v5.2/config/environments/development.rb

@@ -1,4 +1,4 @@
-# typed: false
+# typed: ignore
 Rails.application.configure do
   # Settings specified here will take precedence over those in config/application.rb.
 

data/spec/support/v5.2/config/environments/production.rb

@@ -1,4 +1,4 @@
-# typed: false
+# typed: ignore
 Rails.application.configure do
   # Settings specified here will take precedence over those in config/application.rb.
 

data/spec/support/v5.2/config/environments/test.rb

@@ -1,4 +1,4 @@
-# typed: false
+# typed: ignore
 Rails.application.configure do
   # Settings specified here will take precedence over those in config/application.rb.
 

data/spec/support/v5.2/config/initializers/wrap_parameters.rb

@@ -1,4 +1,4 @@
-# typed: false
+# typed: strict
 # Be sure to restart your server when you modify this file.
 
 # This file contains settings for ActionController::ParamsWrapper which

data/spec/support/v5.2/config/routes.rb

@@ -1,4 +1,4 @@
-# typed: false
+# typed: ignore
 Rails.application.routes.draw do
   get 'test/index' => 'test#index'
   # For details on the DSL available within this file, see http://guides.rubyonrails.org/routing.html

data/spec/support/v5.2/sorbet_test_cases.rb

@@ -121,12 +121,17 @@ T.assert_type!(Wizard.all.find_each, T::Enumerator[Wizard])
 Wizard.all.find_in_batches { |w| T.assert_type!(w, T::Array[Wizard]) }
 T.assert_type!(Wizard.all.find_in_batches, T::Enumerator[T::Array[Wizard]])
 Wizard.all.in_batches { |w| T.assert_type!(w, Wizard::ActiveRecord_Relation) }
-T.assert_type!(Wizard.all.in_batches, T::Enumerable[Wizard::ActiveRecord_Relation])
+T.assert_type!(Wizard.all.in_batches, ActiveRecord::Batches::BatchEnumerator)
 # T.assert_type!(Wizard.all.destroy_all, T::Array[Wizard]) # Ignored until we add support
 T.assert_type!(Wizard.all.any?, T::Boolean)
 T.assert_type!(Wizard.all.many?, T::Boolean)
 T.assert_type!(Wizard.all.none?, T::Boolean)
 T.assert_type!(Wizard.all.one?, T::Boolean)
+T.assert_type!(Wizard.all.any? { |r| r.id > 1 }, T::Boolean)
+T.assert_type!(Wizard.all.many? { |r| r.id > 1 }, T::Boolean)
+T.assert_type!(Wizard.all.none? { |r| r.id > 1 }, T::Boolean)
+T.assert_type!(Wizard.all.one? { |r| r.id > 1 }, T::Boolean)
+
 # T.assert_type!(Wizard.all.update_all(name: 'Harry Potter'), Integer) # Ignored until we add support
 # T.assert_type!(Wizard.all.delete_all, Integer) # Ignored until we add support
 # Query methods
@@ -185,12 +190,16 @@ T.assert_type!(spell_books.find_each, T::Enumerator[SpellBook])
 spell_books.find_in_batches { |s| T.assert_type!(s, T::Array[SpellBook]) }
 T.assert_type!(spell_books.find_in_batches, T::Enumerator[T::Array[SpellBook]])
 spell_books.in_batches { |s| T.assert_type!(s, SpellBook::ActiveRecord_AssociationRelation) }
-T.assert_type!(spell_books.in_batches, T::Enumerable[SpellBook::ActiveRecord_AssociationRelation])
+T.assert_type!(spell_books.in_batches, ActiveRecord::Batches::BatchEnumerator)
 # T.assert_type!(spell_books.destroy_all, T::Array[SpellBook]) # Ignored until we add support
 T.assert_type!(spell_books.any?, T::Boolean)
 T.assert_type!(spell_books.many?, T::Boolean)
 T.assert_type!(spell_books.none?, T::Boolean)
 T.assert_type!(spell_books.one?, T::Boolean)
+T.assert_type!(spell_books.any? { |r| r.id > 1 }, T::Boolean)
+T.assert_type!(spell_books.many? { |r| r.id > 1 }, T::Boolean)
+T.assert_type!(spell_books.none? { |r| r.id > 1 }, T::Boolean)
+T.assert_type!(spell_books.one? { |r| r.id > 1 }, T::Boolean)
 # T.assert_type!(spell_books.update_all(name: 'Fantastic Beasts'), Integer) # Ignored until we add support
 # T.assert_type!(spell_books.delete_all, Integer) # Ignored until we add support
 # Query methods
@@ -257,12 +266,16 @@ T.assert_type!(spell_books_query.find_each, T::Enumerator[SpellBook])
 spell_books_query.find_in_batches { |s| T.assert_type!(s, T::Array[SpellBook]) }
 T.assert_type!(spell_books_query.find_in_batches, T::Enumerator[T::Array[SpellBook]])
 spell_books_query.in_batches { |s| T.assert_type!(s, SpellBook::ActiveRecord_AssociationRelation) }
-T.assert_type!(spell_books_query.in_batches, T::Enumerable[SpellBook::ActiveRecord_AssociationRelation])
+T.assert_type!(spell_books_query.in_batches, ActiveRecord::Batches::BatchEnumerator)
 # T.assert_type!(spell_books_query.destroy_all, T::Array[SpellBook]) # Ignored until we add support
 T.assert_type!(spell_books_query.any?, T::Boolean)
 T.assert_type!(spell_books_query.many?, T::Boolean)
 T.assert_type!(spell_books_query.none?, T::Boolean)
 T.assert_type!(spell_books_query.one?, T::Boolean)
+T.assert_type!(spell_books_query.any? { |r| r.id > 1 }, T::Boolean)
+T.assert_type!(spell_books_query.many? { |r| r.id > 1 }, T::Boolean)
+T.assert_type!(spell_books_query.none? { |r| r.id > 1 }, T::Boolean)
+T.assert_type!(spell_books_query.one? { |r| r.id > 1 }, T::Boolean)
 # T.assert_type!(spell_books_query.update_all(name: 'Fantastic Beasts'), Integer) # Ignored until we add support
 # T.assert_type!(spell_books_query.delete_all, Integer) # Ignored until we add support
 # Query methods
@@ -316,7 +329,7 @@ T.assert_type!(
 )
 T.assert_type!(
   wizard.patronus_characteristics,
-  T.nilable(T.any(T::Array[T.untyped], T::Boolean, Float, T::Hash[String, T.untyped], Integer, String))
+  T.nilable(ActiveRecord::Coders::JSON),
 )
 T.assert_type!(wizard.pets, T.nilable(T::Array[T.untyped]))
 

data/spec/support/v6.0/Gemfile

@@ -1,7 +1,7 @@
 source 'https://rubygems.org'
 git_source(:github) { |repo| "https://github.com/#{repo}.git" }
 
-ruby '2.5.5'
+# ruby '2.5.5'
 
 # Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
 gem 'rails', '~> 6.0.3'