ui_bibz 2.5.3 → 3.0.0.alpha5

data/test/ui/core/boxes/jumbotron_test.rb

@@ -7,14 +7,14 @@ class JumbotronTest < ActionView::TestCase
 
   test 'jumbotron with full_width' do
     actual   = ui_jumbotron 'state', full_width: true
-    expected = '<div class="jumbotron">state</div>'
+    expected = '<div class="jumbotron bg-light rounded p-4">state</div>'
 
     assert_equal expected, actual
   end
 
   test 'jumbotron' do
     actual   = ui_jumbotron 'state'
-    expected = '<div class="jumbotron">state</div>'
+    expected = '<div class="jumbotron bg-light rounded p-4">state</div>'
 
     assert_equal expected, actual
   end

data/test/ui/core/component_test.rb

@@ -21,7 +21,7 @@ class ComponentTest < ActionView::TestCase
 
   test 'create component without text and glyph' do
     actual = UiBibz::Ui::Core::Component.new('My text', { glyph: 'diamond', text: false }).render
-    expected = '<i class="glyph fas fa-diamond"></i>'
+    expected = '<i class="glyph fas fa-diamond"></i><span class="empty-space"> </span>'
 
     assert_equal expected, actual
   end

data/test/ui/core/forms/buttons/button_group_test.rb

@@ -43,7 +43,7 @@ class ButtonGroupTest < ActionView::TestCase
 
   test 'button group with dropdown' do
     actual = ui_button_group do |bg|
-      bg.dropdown('Dropdown', { type: :dropup, status: :success }, { id: 'dropdown-test' }) do |d|
+      bg.dropdown('Dropdown', { position: :up, status: :success }, { id: 'dropdown-test' }) do |d|
         d.link 'Link 1', url: '#link1', glyph: 'eye'
       end
     end

data/test/ui/core/forms/buttons/button_link_test.rb

@@ -49,7 +49,7 @@ class ButtonLinkTest < ActionView::TestCase
 
   test 'button_link badge' do
     actual   = ui_button_link('state', badge: 2)
-    expected = '<a class="btn-secondary btn" role="button" href="#">state<span class="badge-secondary badge">2</span></a>'
+    expected = '<a class="btn-secondary btn" role="button" href="#">state<span class="bg-secondary badge">2</span></a>'
 
     assert_equal expected, actual
   end

data/test/ui/core/forms/buttons/button_test.rb

@@ -42,7 +42,7 @@ class ButtonTest < ActionView::TestCase
 
   test 'button badge' do
     actual   = ui_button('state', badge: 2)
-    expected = '<button class="btn-secondary btn">state<span class="badge-secondary badge">2</span></button>'
+    expected = '<button class="btn-secondary btn">state<span class="bg-secondary badge">2</span></button>'
 
     assert_equal expected, actual
   end
@@ -77,7 +77,7 @@ class ButtonTest < ActionView::TestCase
 
   test 'button glyph without text' do
     actual   = ui_button('state', glyph: 'diamond', text: false)
-    expected = '<button class="btn-secondary btn without-text"><i class="glyph fas fa-diamond"></i></button>'
+    expected = '<button class="btn-secondary btn without-text"><i class="glyph fas fa-diamond"></i><span class="empty-space"> </span></button>'
 
     assert_equal expected, actual
   end

data/test/ui/core/forms/choices/checkbox_field_test.rb

@@ -5,7 +5,14 @@ require 'test_helper'
 class CheckboxFieldTest < ActionView::TestCase
   test 'checkbox_field' do
     actual = UiBibz::Ui::Core::Forms::Choices::CheckboxField.new('John', { value: 1 }).render
-    expected = '<div class="custom-control custom-checkbox"><input type="hidden" name="John" id="John-hidden" value="0" /><input type="checkbox" name="John" id="John" value="1" class="custom-control-input" /><label class="custom-control-label" for="John">John</label></div>'
+    expected = "<div class=\"form-check\"><input type=\"checkbox\" name=\"John\" id=\"John\" value=\"1\" class=\"form-check-input\" /><label class=\"form-check-label\" for=\"John\">John</label></div>"
+
+    assert_equal expected, actual
+  end
+
+  test 'checkbox_field which is a boolean' do
+    actual = UiBibz::Ui::Core::Forms::Choices::CheckboxField.new('John', { boolean: true, value: 1 }).render
+    expected = "<div class=\"form-check\"><input type=\"hidden\" name=\"John\" id=\"John-hidden\" value=\"0\" /><input type=\"checkbox\" name=\"John\" id=\"John\" value=\"1\" class=\"form-check-input\" /><label class=\"form-check-label\" for=\"John\">John</label></div>"
 
     assert_equal expected, actual
   end

data/test/ui/core/forms/choices/choice_group_test.rb

@@ -6,32 +6,34 @@ class ChoiceGroupTest < ActionView::TestCase
   include UiBibz::Helpers::Ui::CoreHelper
 
   test 'Choice group checkbox' do
-    actual = ui_choice_group do |bc|
+    actual = UiBibz::Ui::Core::Forms::Choices::ChoiceGroup.new.tap do |bc|
       bc.choice 'Checkbox 1'
       bc.choice 'Checkbox 2', state: :active
     end
