jro_apps/redmine Commit - r14601:9619aa98147c

Merged r14967 to r14969 (#21488)....

Jean-Philippe Lang -

r14601:9619aa98147c

parent child

Context file:

r14601:9619aa98147c

Collapse all files

public/javascripts/application.js +7 -1

                   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;
               }

test/ui/base.rb +5 0

                     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

test/ui/issues_test_ui.rb +18 -3

               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')
                 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

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages