ui_bibz 2.0.0.alpha32 → 2.0.0.beta2

data/test/ui/core/cards/card_test.rb

@@ -1,21 +1,21 @@
 require 'test_helper'
-include UiBibz::Helpers
-include UiBibz::Helpers::UiCoreHelper
+
 class CardTest < ActionView::TestCase
+  include UiBibz::Helpers::Ui::CoreHelper
 
   test 'create card' do
-    actual = card do
+    actual = ui_card do
       'test'
     end
-    expected = "<div class=\"card card-block\">test</div>"
+    expected = "<div class=\"card\"><div class=\"card-body\">test</div></div>"
 
     assert_equal expected, actual
   end
 
-  test 'create card with image, list and block' do
-    actual = card(tap: true) do |c|
+  test 'create card with image, list and body' do
+    actual = ui_card(tap: true) do |c|
       c.image 'image.svg'
-      c.block do
+      c.body do
         "test"
       end
       c.list_group do |lg|
@@ -23,82 +23,81 @@ class CardTest < ActionView::TestCase
         lg.list "Dapibas ac facilisis in"
         lg.list "vestibulum at eros"
       end
-      c.block do
+      c.body do
         link_to "Card link", '#', class: "card-link"
         link_to "Card link", '#', class: "card-link"
       end
     end
-    expected = "<div class=\"card\"><img src=\"/assets/image.svg\" alt=\"Image\" /><div class=\"card-block\">test</div><ul class=\"list-group-flush list-group\"><li class=\"list-group-item\">Cras justo odio</li><li class=\"list-group-item\">Dapibas ac facilisis in</li><li class=\"list-group-item\">vestibulum at eros</li></ul><div class=\"card-block\"><a class=\"card-link\" href=\"#\">Card link</a></div></div>"
+    expected = "<div class=\"card\"><div class=\"card-body\"></div><img src=\"/images/image.svg\" alt=\"Image\" /><div class=\"card-body\">test</div><ul class=\"list-group-flush list-group\"><li class=\"list-group-item\">Cras justo odio</li><li class=\"list-group-item\">Dapibas ac facilisis in</li><li class=\"list-group-item\">vestibulum at eros</li></ul><div class=\"card-body\"><a class=\"card-link\" href=\"#\">Card link</a></div></div>"
 
     assert_equal expected, actual
   end
 
-  test 'create card with header, block and footer' do
-    actual = card(status: :danger, tap: true, class: 'state') do |p|
+  test 'create card with header, body and footer' do
+    actual = ui_card(status: :danger, tap: true, class: 'state') do |p|
       p.header 'state', glyph: 'eye'
-      p.block 'state'
+      p.body 'state'
       p.footer 'state'
     end
-    expected = "<div class=\"card-danger state card\"><div class=\"card-header\"><i class=\"glyph fa fa-eye\"></i> state</div><div class=\"card-block\">state</div><div class=\"card-footer\">state</div></div>"
+    expected = "<div class=\"card-danger state card\"><div class=\"card-body\"></div><div class=\"card-header\"><i class=\"glyph fa fa-eye\"></i> state</div><div class=\"card-body\">state</div><div class=\"card-footer\">state</div></div>"
 
     assert_equal expected, actual
   end
 
   test 'create card group' do
-    actual = card_group do |cg|
-      cg.card 'test 1', block: true
-      cg.card 'test 2', block: true
-      cg.card 'test 3', block: true
+    actual = ui_card_group do |cg|
+      cg.card 'test 1', body: true
+      cg.card 'test 2', body: true
+      cg.card 'test 3', body: true
     end
-    expected = "<div class=\"card-group\"><div class=\"card card-block\">test 1</div><div class=\"card card-block\">test 2</div><div class=\"card card-block\">test 3</div></div>"
+    expected = "<div class=\"card-group\"><div class=\"card\"><div class=\"card-body\">test 1</div></div><div class=\"card\"><div class=\"card-body\">test 2</div></div><div class=\"card\"><div class=\"card-body\">test 3</div></div></div>"
 
     assert_equal expected, actual
   end
 
   test 'create card deck' do