-    expected = '<div data-toggle="buttons" class="btn-group button-choice btn-group-toggle"><label class="btn-secondary btn checkbox"><input type="checkbox" autocomplete="off" />Checkbox 1</label><label class="active btn-secondary btn checkbox" aria-pressed="true"><input type="checkbox" autocomplete="off" checked="checked" />Checkbox 2</label></div>'
 
-    assert_equal expected, actual
+    expected = "<div data-toggle=\"buttons\" class=\"btn-group button-choice btn-group-toggle\"><input type=\"checkbox\" autocomplete=\"off\" class=\"btn-check\" id=\"#{actual.items.first.input_options[:id]}\" /><label class=\"btn-secondary btn checkbox\" for=\"#{actual.items.first.input_options[:id]}\">Checkbox 1</label><input type=\"checkbox\" autocomplete=\"off\" class=\"btn-check\" checked=\"checked\" id=\"#{actual.items.last.input_options[:id]}\" /><label class=\"active btn-secondary btn checkbox\" aria-pressed=\"true\" for=\"#{actual.items.last.input_options[:id]}\">Checkbox 2</label></div>"
+
+    assert_equal expected, actual.render
   end
 
   test 'Choice group radio' do
-    actual = ui_choice_group type: :radio do |bc|
+    actual = UiBibz::Ui::Core::Forms::Choices::ChoiceGroup.new(type: :radio).tap do |bc|
       bc.choice 'Radio 1'
       bc.choice 'Radio 2', state: :active
     end
-    expected = '<div data-toggle="buttons" class="btn-group button-choice btn-group-toggle"><label class="btn-secondary btn radio"><input type="radio" autocomplete="off" />Radio 1</label><label class="active btn-secondary btn radio" aria-pressed="true"><input type="radio" autocomplete="off" checked="checked" />Radio 2</label></div>'
 
-    assert_equal expected, actual
+    expected = "<div data-toggle=\"buttons\" class=\"btn-group button-choice btn-group-toggle\"><input type=\"radio\" autocomplete=\"off\" class=\"btn-check\" name=\"#{actual.items.first.input_options[:name]}\" id=\"#{actual.items.first.input_options[:id]}\" /><label class=\"btn-secondary btn radio\" for=\"#{actual.items.first.input_options[:id]}\">Radio 1</label><input type=\"radio\" autocomplete=\"off\" class=\"btn-check\" checked=\"checked\" name=\"#{actual.items.last.input_options[:name]}\" id=\"#{actual.items.last.input_options[:id]}\" /><label class=\"active btn-secondary btn radio\" aria-pressed=\"true\" for=\"#{actual.items.last.input_options[:id]}\">Radio 2</label></div>"
+
+    assert_equal expected, actual.render
   end
 
   test 'Choice group options' do
-    actual = ui_choice_group size: :lg, outline: true, type: :radio do |bc|
+    actual = UiBibz::Ui::Core::Forms::Choices::ChoiceGroup.new(size: :lg, outline: true, type: :radio).tap do |bc|
       bc.choice 'Radio 1', glyph: 'diamond', status: :primary
       bc.choice 'Radio 2', state: :active
     end
-    expected = '<div data-toggle="buttons" class="btn-group btn-group-lg button-choice btn-group-toggle"><label class="btn-outline-primary btn btn-lg radio"><input type="radio" autocomplete="off" /><i class="glyph fas fa-diamond"></i>  Radio 1</label><label class="active btn-outline-secondary btn btn-lg radio" aria-pressed="true"><input type="radio" autocomplete="off" checked="checked" />Radio 2</label></div>'
+    expected = "<div data-toggle=\"buttons\" class=\"btn-group btn-group-lg button-choice btn-group-toggle\"><input type=\"radio\" autocomplete=\"off\" class=\"btn-check\" name=\"#{actual.items.first.input_options[:name]}\" id=\"#{actual.items.first.input_options[:id]}\" /><label class=\"btn-outline-primary btn btn-lg radio\" for=\"#{actual.items.first.input_options[:id]}\"><i class=\"glyph fas fa-diamond\"></i>  Radio 1</label><input type=\"radio\" autocomplete=\"off\" class=\"btn-check\" checked=\"checked\" name=\"#{actual.items.last.input_options[:name]}\" id=\"#{actual.items.last.input_options[:id]}\" /><label class=\"active btn-outline-secondary btn btn-lg radio\" aria-pressed=\"true\" for=\"#{actual.items.last.input_options[:id]}\">Radio 2</label></div>"
 
-    assert_equal expected, actual
+    assert_equal expected, actual.render
   end
 end

data/test/ui/core/forms/choices/radio_field_test.rb

@@ -5,7 +5,7 @@ require 'test_helper'
 class RadioFieldTest < ActionView::TestCase
   test 'radio_field' do
     actual = UiBibz::Ui::Core::Forms::Choices::RadioField.new('John', { value: 1, status: :primary, type: :square }).render
