mongoid 7.1.6 → 7.2.2

data/spec/shared/shlib/set_env.sh

@@ -0,0 +1,128 @@
+TOOLCHAIN_VERSION=289d4bec7c61e88000cea582c05fd8073b932122
+
+set_env_java() {
+  ls -l /opt || true
+  ls -l /usr/lib/jvm || true
+
+  # Use toolchain java if it exists
+  if [ -f /opt/java/jdk8/bin/java ]; then
+    export JAVACMD=/opt/java/jdk8/bin/java
+    #export PATH=$PATH:/opt/java/jdk8/bin
+  fi
+  
+  # ppc64le has it in a different place
+  if test -z "$JAVACMD" && [ -f /usr/lib/jvm/java-1.8.0/bin/java ]; then
+    export JAVACMD=/usr/lib/jvm/java-1.8.0/bin/java
+    #export PATH=$PATH:/usr/lib/jvm/java-1.8.0/bin
+  fi
+  
+  if true; then
+    # newer
+    # rhel71-ppc, https://jira.mongodb.org/browse/BUILD-9231
+    if test -z "$JAVACMD" &&
+      (ls /opt/java || true) |grep -q java-1.8.0-openjdk-1.8.0 &&
+      test -f /opt/java/java-1.8.0-openjdk-1.8.0*/bin/java;
+    then
+      path=$(cd /opt/java && ls -d java-1.8.0-openjdk-1.8.0* |head -n 1)
+      export JAVACMD=/opt/java/"$path"/bin/java
+    fi
+  else
+    # older
+    # rhel71-ppc seems to have an /opt/java/jdk8/bin/java but it doesn't work
+    if test -n "$JAVACMD" && ! exec $JAVACMD -version; then
+      JAVACMD=
+      # we will try the /usr/lib/jvm then
+    fi
+  fi
+  
+  if test -n "$JAVACMD"; then
+    eval $JAVACMD -version
+  elif which java 2>/dev/null; then
+    java -version
+  else
+    echo No java runtime found
+  fi
+}
+
+set_env_ruby() {
+  if test -z "$RVM_RUBY"; then
+    echo "Empty RVM_RUBY, aborting"
+    exit 2
+  fi
+
+  #ls -l /opt
+
+  # Necessary for jruby
+  set_env_java
+
+  if [ "$RVM_RUBY" == "ruby-head" ]; then
+    # When we use ruby-head, we do not install the Ruby toolchain.
+    # But we still need Python 3.6+ to run mlaunch.
+    # Since the ruby-head tests are run on ubuntu1604, we can use the
+    # globally installed Python toolchain.
+    #export PATH=/opt/python/3.7/bin:$PATH
+
+    # 12.04, 14.04 and 16.04 are good
+    curl --retry 3 -fL http://rubies.travis-ci.org/ubuntu/`lsb_release -rs`/x86_64/ruby-head.tar.bz2 |tar xfj -
+    # TODO adjust gem path?
+    export PATH=`pwd`/ruby-head/bin:`pwd`/ruby-head/lib/ruby/gems/2.6.0/bin:$PATH
+    ruby --version
+    ruby --version |grep dev
+  else
+    if test "$USE_OPT_TOOLCHAIN" = 1; then
+      # nothing, also PATH is already set
+      :
+    elif true; then
+
+    # For testing toolchains:
+    #toolchain_url=https://s3.amazonaws.com//mciuploads/mongo-ruby-toolchain/`host_distro`/f11598d091441ffc8d746aacfdc6c26741a3e629/mongo_ruby_driver_toolchain_`host_distro |tr - _`_patch_f11598d091441ffc8d746aacfdc6c26741a3e629_5e46f2793e8e866f36eda2c5_20_02_14_19_18_18.tar.gz
+    toolchain_url=http://boxes.10gen.com/build/toolchain-drivers/mongo-ruby-driver/ruby-toolchain-`host_distro`-$TOOLCHAIN_VERSION.tar.xz
+    curl --retry 3 -fL $toolchain_url |tar Jxf -
+    export PATH=`pwd`/rubies/$RVM_RUBY/bin:$PATH
+    #export PATH=`pwd`/rubies/python/3/bin:$PATH
+
+    # Attempt to get bundler to report all errors - so far unsuccessful
+    #curl --retry 3 -o bundler-openssl.diff https://github.com/bundler/bundler/compare/v2.0.1...p-mongo:report-errors.diff
+    #find . -path \*/lib/bundler/fetcher.rb -exec patch {} bundler-openssl.diff \;
+
+    else
+
+    # Normal operation
+    if ! test -d $HOME/.rubies/$RVM_RUBY/bin; then
+      echo "Ruby directory does not exist: $HOME/.rubies/$RVM_RUBY/bin" 1>&2
+      echo "Contents of /opt:" 1>&2
+      ls -l /opt 1>&2 || true
+      echo ".rubies symlink:" 1>&2
+      ls -ld $HOME/.rubies 1>&2 || true
+      echo "Our rubies:" 1>&2
+      ls -l $HOME/.rubies 1>&2 || true
+      exit 2
+    fi
+    export PATH=$HOME/.rubies/$RVM_RUBY/bin:$PATH
+
+    fi
+
+    ruby --version
+
+    # Ensure we're using the right ruby
+    ruby_name=`echo $RVM_RUBY |awk -F- '{print $1}'`
+    ruby_version=`echo $RVM_RUBY |awk -F- '{print $2}' |cut -c 1-3`
+
+    ruby -v |fgrep $ruby_name
+    ruby -v |fgrep $ruby_version
+
+    # We shouldn't need to update rubygems, and there is value in
+    # testing on whatever rubygems came with each supported ruby version
+    #echo 'updating rubygems'
+    #gem update --system
+
+    # Only install bundler when not using ruby-head.
+    # ruby-head comes with bundler and gem complains
+    # because installing bundler would overwrite the bundler binary.
+    # We now install bundler in the toolchain, hence nothing needs to be done
+    # in the tests.
+    if false && echo "$RVM_RUBY" |grep -q jruby; then
+      gem install bundler -v '<2'
+    fi
+  fi
+}

