Merge pull request #5484 from luke-gru/consistent_module_naming

use consistent explicit module inclusion

actionpack/test/abstract/abstract_controller_test.rb

@@ -29,7 +29,7 @@ class TestBasic < ActiveSupport::TestCase
     # Test Render mixin
     # ====
     class RenderingController < AbstractController::Base
-      include ::AbstractController::Rendering
+      include AbstractController::Rendering
 
       def _prefixes
         []
@@ -153,7 +153,7 @@ def setup
     # ====
     # self._layout is used when defined
     class WithLayouts < PrefixedViews
-      include Layouts
+      include AbstractController::Layouts
 
       private
       def self.layout(formats)

actionpack/test/abstract/collector_test.rb

@@ -3,7 +3,7 @@
 module AbstractController
   module Testing
     class MyCollector
-      include Collector
+      include AbstractController::Collector
       attr_accessor :responses
 
       def initialize
@@ -54,4 +54,4 @@ class TestCollector < ActiveSupport::TestCase
       end
     end
   end
-end
+end

actionpack/test/abstract/helper_test.rb

@@ -7,7 +7,7 @@ module Testing
 
     class ControllerWithHelpers < AbstractController::Base
       include AbstractController::Rendering
-      include Helpers
+      include AbstractController::Helpers
 
       def with_module
         render :inline => "Module <%= included_method %>"
@@ -44,7 +44,7 @@ class ::HelperyTestController < AbstractHelpers
 
     class AbstractHelpersBlock < ControllerWithHelpers
       helper do
-        include ::AbstractController::Testing::HelperyTest
+        include AbstractController::Testing::HelperyTest
       end
     end