-    expected = '<div class="custom-control custom-radio"><input type="radio" name="John" id="John_1" value="1" class="custom-control-input" /><label class="custom-control-label" for="John_1">John</label></div>'
+    expected = "<div class=\"form-check\"><input type=\"radio\" name=\"John\" id=\"John_1\" value=\"1\" class=\"form-check-input\" /><label class=\"form-check-label\" for=\"John_1\">John</label></div>"
 
     assert_equal expected, actual
   end

data/test/ui/core/forms/dates/date_picker_field_test.rb

@@ -5,7 +5,7 @@ require 'test_helper'
 class DatePickerFieldTest < ActionView::TestCase
   test 'Date Picker Field' do
     actual   = UiBibz::Ui::Core::Forms::Dates::DatePickerField.new(%w[date_1 date_2], { append: 'a', prepend: 'b', range: 'u' }, { class: 'datepicker-test' }).render
-    expected = '<div class="input-daterange input-group ui_surround_field"><span class="input-group-addon">a</span><input type="text" name="date_1" id="date_1" class="datepicker-test date_picker form-control" data-date-locale="en" data-provide="datepicker" data-date-format="yyyy-mm-dd" data-date-today-btn="linked" data-date-toggle-active="true" /><span class="input-group-addon">u</span><input type="text" name="date_2" id="date_2" class="datepicker-test date_picker form-control" data-date-locale="en" data-provide="datepicker" data-date-format="yyyy-mm-dd" data-date-today-btn="linked" data-date-toggle-active="true" /><span class="input-group-addon">b</span></div>'
+    expected = '<div class="input-daterange input-group ui_surround_field"><span class="input-group-text">a</span><input type="text" name="date_1" id="date_1" class="datepicker-test date_picker form-control" data-date-locale="en" data-provide="datepicker" data-date-format="yyyy-mm-dd" data-date-today-btn="linked" data-date-toggle-active="true" /><span class="input-group-text">u</span><input type="text" name="date_2" id="date_2" class="datepicker-test date_picker form-control" data-date-locale="en" data-provide="datepicker" data-date-format="yyyy-mm-dd" data-date-today-btn="linked" data-date-toggle-active="true" /><span class="input-group-text">b</span></div>'
 
     assert_equal expected, actual
   end

data/test/ui/core/forms/dropdowns/dropdown_test.rb

@@ -32,14 +32,14 @@ class DropdownTest < ActionView::TestCase
   end
 
   test 'Dropdown options' do
-    actual = UiBibz::Ui::Core::Forms::Dropdowns::Dropdown.new('Dropdown', type: :dropup, status: :success, glyph: 'diamond').tap do |d|
+    actual = UiBibz::Ui::Core::Forms::Dropdowns::Dropdown.new('Dropdown', position: :up, alignement: :right, status: :success, glyph: 'diamond').tap do |d|
       d.link 'Link 1', url: '#link1', glyph: 'eye'
       d.header 'header'
       d.link 'Link 2', url: '#link2'
       d.divider
       d.link 'Link3', url: '#link3'
     end
-    expected = "<div class=\"dropup\"><button class=\"btn btn-success dropdown-toggle\" type=\"button\" data-toggle=\"dropdown\" aria-haspopup=\"true\" aria-expanded=\"false\" id=\"#{actual.id}\"><i class=\"glyph fas fa-diamond\"></i>  Dropdown</button><div class=\"dropdown-menu\" arial-labelledby=\"#{actual.id}\"><a class=\"dropdown-item\" href=\"#link1\"><i class=\"glyph fas fa-eye\"></i>  Link 1</a><h6 class=\"dropdown-header\" role=\"presentation\">header</h6><a class=\"dropdown-item\" href=\"#link2\">Link 2</a><div class=\"dropdown-divider\"></div><a class=\"dropdown-item\" href=\"#link3\">Link3</a></div></div>"
+    expected = "<div class=\"dropup btn-group\"><button class=\"btn btn-success dropdown-toggle\" type=\"button\" data-toggle=\"dropdown\" aria-haspopup=\"true\" aria-expanded=\"false\" id=\"#{actual.id}\"><i class=\"glyph fas fa-diamond\"></i>  Dropdown</button><div class=\"dropdown-menu dropdown-menu-right\" arial-labelledby=\"#{actual.id}\"><a class=\"dropdown-item\" href=\"#link1\"><i class=\"glyph fas fa-eye\"></i>  Link 1</a><h6 class=\"dropdown-header\" role=\"presentation\">header</h6><a class=\"dropdown-item\" href=\"#link2\">Link 2</a><div class=\"dropdown-divider\"></div><a class=\"dropdown-item\" href=\"#link3\">Link3</a></div></div>"
 
     assert_equal expected, actual.render
   end

data/test/ui/core/forms/files/file_field_test.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+require 'test_helper'
+
+class FileFieldTest < ActionView::TestCase
+  test 'file_field' do
+    actual = UiBibz::Ui::Core::Forms::Files::FileField.new('test').render
+    expected = "<div class=\"form-file\"><input type=\"file\" name=\"test\" id=\"test\" class=\"form-file-input\" /><label class=\"form-file-label\" for=\"test\"><span class=\"form-file-text\"></span><span class=\"form-file-button\">Browse</span></label></div>"
+
+    assert_equal expected, actual
+  end
+end