data/spec/spec_helper.rb

@@ -3,7 +3,7 @@
 
 require 'lite_spec_helper'
 
-MODELS = File.join(File.dirname(__FILE__), "app/models")
+MODELS = File.join(File.dirname(__FILE__), "support/models")
 $LOAD_PATH.unshift(MODELS)
 
 require "action_controller"
@@ -35,6 +35,7 @@ require 'support/helpers'
 require 'support/macros'
 require 'support/cluster_config'
 require 'support/constraints'
+require 'mrss/constraints'
 
 # Give MongoDB servers time to start up in CI environments
 if SpecConfig.instance.ci?
@@ -82,7 +83,7 @@ Mongoid.configure do |config|
   config.load_configuration(CONFIG)
 end
 
-# Autoload every model for the test suite that sits in spec/app/models.
+# Autoload every model for the test suite that sits in spec/support/models.
 Dir[ File.join(MODELS, "*.rb") ].sort.each do |file|
   name = File.basename(file, ".rb")
   autoload name.camelize.to_sym, name
@@ -128,6 +129,7 @@ RSpec.configure do |config|
   config.raise_errors_for_deprecations!
   config.include(Helpers)
   config.include(Mongoid::Expectations)
+  config.extend(Mrss::Constraints)
   config.extend(Constraints)
   config.extend(Mongoid::Macros)
 

data/spec/support/constraints.rb

@@ -4,252 +4,50 @@
 module Constraints
   RAILS_VERSION = ActiveSupport.version.to_s.split('.')[0..1].join('.').freeze
 
-  def min_rails_version(version)
-    unless version =~ /\A\d+\.\d+\z/
-      raise ArgumentError, "Version can only be major.minor: #{version}"
-    end
-
+  def min_driver_version(version)
+    required_version = version.split('.').map(&:to_i)
+    actual_version = driver_version(required_version.length)
     before(:all) do
-      if version > RAILS_VERSION
-        skip "Rails version #{version} or higher required, we have #{RAILS_VERSION}"
+      if (actual_version <=> required_version) < 0
+        skip "Driver version #{version} or higher is required"
       end
     end
   end
 
