aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test/abstract
diff options
context:
space:
mode:
authorSantiago Pastorino <santiago@wyeworks.com>2010-08-14 02:13:00 -0300
committerSantiago Pastorino <santiago@wyeworks.com>2010-08-14 04:12:33 -0300
commitb451de0d6de4df6bc66b274cec73b919f823d5ae (patch)
treef252c4143a0adb3be7d36d543282539cca0fb971 /actionpack/test/abstract
parent1590377886820e00b1a786616518a32f3b61ec0f (diff)
downloadrails-b451de0d6de4df6bc66b274cec73b919f823d5ae.tar.gz
rails-b451de0d6de4df6bc66b274cec73b919f823d5ae.tar.bz2
rails-b451de0d6de4df6bc66b274cec73b919f823d5ae.zip
Deletes trailing whitespaces (over text files only find * -type f -exec sed 's/[ \t]*$//' -i {} \;)
Diffstat (limited to 'actionpack/test/abstract')
-rw-r--r--actionpack/test/abstract/callbacks_test.rb92
-rw-r--r--actionpack/test/abstract/helper_test.rb8
-rw-r--r--actionpack/test/abstract/translation_test.rb8
3 files changed, 54 insertions, 54 deletions
diff --git a/actionpack/test/abstract/callbacks_test.rb b/actionpack/test/abstract/callbacks_test.rb
index 232a1679e0..b2d4d5f79a 100644
--- a/actionpack/test/abstract/callbacks_test.rb
+++ b/actionpack/test/abstract/callbacks_test.rb
@@ -2,23 +2,23 @@ require 'abstract_unit'
module AbstractController
module Testing
-
+
class ControllerWithCallbacks < AbstractController::Base
include AbstractController::Callbacks
end
-
+
class Callback1 < ControllerWithCallbacks
set_callback :process_action, :before, :first
-
+
def first
@text = "Hello world"
end
-
+
def index
self.response_body = @text
end
end
-
+
class TestCallbacks1 < ActiveSupport::TestCase
test "basic callbacks work" do
controller = Callback1.new
@@ -31,21 +31,21 @@ module AbstractController
before_filter :first
after_filter :second
around_filter :aroundz
-
+
def first
@text = "Hello world"
end
-
+
def second
@second = "Goodbye"
end
-
+
def aroundz
@aroundz = "FIRST"
yield
@aroundz << "SECOND"
end
-
+
def index
self.response_body = @text.to_s
end
@@ -54,7 +54,7 @@ module AbstractController
class Callback2Overwrite < Callback2
before_filter :first, :except => :index
end
-
+
class TestCallbacks2 < ActiveSupport::TestCase
def setup
@controller = Callback2.new
@@ -64,12 +64,12 @@ module AbstractController
result = @controller.process(:index)
assert_equal "Hello world", @controller.response_body
end
-
+
test "after_filter works" do
@controller.process(:index)
assert_equal "Goodbye", @controller.instance_variable_get("@second")
end
-
+
test "around_filter works" do
@controller.process(:index)
assert_equal "FIRSTSECOND", @controller.instance_variable_get("@aroundz")
@@ -81,16 +81,16 @@ module AbstractController
assert_equal "", @controller.response_body
end
end
-
+
class Callback3 < ControllerWithCallbacks
before_filter do |c|
c.instance_variable_set("@text", "Hello world")
end
-
+
after_filter do |c|
c.instance_variable_set("@second", "Goodbye")
end
-
+
def index
self.response_body = @text
end
@@ -100,41 +100,41 @@ module AbstractController
def setup
@controller = Callback3.new
end
-
+
test "before_filter works with procs" do
result = @controller.process(:index)
assert_equal "Hello world", @controller.response_body
end
-
+
test "after_filter works with procs" do
result = @controller.process(:index)
assert_equal "Goodbye", @controller.instance_variable_get("@second")
- end
+ end
end
-
+
class CallbacksWithConditions < ControllerWithCallbacks
before_filter :list, :only => :index
before_filter :authenticate, :except => :index
-
+
def index
self.response_body = @list.join(", ")
end
-
+
def sekrit_data
self.response_body = (@list + [@authenticated]).join(", ")
end
-
+
private
def list
@list = ["Hello", "World"]
end
-
+
def authenticate
@list = []
@authenticated = "true"
end
end
-
+
class TestCallbacksWithConditions < ActiveSupport::TestCase
def setup
@controller = CallbacksWithConditions.new
@@ -144,41 +144,41 @@ module AbstractController
@controller.process(:index)
assert_equal "Hello, World", @controller.response_body
end
-
+
test "when :only is specified, a before filter is not triggered on other actions" do
@controller.process(:sekrit_data)
assert_equal "true", @controller.response_body
end
-
+
test "when :except is specified, an after filter is not triggered on that action" do
result = @controller.process(:index)
assert_nil @controller.instance_variable_get("@authenticated")
end
end
-
+
class CallbacksWithArrayConditions < ControllerWithCallbacks
before_filter :list, :only => [:index, :listy]
before_filter :authenticate, :except => [:index, :listy]
-
+
def index
self.response_body = @list.join(", ")
end
-
+
def sekrit_data
self.response_body = (@list + [@authenticated]).join(", ")
end
-
+
private
def list
@list = ["Hello", "World"]
end
-
+
def authenticate
@list = []
@authenticated = "true"
- end
+ end
end
-
+
class TestCallbacksWithArrayConditions < ActiveSupport::TestCase
def setup
@controller = CallbacksWithArrayConditions.new
@@ -188,54 +188,54 @@ module AbstractController
result = @controller.process(:index)
assert_equal "Hello, World", @controller.response_body
end
-
+
test "when :only is specified with an array, a before filter is not triggered on other actions" do
result = @controller.process(:sekrit_data)
assert_equal "true", @controller.response_body
end
-
+
test "when :except is specified with an array, an after filter is not triggered on that action" do
result = @controller.process(:index)
assert_nil @controller.instance_variable_get("@authenticated")
end
- end
-
+ end
+
class ChangedConditions < Callback2
before_filter :first, :only => :index
-
+
def not_index
self.response_body = @text.to_s
end
end
-
+
class TestCallbacksWithChangedConditions < ActiveSupport::TestCase
def setup
@controller = ChangedConditions.new
end
-
+
test "when a callback is modified in a child with :only, it works for the :only action" do
result = @controller.process(:index)
assert_equal "Hello world", @controller.response_body
end
-
+
test "when a callback is modified in a child with :only, it does not work for other actions" do
result = @controller.process(:not_index)
assert_equal "", @controller.response_body
end
end
-
+
class SetsResponseBody < ControllerWithCallbacks
before_filter :set_body
-
+
def index
self.response_body = "Fail"
end
-
+
def set_body
self.response_body = "Success"
end
end
-
+
class TestHalting < ActiveSupport::TestCase
test "when a callback sets the response body, the action should not be invoked" do
controller = SetsResponseBody.new
@@ -243,6 +243,6 @@ module AbstractController
assert_equal "Success", controller.response_body
end
end
-
+
end
end
diff --git a/actionpack/test/abstract/helper_test.rb b/actionpack/test/abstract/helper_test.rb
index 15c27501f2..73941222dc 100644
--- a/actionpack/test/abstract/helper_test.rb
+++ b/actionpack/test/abstract/helper_test.rb
@@ -4,7 +4,7 @@ ActionController::Base.helpers_path = File.expand_path('../../fixtures/helpers',
module AbstractController
module Testing
-
+
class ControllerWithHelpers < AbstractController::Base
include AbstractController::Rendering
include Helpers
@@ -13,13 +13,13 @@ module AbstractController
render :inline => "Module <%= included_method %>"
end
end
-
+
module HelperyTest
def included_method
"Included"
end
end
-
+
class AbstractHelpers < ControllerWithHelpers
helper(HelperyTest) do
def helpery_test
@@ -76,6 +76,6 @@ module AbstractController
end
end
-
+
end
end
diff --git a/actionpack/test/abstract/translation_test.rb b/actionpack/test/abstract/translation_test.rb
index 09ebfab85e..8ec50fd57a 100644
--- a/actionpack/test/abstract/translation_test.rb
+++ b/actionpack/test/abstract/translation_test.rb
@@ -7,19 +7,19 @@ class TranslationControllerTest < Test::Unit::TestCase
def setup
@controller = ActionController::Base.new
end
-
+
def test_action_controller_base_responds_to_translate
assert_respond_to @controller, :translate
end
-
+
def test_action_controller_base_responds_to_t
assert_respond_to @controller, :t
end
-
+
def test_action_controller_base_responds_to_localize
assert_respond_to @controller, :localize
end
-
+
def test_action_controller_base_responds_to_l
assert_respond_to @controller, :l
end