aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/test
diff options
context:
space:
mode:
authorJoshua Peek <josh@joshpeek.com>2009-05-07 10:38:57 -0500
committerJoshua Peek <josh@joshpeek.com>2009-05-07 10:38:57 -0500
commitaf40fa6d036d86895e7be4ef46a615d44eb41ede (patch)
tree481cd4d0aaf724833ce4c97fcaaf56aa8e109891 /activesupport/test
parent2854535b02bcee3668bda02c76c3105fc24730d3 (diff)
downloadrails-af40fa6d036d86895e7be4ef46a615d44eb41ede.tar.gz
rails-af40fa6d036d86895e7be4ef46a615d44eb41ede.tar.bz2
rails-af40fa6d036d86895e7be4ef46a615d44eb41ede.zip
Prefer "included" language over "setup"
Diffstat (limited to 'activesupport/test')
-rw-r--r--activesupport/test/dependency_module_test.rb16
1 files changed, 8 insertions, 8 deletions
diff --git a/activesupport/test/dependency_module_test.rb b/activesupport/test/dependency_module_test.rb
index d611b4056c..07090d15a1 100644
--- a/activesupport/test/dependency_module_test.rb
+++ b/activesupport/test/dependency_module_test.rb
@@ -10,17 +10,17 @@ class DependencyModuleTest < Test::Unit::TestCase
"baz"
end
- def setup=(value)
- @@setup = value
+ def included_ran=(value)
+ @@included_ran = value
end
- def setup
- @@setup
+ def included_ran
+ @@included_ran
end
end
- setup do
- self.setup = true
+ included do
+ self.included_ran = true
end
def baz
@@ -62,9 +62,9 @@ class DependencyModuleTest < Test::Unit::TestCase
assert_equal DependencyModuleTest::Baz::ClassMethods, (class << @klass; self.included_modules; end)[0]
end
- def test_setup_block_is_ran
+ def test_included_block_is_ran
@klass.send(:include, Baz)
- assert_equal true, @klass.setup
+ assert_equal true, @klass.included_ran
end
def test_modules_dependencies_are_met