data/test/ui/core/forms/numbers/formula_field_test.rb

@@ -5,7 +5,7 @@ require 'test_helper'
 class FormulaFieldTest < ActionView::TestCase
   test 'formula_field' do
     actual = UiBibz::Ui::Core::Forms::Numbers::FormulaField.new('value').render
-    expected = '<div class="formula_field input-group ui_surround_field"><input type="text" name="value_formula" id="value_formula" class="formula-field form-control" /><span class="formula-field-sign input-group-addon">=</span><input type="text" name="value" id="value" class="formula-field-result form-control" readonly="readonly" /><span data-toggle="tooltip" class="formula-field-alert input-group-addon"><i class="glyph-danger glyph fas fa-exclamation-triangle"></i></span></div>'
+    expected = '<div class="formula_field input-group ui_surround_field"><input type="text" name="value_formula" id="value_formula" class="formula-field form-control" /><span class="formula-field-sign input-group-text">=</span><input type="text" name="value" id="value" class="formula-field-result form-control" readonly="readonly" /><span data-toggle="tooltip" class="formula-field-alert input-group-text"><i class="glyph-danger glyph fas fa-exclamation-triangle"></i></span></div>'
 
     assert_equal expected, actual
   end

data/test/ui/core/forms/numbers/range_field_test.rb

@@ -5,15 +5,36 @@ require 'test_helper'
 class RangeFieldTest < ActionView::TestCase
   test 'range_field' do
     actual = UiBibz::Ui::Core::Forms::Numbers::RangeField.new('myrange').render
-    expected = '<input type="range" name="myrange" id="myrange" class="custom-range" />'
+    expected = '<input type="range" name="myrange" id="myrange" class="form-range" />'
 
     assert_equal expected, actual
   end
 
   test 'range_field with options' do
     actual = UiBibz::Ui::Core::Forms::Numbers::RangeField.new('myrange', value: 5, min: -9, max: 6, step: 0.2).render
-    expected = '<input type="range" name="myrange" id="myrange" value="5" class="custom-range" min="-9" max="6" step="0.2" />'
+    expected = '<input type="range" name="myrange" id="myrange" value="5" class="form-range" min="-9" max="6" step="0.2" />'
 
     assert_equal expected, actual
   end
+
+  test 'range_field with in option' do
+    actual = UiBibz::Ui::Core::Forms::Numbers::RangeField.new('myrange', value: 5, in: (0..10)).render
+    expected = "<input type=\"range\" name=\"myrange\" id=\"myrange\" value=\"5\" class=\"form-range\" min=\"0\" max=\"10\" />"
+
+    assert_equal expected, actual
+  end
+
+  test 'range_field with within option' do
+    actual = UiBibz::Ui::Core::Forms::Numbers::RangeField.new('myrange', value: 2, within: (-2..4)).render
+    expected = "<input type=\"range\" name=\"myrange\" id=\"myrange\" value=\"2\" class=\"form-range\" min=\"-2\" max=\"4\" />"
+
+    assert_equal expected, actual
+  end
+
+  test 'range_field with tick' do
+    actual = UiBibz::Ui::Core::Forms::Numbers::RangeField.new('myrange', value: 2, max: 3, tick: true)
+    expected = "<input type=\"range\" name=\"myrange\" id=\"myrange\" value=\"2\" class=\"form-range\" max=\"3\" list=\"#{actual.html_id}-list\" /><datalist id=\"#{actual.html_id}-list\"><option value=\"0\" label=\"0\">0</option><option value=\"1\"></option><option value=\"2\" label=\"2\">2</option><option value=\"3\" label=\"3\">3</option></datalist>"
+
+    assert_equal expected, actual.render
+  end
 end

