Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adds support for DateTime inputs #41

Merged
merged 1 commit into from
Feb 6, 2015
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions lib/formulaic/form.rb
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ class Form
ATTRIBUTE_INPUT_MAP = {
ActiveSupport::TimeWithZone => Formulaic::Inputs::DateInput,
Date => Formulaic::Inputs::DateInput,
DateTime => Formulaic::Inputs::DateTimeInput,
Array => Formulaic::Inputs::ArrayInput,
String => Formulaic::Inputs::StringInput,
Fixnum => Formulaic::Inputs::StringInput,
Expand Down
1 change: 1 addition & 0 deletions lib/formulaic/inputs.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,6 @@
require 'formulaic/inputs/array_input'
require 'formulaic/inputs/boolean_input'
require 'formulaic/inputs/date_input'
require 'formulaic/inputs/date_time_input'
require 'formulaic/inputs/string_input'
require 'formulaic/inputs/file_input'
18 changes: 18 additions & 0 deletions lib/formulaic/inputs/date_time_input.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
module Formulaic
module Inputs
class DateTimeInput < DateInput
def fill
select_date(value, from: label)
end

private

def select_date(date_time, options)
super
field = find_field(options[:from].to_s)["id"].gsub(/_\di/, "")
select date_time.hour.to_s, from: "#{field}_4i"
select date_time.minute.to_s, from: "#{field}_5i"
end
end
end
end
13 changes: 13 additions & 0 deletions spec/features/fill_in_user_form_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,19 @@
expect(page.find('#user_date_of_birth_3i').value).to eq('2')
end

it 'finds and fills a datetime field' do
visit 'user_form'
form = Formulaic::Form.new(:user, :new, date_of_birth: DateTime.new(1980, 1, 2, 10, 30))

form.fill

expect(page.find('#user_date_of_birth_1i').value).to eq('1980')
expect(page.find('#user_date_of_birth_2i').value).to eq('1')
expect(page.find('#user_date_of_birth_3i').value).to eq('2')
expect(page.find('#user_date_of_birth_4i').value).to eq('10')
expect(page.find('#user_date_of_birth_5i').value).to eq('30')
end

it 'finds and checks a boolean field' do
visit 'user_form'
form = Formulaic::Form.new(:user, :new, terms_of_service: true)
Expand Down
88 changes: 88 additions & 0 deletions spec/fixtures/user_form.html
Original file line number Diff line number Diff line change
Expand Up @@ -199,6 +199,94 @@
<option value="30">30</option>
<option value="31">31</option>
</select>
<select class="date required" id="user_date_of_birth_4i" name="user[date_of_birth(4i)]">
<option value="00">00</option>
<option value="01">01</option>
<option value="02">02</option>
<option value="03">03</option>
<option value="04">04</option>
<option value="05">05</option>
<option value="06">06</option>
<option value="07">07</option>
<option value="08">08</option>
<option value="09">09</option>
<option value="10">10</option>
<option value="11">11</option>
<option value="12" selected="selected">12</option>
<option value="13">13</option>
<option value="14">14</option>
<option value="15">15</option>
<option value="16">16</option>
<option value="17">17</option>
<option value="18">18</option>
<option value="19">19</option>
<option value="20">20</option>
<option value="21">21</option>
<option value="22">22</option>
<option value="23">23</option>
</select>
<select class="date required" id="user_date_of_birth_5i" name="user[date_of_birth(5i)]">
<option value="00">00</option>
<option value="01">01</option>
<option value="02">02</option>
<option value="03">03</option>
<option value="04">04</option>
<option value="05">05</option>
<option value="06">06</option>
<option value="07">07</option>
<option value="08">08</option>
<option value="09">09</option>
<option value="10">10</option>
<option value="11">11</option>
<option value="12">12</option>
<option value="13">13</option>
<option value="14">14</option>
<option value="15">15</option>
<option value="16">16</option>
<option value="17">17</option>
<option value="18">18</option>
<option value="19">19</option>
<option value="20">20</option>
<option value="21">21</option>
<option value="22">22</option>
<option value="23">23</option>
<option value="24">24</option>
<option value="25">25</option>
<option value="26">26</option>
<option value="27">27</option>
<option value="28" selected="selected">28</option>
<option value="29">29</option>
<option value="30">30</option>
<option value="31">31</option>
<option value="32">32</option>
<option value="33">33</option>
<option value="34">34</option>
<option value="35">35</option>
<option value="36">36</option>
<option value="37">37</option>
<option value="38">38</option>
<option value="39">39</option>
<option value="40">40</option>
<option value="41">41</option>
<option value="42">42</option>
<option value="43">43</option>
<option value="44">44</option>
<option value="45">45</option>
<option value="46">46</option>
<option value="47">47</option>
<option value="48">48</option>
<option value="49">49</option>
<option value="50">50</option>
<option value="51">51</option>
<option value="52">52</option>
<option value="53">53</option>
<option value="54">54</option>
<option value="55">55</option>
<option value="56">56</option>
<option value="57">57</option>
<option value="58">58</option>
<option value="59">59</option>
</select>
</div>
<div class="input boolean required user_terms_of_service"><input name="user[terms_of_service]" type="hidden" value="0"><input class="boolean required" id="user_terms_of_service" name="user[terms_of_service]" type="checkbox" value="1"><label class="boolean required" for="user_terms_of_service"><abbr title="required">*</abbr> I agree to the Terms of Service</label></div>
<input name="commit" type="submit" value="Register">
Expand Down