-    actual = card_deck do |cg|
-      cg.card 'test 1', block: true
-      cg.card 'test 2', block: true
-      cg.card 'test 3', block: true
+    actual = ui_card_deck do |cg|
+      cg.card 'test 1', body: true
+      cg.card 'test 2', body: true
+      cg.card 'test 3', body: true
     end
-    expected = "<div class=\"card-deck-wrapper\"><div class=\"card-deck\"><div class=\"card card-block\">test 1</div><div class=\"card card-block\">test 2</div><div class=\"card card-block\">test 3</div></div></div>"
-
+    expected = "<div class=\"card-deck-wrapper\"><div class=\"card-deck\"><div class=\"card\"><div class=\"card-body\">test 1</div></div><div class=\"card\"><div class=\"card-body\">test 2</div></div><div class=\"card\"><div class=\"card-body\">test 3</div></div></div></div>"
     assert_equal expected, actual
   end
 
   test 'create card column' do
-    actual = card_column do |cg|
-      cg.card 'test 1', block: true
-      cg.card 'test 2', block: true
-      cg.card 'test 3', block: true
+    actual = ui_card_column do |cg|
+      cg.card 'test 1', body: true
+      cg.card 'test 2', body: true
+      cg.card 'test 3', body: true
     end
-    expected = "<div class=\"card-columns\"><div class=\"card card-block\">test 1</div><div class=\"card card-block\">test 2</div><div class=\"card card-block\">test 3</div></div>"
+    expected = "<div class=\"card-columns\"><div class=\"card\"><div class=\"card-body\">test 1</div></div><div class=\"card\"><div class=\"card-body\">test 2</div></div><div class=\"card\"><div class=\"card-body\">test 3</div></div></div>"
 
     assert_equal expected, actual
   end
 
   test 'card list group' do
-    actual = card tap: true do |c|
+    actual = ui_card tap: true do |c|
       c.list_group do |lg|
         lg.list "list 1"
         lg.list "list 2"
         lg.list "list 3"
       end
     end
-    expected = "<div class=\"card\"><ul class=\"list-group-flush list-group\"><li class=\"list-group-item\">list 1</li><li class=\"list-group-item\">list 2</li><li class=\"list-group-item\">list 3</li></ul></div>"
+    expected = "<div class=\"card\"><div class=\"card-body\"></div><ul class=\"list-group-flush list-group\"><li class=\"list-group-item\">list 1</li><li class=\"list-group-item\">list 2</li><li class=\"list-group-item\">list 3</li></ul></div>"
 
     assert_equal expected, actual
   end
 
-  test 'card block parameters' do
-    actual = card tap: true do |c|
-      c.block tap: true do |b|
+  test 'card body parameters' do
+    actual = ui_card tap: true do |c|
+      c.body tap: true do |b|
         b.title "title"
         b.text "text"
         b.link 'link', url: '#'
       end
     end
-    expected = "<div class=\"card\"><div class=\"card-block\"><h4 class=\"card-title\">title</h4><p class=\"card-text\">text</p><a class=\"card-link\" href=\"#\">link</a></div></div>"
+    expected = "<div class=\"card\"><div class=\"card-body\"></div><div class=\"card-body\"><h4 class=\"card-title\">title</h4><p class=\"card-text\">text</p><a class=\"card-link\" href=\"#\">link</a></div></div>"
 
     assert_equal expected, actual
   end

data/test/ui/{component_test.rb → core/component_test.rb}

@@ -1,6 +1,5 @@
 require 'test_helper'
 
-include UiBibz::Helpers
 class ComponentTest < ActionView::TestCase
 
   test 'create complex component' do

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

@@ -1,28 +1,28 @@
 require 'test_helper'
-include UiBibz::Helpers
 class DropdownTest < ActionView::TestCase
+  include UiBibz::Helpers::Ui::CoreHelper
 
   test 'Dropdown' do
