github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-06-05 14:07:30 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

UX: improve message when admin login is blocked because of admin ip address whitelisting

Browse Source
This commit is contained in:
Neil Lalonde
2015-03-02 12:13:10 -05:00
parent 1bf4f34049
commit 7c14db44cc
8 changed files with 36 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
spec/models/screened_ip_address_spec.rb
View File

@ -238,22 +238,22 @@ describe ScreenedIpAddress do
end
end
describe '#block_login?' do
describe '#block_admin_login?' do
context 'no allow_admin records exist' do
it "returns false when user is nil" do
expect(described_class.block_login?(nil, '123.12.12.12')).to eq(false)
expect(described_class.block_admin_login?(nil, '123.12.12.12')).to eq(false)
end
it "returns false for non-admin user" do
expect(described_class.block_login?(Fabricate.build(:user), '123.12.12.12')).to eq(false)
expect(described_class.block_admin_login?(Fabricate.build(:user), '123.12.12.12')).to eq(false)
end
it "returns false for admin user" do
expect(described_class.block_login?(Fabricate.build(:admin), '123.12.12.12')).to eq(false)
expect(described_class.block_admin_login?(Fabricate.build(:admin), '123.12.12.12')).to eq(false)
end
it "returns false for admin user and ip_address arg is nil" do
expect(described_class.block_login?(Fabricate.build(:admin), nil)).to eq(false)
expect(described_class.block_admin_login?(Fabricate.build(:admin), nil)).to eq(false)
end
end
@ -264,23 +264,23 @@ describe ScreenedIpAddress do
end
it "returns false when user is nil" do
expect(described_class.block_login?(nil, @permitted_ip_address)).to eq(false)
expect(described_class.block_admin_login?(nil, @permitted_ip_address)).to eq(false)
end
it "returns false for an admin user at the allowed ip address" do
expect(described_class.block_login?(Fabricate.build(:admin), @permitted_ip_address)).to eq(false)
expect(described_class.block_admin_login?(Fabricate.build(:admin), @permitted_ip_address)).to eq(false)
end
it "returns true for an admin user at another ip address" do
expect(described_class.block_login?(Fabricate.build(:admin), '123.12.12.12')).to eq(true)
expect(described_class.block_admin_login?(Fabricate.build(:admin), '123.12.12.12')).to eq(true)
end
it "returns false for regular user at allowed ip address" do
expect(described_class.block_login?(Fabricate.build(:user), @permitted_ip_address)).to eq(false)
expect(described_class.block_admin_login?(Fabricate.build(:user), @permitted_ip_address)).to eq(false)
end
it "returns false for regular user at another ip address" do
expect(described_class.block_login?(Fabricate.build(:user), '123.12.12.12')).to eq(false)
expect(described_class.block_admin_login?(Fabricate.build(:user), '123.12.12.12')).to eq(false)
end
end
end