2 files changed, 31 insertions, 0 deletions
diff --git a/activerecord/test/cases/relation_scoping_test.rb b/activerecord/test/cases/relation_scoping_test.rb
index 78fb91d321..7388324a0d 100644
--- a/activerecord/test/cases/relation_scoping_test.rb
+++ b/activerecord/test/cases/relation_scoping_test.rb
@@ -161,6 +161,28 @@ class RelationScopingTest < ActiveRecord::TestCase
 
     assert !Developer.all.where_values.include?("name = 'Jamis'")
   end
+
+  def test_default_scope_filters_on_joins
+    assert_equal 1, DeveloperFilteredOnJoins.all.count
+    assert_equal DeveloperFilteredOnJoins.all.first, developers(:david).becomes(DeveloperFilteredOnJoins)
+  end
+
+  def test_update_all_default_scope_filters_on_joins
+    DeveloperFilteredOnJoins.update_all(:salary => 65000)
+    assert_equal 65000, Developer.find(developers(:david).id).salary
+
+    # has not changed jamis
+    assert_not_equal 65000, Developer.find(developers(:jamis).id).salary
+  end
+
+  def test_delete_all_default_scope_filters_on_joins
+    assert_not_equal [], DeveloperFilteredOnJoins.all
+
+    DeveloperFilteredOnJoins.delete_all()
+
+    assert_equal [], DeveloperFilteredOnJoins.all
+    assert_not_equal [], Developer.all
+  end
 end
 
 class NestedRelationScopingTest < ActiveRecord::TestCase
diff --git a/activerecord/test/models/developer.rb b/activerecord/test/models/developer.rb
index 683cb54a10..81bc87bd42 100644
--- a/activerecord/test/models/developer.rb
+++ b/activerecord/test/models/developer.rb
@@ -101,6 +101,15 @@ class DeveloperWithIncludes < ActiveRecord::Base
   default_scope { includes(:audit_logs) }
 end
 
+class DeveloperFilteredOnJoins < ActiveRecord::Base
+  self.table_name = 'developers'
+  has_and_belongs_to_many :projects, -> { order('projects.id') }, :foreign_key => 'developer_id', :join_table => 'developers_projects'
+
+  def self.default_scope
+    joins(:projects).where(:projects => { :name => 'Active Controller' })
+  end
+end
+
 class DeveloperOrderedBySalary < ActiveRecord::Base
   self.table_name = 'developers'
   default_scope { order('salary DESC') }