Nemcio/Redmine
1
0
Fork 0
mirror of https://github.com/redmine/redmine.git synced 2026-01-30 03:09:58 +01:00
Code Issues Packages Projects Releases Activity

Merged r14967 to r14969 (#21488).

Browse Source 
git-svn-id: http://svn.redmine.org/redmine/branches/3.1-stable@14983 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang
2015-12-19 08:14:48 +00:00
parent 21e551369c
commit 9619aa9814
3 changed files with 30 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
public/javascripts/application.js
View File

@@ -555,7 +555,13 @@ function beforeShowDatePicker(input, inst) {
break;
case "issue_due_date" :
if ($("#issue_start_date").size() > 0) {
default_date = $("#issue_start_date").val();
var start_date = $("#issue_start_date").val();
if (start_date != "") {
start_date = new Date(Date.parse(start_date));
if (start_date > new Date()) {
default_date = $("#issue_start_date").val();
}
}
}
break;
}

5
test/ui/base.rb
View File

@@ -60,6 +60,11 @@ module Redmine
assert_equal '/my/page', current_path
end
setup do
# Set the page width higher than 900 to get the full layout with sidebar
page.driver.browser.manage.window.resize_to(1024, 900)
end
teardown do
Capybara.reset_sessions! # Forget the (simulated) browser state
Capybara.use_default_driver # Revert Capybara.current_driver to Capybara.default_driver

21
test/ui/issues_test_ui.rb
View File

@@ -21,7 +21,7 @@ class Redmine::UiTest::IssuesTest < Redmine::UiTest::Base
fixtures :projects, :users, :email_addresses, :roles, :members, :member_roles,
:trackers, :projects_trackers, :enabled_modules, :issue_statuses, :issues,
:enumerations, :custom_fields, :custom_values, :custom_fields_trackers,
:watchers
:watchers, :journals, :journal_details
def test_create_issue
log_user('jsmith', 'jsmith')
@@ -150,15 +150,30 @@ class Redmine::UiTest::IssuesTest < Redmine::UiTest::Base
end
end
def test_create_issue_start_due_date_default
def test_default_due_date_proposed_in_date_picker
log_user('jsmith', 'jsmith')
visit '/projects/ecookbook/issues/new'
# Future start date: due date should default to start date
fill_in 'Start date', :with => '2027-04-01'
fill_in 'Due date', :with => ''
page.first('p#due_date_area img').click
page.first("td.ui-datepicker-days-cell-over a").click
assert_equal '2027-04-01', page.find('input#issue_due_date').value
# Passed start date: due date should default to today
fill_in 'Start date', :with => '2012-04-01'
fill_in 'Due date', :with => ''
page.first('p#due_date_area img').click
page.first("td.ui-datepicker-days-cell-over a").click
assert_equal '2012-04-01', page.find('input#issue_due_date').value
assert_equal Date.today.to_s, page.find('input#issue_due_date').value
end
def test_default_start_date_proposed_in_date_picker
log_user('jsmith', 'jsmith')
visit '/projects/ecookbook/issues/new'
# Passed due date: start date should default to due date
fill_in 'Start date', :with => ''
fill_in 'Due date', :with => '2012-04-01'
page.first('p#start_date_area img').click