another rails3 fix

the context of an after_save block has changed
apartmentlist-archive · Feb 27, 2012 · 4d5df71 · 4d5df71
1 parent b50a109
commit 4d5df71
Showing 1 changed file with 35 additions and 13 deletions.
diff --git a/test/metric/active_record_test.rb b/test/metric/active_record_test.rb
@@ -211,13 +211,24 @@ class Sky < ActiveRecord::Base
   end
 
   test "with after_save" do
-    File.open "tmp/experiments/metrics/sky_is_limit.rb", "w" do |f|
-      f.write <<-RUBY
-        metric "Sky is limit" do
-          model Sky, :conditions=>["height > 3"]
-          Sky.after_save { |sky| track! if sky.height_changed? && sky.height > 3 }
-        end
-      RUBY
+    if rails3?
+      File.open "tmp/experiments/metrics/sky_is_limit.rb", "w" do |f|
+        f.write <<-RUBY
+          metric "Sky is limit" do
+            model Sky, :conditions=>["height > 3"]
+            Sky.after_save { |sky| track!(:sky_is_limit) if sky.height_changed? && sky.height > 3 }
+          end
+        RUBY
+      end
+    else
+      File.open "tmp/experiments/metrics/sky_is_limit.rb", "w" do |f|
+        f.write <<-RUBY
+          metric "Sky is limit" do
+            model Sky, :conditions=>["height > 3"]
+            Sky.after_save { |sky| track! if sky.height_changed? && sky.height > 3 }
+          end
+        RUBY
+      end
     end
     Vanity.playground.metrics
     times = 0
@@ -232,12 +243,22 @@ class Sky < ActiveRecord::Base
   end
 
   test "do it youself" do
-    File.open "tmp/experiments/metrics/sky_is_limit.rb", "w" do |f|
-      f.write <<-RUBY
-        metric "Sky is limit" do
-          Sky.after_save { |sky| track! if sky.height_changed? && sky.height > 3 }
-        end
-      RUBY
+    if rails3?
+      File.open "tmp/experiments/metrics/sky_is_limit.rb", "w" do |f|
+        f.write <<-RUBY
+          metric "Sky is limit" do
+            Sky.after_save { |sky| track!(:sky_is_limit) if sky.height_changed? && sky.height > 3 }
+          end
+        RUBY
+      end
+    else
+      File.open "tmp/experiments/metrics/sky_is_limit.rb", "w" do |f|
+        f.write <<-RUBY
+          metric "Sky is limit" do
+            Sky.after_save { |sky| track! if sky.height_changed? && sky.height > 3 }
+          end
+        RUBY
+      end
     end
     Vanity.playground.metrics
     (1..5).each do |height|
@@ -277,6 +298,7 @@ class Sky < ActiveRecord::Base
     Sky.delete_all
     if rails3?
       Sky.reset_callbacks(:create)
+      Sky.reset_callbacks(:save)
     else
       Sky.after_create.clear
       Sky.after_save.clear