data/test/ui/core/forms/numbers/slider_field_test.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+require 'test_helper'
+
+class SliderFieldTest < ActionView::TestCase
+  test 'slider field' do
+    actual = UiBibz::Ui::Core::Forms::Numbers::SliderField.new('myrange').render
+    expected = "<div class=\"slider\"><div><div class=\"slider-inverse-left\" style=\"width: 100%\"></div><div class=\"slider-inverse-right\" style=\"width: 100%\"></div><div class=\"slider-range\" style=\"left: 0%; right: 0%\"></div><div class=\"slider-thumb slider-thumb-left\" style=\"left: 0%\"></div><div class=\"slider-thumb slider-thumb-right\" style=\"left: 100%\"></div></div><input type=\"range\" name=\"myrange_min\" id=\"myrange_min\" value=\"0\" max=\"100\" min=\"0\" step=\"1\" /><input type=\"range\" name=\"myrange_max\" id=\"myrange_max\" value=\"100\" max=\"100\" min=\"0\" step=\"1\" /></div>"
+
+    assert_equal expected, actual
+  end
+
+  test 'slider field with options' do
+    actual = UiBibz::Ui::Core::Forms::Numbers::SliderField.new('myrange', thumb_max: 2, thumb_min: -7, min: -9, max: 6, step: 2, input_name_max: "price_max", input_name_min: "price_min").render
+    expected = "<div class=\"slider\" min=\"-9\" max=\"6\" step=\"2\"><div><div class=\"slider-inverse-left\" style=\"width: 100%\"></div><div class=\"slider-inverse-right\" style=\"width: 100%\"></div><div class=\"slider-range\" style=\"left: 13%; right: 26%\"></div><div class=\"slider-thumb slider-thumb-left\" style=\"left: 13%\"></div><div class=\"slider-thumb slider-thumb-right\" style=\"left: 74%\"></div></div><input type=\"range\" name=\"price_min\" id=\"price_min\" value=\"-7\" max=\"6\" min=\"-9\" step=\"2\" /><input type=\"range\" name=\"price_max\" id=\"price_max\" value=\"2\" max=\"6\" min=\"-9\" step=\"2\" /></div>"
+
+    assert_equal expected, actual
+  end
+
+  test 'slider header' do
+    actual = UiBibz::Ui::Core::Forms::Numbers::SliderHeader.new(nil, target: "test", thumb_min: -7, thumb_max: 2, label_min: "min", label_max: "max").render
+    expected = "<div data-target=\"test\" class=\"slider-header\"><div class=\"slider-header-min\"><label>min</label><span>-7</span></div><div class=\"slider-header-max\"><label>max</label><span>2</span></div></div>"
+
+    assert_equal expected, actual
+  end
+end

data/test/ui/core/forms/selects/multi_column_field_test.rb

@@ -4,7 +4,7 @@ require 'test_helper'
 
 class MultiColumnFieldTest < ActionView::TestCase
   test 'Multi Column Field' do
-    options  = options_for_select(2.times.map { |i| "option #{i}" })
+    options  = options_for_select(Array.new(2) { |i| "option #{i}" })
     actual   = UiBibz::Ui::Core::Forms::Selects::MultiColumnField.new('example', option_tags: options).render
     expected = "<select name=\"example[]\" id=\"example\" class=\"multi-column-field\" multiple=\"multiple\"><option value=\"option 0\">option 0</option>
 <option value=\"option 1\">option 1</option></select>"

data/test/ui/core/forms/selects/multi_select_field_test.rb

@@ -2,10 +2,10 @@
 
 require 'test_helper'
 
-class MultiSelectFieldTest < ActionView::TestCase
+class DropdownSelectFieldTest < ActionView::TestCase
   test 'Multi Select Field' do
-    options  = options_for_select(2.times.map { |i| "option #{i}" })
-    actual   = UiBibz::Ui::Core::Forms::Selects::MultiSelectField.new('example', option_tags: options).render
+    options  = options_for_select(Array.new(2) { |i| "option #{i}" })
+    actual   = UiBibz::Ui::Core::Forms::Selects::DropdownSelectField.new('example', multiple: true, option_tags: options).render
     expected = "<select name=\"example[]\" id=\"example\" class=\"btn-secondary multi-select-field\" multiple=\"multiple\"><option value=\"option 0\">option 0</option>
 <option value=\"option 1\">option 1</option></select>"
 
@@ -14,8 +14,8 @@ class MultiSelectFieldTest < ActionView::TestCase
 
   test 'Multi Select Field data html options' do
     grouped_options = { 'North America' => [['United statuss', 'US'], 'Canada'], 'Europe' => %w[Denmark Germany France] }
-    actual = UiBibz::Ui::Core::Forms::Selects::MultiSelectField.new('example', { option_tags: grouped_options_for_select(grouped_options), clickable_opt_group: true, collapsible_opt_group: true, searchable: true, select_all_options: true, number_displayed: 2, status: :danger }).render
-    expected = "<select name=\"example[]\" id=\"example\" data-enable-clickable-opt-groups=\"true\" data-enable-collapsible-opt-groups=\"true\" data-enable-filtering=\"true\" data-include-select-all-option=\"true\" data-number-displayed=\"true\" class=\"btn-danger btn-secondary multi-select-field\" multiple=\"multiple\"><optgroup label=\"North America\"><option value=\"US\">United statuss</option>
+    actual = UiBibz::Ui::Core::Forms::Selects::DropdownSelectField.new('example', { multiple: true, option_tags: grouped_options_for_select(grouped_options), clickable_opt_group: true, collapsible_opt_group: true, searchable: true, select_all_options: true, number_displayed: 2, status: :danger }).render
+    expected = "<select name=\"example[]\" id=\"example\" data-enable-clickable-opt-groups=\"true\" data-enable-collapsible-opt-groups=\"true\" data-enable-filtering=\"true\" data-include-select-all-option=\"true\" data-number-displayed=\"true\" class=\"btn-danger multi-select-field\" multiple=\"multiple\"><optgroup label=\"North America\"><option value=\"US\">United statuss</option>
 <option value=\"Canada\">Canada</option></optgroup><optgroup label=\"Europe\"><option value=\"Denmark\">Denmark</option>
 <option value=\"Germany\">Germany</option>
 <option value=\"France\">France</option></optgroup></select>"
