Nemcio/Redmine
1
0
Fork 0
mirror of https://github.com/redmine/redmine.git synced 2025-11-07 22:05:56 +01:00
Code Issues Packages Projects Releases Activity

Fix incorrect argument format for assert_select that causes ArgumentError with rails-dom-testing >= 2.1.0 (#38797).

Browse Source 
Patch by Go MAEDA.


git-svn-id: https://svn.redmine.org/redmine/trunk@22273 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Go MAEDA
2023-07-02 06:34:03 +00:00
parent a519accb99
commit a7bc173a7e
4 changed files with 21 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
test/functional/issues_controller_test.rb
View File

@@ -2797,12 +2797,8 @@ class IssuesControllerTest < Redmine::ControllerTest
assert_response :success assert_response :success
# long text custom field should not be render in the attributes div # long text custom field should not be render in the attributes div
assert_select "div.attributes div.attribute.cf_#{field.id} p strong", 0, :text => 'Long text' assert_select "div.attributes div.attribute.cf_#{field.id} p strong", 0
assert_select( assert_select "div.attributes div.attribute.cf_#{field.id} div.value", 0
"div.attributes div.attribute.cf_#{field.id} div.value",
0,
:text => 'This is a long text'
)
# long text custom field should be render under description field # long text custom field should be render under description field
assert_select "div.description ~ div.attribute.cf_#{field.id} p strong", :text => 'Long text' assert_select "div.description ~ div.attribute.cf_#{field.id} p strong", :text => 'Long text'
assert_select( assert_select(
@@ -3857,10 +3853,11 @@ class IssuesControllerTest < Redmine::ControllerTest
end end
assert_select 'div#trackers_description' do assert_select 'div#trackers_description' do
assert_select 'h3', 1, :text => 'Trackers description' assert_select 'h3', :text => 'Trackers description', :count => 1
# only Bug and Feature have descriptions # only Bug and Feature have descriptions
assert_select 'dt', 2, :text => 'Bug' assert_select 'dt', 2
assert_select 'dd', 2, :text => 'Description for Bug tracker' assert_select 'dt', :text => 'Bug', :count => 1
assert_select 'dd', :text => 'Description for Bug tracker', :count => 1
end end
end end

16
test/functional/my_controller_test.rb
View File

@@ -272,7 +272,9 @@ class MyControllerTest < Redmine::ControllerTest
assert_match 'v[updated_by][]=me', report_url assert_match 'v[updated_by][]=me', report_url
assert_select 'table.issues tbody tr', 2 assert_select 'table.issues tbody tr', 2
assert_select 'table.issues tbody tr[id=?]', 'issue-1', 1, :title => 'Cannot print recipes' assert_select 'table.issues tbody tr[id=?]', 'issue-1' do
assert_select 'td.subject a', :text => 'Cannot print recipes', :count => 1
end
assert_select 'table.issues tbody tr[id=?]', 'issue-14', 0 assert_select 'table.issues tbody tr[id=?]', 'issue-14', 0
end end
end end
@@ -311,7 +313,9 @@ class MyControllerTest < Redmine::ControllerTest
assert_match 'v%5Bproject.status%5D%5B%5D=1', report_url assert_match 'v%5Bproject.status%5D%5B%5D=1', report_url
assert_select 'tr', 1 assert_select 'tr', 1
assert_select 'tr[id=?]', 'issue-1', 1, :title => 'Cannot print recipes' assert_select 'tr[id=?]', 'issue-1' do
assert_select 'td.subject a', :text => 'Cannot print recipes', :count => 1
end
assert_select 'tr[id=?]', 'issue-4', 0 assert_select 'tr[id=?]', 'issue-4', 0
end end
end end
@@ -339,7 +343,9 @@ class MyControllerTest < Redmine::ControllerTest
assert_match 'v%5Bproject.status%5D%5B%5D=1', report_url assert_match 'v%5Bproject.status%5D%5B%5D=1', report_url
assert_select 'table.issues tbody tr', 10 assert_select 'table.issues tbody tr', 10
assert_select 'table.issues tbody tr[id=?]', 'issue-1', 1, :title => 'Cannot print recipes' assert_select 'table.issues tbody tr[id=?]', 'issue-1' do
assert_select 'td.subject a', :text => 'Cannot print recipes', :count => 1
end
assert_select 'table.issues tbody tr[id=?]', 'issue-4', 0 assert_select 'table.issues tbody tr[id=?]', 'issue-4', 0
end end
end end
@@ -371,7 +377,9 @@ class MyControllerTest < Redmine::ControllerTest
assert_match 'v%5Bproject.status%5D%5B%5D=1', report_url assert_match 'v%5Bproject.status%5D%5B%5D=1', report_url
assert_select 'tr', 1 assert_select 'tr', 1
assert_select 'tr[id=?]', 'issue-1', 1, :title => 'Cannot print recipes' assert_select 'tr[id=?]', 'issue-1' do
assert_select 'td.subject a', :text => 'Cannot print recipes', :count => 1
end
assert_select 'tr[id=?]', 'issue-4', 0 assert_select 'tr[id=?]', 'issue-4', 0
end end
end end

2
test/functional/timelog_controller_test.rb
View File

@@ -768,7 +768,7 @@ class TimelogControllerTest < Redmine::ControllerTest
assert_response :success assert_response :success
assert_select 'select[id=?]', 'time_entry_activity_id' do assert_select 'select[id=?]', 'time_entry_activity_id' do
assert_select 'option', 3 assert_select 'option', 3
assert_select 'option[value=?]', '11', 0, :text => 'QA' assert_select 'option[value=?]', '11', 0
end end
end end

4
test/functional/timelog_report_test.rb
View File

@@ -110,8 +110,8 @@ class TimelogReportTest < Redmine::ControllerTest
get :report, :params => {:project_id => 1, :columns => 'month', :criteria => ["user", "activity"]} get :report, :params => {:project_id => 1, :columns => 'month', :criteria => ["user", "activity"]}
assert_response :success assert_response :success
assert_select 'td.name a.user.active[href=?]', '/users/1', 1, :text => 'Redmine Admin' assert_select 'td.name a.user.active[href=?]', '/users/1', :text => 'Redmine Admin', :count => 1
assert_select 'td.name a.user.locked[href=?]', '/users/2', 1, :text => 'John Smith' assert_select 'td.name a.user.locked[href=?]', '/users/2', :text => 'John Smith', :count => 1
end end
def test_report_custom_field_criteria_with_multiple_values_on_single_value_custom_field_should_not_fail def test_report_custom_field_criteria_with_multiple_values_on_single_value_custom_field_should_not_fail