sorbet-rails 0.7.4 → 0.7.25

data/spec/support/{v5.1 → v6.1}/config/environments/production.rb

@@ -15,16 +15,14 @@ Rails.application.configure do
   config.consider_all_requests_local       = false
   config.action_controller.perform_caching = true
 
-  # Attempt to read encrypted secrets from `config/secrets.yml.enc`.
-  # Requires an encryption key in `ENV["RAILS_MASTER_KEY"]` or
-  # `config/secrets.yml.key`.
-  config.read_encrypted_secrets = true
+  # Ensures that a master key has been made available in either ENV["RAILS_MASTER_KEY"]
+  # or in config/master.key. This key is used to decrypt credentials (and other encrypted files).
+  # config.require_master_key = true
 
   # Disable serving static files from the `/public` folder by default since
   # Apache or NGINX already handles this.
   config.public_file_server.enabled = ENV['RAILS_SERVE_STATIC_FILES'].present?
 
-
   # Enable serving of images, stylesheets, and JavaScripts from an asset server.
   # config.action_controller.asset_host = 'http://assets.example.com'
 
@@ -32,6 +30,8 @@ Rails.application.configure do
   # config.action_dispatch.x_sendfile_header = 'X-Sendfile' # for Apache
   # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for NGINX
 
+  # Store uploaded files on the local file system (see config/storage.yml for options).
+  config.active_storage.service = :local
 
   # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies.
   # config.force_ssl = true
@@ -46,9 +46,10 @@ Rails.application.configure do
   # Use a different cache store in production.
   # config.cache_store = :mem_cache_store
 
-  # Use a real queuing backend for Active Job (and separate queues per environment)
+  # Use a real queuing backend for Active Job (and separate queues per environment).
   # config.active_job.queue_adapter     = :resque
-  # config.active_job.queue_name_prefix = "v5_1_#{Rails.env}"
+  # config.active_job.queue_name_prefix = "v6_0_production"
+
   config.action_mailer.perform_caching = false
 
   # Ignore bad email addresses and do not raise email delivery errors.
@@ -77,4 +78,25 @@ Rails.application.configure do
 
   # Do not dump schema after migrations.
   config.active_record.dump_schema_after_migration = false
+
+  # Inserts middleware to perform automatic connection switching.
+  # The `database_selector` hash is used to pass options to the DatabaseSelector
+  # middleware. The `delay` is used to determine how long to wait after a write
+  # to send a subsequent read to the primary.
+  #
+  # The `database_resolver` class is used by the middleware to determine which
+  # database is appropriate to use based on the time delay.
+  #
+  # The `database_resolver_context` class is used by the middleware to set
+  # timestamps for the last write to the primary. The resolver uses the context
+  # class timestamps to determine how long to wait before reading from the
+  # replica.
+  #
+  # By default Rails will store a last write timestamp in the session. The
+  # DatabaseSelector middleware is designed as such you can define your own
+  # strategy for connection switching and pass that into the middleware through
+  # these configuration options.
+  # config.active_record.database_selector = { delay: 2.seconds }
+  # config.active_record.database_resolver = ActiveRecord::Middleware::DatabaseSelector::Resolver
+  # config.active_record.database_resolver_context = ActiveRecord::Middleware::DatabaseSelector::Resolver::Session
 end

data/spec/support/{v5.1 → v6.1}/config/environments/test.rb

@@ -1,11 +1,12 @@
-# typed: false
+# typed: strict
+# The test environment is used exclusively to run your application's
+# test suite. You never need to work with it otherwise. Remember that
+# your test database is "scratch space" for the test suite and is wiped
+# and recreated between test runs. Don't rely on the data there!
+
 Rails.application.configure do
   # Settings specified here will take precedence over those in config/application.rb.
 
-  # The test environment is used exclusively to run your application's
-  # test suite. You never need to work with it otherwise. Remember that
-  # your test database is "scratch space" for the test suite and is wiped
-  # and recreated between test runs. Don't rely on the data there!
   config.cache_classes = true
 
   # Do not eager load code on boot. This avoids loading your whole application
