cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Updated for changes in rails HTML testing

Browse source
This commit is contained in:
Tom Hughes 2015-01-10 12:40:41 +00:00
parent 046fbdc177
commit a9a9ae2cbb
2 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
test/controllers/diary_entry_controller_test.rb
View file

@ -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_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
@ -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_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

6
test/lib/rich_text_test.rb
View file

@ -1,7 +1,7 @@
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")
@ -152,7 +152,7 @@ class RichTextTest < ActiveSupport::TestCase
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
@ -161,7 +161,7 @@ private
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