@@ -24,8 +24,8 @@ class MultiSelectFieldTest < ActionView::TestCase
   end
 
   test 'Multi select Field refresh option' do
-    actual = UiBibz::Ui::Core::Forms::Selects::MultiSelectField.new('test', { refresh: { target: { url: '/' } } }).render
-    expected = '<div class="field-refresh input-group ui_surround_field"><select name="test[]" id="test" class="btn-secondary multi-select-field" multiple="multiple"></select><div class="input-group-btn"><span data-connect="{&quot;events&quot;:&quot;click&quot;,&quot;mode&quot;:&quot;remote&quot;,&quot;target&quot;:{&quot;selector&quot;:&quot;#test&quot;,&quot;url&quot;:&quot;/&quot;,&quot;data&quot;:[]}}" class="btn-secondary ui-bibz-connect btn input-refresh-button"><i class="glyph fas fa-sync-alt"></i> </span></div></div>'
+    actual = UiBibz::Ui::Core::Forms::Selects::DropdownSelectField.new('test', { multiple: true, refresh: { target: { url: '/' } } }).render
+    expected = '<div class="field-refresh input-group ui_surround_field"><select name="test[]" id="test" class="btn-secondary multi-select-field" multiple="multiple"></select><span data-connect="{&quot;events&quot;:&quot;click&quot;,&quot;mode&quot;:&quot;remote&quot;,&quot;target&quot;:{&quot;selector&quot;:&quot;#test&quot;,&quot;url&quot;:&quot;/&quot;,&quot;data&quot;:[]}}" class="btn-secondary ui-bibz-connect btn input-refresh-button"><i class="glyph fas fa-sync-alt"></i> </span></div>'
 
     assert_equal expected, actual
   end

data/test/ui/core/forms/selects/select_field_test.rb

@@ -4,9 +4,9 @@ require 'test_helper'
 
 class SelectFieldTest < ActionView::TestCase
   test 'Select Field' do
-    options  = options_for_select(2.times.map { |i| "option #{i}" })
+    options  = options_for_select(Array.new(2) { |i| "option #{i}" })
     actual   = UiBibz::Ui::Core::Forms::Selects::SelectField.new('example', option_tags: options).render
-    expected = "<select name=\"example\" id=\"example\" class=\"select-field form-control custom-select\"><option value=\"option 0\">option 0</option>
+    expected = "<select name=\"example\" id=\"example\" class=\"select-field form-control form-select\"><option value=\"option 0\">option 0</option>
 <option value=\"option 1\">option 1</option></select>"
 
     assert_equal expected, actual
@@ -14,7 +14,7 @@ class SelectFieldTest < ActionView::TestCase
 
   test 'Select Field refresh' do
     actual   = UiBibz::Ui::Core::Forms::Selects::SelectField.new('example', refresh: { target: { url: '/' } }).render
-    expected = '<div class="field-refresh input-group ui_surround_field"><select name="example" id="example" class="select-field form-control custom-select"></select><div class="input-group-btn"><span data-connect="{&quot;events&quot;:&quot;click&quot;,&quot;mode&quot;:&quot;remote&quot;,&quot;target&quot;:{&quot;selector&quot;:&quot;#example&quot;,&quot;url&quot;:&quot;/&quot;,&quot;data&quot;:[]}}" class="btn-secondary ui-bibz-connect btn input-refresh-button"><i class="glyph fas fa-sync-alt"></i> </span></div></div>'
+    expected = '<div class="field-refresh input-group ui_surround_field"><select name="example" id="example" class="select-field form-control form-select"></select><span data-connect="{&quot;events&quot;:&quot;click&quot;,&quot;mode&quot;:&quot;remote&quot;,&quot;target&quot;:{&quot;selector&quot;:&quot;#example&quot;,&quot;url&quot;:&quot;/&quot;,&quot;data&quot;:[]}}" class="btn-secondary ui-bibz-connect btn input-refresh-button"><i class="glyph fas fa-sync-alt"></i> </span></div>'
 
     assert_equal expected, actual
   end

data/test/ui/core/forms/surrounds/surround_field_test.rb

@@ -7,7 +7,7 @@ class SurroundFieldTest < ActionView::TestCase
     actual = UiBibz::Ui::Core::Forms::Surrounds::SurroundField.new.tap do |sf|
       sf.glyph 'pencil'
     end.render
-    expected = '<div class="input-group ui_surround_field"><span class="input-group-addon"><i class="glyph fas fa-pencil"></i></span></div>'
+    expected = '<div class="input-group ui_surround_field"><span class="input-group-text"><i class="glyph fas fa-pencil"></i></span></div>'
 
     assert_equal expected, actual
   end
@@ -16,7 +16,7 @@ class SurroundFieldTest < ActionView::TestCase
     actual = UiBibz::Ui::Core::Forms::Surrounds::SurroundField.new.tap do |sf|
       sf.addon 'content addon'
     end.render
-    expected = '<div class="input-group ui_surround_field"><span class="input-group-addon">content addon</span></div>'
+    expected = '<div class="input-group ui_surround_field"><span class="input-group-text">content addon</span></div>'
 
     assert_equal expected, actual
   end
