Changeset 8808

Timestamp:

02/06/08 22:26:47 (7 months ago)

Author:

nzkoz

Message:

Add uses_tzinfo to active record tests to prevent breaking the cc.rb build etc. Closes #11034 [mpalmer]

Files:

• trunk/activerecord/test/cases/attribute_methods_test.rb (modified) (1 diff)
• trunk/activerecord/test/cases/base_test.rb (modified) (1 diff)
• trunk/activerecord/test/cases/helper.rb (modified) (1 diff)

trunk/activerecord/test/cases/attribute_methods_test.rb

@@ -139 +139 @@
-  end
-  
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-      utc_time = Time.utc(2008, 1, 1)
-record   = @target.new
-record[:written_on] = utc_time
-assert_equal utc_time, record.written_on # record.written on is equal to (i.e., simultaneous with) utc_time
-assert_kind_of ActiveSupport::TimeWithZone, record.written_on # but is a TimeWithZon
-assert_equal TimeZone["Pacific Time (US & Canada)"], record.written_on.time_zone # and is in the current Time.zone
-assert_equal Time.utc(2007, 12, 31, 16), record.written_on.time # and represents time values adjusted accordingly
-end
-
-
-
-in_time_zone "Pacific Time (US & Canada)" do
+cst_time = utc_time.in_time_zone("Central Time (US & Canada)")
+in_time_zone "Pacific Time (US & Canada)" do
+  record   = @target.new
+  record.written_on = cst_tim
+  assert_equal utc_time, record.written_on
+  assert_equal TimeZone["Pacific Time (US & Canada)"], record.written_on.time_zone
+    assert_equal Time.utc(2007, 12, 31, 16), record.written_on.time
+    
+  end
+
+def test_setting_time_zone_aware_attribute_in_current_time_zone
-      utc_time = Time.utc(2008, 1, 1)
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-    end
-  end

trunk/activerecord/test/cases/base_test.rb

@@ -938 +938 @@
-  end
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-  def test_multiparameter_attributes_on_time_with_skip_time_zone_conversion_for_attributes
-    ActiveRecord::Base.time_zone_aware_attributes = true

trunk/activerecord/test/cases/helper.rb

@@ -30 +30 @@
-end
-
+def uses_tzinfo(description)
+  require 'rubygems'
+  require 'tzinfo'
+  yield
+rescue LoadError
+  $stderr.puts "Skipping #{description} tests.  `gem install tzinfo` and try again."
+end
+
-ActiveRecord::Base.connection.class.class_eval do
-  IGNORED_SQL = [/^PRAGMA/, /^SELECT currval/, /^SELECT CAST/, /^SELECT @@IDENTITY/, /^SELECT @@ROWCOUNT/]