Merge pull request airbrake#271 from rykov/master

Keep passed exception if original_exception is nil
rokob · Jul 28, 2014 · 6401d52 · 6401d52
2 parents f6d64c6 + 2cc8e8d
commit 6401d52
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/lib/airbrake.rb b/lib/airbrake.rb
@@ -177,9 +177,7 @@ def unwrap_exception(exception)
         exception.original_exception
       elsif exception.respond_to?(:continued_exception)
         exception.continued_exception
-      else
-        exception
-      end
+      end || exception
     end
   end
 end
diff --git a/test/notifier_test.rb b/test/notifier_test.rb
@@ -256,6 +256,12 @@ def set_development_env
         @hash = Airbrake.build_lookup_hash_for(@exception)
         assert_equal "NotifierTest::OriginalException", @hash[:error_class]
       end
+
+      should "keep exception if #original_exception is nil" do
+        @exception.stubs(:original_exception).returns(nil)
+        @hash = Airbrake.build_lookup_hash_for(@exception)
+        assert_equal "BacktracedException", @hash[:error_class]
+      end
     end
 
     context "when an exception that provides #continued_exception is raised" do
@@ -271,6 +277,12 @@ def set_development_env
         @hash = Airbrake.build_lookup_hash_for(@exception)
         assert_equal "NotifierTest::ContinuedException", @hash[:error_class]
       end
+
+      should "keep exception if #continued_exception is nil" do
+        @exception.stubs(:continued_exception).returns(nil)
+        @hash = Airbrake.build_lookup_hash_for(@exception)
+        assert_equal "BacktracedException", @hash[:error_class]
+      end
     end
   end
 end