jaculabilis/danbooru
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

ip bans: rename ban types to full and partial.

Browse Source 
Rename ban types from "normal" and "signup" to "full" and "partial".
This commit is contained in:
evazion
2020-04-07 14:59:46 -05:00
parent bfdb0a4f5e
commit 16011771f1
6 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
test/functional/sessions_controller_test.rb
View File

@@ -35,7 +35,7 @@ class SessionsControllerTest < ActionDispatch::IntegrationTest
end
should "not allow IP banned users to login" do
@ip_ban = create(:ip_ban, category: :normal, ip_addr: "1.2.3.4")
@ip_ban = create(:ip_ban, category: :full, ip_addr: "1.2.3.4")
post session_path, params: { name: @user.name, password: "password" }, headers: { REMOTE_ADDR: "1.2.3.4" }
assert_response 403
@@ -44,8 +44,8 @@ class SessionsControllerTest < ActionDispatch::IntegrationTest
assert(@ip_ban.last_hit_at > 1.minute.ago)
end
should "allow signup-restricted IP banned users to login" do
@ip_ban = create(:ip_ban, category: :signup, ip_addr: "1.2.3.4")
should "allow partial IP banned users to login" do
@ip_ban = create(:ip_ban, category: :partial, ip_addr: "1.2.3.4")
post session_path, params: { name: @user.name, password: "password" }, headers: { REMOTE_ADDR: "1.2.3.4" }
assert_redirected_to posts_path
@@ -55,7 +55,7 @@ class SessionsControllerTest < ActionDispatch::IntegrationTest
end
should "ignore deleted IP bans when logging in" do
@ip_ban = create(:ip_ban, is_deleted: true, category: :normal, ip_addr: "1.2.3.4")
@ip_ban = create(:ip_ban, is_deleted: true, category: :full, ip_addr: "1.2.3.4")
post session_path, params: { name: @user.name, password: "password" }, headers: { REMOTE_ADDR: "1.2.3.4" }
assert_redirected_to posts_path

4
test/functional/users_controller_test.rb
View File

@@ -168,11 +168,11 @@ class UsersControllerTest < ActionDispatch::IntegrationTest
assert_equal(true, User.last.requires_verification)
end
should "mark users signing up from a signup banned IP as requiring verification" do
should "mark users signing up from a partial banned IP as requiring verification" do
skip unless IpLookup.enabled?
self.remote_addr = "187.37.226.17"
@ip_ban = create(:ip_ban, ip_addr: self.remote_addr, category: :signup)
@ip_ban = create(:ip_ban, ip_addr: self.remote_addr, category: :partial)
post users_path, params: { user: { name: "xxx", password: "xxxxx1", password_confirmation: "xxxxx1" }}
assert_redirected_to User.last