From a5903d9daf50d8961d18b2d60dbddb4873c5ea7f Mon Sep 17 00:00:00 2001 From: Eric Schultz Date: Wed, 16 Jan 2019 14:38:59 -0600 Subject: [PATCH] Correct blocklist name WIP --- config/environments/test.rb | 4 ++-- config/initializers/block_ips.rb | 2 +- spec/controllers/events_spec.rb | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/config/environments/test.rb b/config/environments/test.rb index 48544a21..728e452a 100755 --- a/config/environments/test.rb +++ b/config/environments/test.rb @@ -1,11 +1,11 @@ -Rails.application.configure do +Commitchange::Application.configure do # Settings specified here will take precedence over those in config/application.rb. # The test environment is used exclusively to run your application's # test suite. You never need to work with it otherwise. Remember that # your test database is "scratch space" for the test suite and is wiped # and recreated between test runs. Don't rely on the data there! - config.cache_classes = true + config.cache_classes = false # Do not eager load code on boot. This avoids loading your whole application # just for the purpose of running a single test. If you are using a tool that diff --git a/config/initializers/block_ips.rb b/config/initializers/block_ips.rb index 5e547e78..ed9f52f0 100644 --- a/config/initializers/block_ips.rb +++ b/config/initializers/block_ips.rb @@ -1,5 +1,5 @@ # License: AGPL-3.0-or-later WITH Web-Template-Output-Additional-Permission-3.0-or-later -Rack::Attack.blacklist('block charge abusers') do |req| +Rack::Attack.blocklist('block charge abusers') do |req| ['54.159.242.229', '54.161.246.233', '54.211.94.199' diff --git a/spec/controllers/events_spec.rb b/spec/controllers/events_spec.rb index 09e4f6b0..5d832eb6 100644 --- a/spec/controllers/events_spec.rb +++ b/spec/controllers/events_spec.rb @@ -15,7 +15,7 @@ describe EventsController, :type => :controller do include_context :open_to_event_editor, :post, :duplicate, nonprofit_id: :__our_np, id: :__our_event end describe 'soft_delete' do - include_context :open_to_event_editor, :delete, :soft_delete, nonprofit_id: :__our_np, id: :__our_event + include_context :open_to_event_editor, :delete, :soft_delete, nonprofit_id: :__our_np, event_id: :__our_event end describe 'stats' do include_context :open_to_event_editor, :get, :stats, nonprofit_id: :__our_np, id: :__our_event