@@ -16,18 +17,23 @@ Rails.application.configure do
   # Configure public file server for tests with Cache-Control for performance.
   config.public_file_server.enabled = true
   config.public_file_server.headers = {
-    'Cache-Control' => "public, max-age=#{1.hour.seconds.to_i}"
+    'Cache-Control' => "public, max-age=#{1.hour.to_i}"
   }
 
   # Show full error reports and disable caching.
   config.consider_all_requests_local       = true
   config.action_controller.perform_caching = false
+  config.cache_store = :null_store
 
   # Raise exceptions instead of rendering exception templates.
   config.action_dispatch.show_exceptions = false
 
   # Disable request forgery protection in test environment.
   config.action_controller.allow_forgery_protection = false
+
+  # Store uploaded files on the local file system in a temporary directory.
+  config.active_storage.service = :test
+
   config.action_mailer.perform_caching = false
 
   # Tell Action Mailer not to deliver emails to the real world.
@@ -38,6 +44,6 @@ Rails.application.configure do
   # Print deprecation notices to the stderr.
   config.active_support.deprecation = :stderr
 
-  # Raises error for missing translations
+  # Raises error for missing translations.
   # config.action_view.raise_on_missing_translations = true
 end

data/spec/support/v6.1/config/initializers/content_security_policy.rb

@@ -0,0 +1,29 @@
+# typed: strong
+# Be sure to restart your server when you modify this file.
+
+# Define an application-wide content security policy
+# For further information see the following documentation
+# https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Security-Policy
+
+# Rails.application.config.content_security_policy do |policy|
+#   policy.default_src :self, :https
+#   policy.font_src    :self, :https, :data
+#   policy.img_src     :self, :https, :data
+#   policy.object_src  :none
+#   policy.script_src  :self, :https
+#   policy.style_src   :self, :https
+
+#   # Specify URI for violation reports
+#   # policy.report_uri "/csp-violation-report-endpoint"
+# end
+
+# If you are using UJS then enable automatic nonce generation
+# Rails.application.config.content_security_policy_nonce_generator = -> request { SecureRandom.base64(16) }
+
+# Set the nonce only to specific directives
+# Rails.application.config.content_security_policy_nonce_directives = %w(script-src)
+
+# Report CSP violations to a specified URI
+# For further information see the following documentation:
+# https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Content-Security-Policy-Report-Only
+# Rails.application.config.content_security_policy_report_only = true

data/spec/support/{v5.1 → v6.1}/config/initializers/cookies_serializer.rb

@@ -1,4 +1,4 @@
-# typed: strict
+# typed: false
 # Be sure to restart your server when you modify this file.
 
 # Specify a serializer for the signed and encrypted cookie jars.

data/spec/support/{v5.0 → v6.1}/config/initializers/sorbet_rails.rb

@@ -1,3 +1,3 @@
-# typed: strict
+# typed: false
 require(Rails.root.join('lib/mythical_rbi_plugin'))
 SorbetRails::ModelRbiFormatter.register_plugin(MythicalRbiPlugin)

data/spec/support/{v5.1 → v6.1}/config/locales/en.yml

@@ -27,7 +27,7 @@
 #   'true': 'foo'
 #
 # To learn more, please read the Rails Internationalization guide
-# available at http://guides.rubyonrails.org/i18n.html.
+# available at https://guides.rubyonrails.org/i18n.html.
 
 en:
   hello: "Hello world"

data/spec/support/{v5.1 → v6.1}/config/puma.rb

@@ -5,8 +5,9 @@
 # the maximum value specified for Puma. Default is set to 5 threads for minimum
 # and maximum; this matches the default thread size of Active Record.
 #
-threads_count = ENV.fetch("RAILS_MAX_THREADS") { 5 }
-threads threads_count, threads_count
+max_threads_count = ENV.fetch("RAILS_MAX_THREADS") { 5 }
+min_threads_count = ENV.fetch("RAILS_MIN_THREADS") { max_threads_count }
+threads min_threads_count, max_threads_count
 
 # Specifies the `port` that Puma will listen on to receive requests; default is 3000.
 #
@@ -16,8 +17,11 @@ port        ENV.fetch("PORT") { 3000 }
 #
 environment ENV.fetch("RAILS_ENV") { "development" }
 
+# Specifies the `pidfile` that Puma will use.
+pidfile ENV.fetch("PIDFILE") { "tmp/pids/server.pid" }
+
 # Specifies the number of `workers` to boot in clustered mode.
