Merge branch 'version-dependent-caching' into rails-3-develop

2 files changed, 15 insertions, 1 deletions

diff --git a/spec/models/info_request_event_spec.rb b/spec/models/info_request_event_spec.rb
index 53c83bd46..1299dfb63 100644
--- a/spec/models/info_request_event_spec.rb
+++ b/spec/models/info_request_event_spec.rb
@@ -30,6 +30,12 @@ describe InfoRequestEvent do
             ire.params.should == example_params
         end
 
+        it "should restore UTF8-heavy params stored under ruby 1.8 as UTF-8" do
+            ire = InfoRequestEvent.new
+            utf8_params = "--- \n:foo: !binary |\n  0KLQvtCz0LDRiCDR\n"
+            ire.params_yaml = utf8_params
+            ire.params[:foo].encoding.to_s.should == 'UTF-8' if ire.params[:foo].respond_to?(:encoding)
+        end
     end
 
     describe 'when deciding if it is indexed by search' do
diff --git a/spec/models/post_redirect_spec.rb b/spec/models/post_redirect_spec.rb
index 73740e914..70b221f10 100644
--- a/spec/models/post_redirect_spec.rb
+++ b/spec/models/post_redirect_spec.rb
@@ -65,11 +65,19 @@ describe PostRedirect, " when accessing values" do
     end
 
     it "should convert reason parameters into YAML and back successfully" do
-        pr = PostRedirect.new 
+        pr = PostRedirect.new
         example_reason_params = { :foo => 'this is stuff', :bar => 83, :humbug => "yikes!!!" }
         pr.reason_params = example_reason_params
         pr.reason_params_yaml.should == example_reason_params.to_yaml
         pr.reason_params.should == example_reason_params
     end
+
+    it "should restore UTF8-heavy params stored under ruby 1.8 as UTF-8" do
+        pr = PostRedirect.new
+        utf8_params = "--- \n:foo: !binary |\n  0KLQvtCz0LDRiCDR\n"
+        pr.reason_params_yaml = utf8_params
+        puts pr.reason_params
+        pr.reason_params[:foo].encoding.to_s.should == 'UTF-8' if pr.reason_params[:foo].respond_to?(:encoding)
+    end
 end