Fix: always return Criteria from querable, see MONGOID-4177.

mongoid · Oct 31, 2015 · e20836b · e20836b
1 parent 59fced3
commit e20836b
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 1 deletion.
diff --git a/.travis.yml b/.travis.yml
@@ -6,6 +6,7 @@ env:
   - MONGOID_VERSION=3
   - MONGOID_VERSION=4
   - MONGOID_VERSION=5
+  - MONGOID_VERSION=HEAD
 
 rvm:
   - jruby-19mode

diff --git a/Gemfile b/Gemfile
@@ -3,6 +3,10 @@ source 'https://rubygems.org'
 gemspec name: 'mongoid-slug'
 
 case version = ENV['MONGOID_VERSION'] || '5.0'
+when 'HEAD'
+  gem 'mongoid', github: 'mongodb/mongoid'
+  gem 'mongoid_paranoia'
+  gem 'mongoid-observers'
 when /^5/
   gem 'mongoid', '~> 5.0'
   gem 'mongoid_paranoia'

diff --git a/lib/mongoid/slug.rb b/lib/mongoid/slug.rb
@@ -137,7 +137,8 @@ def find_by_slug!(*args)
 
       def queryable
         scope = Mongoid::Compatibility::Version.mongoid5? ? Threaded.current_scope : scope_stack.last
-        scope || Criteria.new(self) # Use Mongoid::Slug::Criteria for slugged documents.
+        return scope if scope && scope.is_a?(::Mongoid::Criteria)
+        Criteria.new(self) # Use Mongoid::Slug::Criteria for slugged documents.
       end
 
       # Indicates whether or not the document includes Mongoid::Paranoia