From fd5f236d32366bf6a2cefcde4dffbfab5372eb1d Mon Sep 17 00:00:00 2001 From: Arindam Barman Date: Mon, 18 Jan 2021 12:09:36 +0530 Subject: [PATCH 1/2] Adhere to TRU compliance --- lib/intercom-rails/auto_include_filter.rb | 4 ++-- spec/auto_include_filter_spec.rb | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/intercom-rails/auto_include_filter.rb b/lib/intercom-rails/auto_include_filter.rb index 8360132..0617bb5 100644 --- a/lib/intercom-rails/auto_include_filter.rb +++ b/lib/intercom-rails/auto_include_filter.rb @@ -11,10 +11,10 @@ def intercom_rails_auto_include class Filter CLOSING_BODY_TAG = "" - BLACKLISTED_CONTROLLER_NAMES = %w{ Devise::PasswordsController } + DISALLOWED_CONTROLLER_NAMES = %w{ Devise::PasswordsController } def self.filter(controller) - return if BLACKLISTED_CONTROLLER_NAMES.include?(controller.class.name) + return if DISALLOWED_CONTROLLER_NAMES.include?(controller.class.name) auto_include_filter = new(controller) return unless auto_include_filter.include_javascript? diff --git a/spec/auto_include_filter_spec.rb b/spec/auto_include_filter_spec.rb index eda6537..d158d2b 100644 --- a/spec/auto_include_filter_spec.rb +++ b/spec/auto_include_filter_spec.rb @@ -199,8 +199,8 @@ def current_user expect(response.body).to eq("Hello world") end - it 'does not inject if blacklisted controller' do - stub_const("IntercomRails::AutoInclude::Filter::BLACKLISTED_CONTROLLER_NAMES", ["TestController"]) + it 'does not inject if disabllowed controller' do + stub_const("IntercomRails::AutoInclude::Filter::DISALLOWED_CONTROLLER_NAMES", ["TestController"]) get :with_current_user_method expect(response.body).to eq("Hello world") end From d1051b1070c2591cf759b37f61e44279b9b7fe59 Mon Sep 17 00:00:00 2001 From: Arindam Barman Date: Mon, 18 Jan 2021 15:19:33 +0530 Subject: [PATCH 2/2] disallowed to blocked --- lib/intercom-rails/auto_include_filter.rb | 4 ++-- spec/auto_include_filter_spec.rb | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/intercom-rails/auto_include_filter.rb b/lib/intercom-rails/auto_include_filter.rb index 0617bb5..fdb30ed 100644 --- a/lib/intercom-rails/auto_include_filter.rb +++ b/lib/intercom-rails/auto_include_filter.rb @@ -11,10 +11,10 @@ def intercom_rails_auto_include class Filter CLOSING_BODY_TAG = "" - DISALLOWED_CONTROLLER_NAMES = %w{ Devise::PasswordsController } + BLOCKED_CONTROLLER_NAMES = %w{ Devise::PasswordsController } def self.filter(controller) - return if DISALLOWED_CONTROLLER_NAMES.include?(controller.class.name) + return if BLOCKED_CONTROLLER_NAMES.include?(controller.class.name) auto_include_filter = new(controller) return unless auto_include_filter.include_javascript? diff --git a/spec/auto_include_filter_spec.rb b/spec/auto_include_filter_spec.rb index d158d2b..aec9a0e 100644 --- a/spec/auto_include_filter_spec.rb +++ b/spec/auto_include_filter_spec.rb @@ -199,8 +199,8 @@ def current_user expect(response.body).to eq("Hello world") end - it 'does not inject if disabllowed controller' do - stub_const("IntercomRails::AutoInclude::Filter::DISALLOWED_CONTROLLER_NAMES", ["TestController"]) + it 'does not inject if blocked controller' do + stub_const("IntercomRails::AutoInclude::Filter::BLOCKED_CONTROLLER_NAMES", ["TestController"]) get :with_current_user_method expect(response.body).to eq("Hello world") end