Merge branch 'master' into release

arunagw · Nov 9, 2010 · 2396956 · 2396956
2 parents f9fbbf4 + b0e857a
commit 2396956
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/lib/exceptional/exception_data.rb b/lib/exceptional/exception_data.rb
@@ -15,7 +15,7 @@ def to_hash
           'exception_class' => @exception.class.to_s,
           'message' => @exception.message,
           'backtrace' => @exception.backtrace,
-          'occurred_at' => Time.now
+          'occurred_at' => Time.now.utc.iso8601
         }
       })
       hash.merge!(extra_stuff)

diff --git a/spec/exceptional/exception_data_spec.rb b/spec/exceptional/exception_data_spec.rb
@@ -124,6 +124,13 @@ def to_json
     data.to_hash['request']['parameters'].should == {'var1' => '[FILTERED]'}
   end
 
+  it "formats the occurred_at as iso8601" do
+    @request.stub!(:env).and_return({'SOME_VAR' => 'abc', 'HTTP_CONTENT_TYPE' => 'text/html', 'action_dispatch.parameter_filter' => [:var1]})
+    @request.stub!(:parameters).and_return({'var1' => 'abc'})
+    data = Exceptional::ControllerExceptionData.new(@error, @controller, @request)
+    data.to_hash['exception']['occurred_at'].should match(/\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}.{1,6}$/)
+  end
+
   it "ArgumentError bug with file object" do
     file = File.new(File.expand_path('../../fixtures/favicon.png',__FILE__))
     @request.stub!(:parameters).and_return({'something' => file })