Nemcio/Redmine
1
0
Fork 0
mirror of https://github.com/redmine/redmine.git synced 2025-11-12 16:26:03 +01:00
Code Issues Packages Projects Releases Activity

shorten long line of MyControllerTest

Browse Source 
git-svn-id: http://svn.redmine.org/redmine/trunk@20080 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Toshi MARUYAMA
2020-09-26 15:01:37 +00:00
parent ec488e6379
commit a9aea31657
1 changed files with 27 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
test/functional/my_controller_test.rb
View File

@@ -46,9 +46,16 @@ class MyControllerTest < Redmine::ControllerTest
preferences = User.find(2).pref preferences = User.find(2).pref
preferences[:my_page_layout] = {'top' => ['timelog']} preferences[:my_page_layout] = {'top' => ['timelog']}
preferences.save! preferences.save!
with_issue = TimeEntry.create!(:user => User.find(2), :spent_on => Date.yesterday, :hours => 2.5, :activity_id => 10, :issue_id => 1) with_issue =
without_issue = TimeEntry.create!(:user => User.find(2), :spent_on => Date.yesterday, :hours => 3.5, :activity_id => 10, :project_id => 1) TimeEntry.create!(
:user => User.find(2), :spent_on => Date.yesterday,
:hours => 2.5, :activity_id => 10, :issue_id => 1
)
without_issue =
TimeEntry.create!(
:user => User.find(2), :spent_on => Date.yesterday,
:hours => 3.5, :activity_id => 10, :project_id => 1
)
get :page get :page
assert_response :success assert_response :success
assert_select "tr#time-entry-#{with_issue.id}" do assert_select "tr#time-entry-#{with_issue.id}" do
@@ -80,7 +87,8 @@ class MyControllerTest < Redmine::ControllerTest
def test_page_with_assigned_issues_block_and_custom_columns def test_page_with_assigned_issues_block_and_custom_columns
preferences = User.find(2).pref preferences = User.find(2).pref
preferences.my_page_layout = {'top' => ['issuesassignedtome']} preferences.my_page_layout = {'top' => ['issuesassignedtome']}
preferences.my_page_settings = {'issuesassignedtome' => {:columns => ['tracker', 'subject', 'due_date']}} preferences.my_page_settings =
{'issuesassignedtome' => {:columns => ['tracker', 'subject', 'due_date']}}
preferences.save! preferences.save!
get :page get :page
@@ -119,7 +127,11 @@ class MyControllerTest < Redmine::ControllerTest
def test_page_with_issuequery_block_and_global_query def test_page_with_issuequery_block_and_global_query
user = User.find(2) user = User.find(2)
query = IssueQuery.create!(:name => 'All issues', :user => user, :column_names => [:tracker, :subject, :status, :assigned_to]) query =
IssueQuery.create!(
:name => 'All issues', :user => user,
:column_names => [:tracker, :subject, :status, :assigned_to]
)
user.pref.my_page_layout = {'top' => ['issuequery']} user.pref.my_page_layout = {'top' => ['issuequery']}
user.pref.my_page_settings = {'issuequery' => {:query_id => query.id}} user.pref.my_page_settings = {'issuequery' => {:query_id => query.id}}
user.pref.save! user.pref.save!
@@ -139,7 +151,12 @@ class MyControllerTest < Redmine::ControllerTest
def test_page_with_issuequery_block_and_project_query def test_page_with_issuequery_block_and_project_query
user = User.find(2) user = User.find(2)
query = IssueQuery.create!(:name => 'All issues', :project => Project.find(1), :user => user, :column_names => [:tracker, :subject, :status, :assigned_to]) query =
IssueQuery.create!(
:name => 'All issues', :project => Project.find(1),
:user => user,
:column_names => [:tracker, :subject, :status, :assigned_to]
)
user.pref.my_page_layout = {'top' => ['issuequery']} user.pref.my_page_layout = {'top' => ['issuequery']}
user.pref.my_page_settings = {'issuequery' => {:query_id => query.id}} user.pref.my_page_settings = {'issuequery' => {:query_id => query.id}}
user.pref.save! user.pref.save!
@@ -214,7 +231,10 @@ class MyControllerTest < Redmine::ControllerTest
assert_select 'div#block-activity' do assert_select 'div#block-activity' do
assert_select 'h3' do assert_select 'h3' do
assert_select 'a[href=?]', activity_path(from: User.current.today, user_id: user.id), :text => 'Activity' assert_select(
'a[href=?]', activity_path(from: User.current.today, user_id: user.id),
:text => 'Activity'
)
end end
assert_select 'div#activity' do assert_select 'div#activity' do
assert_select 'dt', 10 assert_select 'dt', 10