Change how helpers are loaded in TestCase

enriclluelles · Feb 4, 2016 · c33464f · c33464f
1 parent 6d1a9ff
commit c33464f
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/.rubocop.yml b/.rubocop.yml
@@ -22,7 +22,7 @@ Metrics/MethodLength:
   Max: 24
 
 Metrics/ModuleLength:
-  Max: 128 # TODO: Lower to 100
+  Max: 129 # TODO: Lower to 100
 
 Metrics/ParameterLists:
   Max: 8

diff --git a/lib/route_translator/translator.rb b/lib/route_translator/translator.rb
@@ -36,8 +36,9 @@ def self.add_untranslated_helpers_to_controllers_and_views(old_name, named_route
     end
 
     def self.add_helpers_to_test_cases(helper_container)
-      [ActionController::TestCase, ActionMailer::TestCase, ActionView::TestCase].each do |klass|
-        klass.__send__(:include, helper_container)
+      %w(ActionController ActionMailer ActionView).each do |klass_name|
+        next unless Module.const_defined?(klass_name)
+        klass_name.constantize::TestCase.__send__(:include, helper_container)
       end
     end
 

diff --git a/test/support/routes_helper.rb b/test/support/routes_helper.rb
@@ -5,8 +5,9 @@ def draw_routes(&block)
       if @routes.respond_to?(:install_helpers)
         @routes.install_helpers
       else
-        [ActionController::Base, ActionMailer::Base, ActionView::Base].each do |klass|
-          klass.__send__(:include, @routes.url_helpers)
+        %w(ActionController ActionMailer ActionView).each do |klass_name|
+          next unless Module.const_defined?(klass_name)
+          klass_name.constantize::Base.__send__(:include, @routes.url_helpers)
         end
       end
     end