Permalink
Browse files

Merge pull request #5484 from luke-gru/consistent_module_naming

use consistent explicit module inclusion
  • Loading branch information...
2 parents facf1e5 + 08c4d8e commit 92563722da460191c5f021b4570380740a5333de @fxn fxn committed Mar 17, 2012
@@ -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)
@@ -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
@@ -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

0 comments on commit 9256372

Please sign in to comment.