-    actual = UiBibz::Ui::Core::Dropdowns::Dropdown.new("Dropdown", type: :dropup, status: :success).tap do |d|
+    actual = ui_dropdown("Dropdown", type: :dropup, status: :success) 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.render
+    end
     expected = "<div class=\"dropup btn-group\"><button class=\"btn btn-success dropdown-toggle\" type=\"button\" data-toggle=\"dropdown\" aria-haspopup=\"true\" aria-expanded=\"false\">Dropdown <span class=\"caret\"></span></button><div class=\"dropdown-menu dropdown-menu-left\"><a class=\"dropdown-item\" href=\"#link1\"><i class=\"glyph fa 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
   end
 
   test 'Split Dropdown' do
-    actual = UiBibz::Ui::Core::Dropdowns::SplitDropdown.new("Split Dropdown", type: :dropup, status: :primary).tap do |d|
+    actual = ui_dropdown("Split Dropdown", type: :dropup, status: :primary) do |d|
       d.link 'state'
       d.header 'header'
       d.link 'momo'
       d.divider
       d.link 'lolo'
-    end.render
+    end
     expected = "<div class=\"btn-group dropup\"><button class=\"btn btn-primary\">Split Dropdown</button><button class=\"btn btn-primary dropdown-toggle dropdown-toggle-split\" type=\"button\" data-toggle=\"dropdown\" aria-haspopup=\"true\" aria-expanded=\"false\"><span class=\"sr-only\">Toggle Dropdown</span></button><div class=\"dropdown-menu dropdown-menu-left\"><a class=\"dropdown-item\" href=\"#\">state</a><h6 class=\"dropdown-header\" role=\"presentation\">header</h6><a class=\"dropdown-item\" href=\"#\">momo</a><div class=\"dropdown-divider\"></div><a class=\"dropdown-item\" href=\"#\">lolo</a></div></div>"
 
     assert_equal expected, actual

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

@@ -1,18 +1,34 @@
 require 'test_helper'
-include UiBibz::Helpers
 
 class ButtonChoiceTest < ActionView::TestCase
+  include UiBibz::Helpers::Ui::CoreHelper
 
-  test 'checkbox button checked' do
-    actual   = UiBibz::Ui::Core::Forms::Buttons::ButtonChoice.new('state', { state: :active }).render
-    expected = "<label class=\"active btn-primary btn\"><input type=\"checkbox\" autocomplete=\"off\" checked=\"checked\" />state</label>"
+  test 'Button choice checkbox' do
+    actual   = ui_button_choice do |bc|
+      bc.button 'Checkbox 1'
+      bc.button 'Checkbox 2', state: :active
+    end
+    expected = "<div data-toggle=\"buttons\" class=\"btn-group\"><label class=\"btn-secondary btn\"><input type=\"checkbox\" autocomplete=\"off\" />Checkbox 1</label><label class=\"active btn-secondary btn\" aria-pressed=\"true\"><input type=\"checkbox\" autocomplete=\"off\" checked=\"checked\" />Checkbox 2</label></div>"
 
     assert_equal expected, actual
   end
 
-  test 'checkbox button non checked' do
-    actual   = UiBibz::Ui::Core::Forms::Buttons::ButtonChoice.new('state', { name: 'state', id: 'state', input_html_options: { class: 'state'}}).render
-    expected = "<label class=\"btn-primary btn\"><input type=\"checkbox\" autocomplete=\"off\" name=\"state\" id=\"state\" class=\"state\" />state</label>"
+  test 'Button choice radio' do
+    actual = ui_button_choice type: :radio do |bc|
+      bc.button 'Radio 1'
+      bc.button 'Radio 2', state: :active
+    end
+    expected = "<div data-toggle=\"buttons\" class=\"btn-group\"><label class=\"btn-secondary btn\"><input type=\"radio\" autocomplete=\"off\" />Radio 1</label><label class=\"active btn-secondary btn\" aria-pressed=\"true\"><input type=\"radio\" autocomplete=\"off\" checked=\"checked\" />Radio 2</label></div>"
+
+    assert_equal expected, actual
+  end
+
+  test 'Button choice options' do
+    actual = ui_button_choice size: :lg, outline: true, type: :radio do |bc|
+      bc.button 'Radio 1', glyph: 'diamond', status: :primary
+      bc.button 'Radio 2', state: :active
+    end
+    expected = "<div data-toggle=\"buttons\" class=\"btn-group btn-group-lg\"><label class=\"btn-primary btn btn-lg\"><input type=\"radio\" autocomplete=\"off\" /><i class=\"glyph fa fa-diamond\"></i> Radio 1</label><label class=\"active btn-secondary btn btn-lg\" aria-pressed=\"true\"><input type=\"radio\" autocomplete=\"off\" checked=\"checked\" />Radio 2</label></div>"
 
     assert_equal expected, actual
   end

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