-# Workers are forked webserver processes. If using threads and workers together
+# Workers are forked web server processes. If using threads and workers together
 # the concurrency of the application would be max `threads` * `workers`.
 # Workers do not work on JRuby or Windows (both of which do not support
 # processes).
@@ -27,31 +31,9 @@ environment ENV.fetch("RAILS_ENV") { "development" }
 # Use the `preload_app!` method when specifying a `workers` number.
 # This directive tells Puma to first boot the application and load code
 # before forking the application. This takes advantage of Copy On Write
-# process behavior so workers use less memory. If you use this option
-# you need to make sure to reconnect any threads in the `on_worker_boot`
-# block.
+# process behavior so workers use less memory.
 #
 # preload_app!
 
-# If you are preloading your application and using Active Record, it's
-# recommended that you close any connections to the database before workers
-# are forked to prevent connection leakage.
-#
-# before_fork do
-#   ActiveRecord::Base.connection_pool.disconnect! if defined?(ActiveRecord)
-# end
-
-# The code in the `on_worker_boot` will be called if you are using
-# clustered mode by specifying a number of `workers`. After each worker
-# process is booted, this block will be run. If you are using the `preload_app!`
-# option, you will want to use this block to reconnect to any threads
-# or connections that may have been created at application boot, as Ruby
-# cannot share connections between processes.
-#
-# on_worker_boot do
-#   ActiveRecord::Base.establish_connection if defined?(ActiveRecord)
-# end
-#
-
 # Allow puma to be restarted by `rails restart` command.
 plugin :tmp_restart

data/spec/support/v6.1/config/routes.rb

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

data/spec/support/v6.1/config/storage.yml

@@ -0,0 +1,34 @@
+test:
+  service: Disk
+  root: <%= Rails.root.join("tmp/storage") %>
+
+local:
+  service: Disk
+  root: <%= Rails.root.join("storage") %>
+
+# Use rails credentials:edit to set the AWS secrets (as aws:access_key_id|secret_access_key)
+# amazon:
+#   service: S3
+#   access_key_id: <%= Rails.application.credentials.dig(:aws, :access_key_id) %>
+#   secret_access_key: <%= Rails.application.credentials.dig(:aws, :secret_access_key) %>
+#   region: us-east-1
+#   bucket: your_own_bucket
+
+# Remember not to checkin your GCS keyfile to a repository
+# google:
+#   service: GCS
+#   project: your_project
+#   credentials: <%= Rails.root.join("path/to/gcs.keyfile") %>
+#   bucket: your_own_bucket
+
+# Use rails credentials:edit to set the Azure Storage secret (as azure_storage:storage_access_key)
+# microsoft:
+#   service: AzureStorage
+#   storage_account_name: your_account_name
+#   storage_access_key: <%= Rails.application.credentials.dig(:azure_storage, :storage_access_key) %>
+#   container: your_container_name
+
+# mirror:
+#   service: Mirror
+#   primary: local
+#   mirrors: [ amazon, google, microsoft ]

data/spec/support/{v5.1 → v6.1}/db/migrate/20190620000001_create_wizards.rb

@@ -1,5 +1,5 @@
-# typed: false
-class CreateWizards < ActiveRecord::Migration[5.1]
+# typed: true
+class CreateWizards < ActiveRecord::Migration[6.0]
   def change
     create_table :wizards do |t|
       t.string :name

data/spec/support/{v5.1 → v6.1}/db/migrate/20190620000002_create_wands.rb

@@ -1,5 +1,5 @@
-# typed: false
-class CreateWands < ActiveRecord::Migration[5.1]
+# typed: true
+class CreateWands < ActiveRecord::Migration[6.0]
   def change
     create_table :wands do |t|
       t.references :wizard, unique: true, null: false

data/spec/support/{v5.1 → v6.1}/db/migrate/20190620000003_create_spell_books.rb

@@ -1,5 +1,5 @@
-# typed: false
-class CreateSpellBooks < ActiveRecord::Migration[5.1]
+# typed: true
+class CreateSpellBooks < ActiveRecord::Migration[6.0]
   def change
     create_table :spell_books do |t|
       t.string :name

data/spec/support/{v5.1 → v6.1}/db/migrate/20190620000004_add_more_column_types_to_wands.rb

