From 767f022b294d739972b2b053747df2729c512c86 Mon Sep 17 00:00:00 2001 From: OsamaSayegh Date: Mon, 11 Jun 2018 07:48:34 +0300 Subject: [PATCH] REFACTOR: admin screened ip addresses controller specs to requests (#5965) --- .../screened_ip_addresses_controller_spec.rb | 29 ++++++++++--------- 1 file changed, 16 insertions(+), 13 deletions(-) rename spec/{controllers => requests}/admin/screened_ip_addresses_controller_spec.rb (77%) diff --git a/spec/controllers/admin/screened_ip_addresses_controller_spec.rb b/spec/requests/admin/screened_ip_addresses_controller_spec.rb similarity index 77% rename from spec/controllers/admin/screened_ip_addresses_controller_spec.rb rename to spec/requests/admin/screened_ip_addresses_controller_spec.rb index fb4ed1e9bb5..7737b1ee53f 100644 --- a/spec/controllers/admin/screened_ip_addresses_controller_spec.rb +++ b/spec/requests/admin/screened_ip_addresses_controller_spec.rb @@ -6,33 +6,34 @@ describe Admin::ScreenedIpAddressesController do expect(Admin::ScreenedIpAddressesController < Admin::AdminController).to eq(true) end - let!(:user) { log_in(:admin) } + let(:admin) { Fabricate(:admin) } - describe 'index' do + before do + sign_in(admin) + end + describe '#index' do it 'filters screened ip addresses' do Fabricate(:screened_ip_address, ip_address: "1.2.3.4") Fabricate(:screened_ip_address, ip_address: "1.2.3.5") Fabricate(:screened_ip_address, ip_address: "1.2.3.6") Fabricate(:screened_ip_address, ip_address: "4.5.6.7") - get :index, params: { filter: "1.2.*" }, format: :json + get "/admin/logs/screened_ip_addresses.json", params: { filter: "1.2.*" } expect(response.status).to eq(200) result = JSON.parse(response.body) expect(result.length).to eq(3) - get :index, params: { filter: "4.5.6.7" }, format: :json + get "/admin/logs/screened_ip_addresses.json", params: { filter: "4.5.6.7" } expect(response.status).to eq(200) result = JSON.parse(response.body) expect(result.length).to eq(1) end - end - describe 'roll_up' do - + describe '#roll_up' do it "rolls up 1.2.3.* entries" do Fabricate(:screened_ip_address, ip_address: "1.2.3.4", match_count: 1) Fabricate(:screened_ip_address, ip_address: "1.2.3.5", match_count: 1) @@ -41,10 +42,12 @@ describe Admin::ScreenedIpAddressesController do Fabricate(:screened_ip_address, ip_address: "42.42.42.4", match_count: 1) Fabricate(:screened_ip_address, ip_address: "42.42.42.5", match_count: 1) - StaffActionLogger.any_instance.expects(:log_roll_up) SiteSetting.min_ban_entries_for_roll_up = 3 - post :roll_up, format: :json + expect do + post "/admin/logs/screened_ip_addresses/roll_up.json" + end.to change { UserHistory.where(action: UserHistory.actions[:roll_up]).count }.by(1) + expect(response.status).to eq(200) subnet = ScreenedIpAddress.where(ip_address: "1.2.3.0/24").first @@ -61,17 +64,17 @@ describe Admin::ScreenedIpAddressesController do Fabricate(:screened_ip_address, ip_address: "1.2.42.0/24", match_count: 1) - StaffActionLogger.any_instance.expects(:log_roll_up) SiteSetting.min_ban_entries_for_roll_up = 5 - post :roll_up, format: :json + expect do + post "/admin/logs/screened_ip_addresses/roll_up.json" + end.to change { UserHistory.where(action: UserHistory.actions[:roll_up]).count }.by(1) + expect(response.status).to eq(200) subnet = ScreenedIpAddress.where(ip_address: "1.2.0.0/16").first expect(subnet).to be_present expect(subnet.match_count).to eq(6) end - end - end