@@ -1,33 +1,51 @@
 require 'test_helper'
-include UiBibz::Helpers
 
 class ButtonGroupTest < ActionView::TestCase
+  include UiBibz::Helpers::Ui::CoreHelper
 
   test 'button group' do
-    actual = UiBibz::Ui::Core::Forms::Buttons::ButtonGroup.new position: :vertical do
-      UiBibz::Ui::Core::Forms::Buttons::Button.new('state').render
-    end.render
-    expected = "<div data-toggle=\"buttons\" class=\"btn-group btn-group-vertical\" role=\"group\"><button class=\"btn-primary btn\">state</button></div>"
+    actual = ui_button_group do |bg|
+      bg.button 'state'
+    end
+    expected = "<div class=\"btn-group\" role=\"group\"><button class=\"btn\">state</button></div>"
 
     assert_equal expected, actual
   end
 
-  test 'button group choice checkbox' do
-    actual = UiBibz::Ui::Core::Forms::Buttons::ButtonGroup.new do
-      concat UiBibz::Ui::Core::Forms::Buttons::ButtonChoice.new('state1').render
-      concat UiBibz::Ui::Core::Forms::Buttons::ButtonChoice.new('state2').render
-    end.render
-    expected = "<div data-toggle=\"buttons\" class=\"btn-group\" role=\"group\"><label class=\"btn-primary btn\"><input type=\"checkbox\" autocomplete=\"off\" />state1</label><label class=\"btn-primary btn\"><input type=\"checkbox\" autocomplete=\"off\" />state2</label></div>"
+  test 'button group vertical' do
+    actual = ui_button_group(position: :vertical) do |bg|
+      bg.button 'state'
+    end
+    expected = "<div class=\"btn-group-vertical\" role=\"group\"><button class=\"btn\">state</button></div>"
 
     assert_equal expected, actual
   end
 
-  test 'button group choice radio' do
-    actual = UiBibz::Ui::Core::Forms::Buttons::ButtonGroup.new do
-      concat UiBibz::Ui::Core::Forms::Buttons::ButtonChoice.new('state1', type: :radio).render
-      concat UiBibz::Ui::Core::Forms::Buttons::ButtonChoice.new('state2', type: :radio).render
-    end.render
-    expected = "<div data-toggle=\"buttons\" class=\"btn-group\" role=\"group\"><label class=\"btn-primary btn\"><input type=\"radio\" autocomplete=\"off\" />state1</label><label class=\"btn-primary btn\"><input type=\"radio\" autocomplete=\"off\" />state2</label></div>"
+  test 'button group status' do
+    actual = ui_button_group(status: :primary) do |bg|
+      bg.button 'state'
+    end
+    expected = "<div class=\"btn-group\" role=\"group\"><button class=\"btn-primary btn\">state</button></div>"
+
+    assert_equal expected, actual
+  end
+
+  test 'button group size' do
+    actual = ui_button_group(size: :sm) do |bg|
+      bg.button 'state'
+    end
+    expected = "<div class=\"btn-group btn-group-sm\" role=\"group\"><button class=\"btn btn-sm\">state</button></div>"
+
+    assert_equal expected, actual
+  end
+
+  test 'button group with dropdown' do
+    actual = ui_button_group do |bg|
+      bg.dropdown("Dropdown", type: :dropup, status: :success) do |d|
+        d.link 'Link 1', url: '#link1', glyph: 'eye'
+      end
+    end
+    expected = "<div class=\"btn-group\" role=\"group\"><div class=\"dropup btn-group\"><button class=\"btn btn-success dropdown-toggle\" type=\"button\" data-toggle=\"dropdown\" aria-haspopup=\"true\" aria-expanded=\"false\">Dropdown <span class=\"caret\"></span></button><div class=\"dropdown-menu dropdown-menu-left\"><a class=\"dropdown-item\" href=\"#link1\"><i class=\"glyph fa fa-eye\"></i> Link 1</a></div></div></div>"
 
     assert_equal expected, actual
   end

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

