From e1b42e9aa01b0c6adab05afb9c5ee0cf9fbb41a9 Mon Sep 17 00:00:00 2001 From: Matt Jankowski Date: Mon, 22 May 2017 15:50:58 -0400 Subject: Add coverage for ReportFilter and AccountFilter (#3236) --- spec/models/account_filter_spec.rb | 35 +++++++++++++++++++++++++++++++++-- spec/models/report_filter_spec.rb | 3 ++- 2 files changed, 35 insertions(+), 3 deletions(-) (limited to 'spec/models') diff --git a/spec/models/account_filter_spec.rb b/spec/models/account_filter_spec.rb index 52b4c4893..8441939c5 100644 --- a/spec/models/account_filter_spec.rb +++ b/spec/models/account_filter_spec.rb @@ -17,19 +17,50 @@ describe AccountFilter do end end + describe 'when an IP address is provided' do + it 'filters with IP when valid' do + filter = described_class.new(ip: '127.0.0.1') + allow(User).to receive(:with_recent_ip_address).and_return(User.none) + + filter.results + expect(User).to have_received(:with_recent_ip_address).with('127.0.0.1') + end + + it 'skips IP when invalid' do + filter = described_class.new(ip: '345.678.901.234') + expect(User).not_to receive(:with_recent_ip_address) + + filter.results + end + end + describe 'with valid params' do it 'combines filters on Account' do - filter = described_class.new(by_domain: 'test.com', silenced: true) + filter = described_class.new( + by_domain: 'test.com', + silenced: true, + username: 'test', + display_name: 'name', + email: 'user@example.com', + ) allow(Account).to receive(:where).and_return(Account.none) allow(Account).to receive(:silenced).and_return(Account.none) + allow(Account).to receive(:matches_display_name).and_return(Account.none) + allow(Account).to receive(:matches_username).and_return(Account.none) + allow(User).to receive(:matches_email).and_return(User.none) + filter.results + expect(Account).to have_received(:where).with(domain: 'test.com') expect(Account).to have_received(:silenced) + expect(Account).to have_received(:matches_username).with('test') + expect(Account).to have_received(:matches_display_name).with('name') + expect(User).to have_received(:matches_email).with('user@example.com') end describe 'that call account methods' do - %i(local remote silenced recent).each do |option| + %i(local remote silenced recent suspended).each do |option| it "delegates the #{option} option" do allow(Account).to receive(option).and_return(Account.none) filter = described_class.new({ option => true }) diff --git a/spec/models/report_filter_spec.rb b/spec/models/report_filter_spec.rb index fc0b7d7b5..099c0731d 100644 --- a/spec/models/report_filter_spec.rb +++ b/spec/models/report_filter_spec.rb @@ -19,12 +19,13 @@ describe ReportFilter do describe 'with valid params' do it 'combines filters on Report' do - filter = ReportFilter.new(account_id: '123', resolved: true) + filter = ReportFilter.new(account_id: '123', resolved: true, target_account_id: '456') allow(Report).to receive(:where).and_return(Report.none) allow(Report).to receive(:resolved).and_return(Report.none) filter.results expect(Report).to have_received(:where).with(account_id: '123') + expect(Report).to have_received(:where).with(target_account_id: '456') expect(Report).to have_received(:resolved) end end -- cgit