From 9959b1853b3fe8fd4dc1e373569419dfab53ed65 Mon Sep 17 00:00:00 2001 From: Rahul Date: Sat, 9 Mar 2019 00:34:26 +0530 Subject: [PATCH 1/2] Remove picktime Fixes https://github.com/openSUSE/osem/issues/2347 picktime is deprecated so removing it fixes the issue. --- app/assets/javascripts/osem-datepickers.js | 6 ------ 1 file changed, 6 deletions(-) diff --git a/app/assets/javascripts/osem-datepickers.js b/app/assets/javascripts/osem-datepickers.js index 598204ae..5dd2c33c 100644 --- a/app/assets/javascripts/osem-datepickers.js +++ b/app/assets/javascripts/osem-datepickers.js @@ -2,7 +2,6 @@ var today = new Date().toISOString().slice(0, 10); $(function () { $("input[id^='datetimepicker']").datetimepicker({ - pickTime: true, useCurrent: false, sideBySide: true, autoclose: true, @@ -10,14 +9,12 @@ $(function () { }); $('.datetimepicker').datetimepicker({ - pickTime: true, useCurrent: false, sideBySide: true, format: 'YYYY-MM-DD HH:mm' }); $("#registration-arrival-datepicker").datetimepicker({ - pickTime: true, useCurrent: false, minuteStepping: 15, sideBySide: true, @@ -28,7 +25,6 @@ $(function () { }); $("#registration-departure-datepicker").datetimepicker({ - pickTime: true, useCurrent: false, minuteStepping: 15, sideBySide: true, @@ -53,7 +49,6 @@ $(function () { }); $("#conference-start-datepicker").datetimepicker({ - pickTime: false, useCurrent: false, format: "YYYY-MM-DD", // conference-start-day >= Current_date @@ -61,7 +56,6 @@ $(function () { }); $("#conference-end-datepicker").datetimepicker({ - pickTime: false, useCurrent: false, format: "YYYY-MM-DD", }); From 51b6606279bcbc987e5dc1e83eb0c3e07f43cc50 Mon Sep 17 00:00:00 2001 From: Rahul Date: Sat, 9 Mar 2019 01:47:33 +0530 Subject: [PATCH 2/2] Fix test for picktime Fix tests for https://github.com/openSUSE/osem/pull/2391 --- spec/features/conference_spec.rb | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/spec/features/conference_spec.rb b/spec/features/conference_spec.rb index 9810a762..4c2b1438 100644 --- a/spec/features/conference_spec.rb +++ b/spec/features/conference_spec.rb @@ -50,6 +50,14 @@ feature Conference do fill_in 'conference_title', with: 'New Con' fill_in 'conference_short_title', with: '' + day = Time.zone.today + 10 + page + .execute_script("$('#conference-start-datepicker').val('" + + "#{day.strftime('%d/%m/%Y')}')") + page + .execute_script("$('#conference-end-datepicker').val('" + + "#{(day + 7).strftime('%d/%m/%Y')}')") + page.accept_alert do click_button 'Update Conference' end