1 files changed, 10 insertions, 0 deletions
diff --git a/activerecord/test/cases/scoping/default_scoping_test.rb b/activerecord/test/cases/scoping/default_scoping_test.rb
index 5a65ad5dfa..0f69443839 100644
--- a/activerecord/test/cases/scoping/default_scoping_test.rb
+++ b/activerecord/test/cases/scoping/default_scoping_test.rb
@@ -198,6 +198,16 @@ class DefaultScopingTest < ActiveRecord::TestCase
     assert_equal expected, received
   end
 
+  def test_unscope_and_scope
+    developer_klass = Class.new(Developer) do
+      scope :by_name, -> name { unscope(where: :name).where(name: name) }
+    end
+
+    expected = developer_klass.where(name: 'Jamis').collect { |dev| [dev.name, dev.id] }
+    received = developer_klass.where(name: 'David').by_name('Jamis').collect { |dev| [dev.name, dev.id] }
+    assert_equal expected, received
+  end
+
   def test_unscope_errors_with_invalid_value
     assert_raises(ArgumentError) do
       Developer.includes(:projects).where(name: "Jamis").unscope(:stupidly_incorrect_value)