Updated for changes in rails HTML testing

diff --git a/test/controllers/diary_entry_controller_test.rb b/test/controllers/diary_entry_controller_test.rb
index ae978e6f93b04ec81d764e7d7e17a3a16f991254..32cab96cbda07d1d0abb8da2f786668662b6cd77 100644 (file)
--- a/test/controllers/diary_entry_controller_test.rb
+++ b/test/controllers/diary_entry_controller_test.rb
@@ -170,7 +170,7 @@ class DiaryEntryControllerTest < ActionController::TestCase
     assert_template 'diary_entry/view'
     assert_select "title", :text => /Users' diaries | /, :count => 1
     assert_select "div.content-heading", :count => 1 do
     assert_template 'diary_entry/view'
     assert_select "title", :text => /Users' diaries | /, :count => 1
     assert_select "div.content-heading", :count => 1 do

-      assert_select "h2", :text => /#{entry.user.display_name}&#39;s diary/, :count => 1
+      assert_select "h2", :text => /#{entry.user.display_name}'s diary/, :count => 1

     end
     assert_select "div#content", :count => 1 do
       assert_select "div.post_heading", :text => /#{new_title}/, :count => 1
     end
     assert_select "div#content", :count => 1 do
       assert_select "div.post_heading", :text => /#{new_title}/, :count => 1


@@ -189,7 +189,7 @@ class DiaryEntryControllerTest < ActionController::TestCase
     assert_template 'diary_entry/view'
     assert_select "title", :text => /Users' diaries | /, :count => 1
     assert_select "div.content-heading", :count => 1 do
     assert_template 'diary_entry/view'
     assert_select "title", :text => /Users' diaries | /, :count => 1
     assert_select "div.content-heading", :count => 1 do

-      assert_select "h2", :text => /#{users(:normal_user).display_name}&#39;s diary/, :count => 1
+      assert_select "h2", :text => /#{users(:normal_user).display_name}'s diary/, :count => 1

     end
     assert_select "div#content", :count => 1 do
       assert_select "div.post_heading", :text => /#{new_title}/, :count => 1
     end
     assert_select "div#content", :count => 1 do
       assert_select "div.post_heading", :text => /#{new_title}/, :count => 1

diff --git a/test/lib/rich_text_test.rb b/test/lib/rich_text_test.rb
index e99d594a4e184a14f55e1b104bd73d8dd1da8464..14e6f2196fc7321406fd3cd44d995fae61f16a51 100644 (file)
--- a/test/lib/rich_text_test.rb
+++ b/test/lib/rich_text_test.rb
@@ -1,7 +1,7 @@
 require 'test_helper'
 
 class RichTextTest < ActiveSupport::TestCase
 require 'test_helper'
 
 class RichTextTest < ActiveSupport::TestCase

-  include ActionDispatch::Assertions::SelectorAssertions
+  include Rails::Dom::Testing::Assertions::SelectorAssertions

 
   def test_html_to_html
     r = RichText.new("html", "foo http://example.com/ bar")
 
   def test_html_to_html
     r = RichText.new("html", "foo http://example.com/ bar")


@@ -152,7 +152,7 @@ class RichTextTest < ActiveSupport::TestCase
 
     r = RichText.new("text", "foo < bar & baz > qux")
     assert_html r do
 
     r = RichText.new("text", "foo < bar & baz > qux")
     assert_html r do

-      assert_select "p", "foo &lt; bar &amp; baz &gt; qux"
+      assert_select "p", "foo < bar & baz > qux"

     end
   end
 
     end
   end
 


@@ -161,7 +161,7 @@ private
   def assert_html(richtext, &block)
     html = richtext.to_html
     assert html.html_safe?
   def assert_html(richtext, &block)
     html = richtext.to_html
     assert html.html_safe?

-    root = HTML::Document.new(richtext.to_html, false, true).root
+    root = Nokogiri::HTML::DocumentFragment.parse(html)

     assert_select root, "*" do
       yield block
     end
     assert_select root, "*" do
       yield block
     end