From c802bd95b9d3e3f970ad248f323de507542c965b Mon Sep 17 00:00:00 2001 From: Rishabh Saxena Date: Wed, 15 Jun 2016 20:46:30 +0530 Subject: [PATCH] change datepicker id to place correct constraints --- app/views/admin/cfps/_form.html.haml | 8 ++++---- spec/features/cfp_spec.rb | 10 +++++----- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/app/views/admin/cfps/_form.html.haml b/app/views/admin/cfps/_form.html.haml index c216c422..57acd091 100644 --- a/app/views/admin/cfps/_form.html.haml +++ b/app/views/admin/cfps/_form.html.haml @@ -4,8 +4,8 @@ %h1 Call for Papers .row .col-md-8 - = semantic_form_for(@cfp, :url => admin_conference_program_cfp_path(@conference.short_title),:html => {:multipart => true}) do |f| - = f.input :start_date, :as => :string, :input_html => { :id => "conference-start-datepicker", :readonly => "readonly" } - = f.input :end_date, :as => :string, :input_html => { :id => "conference-end-datepicker", :readonly => "readonly" } + = semantic_form_for(@cfp, url: admin_conference_program_cfp_path(@conference.short_title),html: {multipart: true}) do |f| + = f.input :start_date, as: :string, input_html: { id: "registration-period-start-datepicker", start_date: @conference.start_date, end_date: @conference.end_date, readonly: "readonly" } + = f.input :end_date, as: :string, input_html: { id: "registration-period-end-datepicker", readonly: "readonly" } %p.text-right - = f.action :submit, :as => :button, :button_html => {:class => "btn btn-primary"} + = f.action :submit, as: :button, button_html: { class: "btn btn-primary" } diff --git a/spec/features/cfp_spec.rb b/spec/features/cfp_spec.rb index 2b81dd61..b7ee2a01 100644 --- a/spec/features/cfp_spec.rb +++ b/spec/features/cfp_spec.rb @@ -22,9 +22,9 @@ feature Conference do today = Date.today - 1 page.execute_script( - "$('#conference-start-datepicker').val('#{today.strftime('%d/%m/%Y')}')") + "$('#registration-period-start-datepicker').val('#{today.strftime('%d/%m/%Y')}')") page.execute_script( - "$('#conference-end-datepicker').val('#{(today + 6).strftime('%d/%m/%Y')}')") + "$('#registration-period-end-datepicker').val('#{(today + 6).strftime('%d/%m/%Y')}')") click_button 'Create Cfp' @@ -47,7 +47,7 @@ feature Conference do # Validate update with empty start date will not saved page.execute_script( - "$('#conference-start-datepicker').val('')") + "$('#registration-period-start-datepicker').val('')") click_button 'Update Cfp' expect(flash). to eq('Updating call for papers failed. ' + @@ -56,9 +56,9 @@ feature Conference do # Fill in date today = Date.today - 9 page.execute_script( - "$('#conference-start-datepicker').val('#{today.strftime('%d/%m/%Y')}')") + "$('#registration-period-start-datepicker').val('#{today.strftime('%d/%m/%Y')}')") page.execute_script( - "$('#conference-end-datepicker').val('#{(today + 14).strftime('%d/%m/%Y')}')") + "$('#registration-period-end-datepicker').val('#{(today + 14).strftime('%d/%m/%Y')}')") click_button 'Update Cfp'