@@ -51,7 +51,19 @@ class SurroundFieldTest < ActionView::TestCase
       sf.addon '€'
       sf.glyph 'pencil'
     end.render
-    expected = '<div class="input-group ui_surround_field"><div class="input-group-btn"><button class="btn-secondary btn">Submit</button></div><span class="input-group-addon">€</span><span class="input-group-addon"><i class="glyph fas fa-pencil"></i></span></div>'
+    expected = '<div class="input-group ui_surround_field"><div class="input-group-btn"><button class="btn-secondary btn">Submit</button></div><span class="input-group-text">€</span><span class="input-group-text"><i class="glyph fas fa-pencil"></i></span></div>'
+
+    assert_equal expected, actual
+  end
+
+  test 'surround_field with html' do
+    actual = UiBibz::Ui::Core::Forms::Surrounds::SurroundField.new.tap do |sf|
+      sf.html 'Content'
+      sf.html do
+        " Content 2"
+      end
+    end.render
+    expected = "<div class=\"input-group ui_surround_field\">Content Content 2</div>"
 
     assert_equal expected, actual
   end

data/test/ui/core/forms/textareas/markdown_editor_field_test.rb

@@ -5,7 +5,7 @@ require 'test_helper'
 class MarkdownEditorFieldTest < ActionView::TestCase
   test 'markdown_editor' do
     actual = UiBibz::Ui::Core::Forms::Textareas::MarkdownEditorField.new('comments').render
-    expected = "<textarea name=\"comments\" id=\"comments\" data-provide=\"markdown\" data-iconlibrary=\"fa-5\">
+    expected = "<textarea name=\"comments\" id=\"comments\" data-provide=\"markdown\" data-iconlibrary=\"fa\">
 </textarea>"
 
     assert_equal expected, actual

data/test/ui/core/forms/texts/auto_complete_field_test.rb

@@ -4,7 +4,7 @@ require 'test_helper'
 
 class AutoCompleteFieldTest < ActionView::TestCase
   test 'auto_complete_field' do
-    options = options_for_select(2.times.map { |i| "option #{i}" })
+    options = options_for_select(Array.new(2) { |i| "option #{i}" })
     actual = UiBibz::Ui::Core::Forms::Texts::AutoCompleteField.new('test', { option_tags: options }, { id: 'test' }).render
     expected = "<input type=\"text\" name=\"test\" id=\"test\" class=\"form-control auto-complete-field\" autocomplete=\"true\" list=\"test-datalist\" /><datalist id=\"test-datalist\"><option value=\"option 0\">option 0</option>
 <option value=\"option 1\">option 1</option></datalist>"
@@ -13,28 +13,28 @@ class AutoCompleteFieldTest < ActionView::TestCase
   end
 
   test 'auto_complete_field with refresh button' do
-    options = options_for_select(2.times.map { |i| "option #{i}" })
+    options = options_for_select(Array.new(2) { |i| "option #{i}" })
     actual = UiBibz::Ui::Core::Forms::Texts::AutoCompleteField.new('test', { option_tags: options, refresh: { target: { url: '/' } } }, { id: 'test' }).render
     expected = "<div class=\"field-refresh input-group ui_surround_field\"><input type=\"text\" name=\"test\" id=\"test\" class=\"form-control auto-complete-field\" autocomplete=\"true\" list=\"test-datalist\" /><datalist id=\"test-datalist\"><option value=\"option 0\">option 0</option>
-<option value=\"option 1\">option 1</option></datalist><div class=\"input-group-btn\"><span data-connect=\"{&quot;events&quot;:&quot;click&quot;,&quot;mode&quot;:&quot;remote&quot;,&quot;target&quot;:{&quot;selector&quot;:&quot;#test-datalist&quot;,&quot;url&quot;:&quot;/&quot;,&quot;data&quot;:[]}}\" class=\"btn-secondary ui-bibz-connect btn input-refresh-button\"><i class=\"glyph fas fa-sync-alt\"></i> </span></div></div>"
+<option value=\"option 1\">option 1</option></datalist><span data-connect=\"{&quot;events&quot;:&quot;click&quot;,&quot;mode&quot;:&quot;remote&quot;,&quot;target&quot;:{&quot;selector&quot;:&quot;#test-datalist&quot;,&quot;url&quot;:&quot;/&quot;,&quot;data&quot;:[]}}\" class=\"btn-secondary ui-bibz-connect btn input-refresh-button\"><i class=\"glyph fas fa-sync-alt\"></i> </span></div>"
 
     assert_equal expected, actual
   end
 
   test 'auto_complete_field with refresh button and append content' do
-    options = options_for_select(2.times.map { |i| "option #{i}" })
+    options = options_for_select(Array.new(2) { |i| "option #{i}" })
     actual = UiBibz::Ui::Core::Forms::Texts::AutoCompleteField.new('test', { option_tags: options, append: 'Append content', refresh: { target: { url: '/' } } }, { id: 'test' }).render
