From c77a01815c960bf3f5aaf7c2debad3b63c1dc49d Mon Sep 17 00:00:00 2001 From: Rob Harrington Date: Wed, 21 Mar 2018 12:25:03 +1100 Subject: [PATCH] Copy datepicker directive to utils module Ensures that datepicker is available for subscriptions --- .../admin/utils/directives/date_picker.js.coffee | 9 +++++++++ spec/features/admin/subscriptions_spec.rb | 5 ++++- 2 files changed, 13 insertions(+), 1 deletion(-) create mode 100644 app/assets/javascripts/admin/utils/directives/date_picker.js.coffee diff --git a/app/assets/javascripts/admin/utils/directives/date_picker.js.coffee b/app/assets/javascripts/admin/utils/directives/date_picker.js.coffee new file mode 100644 index 0000000000..c6c8b4fba6 --- /dev/null +++ b/app/assets/javascripts/admin/utils/directives/date_picker.js.coffee @@ -0,0 +1,9 @@ +angular.module("admin.utils").directive "datepicker", -> + require: "ngModel" + link: (scope, element, attrs, ngModel) -> + element.datepicker + dateFormat: "yy-mm-dd" + onSelect: (dateText, inst) -> + scope.$apply (scope) -> + # Fires ngModel.$parsers + ngModel.$setViewValue dateText diff --git a/spec/features/admin/subscriptions_spec.rb b/spec/features/admin/subscriptions_spec.rb index 9bc5377bb6..ad115cbb5a 100644 --- a/spec/features/admin/subscriptions_spec.rb +++ b/spec/features/admin/subscriptions_spec.rb @@ -159,7 +159,10 @@ feature 'Subscriptions' do click_button('Next') expect(page).to have_content 'can\'t be blank', count: 2 expect(page).to have_content 'Oops! Please fill in all of the required fields...' - fill_in 'begins_at', with: Time.zone.today.strftime('%F') + find_field('begins_at').click + within(".ui-datepicker-calendar") do + find('.ui-datepicker-today').click + end select2_select card2_option, from: 'credit_card_id' click_button('Next')