Fix ActiveSupport tests that depend on run order
This commit is contained in:
parent
e8afb84b13
commit
cc14a3b2c1
@ -1,3 +1,3 @@
|
||||
class ClassFolder::ClassFolderSubclass < ClassFolder
|
||||
ConstantInClassFolder
|
||||
ConstantInClassFolder = 'indeed'
|
||||
end
|
||||
|
@ -67,17 +67,24 @@ class QualifiedConstTest < ActiveSupport::TestCase
|
||||
end
|
||||
|
||||
test "qualified_const_set" do
|
||||
m = Module.new
|
||||
assert_equal m, Object.qualified_const_set("QualifiedConstTestMod2", m)
|
||||
assert_equal m, ::QualifiedConstTestMod2
|
||||
begin
|
||||
m = Module.new
|
||||
assert_equal m, Object.qualified_const_set("QualifiedConstTestMod2", m)
|
||||
assert_equal m, ::QualifiedConstTestMod2
|
||||
|
||||
# We are going to assign to existing constants on purpose, so silence warnings.
|
||||
silence_warnings do
|
||||
assert_equal true, QualifiedConstTestMod.qualified_const_set("QualifiedConstTestMod::X", true)
|
||||
assert_equal true, QualifiedConstTestMod::X
|
||||
# We are going to assign to existing constants on purpose, so silence warnings.
|
||||
silence_warnings do
|
||||
assert_equal true, QualifiedConstTestMod.qualified_const_set("QualifiedConstTestMod::X", true)
|
||||
assert_equal true, QualifiedConstTestMod::X
|
||||
|
||||
assert_equal 10, QualifiedConstTestMod::M.qualified_const_set("X", 10)
|
||||
assert_equal 10, QualifiedConstTestMod::M::X
|
||||
assert_equal 10, QualifiedConstTestMod::M.qualified_const_set("X", 10)
|
||||
assert_equal 10, QualifiedConstTestMod::M::X
|
||||
end
|
||||
ensure
|
||||
silence_warnings do
|
||||
QualifiedConstTestMod.qualified_const_set('QualifiedConstTestMod::X', false)
|
||||
QualifiedConstTestMod::M.qualified_const_set('X', 1)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
|
@ -679,6 +679,8 @@ def test_unloadable_should_return_change_flag
|
||||
assert_equal true, M.unloadable
|
||||
assert_equal false, M.unloadable
|
||||
end
|
||||
ensure
|
||||
Object.class_eval { remove_const :M }
|
||||
end
|
||||
|
||||
def test_unloadable_constants_should_receive_callback
|
||||
|
@ -169,11 +169,11 @@ def test_acronyms_camelize_lower
|
||||
def test_underscore_acronym_sequence
|
||||
ActiveSupport::Inflector.inflections do |inflect|
|
||||
inflect.acronym("API")
|
||||
inflect.acronym("HTML5")
|
||||
inflect.acronym("JSON")
|
||||
inflect.acronym("HTML")
|
||||
end
|
||||
|
||||
assert_equal("html5_html_api", ActiveSupport::Inflector.underscore("HTML5HTMLAPI"))
|
||||
assert_equal("json_html_api", ActiveSupport::Inflector.underscore("JSONHTMLAPI"))
|
||||
end
|
||||
|
||||
def test_underscore
|
||||
|
Loading…
Reference in New Issue
Block a user