1 files changed, 8 insertions, 2 deletions
diff --git a/spec/features/issues_spec.rb b/spec/features/issues_spec.rb
index b071fe480e6..394eb31aff8 100644
--- a/spec/features/issues_spec.rb
+++ b/spec/features/issues_spec.rb
@@ -619,14 +619,18 @@ describe 'Issues', feature: true do
       end
 
       it 'adds due date to issue' do
+        date = Date.today.at_beginning_of_month + 2.days
+
         page.within '.due_date' do
           click_link 'Edit'
 
           page.within '.ui-datepicker-calendar' do
-            first('.ui-state-default').click
+            click_link date.day
           end
 
-          expect(page).to have_no_content 'None'
+          wait_for_ajax
+
+          expect(find('.value').text).to have_content date.strftime('%b %-d, %Y')
         end
       end
 
@@ -638,6 +642,8 @@ describe 'Issues', feature: true do
             first('.ui-state-default').click
           end
 
+          wait_for_ajax
+
           expect(page).to have_no_content 'No due date'
 
           click_link 'remove due date'