Ticket #9235: vuo_scoping_with_magic_scope.diff

activerecord/test/fixtures/customer.rb

@@ -2 +2 @@
-  composed_of :address, :mapping => [ %w(address_street street), %w(address_city city), %w(address_country country) ], :allow_nil => true
-  composed_of :balance, :class_name => "Money", :mapping => %w(balance amount)
-  composed_of :gps_location, :allow_nil => true
+  
+  has_many    :orders, :foreign_key => "shipping_customer_id"
-end
-
-class Address

activerecord/test/fixtures/order.rb

@@ -1 +1 @@
-class Order < ActiveRecord::Base
-  belongs_to :billing, :class_name => 'Customer', :foreign_key => 'billing_customer_id' 
-  belongs_to :shipping, :class_name => 'Customer', :foreign_key => 'shipping_customer_id' 
+  
+  validates_uniqueness_of :name
+  
+  def self.create_with_magic_scoping(args)
+    Order.create!(args)
+  end
+  
-end

activerecord/test/validations_test.rb

@@ -3 +3 @@
-require 'fixtures/reply'
-require 'fixtures/person'
-require 'fixtures/developer'
+require 'fixtures/customer'
+require 'fixtures/order'
-
-# The following methods in Topic are used in test_conditional_validation_*
-class Topic
@@ -368 +370 @@
-    assert t2.valid?, "should validate with nil"
-    assert t2.save, "should save with nil"
-  end
+  
+  def test_validates_uniqueness_breaks_out_of_implicit_scoping
+    
+    c1 = Customer.find(1)
+    c2 = Customer.find(2)
+    
+    o1 = c1.orders.create_with_magic_scoping(:name => "Should be unique")
+    
+    #now create & validate with implicit scoping
+    assert_raises ActiveRecord::RecordInvalid do
+      c2.orders.create_with_magic_scoping(:name => "Should be unique")
+    end
+  end
-
-  def test_validate_format
-    Topic.validates_format_of(:title, :content, :with => /^Validation\smacros \w+!$/, :message => "is bad data")

activerecord/lib/active_record/validations.rb

@@ -640 +640 @@
-            condition_sql << " AND #{record.class.table_name}.#{record.class.primary_key} <> ?"
-            condition_params << record.send(:id)
-          end
-
-
+
+
+
+
-          end
-        end
-      end