Merge pull request #3393 from evazion/feat-safe-mode

Fix #3392: Add safe mode account setting.

test/unit/current_user_test.rb

@@ -24,9 +24,21 @@ class CurrentUserTest < ActiveSupport::TestCase
       req = mock()
       req.stubs(:host).returns("danbooru")
       req.stubs(:params).returns({})
+      CurrentUser.user = FactoryGirl.create(:user)
       CurrentUser.set_safe_mode(req)
       assert_equal(false, CurrentUser.safe_mode?)
     end
+
+    should "return true if the user has enabled the safe mode account setting" do
+      req = mock
+      req.stubs(:host).returns("danbooru")
+      req.stubs(:params).returns({})
+
+      CurrentUser.user = FactoryGirl.create(:user, enable_safe_mode: true)
+      CurrentUser.set_safe_mode(req)
+
+      assert_equal(true, CurrentUser.safe_mode?)
+    end
   end 
 
   context "The current user" do