@@ -1,5 +1,5 @@
-# typed: false
-class AddMoreColumnTypesToWands < ActiveRecord::Migration[5.1]
+# typed: true
+class AddMoreColumnTypesToWands < ActiveRecord::Migration[6.0]
   def change
     add_column :wands, :flexibility,    :float,   null: false, default: 0.5
     add_column :wands, :hardness,       :decimal, null: false, precision: 10, scale: 10, default: 5

data/spec/support/v6.1/db/migrate/20190620000005_add_broom_to_wizard.rb

@@ -0,0 +1,6 @@
+# typed: true
+class AddBroomToWizard < ActiveRecord::Migration[6.0]
+  def change
+    add_column :wizards, :broom, :string
+  end
+end

data/spec/support/{v5.1 → v6.1}/db/migrate/20190620000006_add_more_enums_to_wizard.rb

@@ -1,5 +1,5 @@
-# typed: false
-class AddMoreEnumsToWizard < ActiveRecord::Migration[5.1]
+# typed: true
+class AddMoreEnumsToWizard < ActiveRecord::Migration[6.0]
   def change
     add_column :wizards, :quidditch_position, :integer
     add_column :wizards, :hair_color, :integer

data/spec/support/{v5.1 → v6.1}/db/migrate/20190620000007_add_type_to_wizard.rb

@@ -1,5 +1,5 @@
-# typed: false
-class AddTypeToWizard < ActiveRecord::Migration[5.1]
+# typed: true
+class AddTypeToWizard < ActiveRecord::Migration[6.0]
   def change
     add_column :wizards, :type, :string, null: false, default: 'Wizard'
   end

data/spec/support/{v5.1 → v6.1}/db/migrate/20190620000008_add_robe_to_wizard.rb

@@ -1,5 +1,5 @@
-# typed: false
-class AddRobeToWizard < ActiveRecord::Migration[5.1]
+# typed: true
+class AddRobeToWizard < ActiveRecord::Migration[6.0]
   def change
     create_table :robes do |t|
       t.references :wizard

data/spec/support/{v5.1 → v6.1}/db/migrate/20190620000009_add_school.rb

@@ -1,5 +1,5 @@
-# typed: false
-class AddSchool < ActiveRecord::Migration[5.1]
+# typed: true
+class AddSchool < ActiveRecord::Migration[6.0]
   def change
     create_table :schools do |t|
       t.string :name

data/spec/support/{v5.1 → v6.1}/db/migrate/20190620000010_add_subject.rb

@@ -1,5 +1,5 @@
-# typed: false
-class AddSubject < ActiveRecord::Migration[5.1]
+# typed: true
+class AddSubject < ActiveRecord::Migration[6.0]
   def change
     create_table :subjects do |t|
       t.string :name

data/spec/support/{v5.1 → v6.1}/db/migrate/20190620000011_add_subjects_wizards.rb

@@ -1,5 +1,5 @@
-# typed: false
-class AddSubjectsWizards < ActiveRecord::Migration[5.1]
+# typed: true
+class AddSubjectsWizards < ActiveRecord::Migration[6.0]
   def change
     create_join_table :subjects, :wizards, column_options: { null: true } do |t|
       t.index [:subject_id, :wizard_id]

data/spec/support/{v5.1 → v6.1}/db/migrate/20190620000012_add_spell.rb

@@ -1,5 +1,5 @@
-# typed: false
-class AddSpell < ActiveRecord::Migration[5.1]
+# typed: true
+class AddSpell < ActiveRecord::Migration[6.0]
   def change
     create_table :spells do |t|
       t.string :name

data/spec/support/{v5.1 → v6.1}/db/migrate/20190620000013_add_spells_spell_books.rb

@@ -1,5 +1,5 @@
-# typed: false
-class AddSpellsSpellBooks < ActiveRecord::Migration[5.1]
+# typed: true
+class AddSpellsSpellBooks < ActiveRecord::Migration[6.0]
   def change
     create_join_table :spells, :spell_books do |t|
       t.index [:spell_id, :spell_book_id]

data/spec/support/{v5.0 → v6.1}/db/migrate/20190620000014_create_headmasters.rb

