Merge branch 'master' into active_model

Conflicts:
	activemodel/lib/active_model/core.rb
	activemodel/test/cases/state_machine/event_test.rb
	activemodel/test/cases/state_machine/state_transition_test.rb
	activerecord/lib/active_record/validations.rb
	activerecord/test/cases/validations/i18n_validation_test.rb
	activeresource/lib/active_resource.rb
	activeresource/test/abstract_unit.rb

1 files changed, 50 insertions, 0 deletions

diff --git a/actionpack/test/html-scanner/text_node_test.rb b/actionpack/test/html-scanner/text_node_test.rb
new file mode 100644
index 0000000000..1ab3f4454e
--- /dev/null
+++ b/actionpack/test/html-scanner/text_node_test.rb
@@ -0,0 +1,50 @@
+require 'abstract_unit'
+
+class TextNodeTest < Test::Unit::TestCase
+  def setup
+    @node = HTML::Text.new(nil, 0, 0, "hello, howdy, aloha, annyeong")
+  end
+  
+  def test_to_s
+    assert_equal "hello, howdy, aloha, annyeong", @node.to_s
+  end
+  
+  def test_find_string
+    assert_equal @node, @node.find("hello, howdy, aloha, annyeong")
+    assert_equal false, @node.find("bogus")
+  end
+  
+  def test_find_regexp
+    assert_equal @node, @node.find(/an+y/)
+    assert_nil @node.find(/b/)
+  end
+  
+  def test_find_hash
+    assert_equal @node, @node.find(:content => /howdy/)
+    assert_nil @node.find(:content => /^howdy$/)
+    assert_equal false, @node.find(:content => "howdy")
+  end
+  
+  def test_find_other
+    assert_nil @node.find(:hello)
+  end
+
+  def test_match_string
+    assert @node.match("hello, howdy, aloha, annyeong")
+    assert_equal false, @node.match("bogus")
+  end
+
+  def test_match_regexp
+    assert_not_nil @node, @node.match(/an+y/)
+    assert_nil @node.match(/b/)
+  end
+
+  def test_match_hash
+    assert_not_nil @node, @node.match(:content => "howdy")
+    assert_nil @node.match(:content => /^howdy$/)
+  end
+
+  def test_match_other
+    assert_nil @node.match(:hello)
+  end
+end