@@ -1,11 +1,81 @@
 require 'test_helper'
-include UiBibz::Helpers
 
 class ButtonLinkTest < ActionView::TestCase
+  include UiBibz::Helpers::Ui::CoreHelper
 
-  test 'link button' do
-    actual   = UiBibz::Ui::Core::Forms::Buttons::ButtonLink.new('state', { url: users_path, status: :danger, glyph: 'add'}).render
-    expected = "<a class=\"btn-danger btn\" href=\"/users\"><i class=\"glyph fa fa-add\"></i> state</a>"
+  test "button_link" do
+    actual   = ui_button_link('state')
+    expected = "<a class=\"btn-secondary btn\" role=\"button\" href=\"#\">state</a>"
+
+    assert_equal expected, actual
+  end
+
+  test "button_link with url" do
+    actual   = ui_button_link('state', url: '#new_url')
+    expected = "<a class=\"btn-secondary btn\" role=\"button\" href=\"#new_url\">state</a>"
+
+    assert_equal expected, actual
+  end
+
+  test "button_link with status" do
+    actual   = ui_button_link('state', status: :success)
+    expected = "<a class=\"btn-success btn\" role=\"button\" href=\"#\">state</a>"
+
+    assert_equal expected, actual
+  end
+
+  test 'button_link outline' do
+    actual   = ui_button_link('state', status: :success, outline: true)
+    expected = "<a class=\"btn-success btn\" role=\"button\" href=\"#\">state</a>"
+
+    assert_equal expected, actual
+  end
+
+  test 'button_link disabled' do
+    actual   = ui_button_link('state', state: :disabled)
+    expected = "<a class=\"disabled btn-secondary btn\" disabled=\"disabled\" role=\"button\" href=\"#\">state</a>"
+
+    assert_equal expected, actual
+  end
+
+  test 'button_link active' do
+    actual   = ui_button_link('state', state: :active)
+    expected = "<a class=\"active btn-secondary btn\" aria-pressed=\"true\" role=\"button\" href=\"#\">state</a>"
+
+    assert_equal expected, actual
+  end
+
+  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>"
+
+    assert_equal expected, actual
+  end
+
+  test 'button_link block' do
+    actual   = ui_button_link('state', type: :block)
+    expected = "<a class=\"btn-secondary btn btn-block\" role=\"button\" href=\"#\">state</a>"
+
+    assert_equal expected, actual
+  end
+
+  test 'button_link size' do
+    actual   = ui_button_link('state', size: :sm)
+    expected = "<a class=\"btn-secondary btn btn-sm\" role=\"button\" href=\"#\">state</a>"
+
+    assert_equal expected, actual
+  end
+
+  test 'button_link toggle' do
+    actual   = ui_button_link('state', toggle: true)
+    expected = "<a class=\"btn-secondary btn\" data-toggle=\"button\" aria-pressed=\"false\" autocomplete=\"off\" role=\"button\" href=\"#\">state</a>"
+
+    assert_equal expected, actual
+  end
+
+  test 'button_link glyph' do
+    actual   = ui_button_link('state', glyph: 'diamond')
+    expected = "<a class=\"btn-secondary btn\" role=\"button\" href=\"#\"><i class=\"glyph fa fa-diamond\"></i> state</a>"
 
     assert_equal expected, actual
   end

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