-  def max_rails_version(version)
-    unless version =~ /\A\d+\.\d+\z/
-      raise ArgumentError, "Version can only be major.minor: #{version}"
-    end
-
+  def max_driver_version(version)
+    required_version = version.split('.').map(&:to_i)
+    actual_version = driver_version(required_version.length)
     before(:all) do
-      if version < RAILS_VERSION
-        skip "Rails version #{version} or lower required, we have #{RAILS_VERSION}"
+      if (actual_version <=> required_version) > 0
+        skip "Driver version #{version} or lower is required"
       end
     end
   end
 
-  def min_server_version(version)
-    unless version =~ /\A\d+\.\d+\z/
-      raise ArgumentError, "Version can only be major.minor: #{version}"
-    end
-
-    before(:all) do
-      if version > ClusterConfig.instance.server_version
-        skip "Server version #{version} or higher required, we have #{ClusterConfig.instance.server_version}"
-      end
-    end
+  def driver_version(precision)
+    Mongo::VERSION.split('.')[0...precision].map(&:to_i)
   end
 
-  def max_server_version(version)
+  def min_rails_version(version)
     unless version =~ /\A\d+\.\d+\z/
       raise ArgumentError, "Version can only be major.minor: #{version}"
     end
 
     before(:all) do
-      if version < ClusterConfig.instance.short_server_version
-        skip "Server version #{version} or lower required, we have #{ClusterConfig.instance.server_version}"
-      end
-    end
-  end
-
-  def require_topology(*topologies)
-    invalid_topologies = topologies - [:single, :replica_set, :sharded]
-
-    unless invalid_topologies.empty?
-      raise ArgumentError, "Invalid topologies requested: #{invalid_topologies.join(', ')}"
-    end
-
-    before(:all) do
-      unless topologies.include?(topology = ClusterConfig.instance.topology)
-        skip "Topology #{topologies.join(' or ')} required, we have #{topology}"
-      end
-    end
-  end
-
-  def max_example_run_time(timeout)
-    around do |example|
-      TimeoutInterrupt.timeout(timeout, TimeoutInterrupt::Error.new("Test execution terminated after #{timeout} seconds")) do
-        example.run
-      end
-    end
-  end
-
-  def require_transaction_support
-    before(:all) do
-      case ClusterConfig.instance.topology
-      when :single
-        skip 'Transactions tests require a replica set (4.0+) or a sharded cluster (4.2+)'
-      when :replica_set
-        unless ClusterConfig.instance.server_version >= '4.0'
-          skip 'Transactions tests in a replica set topology require server 4.0+'
-        end
-      when :sharded
-        unless ClusterConfig.instance.server_version >= '4.2'
-          skip 'Transactions tests in a sharded cluster topology require server 4.2+'
-        end
-      else
-        raise NotImplementedError
-      end
-    end
-  end
-
-  def require_tls
-    before(:all) do
-      unless SpecConfig.instance.ssl?
-        skip "SSL not enabled"
-      end
-    end
-  end
-
-  def require_no_tls
-    before(:all) do
-      if SpecConfig.instance.ssl?
-        skip "SSL enabled"
-      end
-    end
-  end
-
-  def require_local_tls
-    require_tls
-  end
-
-  def require_no_retry_writes
-    before(:all) do
-      if SpecConfig.instance.retry_writes?
-        skip "Retry writes is enabled"
-      end
-    end
-  end
-
-  def require_compression
-    before(:all) do
-      if SpecConfig.instance.compressors.nil?
-        skip "Compression is not enabled"
-      end
-    end
-  end
-
-  def require_no_compression
-    before(:all) do
-      if SpecConfig.instance.compressors
-        skip "Compression is enabled"
-      end
-    end
-  end
-
-  def ruby_version_gte(version)
-    before(:all) do
-      if RUBY_VERSION < version
-        skip "Ruby version #{version} or higher required"
-      end
-    end
-  end
-
-  def ruby_version_lt(version)
-    before(:all) do
-      if RUBY_VERSION >= version
-        skip "Ruby version less than #{version} required"
-      end
-    end
-  end
-
-  def require_auth
-    before(:all) do
-      unless ENV['AUTH'] == 'auth' || SpecConfig.instance.user || ClusterConfig.instance.auth_enabled?
-        skip "Auth required"
-      end
-    end
-  end
-
-  def require_no_auth
-    before(:all) do
-      if ENV['AUTH'] == 'auth' || SpecConfig.instance.user || ClusterConfig.instance.auth_enabled?
-        skip "Auth not allowed"
-      end
-    end
-  end
-
-  def require_no_x509_auth
-    before(:all) do
-      if SpecConfig.instance.x509_auth?
-        skip "X.509 auth not allowed"
-      end
-    end
-  end
-
-  # Can the driver specify a write concern that won't be overridden?
-  # (mongos 4.0+ overrides the write concern)
-  def require_set_write_concern
-    before(:all) do
-      if ClusterConfig.instance.topology == :sharded && ClusterConfig.instance.short_server_version >= '4.0'
-        skip "mongos 4.0+ overrides write concern"
-      end
-    end
-  end
-
-  def require_multi_shard
-    before(:all) do
-      if ClusterConfig.instance.topology == :sharded && SpecConfig.instance.addresses.length == 1
-        skip 'Test requires a minimum of two shards if run in sharded topology'
-      end
-    end
-  end
-
-  def require_no_multi_shard
-    before(:all) do
-      if ClusterConfig.instance.topology == :sharded && SpecConfig.instance.addresses.length > 1
-        skip 'Test requires a single shard if run in sharded topology'
-      end
-    end
-  end
-
-  def require_wired_tiger
-    before(:all) do
-      if ClusterConfig.instance.storage_engine != :wired_tiger
-        skip 'Test requires WiredTiger storage engine'
-      end
-    end
-  end
-
-  def require_wired_tiger_on_36
-    before(:all) do
-      if ClusterConfig.instance.short_server_version >= '3.6'
-        if ClusterConfig.instance.storage_engine != :wired_tiger
-          skip 'Test requires WiredTiger storage engine on 3.6+ servers'
-        end
-      end
-    end
-  end
-
-  def require_mmapv1
-    before(:all) do
-      if ClusterConfig.instance.storage_engine != :mmapv1
-        skip 'Test requires MMAPv1 storage engine'
+      if version > RAILS_VERSION
+        skip "Rails version #{version} or higher required, we have #{RAILS_VERSION}"
       end
     end
   end
 
