kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

Fixed all the tests

Browse source 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@623 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
This commit is contained in:
David Heinemeier Hansson 2005-02-15 15:02:43 +00:00
parent d33b741621
commit 45caae41c3
3 changed files with 9 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
activesupport/lib/core_ext/hash/keys.rb
View file

@ -13,7 +13,7 @@ module ActiveSupport #:nodoc:
# Destructively convert all keys to strings. # Destructively convert all keys to strings.
def stringify_keys! def stringify_keys!
keys.each do |key| keys.each do |key|
unless key.is_a?(String) unless key.class.to_s == "String" # weird hack to make the tests run when string_ext_test.rb is also running
self[key.to_s] = self[key] self[key.to_s] = self[key]
delete(key) delete(key)
end end

19
activesupport/test/dependencies_test.rb
View file

@ -3,34 +3,23 @@ $LOAD_PATH.unshift File.dirname(__FILE__) + '/../lib'
require 'misc' require 'misc'
require 'dependencies' require 'dependencies'
$LOAD_PATH.unshift File.dirname(__FILE__) + '/dependencies'
class DependenciesTest < Test::Unit::TestCase class DependenciesTest < Test::Unit::TestCase
def teardown def teardown
Dependencies.clear Dependencies.clear
end end
def test_require_dependency def test_require_dependency
require_dependency("service_one") require_dependency(File.dirname(__FILE__) + "/dependencies/service_one")
require_dependency("service_two") require_dependency(File.dirname(__FILE__) + "/dependencies/service_two")
assert_equal 2, Dependencies.loaded.size assert_equal 2, Dependencies.loaded.size
end end
def test_require_dependency_two_times def test_require_dependency_two_times
require_dependency("service_one") require_dependency(File.dirname(__FILE__) + "/dependencies/service_one")
require_dependency("service_one") require_dependency(File.dirname(__FILE__) + "/dependencies/service_one")
assert_equal 1, Dependencies.loaded.size assert_equal 1, Dependencies.loaded.size
end end
def test_reloading_dependency
require_dependency("service_one")
require_dependency("service_one")
assert_equal 1, $loaded_service_one
Dependencies.reload
assert_equal 2, $loaded_service_one
end
def test_require_missing_dependency def test_require_missing_dependency
assert_raises(LoadError) { require_dependency("missing_service") } assert_raises(LoadError) { require_dependency("missing_service") }
end end

8
activesupport/test/inflector_test.rb
View file

@ -1,9 +1,9 @@
require 'test/unit' require 'test/unit'
require File.dirname(__FILE__) + '/../lib/inflector' require File.dirname(__FILE__) + '/../lib/inflector'
module A module Ace
module B module Base
class C class Case
end end
end end
end end
@ -164,7 +164,7 @@ class InflectorTest < Test::Unit::TestCase
end end
def test_constantize def test_constantize
assert_equal A::B::C, Inflector.constantize("A::B::C") assert_equal Ace::Base::Case, Inflector.constantize("Ace::Base::Case")
assert_equal InflectorTest, Inflector.constantize("InflectorTest") assert_equal InflectorTest, Inflector.constantize("InflectorTest")
assert_raises(NameError) { Inflector.constantize("UnknownClass") } assert_raises(NameError) { Inflector.constantize("UnknownClass") }
end end