@@ -1,11 +1,10 @@
 require 'test_helper'
-include UiBibz::Helpers
 
 class ButtonRefreshTest < ActionView::TestCase
 
   test "button" do
     actual   = UiBibz::Ui::Core::Forms::Buttons::ButtonRefresh.new('state', status: :success, connect: { target: { url: '/'}}).render
-    expected = "<span data-connect=\"{&quot;events&quot;:&quot;click&quot;,&quot;mode&quot;:&quot;remote&quot;,&quot;target&quot;:{&quot;selector&quot;:&quot;&quot;,&quot;url&quot;:&quot;/&quot;,&quot;data&quot;:[]}}\" class=\"btn-success ui-bibz-connect input-refresh-button btn\"><i class=\"glyph fa fa-refresh\"></i> state</span>"
+    expected = "<span data-connect=\"{&quot;events&quot;:&quot;click&quot;,&quot;mode&quot;:&quot;remote&quot;,&quot;target&quot;:{&quot;selector&quot;:&quot;&quot;,&quot;url&quot;:&quot;/&quot;,&quot;data&quot;:[]}}\" class=\"btn-success ui-bibz-connect btn input-refresh-button\"><i class=\"glyph fa fa-refresh\"></i> state</span>"
 
     assert_equal expected, actual
   end

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

@@ -1,19 +1,82 @@
 require 'test_helper'
-include UiBibz::Helpers
 
 class ButtonTest < ActionView::TestCase
+  include UiBibz::Helpers::Ui::CoreHelper
 
   test "button" do
-    actual   = UiBibz::Ui::Core::Forms::Buttons::Button.new('state', status: :success).render
+    actual   = ui_button('state')
+    expected = "<button class=\"btn\">state</button>"
+
+    assert_equal expected, actual
+  end
+
+  test "button with status" do
+    actual   = ui_button('state', status: :success)
     expected = "<button class=\"btn-success btn\">state</button>"
 
     assert_equal expected, actual
   end
 
   test 'button outline' do
-    actual   = UiBibz::Ui::Core::Forms::Buttons::Button.new('state', status: :success, outline: true).render
+    actual   = ui_button('state', status: :success, outline: true)
     expected = "<button class=\"btn-outline-success btn\">state</button>"
 
     assert_equal expected, actual
   end
+
+  test 'button disabled' do
+    actual   = ui_button('state', state: :disabled)
+    expected = "<button class=\"disabled btn\" disabled=\"disabled\">state</button>"
+
+    assert_equal expected, actual
+  end
+
+  test 'button active' do
+    actual   = ui_button('state', state: :active)
+    expected = "<button class=\"active btn\" aria-pressed=\"true\">state</button>"
+
+    assert_equal expected, actual
+  end
+
+  test 'button badge' do
+    actual   = ui_button('state', badge: 2)
+    expected = "<button class=\"btn\">state<span class=\"badge-secondary badge\">2</span></button>"
+
+    assert_equal expected, actual
+  end
+
+  test 'button block' do
+    actual   = ui_button('state', type: :block)
+    expected = "<button class=\"btn btn-block\">state</button>"
+
+    assert_equal expected, actual
+  end
+
+  test 'button size' do
+    actual   = ui_button('state', size: :sm)
+    expected = "<button class=\"btn btn-sm\">state</button>"
+
+    assert_equal expected, actual
+  end
+
+  test 'button toggle' do
+    actual   = ui_button('state', toggle: true)
+    expected = "<button class=\"btn\" data-toggle=\"button\" aria-pressed=\"false\" autocomplete=\"off\">state</button>"
+
+    assert_equal expected, actual
+  end
+
+  test 'button glyph' do
+    actual   = ui_button('state', glyph: 'diamond')
+    expected = "<button class=\"btn\"><i class=\"glyph fa fa-diamond\"></i> state</button>"
+
+    assert_equal expected, actual
+  end
+
+  test 'button glyph without text' do
+    actual   = ui_button('state', glyph: 'diamond', text: false)
+    expected = "<button class=\"btn without-text\"><i class=\"glyph fa fa-diamond\"></i>  </button>"
+
+    assert_equal expected, actual
+  end
 end

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

