summaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
Diffstat (limited to 'test')
-rw-r--r--test/functional/issues_controller_test.rb6
-rw-r--r--test/functional/my_controller_test.rb8
-rw-r--r--test/functional/projects_controller_test.rb4
-rw-r--r--test/functional/roles_controller_test.rb2
-rw-r--r--test/functional/timelog_controller_test.rb18
-rw-r--r--test/integration/lib/redmine/field_format/attachment_format_test.rb4
-rw-r--r--test/unit/journal_test.rb2
-rw-r--r--test/unit/lib/redmine/helpers/gantt_test.rb4
-rw-r--r--test/unit/lib/redmine/safe_attributes_test.rb4
-rw-r--r--test/unit/query_test.rb6
10 files changed, 29 insertions, 29 deletions
diff --git a/test/functional/issues_controller_test.rb b/test/functional/issues_controller_test.rb
index 52b63f1e0..2348c462e 100644
--- a/test/functional/issues_controller_test.rb
+++ b/test/functional/issues_controller_test.rb
@@ -2375,11 +2375,11 @@ class IssuesControllerTest < Redmine::ControllerTest
assert_select 'div#issue_tree span.issues-stat' do
assert_select 'span.badge', text: '4'
assert_select 'span.open a', text: '3 open'
- assert_equal CGI.unescape(css_select('span.open a').first.attr('href')),
+ assert_equal CGI.unescape(css_select('span.open a').first.attr(:href)),
"/issues?parent_id=~1&set_filter=true&status_id=o"
assert_select 'span.closed a', text: '1 closed'
- assert_equal CGI.unescape(css_select('span.closed a').first.attr('href')),
+ assert_equal CGI.unescape(css_select('span.closed a').first.attr(:href)),
"/issues?parent_id=~1&set_filter=true&status_id=c"
end
end
@@ -2392,7 +2392,7 @@ class IssuesControllerTest < Redmine::ControllerTest
assert_select 'div#issue_tree span.issues-stat' do
assert_select 'span.open a', text: '1 open'
- assert_equal CGI.unescape(css_select('span.open a').first.attr('href')),
+ assert_equal CGI.unescape(css_select('span.open a').first.attr(:href)),
"/issues?parent_id=~1&set_filter=true&status_id=o"
assert_select 'span.closed', text: '0 closed'
assert_select 'span.closed a', 0
diff --git a/test/functional/my_controller_test.rb b/test/functional/my_controller_test.rb
index 6e93e3303..cc0be81c7 100644
--- a/test/functional/my_controller_test.rb
+++ b/test/functional/my_controller_test.rb
@@ -265,7 +265,7 @@ class MyControllerTest < Redmine::ControllerTest
assert_response :success
assert_select '#block-issuesupdatedbyme' do
- report_url = CGI.unescape(css_select('h3 a').first.attr('href'))
+ report_url = CGI.unescape(css_select('h3 a').first.attr(:href))
assert_match 'f[]=project.status', report_url
assert_match 'v[project.status][]=1', report_url
assert_match 'f[]=updated_by', report_url
@@ -306,7 +306,7 @@ class MyControllerTest < Redmine::ControllerTest
assert_response :success
assert_select '#block-issuesassignedtome table.issues tbody' do
- report_url = css_select('h3 a').map {|e| e.attr('href')}.first
+ report_url = css_select('h3 a').map {|e| e.attr(:href)}.first
assert_match 'f%5B%5D=project.status', report_url
assert_match 'v%5Bproject.status%5D%5B%5D=1', report_url
@@ -334,7 +334,7 @@ class MyControllerTest < Redmine::ControllerTest
assert_response :success
assert_select '#block-issuesreportedbyme' do
- report_url = css_select('h3 a').map {|e| e.attr('href')}.first
+ report_url = css_select('h3 a').map {|e| e.attr(:href)}.first
assert_match 'f%5B%5D=project.status', report_url
assert_match 'v%5Bproject.status%5D%5B%5D=1', report_url
@@ -366,7 +366,7 @@ class MyControllerTest < Redmine::ControllerTest
assert_response :success
assert_select '#block-issueswatched table.issues tbody' do
- report_url = css_select('h3 a').map {|e| e.attr('href')}.first
+ report_url = css_select('h3 a').map {|e| e.attr(:href)}.first
assert_match 'f%5B%5D=project.status', report_url
assert_match 'v%5Bproject.status%5D%5B%5D=1', report_url
diff --git a/test/functional/projects_controller_test.rb b/test/functional/projects_controller_test.rb
index a26793a20..38d70150c 100644
--- a/test/functional/projects_controller_test.rb
+++ b/test/functional/projects_controller_test.rb
@@ -139,8 +139,8 @@ class ProjectsControllerTest < Redmine::ControllerTest
}
assert_response :success
- child_level1 = css_select('tr#project-5').map {|e| e.attr('class')}.first.split(' ')
- child_level2 = css_select('tr#project-6').map {|e| e.attr('class')}.first.split(' ')
+ child_level1 = css_select('tr#project-5').map {|e| e.attr(:class)}.first.split(' ')
+ child_level2 = css_select('tr#project-6').map {|e| e.attr(:class)}.first.split(' ')
assert_include 'idnt', child_level1
assert_include 'idnt-1', child_level1
diff --git a/test/functional/roles_controller_test.rb b/test/functional/roles_controller_test.rb
index c1bb859a4..20baae6f9 100644
--- a/test/functional/roles_controller_test.rb
+++ b/test/functional/roles_controller_test.rb
@@ -71,7 +71,7 @@ class RolesControllerTest < Redmine::ControllerTest
assert_response :success
assert_equal(
%w(view_documents view_issues),
- css_select('input[name="role[permissions][]"][checked=checked]').map {|e| e.attr('value')}.sort
+ css_select('input[name="role[permissions][]"][checked=checked]').map {|e| e.attr(:value)}.sort
)
end
diff --git a/test/functional/timelog_controller_test.rb b/test/functional/timelog_controller_test.rb
index b1a4899cc..bdfbf0cfc 100644
--- a/test/functional/timelog_controller_test.rb
+++ b/test/functional/timelog_controller_test.rb
@@ -1165,7 +1165,7 @@ class TimelogControllerTest < Redmine::ControllerTest
assert_response :success
assert_equal(
[t2, t1, t3].map(&:id).map(&:to_s),
- css_select('input[name="ids[]"]').map {|e| e.attr('value')}
+ css_select('input[name="ids[]"]').map {|e| e.attr(:value)}
)
get(
:index,
@@ -1180,7 +1180,7 @@ class TimelogControllerTest < Redmine::ControllerTest
assert_response :success
assert_equal(
[t3, t1, t2].map(&:id).map(&:to_s),
- css_select('input[name="ids[]"]').map {|e| e.attr('value')}
+ css_select('input[name="ids[]"]').map {|e| e.attr(:value)}
)
end
@@ -1206,7 +1206,7 @@ class TimelogControllerTest < Redmine::ControllerTest
get :index, :params => params.dup.merge(sort_criteria)
assert_response :success
expected_ids = expected.map(&:id).map(&:to_s)
- actual_ids = css_select('input[name="ids[]"]').map {|e| e.attr('value')}
+ actual_ids = css_select('input[name="ids[]"]').map {|e| e.attr(:value)}
assert_equal expected_ids, actual_ids
end
end
@@ -1242,7 +1242,7 @@ class TimelogControllerTest < Redmine::ControllerTest
}
)
assert_response :success
- assert_equal [entry].map(&:id).map(&:to_s), css_select('input[name="ids[]"]').map {|e| e.attr('value')}
+ assert_equal [entry].map(&:id).map(&:to_s), css_select('input[name="ids[]"]').map {|e| e.attr(:value)}
end
def test_index_with_project_status_filter
@@ -1261,7 +1261,7 @@ class TimelogControllerTest < Redmine::ControllerTest
)
assert_response :success
- time_entries = css_select('input[name="ids[]"]').map {|e| e.attr('value')}
+ time_entries = css_select('input[name="ids[]"]').map {|e| e.attr(:value)}
assert_include '1', time_entries
assert_not_include '4', time_entries
end
@@ -1308,7 +1308,7 @@ class TimelogControllerTest < Redmine::ControllerTest
:v => {'issue.tracker_id' => ['2']}
}
assert_response :success
- assert_equal [entry].map(&:id).map(&:to_s), css_select('input[name="ids[]"]').map {|e| e.attr('value')}
+ assert_equal [entry].map(&:id).map(&:to_s), css_select('input[name="ids[]"]').map {|e| e.attr(:value)}
end
def test_index_with_issue_tracker_column
@@ -1348,7 +1348,7 @@ class TimelogControllerTest < Redmine::ControllerTest
:v => {'issue.category_id' => ['1']}
}
assert_response :success
- assert_equal ['1', '2'], css_select('input[name="ids[]"]').map {|e| e.attr('value')}
+ assert_equal ['1', '2'], css_select('input[name="ids[]"]').map {|e| e.attr(:value)}
end
def test_index_with_issue_category_column
@@ -1383,7 +1383,7 @@ class TimelogControllerTest < Redmine::ControllerTest
:v => {'author_id' => ['2']}
}
assert_response :success
- assert_equal ['1'], css_select('input[name="ids[]"]').map {|e| e.attr('value')}
+ assert_equal ['1'], css_select('input[name="ids[]"]').map {|e| e.attr(:value)}
end
def test_index_with_author_column
@@ -1447,7 +1447,7 @@ class TimelogControllerTest < Redmine::ControllerTest
assert_response :success
assert_equal(
[entry].map(&:id).map(&:to_s),
- css_select('input[name="ids[]"]').map {|e| e.attr('value')}
+ css_select('input[name="ids[]"]').map {|e| e.attr(:value)}
)
end
diff --git a/test/integration/lib/redmine/field_format/attachment_format_test.rb b/test/integration/lib/redmine/field_format/attachment_format_test.rb
index 414e1c159..f4d191d48 100644
--- a/test/integration/lib/redmine/field_format/attachment_format_test.rb
+++ b/test/integration/lib/redmine/field_format/attachment_format_test.rb
@@ -86,10 +86,10 @@ class AttachmentFieldFormatTest < Redmine::IntegrationTest
# link to the attachment
link = css_select(".cf_#{@field.id} .value a:not(.icon-download)")
assert_equal 1, link.size
- assert_equal "testfile.txt", link.text
+ assert_equal "testfile.txt", link.first.text
# preview the attachment
- get link.attr('href')
+ get link.first.attr(:href)
assert_response :success
assert_select 'h2', :text => "#{issue.tracker} ##{issue.id} ยป testfile.txt"
end
diff --git a/test/unit/journal_test.rb b/test/unit/journal_test.rb
index 345d64aba..d6abd1aec 100644
--- a/test/unit/journal_test.rb
+++ b/test/unit/journal_test.rb
@@ -165,7 +165,7 @@ class JournalTest < ActiveSupport::TestCase
d = JournalDetail.new(:property => 'cf', :prop_key => '2')
journals = [Journal.new(:details => [d])]
- d.expects(:instance_variable_set).with("@custom_field", CustomField.find(2)).once
+ d.expects(:instance_variable_set).with(:@custom_field, CustomField.find(2)).once
Journal.preload_journals_details_custom_fields(journals)
end
diff --git a/test/unit/lib/redmine/helpers/gantt_test.rb b/test/unit/lib/redmine/helpers/gantt_test.rb
index 8d8252346..b7237325c 100644
--- a/test/unit/lib/redmine/helpers/gantt_test.rb
+++ b/test/unit/lib/redmine/helpers/gantt_test.rb
@@ -58,8 +58,8 @@ class Redmine::Helpers::GanttHelperTest < Redmine::HelperTest
@gantt.project = @project
@gantt.query = IssueQuery.new(:project => @project, :name => 'Gantt')
@gantt.view = self
- @gantt.instance_variable_set('@date_from', options[:date_from] || (today - 14))
- @gantt.instance_variable_set('@date_to', options[:date_to] || (today + 14))
+ @gantt.instance_variable_set(:@date_from, options[:date_from] || (today - 14))
+ @gantt.instance_variable_set(:@date_to, options[:date_to] || (today + 14))
end
private :create_gantt
diff --git a/test/unit/lib/redmine/safe_attributes_test.rb b/test/unit/lib/redmine/safe_attributes_test.rb
index 64a215870..edad6212b 100644
--- a/test/unit/lib/redmine/safe_attributes_test.rb
+++ b/test/unit/lib/redmine/safe_attributes_test.rb
@@ -73,14 +73,14 @@ class Redmine::SafeAttributesTest < ActiveSupport::TestCase
def test_set_safe_attributes
p = Person.new
- p.send('safe_attributes=', {'firstname' => 'John', 'lastname' => 'Smith', 'login' => 'jsmith'}, User.anonymous)
+ p.send(:safe_attributes=, {'firstname' => 'John', 'lastname' => 'Smith', 'login' => 'jsmith'}, User.anonymous)
assert_equal 'John', p.firstname
assert_equal 'Smith', p.lastname
assert_nil p.login
p = Person.new
User.current = User.find(1)
- p.send('safe_attributes=', {'firstname' => 'John', 'lastname' => 'Smith', 'login' => 'jsmith'}, User.find(1))
+ p.send(:safe_attributes=, {'firstname' => 'John', 'lastname' => 'Smith', 'login' => 'jsmith'}, User.find(1))
assert_equal 'John', p.firstname
assert_equal 'Smith', p.lastname
assert_equal 'jsmith', p.login
diff --git a/test/unit/query_test.rb b/test/unit/query_test.rb
index 632335a91..ff11ec62c 100644
--- a/test/unit/query_test.rb
+++ b/test/unit/query_test.rb
@@ -1686,7 +1686,7 @@ class QueryTest < ActiveSupport::TestCase
q = IssueQuery.new(:name => '_', :column_names => [:subject, :spent_hours])
assert q.has_column?(:spent_hours)
issues = q.issues
- assert_not_nil issues.first.instance_variable_get("@spent_hours")
+ assert_not_nil issues.first.instance_variable_get(:@spent_hours)
end
def test_query_should_preload_last_updated_by
@@ -1696,7 +1696,7 @@ class QueryTest < ActiveSupport::TestCase
assert q.has_column?(:last_updated_by)
issues = q.issues.sort_by(&:id)
- assert issues.all? {|issue| !issue.instance_variable_get("@last_updated_by").nil?}
+ assert issues.all? {|issue| !issue.instance_variable_get(:@last_updated_by).nil?}
assert_equal ["User", "User", "NilClass"], issues.map {|i| i.last_updated_by.class.name}
assert_equal ["John Smith", "John Smith", ""], issues.map {|i| i.last_updated_by.to_s}
end
@@ -1706,7 +1706,7 @@ class QueryTest < ActiveSupport::TestCase
q = IssueQuery.new(:name => '_', :column_names => [:subject, :last_notes])
assert q.has_column?(:last_notes)
issues = q.issues
- assert_not_nil issues.first.instance_variable_get("@last_notes")
+ assert_not_nil issues.first.instance_variable_get(:@last_notes)
end
def test_groupable_columns_should_include_custom_fields
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-05 05:06:09 +0000