-    expected = "<div class=\"field-refresh input-group ui_surround_field\"><span class=\"input-group-addon\">Append content</span><input type=\"text\" name=\"test\" id=\"test\" class=\"form-control auto-complete-field\" autocomplete=\"true\" list=\"test-datalist\" /><datalist id=\"test-datalist\"><option value=\"option 0\">option 0</option>
-<option value=\"option 1\">option 1</option></datalist><div class=\"input-group-btn\"><span data-connect=\"{&quot;events&quot;:&quot;click&quot;,&quot;mode&quot;:&quot;remote&quot;,&quot;target&quot;:{&quot;selector&quot;:&quot;#test-datalist&quot;,&quot;url&quot;:&quot;/&quot;,&quot;data&quot;:[]}}\" class=\"btn-secondary ui-bibz-connect btn input-refresh-button\"><i class=\"glyph fas fa-sync-alt\"></i> </span></div></div>"
+    expected = "<div class=\"field-refresh input-group ui_surround_field\"><span class=\"input-group-text\">Append content</span><input type=\"text\" name=\"test\" id=\"test\" class=\"form-control auto-complete-field\" autocomplete=\"true\" list=\"test-datalist\" /><datalist id=\"test-datalist\"><option value=\"option 0\">option 0</option>
+<option value=\"option 1\">option 1</option></datalist><span data-connect=\"{&quot;events&quot;:&quot;click&quot;,&quot;mode&quot;:&quot;remote&quot;,&quot;target&quot;:{&quot;selector&quot;:&quot;#test-datalist&quot;,&quot;url&quot;:&quot;/&quot;,&quot;data&quot;:[]}}\" class=\"btn-secondary ui-bibz-connect btn input-refresh-button\"><i class=\"glyph fas fa-sync-alt\"></i> </span></div>"
 
     assert_equal expected, actual
   end
 
   test 'auto_complete_field with prepend content' do
-    options = options_for_select(2.times.map { |i| "option #{i}" })
+    options = options_for_select(Array.new(2) { |i| "option #{i}" })
     actual = UiBibz::Ui::Core::Forms::Texts::AutoCompleteField.new('test', { option_tags: options, prepend: 'Append content' }, { id: 'test' }).render
     expected = "<div class=\"input-group ui_surround_field\"><input type=\"text\" name=\"test\" id=\"test\" class=\"form-control auto-complete-field\" autocomplete=\"true\" list=\"test-datalist\" /><datalist id=\"test-datalist\"><option value=\"option 0\">option 0</option>
-<option value=\"option 1\">option 1</option></datalist><span class=\"input-group-addon\">Append content</span></div>"
+<option value=\"option 1\">option 1</option></datalist><span class=\"input-group-text\">Append content</span></div>"
 
     assert_equal expected, actual
   end

data/test/ui/core/forms/texts/text_field_test.rb

@@ -12,14 +12,14 @@ class TextFieldTest < ActionView::TestCase
 
   test 'text_field with prepend and append' do
     actual = UiBibz::Ui::Core::Forms::Texts::TextField.new('test', append: '1', prepend: '2').render
-    expected = '<div class="input-group ui_surround_field"><span class="input-group-addon">1</span><input type="text" name="test" id="test" class="form-control" /><span class="input-group-addon">2</span></div>'
+    expected = '<div class="input-group ui_surround_field"><span class="input-group-text">1</span><input type="text" name="test" id="test" class="form-control" /><span class="input-group-text">2</span></div>'
 
     assert_equal expected, actual
   end
 
   test 'text_field size' do
     actual = UiBibz::Ui::Core::Forms::Texts::TextField.new('test', size: :xs, append: '1', prepend: '2').render
-    expected = '<div class="input-group-xs input-group ui_surround_field"><span class="input-group-addon">1</span><input type="text" name="test" id="test" class="form-control form-control-xs" /><span class="input-group-addon">2</span></div>'
+    expected = '<div class="input-group-xs input-group ui_surround_field"><span class="input-group-text">1</span><input type="text" name="test" id="test" class="form-control form-control-xs" /><span class="input-group-text">2</span></div>'
 
     assert_equal expected, actual
   end

data/test/ui/core/layouts/col_test.rb

@@ -7,7 +7,7 @@ class ColTest < ActionView::TestCase
 
   test 'col with options' do
     actual   = ui_col('test', { num: 1, push: 2, offset: 3, pull: 4 }, { class: 'test' })
-    expected = '<div class="test col-md-1 col-md-push-2 offset-md-3 col-md-pull-4">test</div>'
+    expected = '<div class="test col-1 col-push-2 offset-3 col-pull-4">test</div>'
 
     assert_equal expected, actual
   end
@@ -22,11 +22,20 @@ class ColTest < ActionView::TestCase
   end
 
   test 'col' do
-    actual   = ui_col do
+    actual = ui_col do
       'test'
     end
     expected = '<div class="col">test</div>'
 
     assert_equal expected, actual
   end
+
+  test 'col with integer in parameter' do
+    actual = ui_col 3 do
+      'test'
+    end
+    expected = '<div class="col-3">test</div>'
+
+    assert_equal expected, actual
+  end
 end