@@ -1,5 +1,5 @@
-# typed: false
-class CreateHeadmasters < ActiveRecord::Migration[5.0]
+# typed: true
+class CreateHeadmasters < ActiveRecord::Migration[6.0]
   def change
     create_table :headmasters do |t|
       t.references :school

data/spec/support/{v5.0 → v6.1}/db/migrate/20190620000015_add_serialized_to_wizards.rb

@@ -1,5 +1,5 @@
-# typed: false
-class AddSerializedToWizards < ActiveRecord::Migration[5.0]
+# typed: true
+class AddSerializedToWizards < ActiveRecord::Migration[6.0]
   def change
     add_column :wizards, :owl_results, :text # Hash
     add_column :wizards, :newt_subjects, :text # generic

data/spec/support/{v5.1 → v6.1}/db/schema.rb

@@ -1,17 +1,17 @@
-# typed: false
+# typed: strict
 # This file is auto-generated from the current state of the database. Instead
 # of editing this file, please use the migrations feature of Active Record to
 # incrementally modify your database, and then regenerate this schema definition.
 #
-# Note that this schema.rb definition is the authoritative source for your
-# database schema. If you need to create the application database on another
-# system, you should be using db:schema:load, not running all the migrations
-# from scratch. The latter is a flawed and unsustainable approach (the more migrations
-# you'll amass, the slower it'll run and the greater likelihood for issues).
+# This file is the source Rails uses to define your schema when running `rails
+# db:schema:load`. When creating a new database, `rails db:schema:load` tends to
+# be faster and is potentially less error prone than running all of your
+# migrations from scratch. Old migrations may fail to apply correctly if those
+# migrations use external dependencies or application code.
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20190620000015) do
+ActiveRecord::Schema.define(version: 2019_06_20_000015) do
 
   create_table "headmasters", force: :cascade do |t|
     t.integer "school_id"
@@ -60,8 +60,8 @@ ActiveRecord::Schema.define(version: 20190620000015) do
     t.integer "wizard_id", null: false
     t.string "wood_type"
     t.integer "core_type"
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
+    t.datetime "created_at", precision: 6, null: false
+    t.datetime "updated_at", precision: 6, null: false
     t.float "flexibility", default: 0.5, null: false
     t.decimal "hardness", precision: 10, scale: 10, default: "5.0", null: false
     t.decimal "reflectance", precision: 10, default: "0", null: false
@@ -69,6 +69,8 @@ ActiveRecord::Schema.define(version: 20190620000015) do
     t.datetime "broken_at"
     t.date "chosen_at_date"
     t.time "chosen_at_time"
+    t.json "spell_history"
+    t.json "maker_info", default: "{}", null: false
     t.index ["wizard_id"], name: "index_wands_on_wizard_id"
   end
 
@@ -78,8 +80,8 @@ ActiveRecord::Schema.define(version: 20190620000015) do
     t.integer "professor"
     t.string "parent_email"
     t.text "notes"
-    t.datetime "created_at", null: false
-    t.datetime "updated_at", null: false
+    t.datetime "created_at", precision: 6, null: false
+    t.datetime "updated_at", precision: 6, null: false
     t.string "broom"
     t.integer "quidditch_position"
     t.integer "hair_color"
@@ -93,4 +95,5 @@ ActiveRecord::Schema.define(version: 20190620000015) do
     t.text "patronus_characteristics"
   end
 
+  add_foreign_key "wizards", "schools"
 end

data/spec/support/{v5.0 → v6.1}/sorbet_test_cases.rb

@@ -84,6 +84,8 @@ T.assert_type!(Wizard.where.not(id: 1), Wizard::ActiveRecord_Relation)
 T.assert_type!(Wizard.preload(:spell_books), Wizard::ActiveRecord_Relation)
 T.assert_type!(Wizard.eager_load(:spell_books), Wizard::ActiveRecord_Relation)
 T.assert_type!(Wizard.order(:id), Wizard::ActiveRecord_Relation)
+T.assert_type!(Wizard.select { |r| r.id == 1 }, T::Array[Wizard])
+T.assert_type!(Wizard.select_columns(:id, :name), Wizard::ActiveRecord_Relation)
 
 # Finder methods -- ActiveRecord::Relation
 T.assert_type!(Wizard.all.exists?(name: 'Harry Potter'), T::Boolean)
