Fix expectations for changes in generated HTML

Just a minor change, supplied attributes now go before the
standard ones
This commit is contained in:
Jonne Haß 2013-09-01 16:01:10 +02:00
parent dc12479070
commit 7e7082a3bd
3 changed files with 5 additions and 5 deletions

View file

@ -50,7 +50,7 @@ module Diaspora
url_bit = '<3'
end
%{#{pre}<a href="/tags/#{url_bit}" class="tag">#{clickable}</a>}
%{#{pre}<a class="tag" href="/tags/#{url_bit}">#{clickable}</a>}
}.html_safe
end
end

View file

@ -48,7 +48,7 @@ STR
fmt_msg = Diaspora::Mentionable.format(@status_msg.raw_message, @people)
fmt_msg.should_not include(p.first_name)
fmt_msg.should include("&gt;", "&lt;", "&#x27;") # ">", "<", "'"
fmt_msg.should include("&gt;", "&lt;", "&#39;") # ">", "<", "'"
end
end

View file

@ -52,9 +52,9 @@ shared_examples_for "it is taggable" do
'#12345 tag' => "#{tag_link('12345')} tag",
'#12cde tag' => "#{tag_link('12cde')} tag",
'#abc45 tag' => "#{tag_link('abc45')} tag",
'#<3' => %{<a href="/tags/<3" class="tag">#&lt;3</a>},
'i #<3' => %{i <a href="/tags/<3" class="tag">#&lt;3</a>},
'i #<3 you' => %{i <a href="/tags/<3" class="tag">#&lt;3</a> you},
'#<3' => %{<a class="tag" href="/tags/<3">#&lt;3</a>},
'i #<3' => %{i <a class="tag" href="/tags/<3">#&lt;3</a>},
'i #<3 you' => %{i <a class="tag" href="/tags/<3">#&lt;3</a> you},
'#<4' => '#&lt;4',
'test#foo test' => 'test#foo test',
'test.#joo bar' => 'test.#joo bar',