Remove CurrentUser.ip_addr.

Remove the `CurrentUser.ip_addr` global variable and replace it with
`request.remote_ip`. Before we had to track the current user's IP in a
global variable so that when we edited a post for example, we could pass
down the user's IP to the model and save it in the post_versions table.
Now that we now longer save IPs in version tables, we don't need a global
variable to get access to the current user's IP outside of controllers.
This commit is contained in:
evazion
2022-09-18 04:41:01 -05:00
parent d4da8499ce
commit 1d2bac7b95
41 changed files with 15 additions and 87 deletions

View File

@@ -3,7 +3,6 @@ require 'test_helper'
class CurrentUserTest < ActiveSupport::TestCase
setup do
CurrentUser.user = nil
CurrentUser.ip_addr = nil
end
context "The current user" do
@@ -11,14 +10,11 @@ class CurrentUserTest < ActiveSupport::TestCase
user = FactoryBot.create(:user)
assert_nil(CurrentUser.user)
assert_nil(CurrentUser.ip_addr)
CurrentUser.user = user
CurrentUser.ip_addr = "1.2.3.4"
assert_not_nil(CurrentUser.user)
assert_equal(user.id, CurrentUser.user.id)
assert_equal("1.2.3.4", CurrentUser.ip_addr)
end
end
@@ -27,7 +23,7 @@ class CurrentUserTest < ActiveSupport::TestCase
user1 = FactoryBot.create(:user)
user2 = FactoryBot.create(:user)
CurrentUser.user = user1
CurrentUser.scoped(user2, nil) do
CurrentUser.scoped(user2) do
assert_equal(user2.id, CurrentUser.user.id)
end
assert_equal(user1.id, CurrentUser.user.id)
@@ -38,7 +34,7 @@ class CurrentUserTest < ActiveSupport::TestCase
user2 = FactoryBot.create(:user)
CurrentUser.user = user1
assert_raises(RuntimeError) do
CurrentUser.scoped(user2, nil) do
CurrentUser.scoped(user2) do
assert_equal(user2.id, CurrentUser.user.id)
raise "ERROR"
end