summaryrefslogtreecommitdiffstats
path: root/test/functional/repositories_bazaar_controller_test.rb
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2015-01-17 17:02:55 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2015-01-17 17:02:55 +0000
commitd85f73a30d48b3472346fb712106e6d5f4403278 (patch)
tree35d9205b3bf1da3c4e1cc9fc7699f798395d4702 /test/functional/repositories_bazaar_controller_test.rb
parent3ea8b706978b490fc54cde8e14dcde2a748dec1a (diff)
downloadredmine-d85f73a30d48b3472346fb712106e6d5f4403278.tar.gz
redmine-d85f73a30d48b3472346fb712106e6d5f4403278.zip
Upgrade to Rails 4.2.0 (#14534).
git-svn-id: http://svn.redmine.org/redmine/trunk@13892 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'test/functional/repositories_bazaar_controller_test.rb')
-rw-r--r--test/functional/repositories_bazaar_controller_test.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/test/functional/repositories_bazaar_controller_test.rb b/test/functional/repositories_bazaar_controller_test.rb
index cde2d1cf7..29b5bf77d 100644
--- a/test/functional/repositories_bazaar_controller_test.rb
+++ b/test/functional/repositories_bazaar_controller_test.rb
@@ -123,7 +123,7 @@ class RepositoriesBazaarControllerTest < ActionController::TestCase
assert_response :success
assert_template 'diff'
# Line 11 removed
- assert_select 'th.line-num:content(11) ~ td.diff_out', :text => /Display more information/
+ assert_select 'th.line-num:contains(11) ~ td.diff_out', :text => /Display more information/
end
end
@@ -157,7 +157,7 @@ class RepositoriesBazaarControllerTest < ActionController::TestCase
assert_select "th.line-num", :text => '1' do
assert_select "+ td.revision" do
assert_select "a", :text => '2'
- assert_select "+ td.author", :text => "test &amp;" do
+ assert_select "+ td.author", :text => "test &" do
assert_select "+ td",
:text => "author escaping test"
end