mongoid 7.1.0.rc0 → 7.2.0.rc1

data/spec/{app/models/profile.rb → support/models/scribe.rb}

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 # encoding: utf-8
 
-class Profile
+class Scribe
   include Mongoid::Document
   field :name, type: String
-  shard_key :name
+  embedded_in :owner
 end

data/spec/support/models/seat.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
+class Seat
+  include Mongoid::Document
+
+  embedded_in :vehicle
+
+  field :rating, type: Integer
+
+  embeds_many :armrests
+
+  before_create :set_rating
+  before_update :update_rating
+
+  private
+
+  def set_rating
+    self.rating ||= 100
+  end
+
+  def update_rating
+    self.rating += 1
+  end
+end

data/spec/{app → support}/models/shape.rb

@@ -11,5 +11,5 @@ class Shape
   def render; end
 end
 
-require "app/models/circle"
-require "app/models/square"
+require "support/models/circle"
+require "support/models/square"

data/spec/support/models/system_role.rb

@@ -0,0 +1,7 @@
+class SystemRole
+ include Mongoid::Document
+
+  # NOTE: this model is for test purposes only. It is not recommended that you
+  # store Mongoid documents in system collections.
+  store_in collection: "system.roles", database: "admin"
+end

data/spec/{app → support}/models/tool.rb

@@ -7,5 +7,5 @@ class Tool
   accepts_nested_attributes_for :palette
 end
 
-require "app/models/eraser"
-require "app/models/pencil"
+require "support/models/eraser"
+require "support/models/pencil"

data/spec/support/models/toy.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
+class Toy
+  include Mongoid::Document
+
+  embedded_in :crate
+
+  field :name
+end

data/spec/{app → support}/models/truck.rb

@@ -3,4 +3,6 @@
 
 class Truck < Vehicle
   embeds_one :bed
+
+  field :capacity, type: Integer
 end

data/spec/{app → support}/models/vehicle.rb

@@ -3,12 +3,17 @@
 
 class Vehicle
   include Mongoid::Document
+
   belongs_to :shipping_container
   belongs_to :driver
 
+  embeds_many :crates
+  embeds_many :seats, cascade_callbacks: true
+
   accepts_nested_attributes_for :driver
   accepts_nested_attributes_for :shipping_container
+  accepts_nested_attributes_for :crates
 end
 
-require "app/models/car"
-require "app/models/truck"
+require "support/models/car"
+require "support/models/truck"

data/spec/{app → support}/models/writer.rb

@@ -10,5 +10,5 @@ class Writer
   def write; end
 end
 
-require "app/models/pdf_writer"
-require "app/models/html_writer"
+require "support/models/pdf_writer"
+require "support/models/html_writer"

data/spec/support/session_registry.rb

@@ -0,0 +1,50 @@
+require 'singleton'
+
+module Mongo
+  class Client
+    alias :get_session_without_tracking :get_session
+
+    def get_session(options = {})
+      get_session_without_tracking(options).tap do |session|
+        SessionRegistry.instance.register(session)
+      end
+    end
+  end
+
+  class Session
+    alias :end_session_without_tracking :end_session
+
+    def end_session
+      SessionRegistry.instance.unregister(self)
+      end_session_without_tracking
+    end
+  end
+end
+
+
+class SessionRegistry
+  include Singleton
+
+  def initialize
+    @registry = {}
+  end
+
+  def register(session)
+    @registry[session.session_id] = session if session
+  end
+
+  def unregister(session)
+    @registry.delete(session.session_id)
+  end
+
+  def verify_sessions_ended!
+    unless @registry.empty?
+      sessions = @registry.map { |_, session| session }
+      raise "Session registry contains live sessions: #{sessions.join(', ')}"
+    end
+  end
+
+  def clear_registry
+    @registry = {}
+  end
+end

data/spec/support/spec_config.rb

@@ -8,15 +8,19 @@ class SpecConfig
 
   def initialize
     if ENV['MONGODB_URI']
-      @mongodb_uri = Mongo::URI.new(ENV['MONGODB_URI'])
+      @uri_str = ENV['MONGODB_URI']
+      @uri = Mongo::URI.new(@uri_str)
     end
   end
 
+  attr_reader :uri_str
+  attr_reader :uri
+
   def addresses
-    if @mongodb_uri
-      @mongodb_uri.servers
+    if @uri
+      @uri.servers
     else
-      ['127.0.0.1']
+      ['127.0.0.1:27017']
     end
   end
 
@@ -33,7 +37,11 @@ class SpecConfig
   end
 
   def client_debug?