@@ -1,5 +1,4 @@
 require 'test_helper'
-include UiBibz::Helpers
 
 class CheckboxFieldTest < ActionView::TestCase
 
@@ -8,5 +7,5 @@ class CheckboxFieldTest < ActionView::TestCase
       expected = "<div class=\"abc-checkbox-primary checkbox abc-checkbox abc-checkbox-circle\"><input type=\"checkbox\" name=\"John\" id=\"John\" value=\"1\" class=\"styled\" /><label for=\"John\">John</label></div>"
 
       assert_equal expected, actual
-    end              
+    end
 end

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

@@ -1,5 +1,4 @@
 require 'test_helper'
-include UiBibz::Helpers
 
 class RadioFieldTest < ActionView::TestCase
 
@@ -9,4 +8,4 @@ class RadioFieldTest < ActionView::TestCase
 
       assert_equal expected, actual
     end
-end              
+end

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

@@ -1,5 +1,4 @@
 require 'test_helper'
-include UiBibz::Helpers
 
 class SwitchFieldTest < ActionView::TestCase
 

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

@@ -1,18 +1,17 @@
 require 'test_helper'
-include UiBibz::Helpers
 
 class DatePickerFieldTest < ActionView::TestCase
 
     test "Date Picker Field" do
       actual   = UiBibz::Ui::Core::Forms::Dates::DatePickerField.new(['date_1', 'date_2'], { append: 'a', prepend: 'b', range: 'u' }, { class: 'datepicker-test' }).render
-      expected = "<div class=\"input-group input-daterange\"><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=\"dd/mm/yyyy\" data-date-today-btn=\"linked\" /><span class=\"input-group-addon input-group-range\">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=\"dd/mm/yyyy\" data-date-today-btn=\"linked\" /><span class=\"input-group-addon\">b</span></div>"
+      expected = "<div class=\"input-daterange input-group\"><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>"
 
       assert_equal expected, actual
     end
 
     test "Date Picker Field data html options" do
       actual   = UiBibz::Ui::Core::Forms::Dates::DatePickerField.new('date', { today_highlight: true, calendar_weeks: true, autoclose: true, dates_disabled: ["11/01/2016", "12/01/2016"] }, { class: 'datepicker-test' }).render
-      expected = "<input type=\"text\" name=\"date\" id=\"date\" class=\"datepicker-test date_picker form-control\" data-date-locale=\"en\" data-provide=\"datepicker\" data-date-format=\"dd/mm/yyyy\" data-date-today-btn=\"linked\" data-date-today-highlight=\"true\" data-date-calendar-weeks=\"true\" data-date-autoclose=\"true\" data-dates-disabled=\"[&quot;11/01/2016&quot;,&quot;12/01/2016&quot;]\" />"
+      expected = "<input type=\"text\" name=\"date\" id=\"date\" 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-today-highlight=\"true\" data-date-calendar-weeks=\"true\" data-date-autoclose=\"true\" data-dates-disabled=\"[&quot;11/01/2016&quot;,&quot;12/01/2016&quot;]\" data-date-toggle-active=\"true\" />"
 
       assert_equal expected, actual
     end

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

@@ -1,11 +1,10 @@
 require 'test_helper'
-include UiBibz::Helpers
 
 class FormulaFieldTest < ActionView::TestCase
 
     test 'formula_field' do
       actual = UiBibz::Ui::Core::Forms::Numbers::FormulaField.new('value').render
-      expected = "<div class=\"input-group formula_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\" readonly=\"readonly\" class=\"formula-field-result form-control\" /><span class=\"formula-field-alert input-group-addon\" data-toggle=\"tooltip\"><i class=\"glyph-danger glyph fa fa-exclamation-triangle\"></i></span></div>"
+      expected = "<div class=\"formula_field input-group\"><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 fa fa-exclamation-triangle\"></i></span></div>"
 
       assert_equal expected, actual
     end

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

