releaf-core 1.1.4 → 1.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f146db6882b2fc3d7df0e83bf19ede7412ddcc16
-  data.tar.gz: 80f33cde890701059860e44c7be419809fc4b2ab
+  metadata.gz: 208fad5bcbaa64e78d3b0881d3efc6504138dcb4
+  data.tar.gz: 0bfd9a1dfc5617558e882595e771de9be5f13e4b
 SHA512:
-  metadata.gz: 65b010d4b06dca9e83012e5078c75e4c61daeb4eea9b45f9887568a044a32d6ad98514097103e9890c916a4d7ec97767fa44a4dbcc535592c7eda89c65fffe40
-  data.tar.gz: dcc3b2485c2c1514e0b12769d1c62dd2666cc2af3de7b621842ffe96e1c13697c4ec8edb96c5a04f771e736fd6d649b9914099559c6e4d487d2d217a76bd58dc
+  metadata.gz: 32621f06c94c10d0eb82dfce9b746141d8c350791f4adb1c4dbb123cba2bcd349445b8b63daf540d39d9eea6f143890187a1ebf0b98cf03199f29620ec0982a1
+  data.tar.gz: a2192cc44b4bb5feda3efa7345e93d8d5e63a191b9143fd20b31aee7e8027b6113dbc2e0728aaca76c2a26ad5903f213284aa96855455522ff1e51e9c9220ae5

data/app/builders/releaf/builders/table_builder.rb

@@ -156,12 +156,13 @@ class Releaf::Builders::TableBuilder
 
   def format_date_content(resource, column)
     value = column_value(resource, column)
-    I18n.l(value, format: :default, default: '%Y-%m-%d') unless value.nil?
+    I18n.l(value, format: :default) unless value.nil?
   end
 
   def format_datetime_content(resource, column)
     value = column_value(resource, column)
-    I18n.l(value, format: :default, default: '%Y-%m-%d %H:%M:%S') unless value.nil?
+    format = Releaf::Builders::Utilities::DateFields.date_or_time_default_format(:datetime)
+    I18n.l(value, format: format) unless value.nil?
   end
 
   def format_association_content(resource, column)

data/app/builders/releaf/builders/utilities/date_fields.rb

@@ -72,7 +72,7 @@ module Releaf::Builders::Utilities
       if type == :time
         value.strftime(default_format)
       else
-        I18n.l(value, default: default_format)
+        I18n.l(value, format: default_format)
       end
     end
 

data/spec/builders/releaf/builders/table_builder_spec.rb

@@ -407,7 +407,7 @@ describe Releaf::Builders::TableBuilder, type: :class do
       allow(subject).to receive(:column_value).with(resource, :birth_date)
         .and_return(value)
 
-      expect(I18n).to receive(:l).with(value, format: :default, default: "%Y-%m-%d")
+      expect(I18n).to receive(:l).with(value, format: :default)
         .and_call_original
 
       expect(subject.format_date_content(resource, :birth_date)).to eq("2012-12-29")
@@ -420,7 +420,7 @@ describe Releaf::Builders::TableBuilder, type: :class do
       allow(subject).to receive(:column_value).with(resource, :created_at)
         .and_return(value)
 
-      allow(I18n).to receive(:l).with(value, format: :default, default: "%Y-%m-%d %H:%M:%S")
+      allow(I18n).to receive(:l).with(value, format: "%Y-%m-%d %H:%M")
         .and_return("2012-12-29 17:12:07")
 
       expect(subject.format_datetime_content(resource, :created_at)).to eq("2012-12-29 17:12:07")

data/spec/builders/releaf/builders/utilities/date_fields_spec.rb

@@ -48,13 +48,13 @@ describe Releaf::Builders::Utilities::DateFields do
 
         allow(described_class).to receive(:date_or_time_default_format).with(:date).and_return("_format_")
         allow(described_class).to receive(:normalize_date_or_time_value).with(value, :date).and_return(time)
-        allow(I18n).to receive(:l).with(time, default: "_format_").and_return("x")
+        allow(I18n).to receive(:l).with(time, format: "_format_").and_return("x")
         expect(described_class.format_date_or_time_value(value, :date)).to eq("x")
 
 
         allow(described_class).to receive(:date_or_time_default_format).with(:datetime).and_return("_format_")
         allow(described_class).to receive(:normalize_date_or_time_value).with(value, :datetime).and_return(time)
-        allow(I18n).to receive(:l).with(time, default: "_format_").and_return("y")
+        allow(I18n).to receive(:l).with(time, format: "_format_").and_return("y")
         expect(described_class.format_date_or_time_value(value, :datetime)).to eq("y")
       end
     end

data/spec/features/edit_actions_spec.rb

@@ -139,4 +139,48 @@ feature "Base controller edit", js: true do
     expect( new_book.chapters.count ).to eq 1
     expect( new_book.chapters.first.title ).to eq "Chapter 1"
   end
+
+  scenario "using datetime picker widget" do
+    visit new_admin_book_path
+
+    create_resource do
+      fill_in "Title", with: "Mustard and Margarine"
+      expect(page).to have_css('.field.type-datetime[data-name="published_at"] input.hasDatepicker')
+      expect(find_field('Published at').value).to eq ''
+      expect(page.document).to have_no_css '#ui-datepicker-div'
+      find('label', text: 'Published at').click
+      within page.document.find('#ui-datepicker-div') do
+        find('.ui-datepicker-month option', text: 'Apr').select_option
+        find('.ui-datepicker-year option', text: '2018').select_option
+        date_cell_selector = '.ui-datepicker-calendar tbody td[data-month="3"][data-year="2018"]'
+        find(date_cell_selector, text: '20').click
+        expect(page).to have_css("#{date_cell_selector}.ui-datepicker-current-day", text: '20')
+
+        find('.ui_tpicker_hour select option', text: '23').select_option
+        find('.ui_tpicker_minute select option', text: '45').select_option
+        expect(page).to have_no_css('.ui_tpicker_second select')
+        expect(page).to have_no_css('.ui_tpicker_millisec select')
+        expect(page).to have_no_css('.ui_tpicker_timezone select')
+        click_on 'Done'
+      end
+      expect(page.document).to have_no_css '#ui-datepicker-div'
+      expect(find_field('Published at').value).to eq '2018-04-20 23:45'
+    end
+
+    visit admin_books_path
+    expect(page).to have_css 'tr', text: /\AMustard and Margarine No 2018-04-20 23:45\z/
+    click_on "Mustard and Margarine"
+    expect(find_field('Published at').value).to eq '2018-04-20 23:45'
+    find('label', text: 'Published at').click
+    within page.document.find('#ui-datepicker-div') do
+      expect(find('select.ui-datepicker-month option:checked').text).to eq 'Apr'
+      expect(find('select.ui-datepicker-year option:checked').text).to eq '2018'
+      expect(page).to have_css('.ui-datepicker-calendar tbody td[data-month="3"][data-year="2018"].ui-datepicker-current-day', text: '20')
+
+      expect(find('.ui_tpicker_hour select option:checked').text).to eq '23'
+      expect(find('.ui_tpicker_minute select option:checked').text).to eq '45'
+    end
+
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: releaf-core
 version: !ruby/object:Gem::Version
-  version: 1.1.4
+  version: 1.1.5
 platform: ruby
 authors:
 - CubeSystems