changes

test/unit/current_user_test.rb

@@ -1,6 +1,11 @@
 require_relative "../test_helper"
 
 class ArtistTest < ActiveSupport::TestCase
+  setup do
+    CurrentUser.user = nil
+    CurrentUser.ip_addr = nil
+  end
+  
   context "The current user" do
     should "be set only within the scope of the block" do
       user = Factory.create(:user)
@@ -16,4 +21,29 @@ class ArtistTest < ActiveSupport::TestCase
       assert_equal("1.2.3.4", CurrentUser.ip_addr)
     end
   end
+  
+  context "A scoped current user" do
+    should "reset the current user after the block has exited" do
+      user1 = Factory.create(:user)
+      user2 = Factory.create(:user)      
+      CurrentUser.user = user1
+      CurrentUser.scoped(user2, nil) do
+        assert_equal(user2.id, CurrentUser.user.id)
+      end
+      assert_equal(user1.id, CurrentUser.user.id)
+    end
+    
+    should "reset the current user even if an exception is thrown" do
+      user1 = Factory.create(:user)
+      user2 = Factory.create(:user)      
+      CurrentUser.user = user1
+      assert_raises(RuntimeError) do
+        CurrentUser.scoped(user2, nil) do
+          assert_equal(user2.id, CurrentUser.user.id)
+          raise "ERROR"
+        end
+      end
+      assert_equal(user1.id, CurrentUser.user.id)
+    end
+  end
 end