@@ -1,6 +1,5 @@
 require 'test_helper'
 
-include UiBibz::Helpers
 class DropdownSelectFieldTest < ActionView::TestCase
 
     test 'dropdown_select_field' do
@@ -77,7 +76,7 @@ class DropdownSelectFieldTest < ActionView::TestCase
 
     test 'dropdown_select_field refresh' do
       actual = UiBibz::Ui::Core::Forms::Selects::DropdownSelectField.new('test', { refresh: { mode: 'local', target: { data: [] }}}).render
-      expected = "<div class=\"input-group field-refresh\"><select name=\"test\" id=\"test\" class=\"dropdown-select-field\"></select><span class=\"input-group-btn\"><span data-connect=\"{&quot;events&quot;:&quot;click&quot;,&quot;mode&quot;:&quot;local&quot;,&quot;target&quot;:{&quot;selector&quot;:&quot;#test&quot;,&quot;url&quot;:&quot;&quot;,&quot;data&quot;:[]}}\" class=\"btn-primary ui-bibz-connect input-refresh-button btn\"><i class=\"glyph fa fa-refresh\"></i> </span></span></div>"
+      expected = "<div class=\"field-refresh input-group\"><select name=\"test\" id=\"test\" class=\"dropdown-select-field\"></select><div class=\"input-group-btn\"><span data-connect=\"{&quot;events&quot;:&quot;click&quot;,&quot;mode&quot;:&quot;local&quot;,&quot;target&quot;:{&quot;selector&quot;:&quot;#test&quot;,&quot;url&quot;:&quot;&quot;,&quot;data&quot;:[]}}\" class=\"btn-primary ui-bibz-connect btn input-refresh-button\"><i class=\"glyph fa fa-refresh\"></i> </span></div></div>"
 
       assert_equal expected, actual
     end

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

@@ -1,5 +1,4 @@
 require 'test_helper'
-include UiBibz::Helpers
 
 class MultiColumnFieldTest < ActionView::TestCase
 

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

@@ -1,5 +1,4 @@
 require 'test_helper'
-include UiBibz::Helpers
 
 class MultiSelectFieldTest < ActionView::TestCase
 
@@ -25,7 +24,7 @@ class MultiSelectFieldTest < ActionView::TestCase
 
     test 'Multi select Field refresh option' do
       actual = UiBibz::Ui::Core::Forms::Selects::MultiSelectField.new('test', { refresh: { target: { url: '/'}}}).render
-      expected = "<div class=\"input-group field-refresh\"><select name=\"test[]\" id=\"test\" class=\"btn-secondary multi-select-field\" multiple=\"multiple\"></select><span 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;&quot;,&quot;url&quot;:&quot;&quot;,&quot;data&quot;:[]}}\" class=\"btn-primary ui-bibz-connect input-refresh-button btn\"><i class=\"glyph fa fa-refresh\"></i> </span></span></div>"
+      expected = "<div class=\"field-refresh input-group\"><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-primary ui-bibz-connect btn input-refresh-button\"><i class=\"glyph fa fa-refresh\"></i> </span></div></div>"
 
       assert_equal expected, actual
     end

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

@@ -1,5 +1,4 @@
 require 'test_helper'
-include UiBibz::Helpers
 
 class SelectFieldTest < ActionView::TestCase
 
@@ -14,7 +13,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=\"input-group field-refresh\"><select name=\"example\" id=\"example\" class=\"select-field form-control\"></select><span 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-primary ui-bibz-connect input-refresh-button btn\"><i class=\"glyph fa fa-refresh\"></i> </span></span></div>"
+      expected = "<div class=\"field-refresh input-group\"><select name=\"example\" id=\"example\" class=\"select-field form-control\"></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-primary ui-bibz-connect btn input-refresh-button\"><i class=\"glyph fa fa-refresh\"></i> </span></div></div>"
 
       assert_equal expected, actual
     end