summaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorGo MAEDA <maeda@farend.jp>2022-02-19 07:36:40 +0000
committerGo MAEDA <maeda@farend.jp>2022-02-19 07:36:40 +0000
commit6a46743cd389aeefc20348445fee2135a8e4c35c (patch)
tree8c504de5f36e05db870cd2f8f70eb7d4e15fb712 /test
parent9f822657820fb87675698d9e6151e7dc650e099f (diff)
downloadredmine-6a46743cd389aeefc20348445fee2135a8e4c35c.tar.gz
redmine-6a46743cd389aeefc20348445fee2135a8e4c35c.zip
Fix code copying in common browsers (#36580).
Patch by Vitaly vit9696. git-svn-id: http://svn.redmine.org/redmine/trunk@21415 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'test')
-rw-r--r--test/functional/attachments_controller_test.rb6
-rw-r--r--test/functional/repositories_bazaar_controller_test.rb11
-rw-r--r--test/functional/repositories_cvs_controller_test.rb4
-rw-r--r--test/functional/repositories_git_controller_test.rb12
-rw-r--r--test/functional/repositories_mercurial_controller_test.rb7
-rw-r--r--test/functional/repositories_subversion_controller_test.rb4
6 files changed, 25 insertions, 19 deletions
diff --git a/test/functional/attachments_controller_test.rb b/test/functional/attachments_controller_test.rb
index f89b03052..885a79dbb 100644
--- a/test/functional/attachments_controller_test.rb
+++ b/test/functional/attachments_controller_test.rb
@@ -157,7 +157,7 @@ class AttachmentsControllerTest < Redmine::ControllerTest
assert_response :success
assert_equal 'text/html', @response.media_type
assert_select 'tr#L1' do
- assert_select 'th.line-num', :text => '1'
+ assert_select 'th.line-num a[data-txt=?]', '1'
assert_select 'td', :text => /日本語/
end
end
@@ -174,7 +174,7 @@ class AttachmentsControllerTest < Redmine::ControllerTest
assert_response :success
assert_equal 'text/html', @response.media_type
assert_select 'tr#L7' do
- assert_select 'th.line-num', :text => '7'
+ assert_select 'th.line-num a[data-txt=?]', '7'
assert_select 'td', :text => /Demande cr\?\?e avec succ\?s/
end
end
@@ -192,7 +192,7 @@ class AttachmentsControllerTest < Redmine::ControllerTest
assert_response :success
assert_equal 'text/html', @response.media_type
assert_select 'tr#L7' do
- assert_select 'th.line-num', :text => '7'
+ assert_select 'th.line-num a[data-txt=?]', '7'
assert_select 'td', :text => /Demande créée avec succès/
end
end
diff --git a/test/functional/repositories_bazaar_controller_test.rb b/test/functional/repositories_bazaar_controller_test.rb
index e8559fc78..929df7b39 100644
--- a/test/functional/repositories_bazaar_controller_test.rb
+++ b/test/functional/repositories_bazaar_controller_test.rb
@@ -181,7 +181,7 @@ class RepositoriesBazaarControllerTest < Redmine::RepositoryControllerTest
)
assert_response :success
# Line 11 removed
- assert_select 'th.line-num:contains(11) ~ td.diff_out', :text => /Display more information/
+ assert_select 'th.line-num[data-txt=11] ~ td.diff_out', :text => /Display more information/
end
end
@@ -196,7 +196,8 @@ class RepositoriesBazaarControllerTest < Redmine::RepositoryControllerTest
)
assert_response :success
- assert_select "th.line-num", :text => '2' do
+ assert_select "th.line-num" do
+ assert_select 'a[data-txt=?]', '2'
assert_select "+ td.revision" do
assert_select "a", :text => '3'
assert_select "+ td.author", :text => "jsmith@" do
@@ -226,7 +227,8 @@ class RepositoriesBazaarControllerTest < Redmine::RepositoryControllerTest
)
assert_response :success
- assert_select "th.line-num", :text => '1' do
+ assert_select "th.line-num" do
+ assert_select "a[data-txt=?]", '1'
assert_select "+ td.revision" do
assert_select "a", :text => '2'
assert_select "+ td.author", :text => "test &" do
@@ -262,7 +264,8 @@ class RepositoriesBazaarControllerTest < Redmine::RepositoryControllerTest
)
assert_response :success
- assert_select "th.line-num", :text => '1' do
+ assert_select "th.line-num" do
+ assert_select 'a[data-txt=?]', '1'
assert_select "+ td.revision" do
assert_select "a", :text => '2'
assert_select "+ td.author", :text => "test Ü" do
diff --git a/test/functional/repositories_cvs_controller_test.rb b/test/functional/repositories_cvs_controller_test.rb
index 09db1611a..fdd8e986d 100644
--- a/test/functional/repositories_cvs_controller_test.rb
+++ b/test/functional/repositories_cvs_controller_test.rb
@@ -283,13 +283,13 @@ class RepositoriesCvsControllerTest < Redmine::RepositoryControllerTest
# 1.1 line
assert_select 'tr' do
- assert_select 'th.line-num', :text => '21'
+ assert_select 'th.line-num a[data-txt=?]', '21'
assert_select 'td.revision', :text => /1.1/
assert_select 'td.author', :text => /LANG/
end
# 1.2 line
assert_select 'tr' do
- assert_select 'th.line-num', :text => '32'
+ assert_select 'th.line-num a[data-txt=?]', '32'
assert_select 'td.revision', :text => /1.2/
assert_select 'td.author', :text => /LANG/
end
diff --git a/test/functional/repositories_git_controller_test.rb b/test/functional/repositories_git_controller_test.rb
index 120118d9c..09458f7f9 100644
--- a/test/functional/repositories_git_controller_test.rb
+++ b/test/functional/repositories_git_controller_test.rb
@@ -378,7 +378,7 @@ class RepositoriesGitControllerTest < Redmine::RepositoryControllerTest
)
assert_response :success
# Line 22 removed
- assert_select 'th.line-num:contains(22) ~ td.diff_out', :text => /def remove/
+ assert_select 'th.line-num[data-txt=22] ~ td.diff_out', :text => /def remove/
assert_select 'h2', :text => /2f9c0091/
end
end
@@ -403,7 +403,7 @@ class RepositoriesGitControllerTest < Redmine::RepositoryControllerTest
)
assert_response :success
# Line 22 removed
- assert_select 'th.line-num:contains(22) ~ td.diff_out', :text => /def remove/
+ assert_select 'th.line-num[data-txt=22] ~ td.diff_out', :text => /def remove/
assert_select 'h2', :text => /2f9c0091/
end
end
@@ -589,7 +589,7 @@ class RepositoriesGitControllerTest < Redmine::RepositoryControllerTest
# Line 23, changeset 2f9c0091
assert_select 'tr' do
- assert_select 'th.line-num', :text => '23'
+ assert_select 'th.line-num a[data-txt=?]', '23'
assert_select 'td.revision', :text => /2f9c0091/
assert_select 'td.author', :text => 'jsmith'
assert_select 'td', :text => /remove_watcher/
@@ -673,7 +673,8 @@ class RepositoriesGitControllerTest < Redmine::RepositoryControllerTest
:rev => r1
}
)
- assert_select "th.line-num", :text => '1' do
+ assert_select "th.line-num" do
+ assert_select "a[data-txt=?]", '1'
assert_select "+ td.revision" do
assert_select "a", :text => '57ca437c'
assert_select "+ td.author", :text => "jsmith" do
@@ -698,7 +699,8 @@ class RepositoriesGitControllerTest < Redmine::RepositoryControllerTest
:rev => r1
}
)
- assert_select "th.line-num", :text => '1' do
+ assert_select "th.line-num" do
+ assert_select "a[data-txt=?]", '1'
assert_select "+ td.revision" do
assert_select "a", :text => '83ca5fd5'
assert_select "+ td.author", :text => "Felix Schäfer" do
diff --git a/test/functional/repositories_mercurial_controller_test.rb b/test/functional/repositories_mercurial_controller_test.rb
index fadb9c7f2..d88a95f0a 100644
--- a/test/functional/repositories_mercurial_controller_test.rb
+++ b/test/functional/repositories_mercurial_controller_test.rb
@@ -396,7 +396,7 @@ class RepositoriesMercurialControllerTest < Redmine::RepositoryControllerTest
assert_response :success
if @diff_c_support
# Line 22 removed
- assert_select 'th.line-num:contains(22) ~ td.diff_out', :text => /def remove/
+ assert_select 'th.line-num[data-txt=22] ~ td.diff_out', :text => /def remove/
assert_select 'h2', :text => /4:def6d2f1254a/
end
end
@@ -492,7 +492,7 @@ class RepositoriesMercurialControllerTest < Redmine::RepositoryControllerTest
# Line 22, revision 4:def6d2f1254a
assert_select 'tr' do
- assert_select 'th.line-num', :text => '22'
+ assert_select 'th.line-num a[data-txt=?]', '22'
assert_select 'td.revision', :text => '4:def6d2f1254a'
assert_select 'td.author', :text => 'jsmith'
assert_select 'td', :text => /remove_watcher/
@@ -548,7 +548,8 @@ class RepositoriesMercurialControllerTest < Redmine::RepositoryControllerTest
}
)
assert_response :success
- assert_select "th.line-num", :text => '1' do
+ assert_select "th.line-num" do
+ assert_select "a[data-txt=?]", '1'
assert_select "+ td.revision" do
assert_select "a", :text => '20:709858aafd1b'
assert_select "+ td.author", :text => "jsmith" do
diff --git a/test/functional/repositories_subversion_controller_test.rb b/test/functional/repositories_subversion_controller_test.rb
index 4c248a790..ca2a224a8 100644
--- a/test/functional/repositories_subversion_controller_test.rb
+++ b/test/functional/repositories_subversion_controller_test.rb
@@ -557,14 +557,14 @@ class RepositoriesSubversionControllerTest < Redmine::RepositoryControllerTest
assert_response :success
assert_select 'tr' do
- assert_select 'th.line-num', :text => '1'
+ assert_select 'th.line-num a[data-txt=?]', '1'
assert_select 'td.revision', :text => '4'
assert_select 'td.author', :text => 'jp'
assert_select 'td', :text => /stdio.h/
end
# Same revision
assert_select 'tr' do
- assert_select 'th.line-num', :text => '2'
+ assert_select 'th.line-num a[data-txt=?]', '2'
assert_select 'td.revision', :text => ''
assert_select 'td.author', :text => ''
end