-    %w(1 true yes).include?((ENV['CLIENT_DEBUG'] || '').downcase)
+    %w(1 true yes).include?(ENV['CLIENT_DEBUG']&.downcase)
+  end
+
+  def app_tests?
+    %w(1 true yes).include?(ENV['APP_TESTS']&.downcase)
   end
 
   def ci?

data/spec/support/spec_organizer.rb

@@ -0,0 +1,130 @@
+require 'support/child_process_helper'
+require 'json'
+
+autoload :FileUtils, 'fileutils'
+autoload :Find, 'find'
+
+# Organizes and runs all of the tests in the test suite in batches.
+#
+# Organizing the tests in batches serves two purposes:
+#
+# 1. This allows running unit tests before integration tests, therefore
+#    in theory revealing failures quicker on average.
+# 2. This allows running some tests that have high intermittent failure rate
+#    in their own test process.
+#
+# This class aggregates RSpec results after the test runs.
+class SpecOrganizer
+  CLASSIFIERS = [
+    [%r,^mongoid/attribute,, :attributes],
+    [%r,^mongoid/association/[or],, :associations_referenced],
+    [%r,^mongoid/association,, :associations],
+    [%r,^mongoid,, :unit],
+    [%r,^integration,, :integration],
+    [%r,^rails,, :rails],
+  ]
+
+  RUN_PRIORITY = %i(
+    unit attributes associations_referenced associations
+    integration rails
+  )
+
+  SPEC_ROOT = File.expand_path(File.join(File.dirname(__FILE__), '..'))
+  ROOT = File.expand_path(File.join(SPEC_ROOT, '..'))
+  RSPEC_JSON_PATH = File.join(ROOT, 'tmp/rspec.json')
+  RSPEC_ALL_JSON_PATH = File.join(ROOT, 'tmp/rspec-all.json')
+
+  def run
+    FileUtils.rm_f(RSPEC_ALL_JSON_PATH)
+
+    buckets = {}
+    Find.find(SPEC_ROOT) do |path|
+      next unless File.file?(path)
+      next unless path =~ /_spec\.rb\z/
+      rel_path = path[(SPEC_ROOT.length + 1)..path.length]
+
+      found = false
+      CLASSIFIERS.each do |(regexp, category)|
+        if regexp =~ rel_path
+          buckets[category] ||= []
+          buckets[category] << rel_path
+          found = true
+          break
+        end
+      end
+
+      unless found
+        buckets[nil] ||= []
+        buckets[nil] << rel_path
+      end
+    end
+
+    failed = []
+
+    RUN_PRIORITY.each do |category|
+      if files = buckets.delete(category)
+        unless run_files(category, files)
+          failed << category
+        end
+      end
+    end
+    if files = buckets.delete(nil)
+      unless run_files('remaining', files)
+        failed << 'remaining'
+      end
+    end
+
+    unless buckets.empty?
+      raise "Some buckets were not executed: #{buckets.keys.map(&:to_s).join(', ')}"
+    end
+
+    if failed.any?
+      raise "The following buckets failed: #{failed.map(&:to_s).join(', ')}"
+    end
+  end
+
+  def run_files(category, paths)
+    paths = paths.map do |path|
+      File.join('spec', path)
+    end
+
+    puts "Running #{category.to_s.gsub('_', ' ')} tests"
+    FileUtils.rm_f(RSPEC_JSON_PATH)
+    cmd = %w(rspec) + paths
+
+    begin
+      ChildProcessHelper.check_call(cmd)
+    ensure
+      if File.exist?(RSPEC_JSON_PATH)
+        if File.exist?(RSPEC_ALL_JSON_PATH)
+          merge_rspec_results
+        else
+          FileUtils.cp(RSPEC_JSON_PATH, RSPEC_ALL_JSON_PATH)
+        end
+      end
+    end
+
+    true
+  rescue ChildProcessHelper::SpawnError
+    false
+  end
+
+  def merge_rspec_results
+    all = JSON.parse(File.read(RSPEC_ALL_JSON_PATH))
+    new = JSON.parse(File.read(RSPEC_JSON_PATH))
+    all['examples'] += new.delete('examples')
+    new.delete('summary').each do |k, v|
+      all['summary'][k] += v
+    end
+    new.delete('version')
+    new.delete('summary_line')
+    unless new.empty?
+      raise "Unhandled rspec results keys: #{new.keys.join(', ')}"
+    end
+    # We do not merge summary lines, delete them from aggregated results
+    all.delete('summary_line')
+    File.open(RSPEC_ALL_JSON_PATH, 'w') do |f|
+      f << JSON.dump(all)
+    end
+  end
+end