-  def require_enterprise
-    before(:all) do
-      unless ClusterConfig.instance.enterprise?
-        skip 'Test requires enterprise build of MongoDB'
-      end
+  def max_rails_version(version)
+    unless version =~ /\A\d+\.\d+\z/
+      raise ArgumentError, "Version can only be major.minor: #{version}"
     end
-  end
 
-  # Integration tests for SRV polling require internet connectivity to
-  # look up SRV records and a sharded cluster configured on default port on
-  # localhost (localhost:27017, localhost:27018).
-  def require_default_port_deployment
-    # Because the DNS records at test1.test.build.10gen.cc point to
-    # localhost:27017 & localhost:27018, the test suite must have been
-    # configured to use these addresses
     before(:all) do
-      have_default_port = SpecConfig.instance.addresses.any? do |address|
-        %w(127.0.0.1 127.0.0.1:27017 localhost localhost:27017).include?(address)
-      end
-      unless have_default_port
-        skip 'This test requires the test suite to be configured for localhost:27017'
+      if version < RAILS_VERSION
+        skip "Rails version #{version} or lower required, we have #{RAILS_VERSION}"
       end
     end
   end

data/spec/support/helpers.rb

@@ -6,6 +6,6 @@ module Helpers
     Object.class_eval do
       remove_const(name)
     end
-    load "spec/app/models/#{name.to_s.underscore}.rb"
+    load "spec/support/models/#{name.to_s.underscore}.rb"
   end
 end

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

@@ -18,4 +18,4 @@ class Actor
   end
 end
 
-require "app/models/actress"
+require "support/models/actress"