@@ -121,12 +123,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
@@ -141,6 +148,8 @@ T.assert_type!(Wizard.all.where.not(id: 1), Wizard::ActiveRecord_Relation)
 T.assert_type!(Wizard.all.preload(:spell_books), Wizard::ActiveRecord_Relation)
 T.assert_type!(Wizard.all.eager_load(:spell_books), Wizard::ActiveRecord_Relation)
 T.assert_type!(Wizard.all.order(:id), Wizard::ActiveRecord_Relation)
+T.assert_type!(Wizard.all.select { |r| r.id == 1 }, T::Array[Wizard])
+T.assert_type!(Wizard.all.select_columns(:id, :name), Wizard::ActiveRecord_Relation)
 # Enumerable methods
 Wizard.all.each { |w| T.assert_type!(w, Wizard) }
 Wizard.all.map { |w| T.assert_type!(w, Wizard) }
@@ -185,12 +194,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
@@ -205,6 +218,9 @@ T.assert_type!(spell_books.where.not(id: 1), SpellBook::ActiveRecord_Association
 T.assert_type!(spell_books.preload(:wizard), SpellBook::ActiveRecord_AssociationRelation)
 T.assert_type!(spell_books.eager_load(:wizard), SpellBook::ActiveRecord_AssociationRelation)
 T.assert_type!(spell_books.order(:id), SpellBook::ActiveRecord_AssociationRelation)
+T.assert_type!(spell_books.select { |r| r.id == 1 }, T::Array[SpellBook])
+T.assert_type!(spell_books.select_columns(:id, :name), SpellBook::ActiveRecord_AssociationRelation)
+
 # Enumerable methods
 spell_books.each { |s| T.assert_type!(s, SpellBook) }
 spell_books.map { |s| T.assert_type!(s, SpellBook) }
@@ -257,12 +273,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
@@ -277,6 +297,8 @@ T.assert_type!(spell_books_query.where.not(id: 1), SpellBook::ActiveRecord_Assoc
 T.assert_type!(spell_books_query.preload(:wizard), SpellBook::ActiveRecord_AssociationRelation)
 T.assert_type!(spell_books_query.eager_load(:wizard), SpellBook::ActiveRecord_AssociationRelation)
 T.assert_type!(spell_books_query.order(:id), SpellBook::ActiveRecord_AssociationRelation)
+T.assert_type!(spell_books.select { |r| r.id == 1 }, T::Array[SpellBook])
+T.assert_type!(spell_books.select_columns(:id, :name), SpellBook::ActiveRecord_AssociationRelation)
 # Enumerable methods
 spell_books_query.each { |s| T.assert_type!(s, SpellBook) }
 spell_books_query.map { |s| T.assert_type!(s, SpellBook) }
@@ -316,7 +338,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/test_data/v5.2/expected_active_record_base.rbi

@@ -96,18 +96,18 @@ class ActiveRecord::Base
   end
   def self.find_in_batches(start: nil, finish: nil, batch_size: 1000, error_on_ignore: nil, &block); end
 
-  sig { params(conditions: T.untyped).returns(T::Boolean) }
-  def self.exists?(conditions = nil); end
+  sig { params(block: T.nilable(T.proc.params(e: T.attached_class).returns(T.nilable(T::Boolean)))).returns(T::Boolean) }
+  def self.any?(&block); end
 
-  sig { returns(T::Boolean) }
-  def self.any?; end
+  sig { params(block: T.nilable(T.proc.params(e: T.attached_class).returns(T.nilable(T::Boolean)))).returns(T::Boolean) }
+  def self.many?(&block); end
 
-  sig { returns(T::Boolean) }
-  def self.many?; end
+  sig { params(block: T.nilable(T.proc.params(e: T.attached_class).returns(T.nilable(T::Boolean)))).returns(T::Boolean) }
+  def self.none?(&block); end
 
-  sig { returns(T::Boolean) }
-  def self.none?; end
+  sig { params(block: T.nilable(T.proc.params(e: T.attached_class).returns(T.nilable(T::Boolean)))).returns(T::Boolean) }
+  def self.one?(&block); end
 
-  sig { returns(T::Boolean) }
-  def self.one?; end
+  sig { params(conditions: T.untyped).returns(T::Boolean) }
+  def self.exists?(conditions = nil); end
 end