ui_bibz 3.0.0.alpha2 → 3.0.0.alpha9

data/lib/ui_bibz/ui/core/navigations/tab_group.rb

@@ -83,6 +83,10 @@ module UiBibz::Ui::Core::Navigations
       ['nav', 'nav-tabs', position, justify, fill]
     end
 
+    def component_html_options
+      { role: 'tablist' }
+    end
+
     def type
       'nav-tabs'
     end

data/lib/ui_bibz/ui/core/windows/modal.rb

@@ -88,7 +88,7 @@ module UiBibz::Ui::Core::Windows
     private
 
     def modal_dialog_classes
-      UiBibz::Utils::Screwdriver.join_classes('modal-dialog', size, position, scrollable)
+      UiBibz::Utils::Screwdriver.join_classes('modal-dialog', fullscreen_size, size, position, scrollable)
     end
 
     def component_html_classes
@@ -105,10 +105,14 @@ module UiBibz::Ui::Core::Windows
     end
 
     # :xl, :lg, :sm or :xs
-    def size
+    def fullscreen_size
       [modal, fullscreen, @options[:size], down].compact.join('-')
     end
 
+    def size
+      [modal, @options[:size]].compact.join('-') if @options[:size]
+    end
+
     def fullscreen
       'fullscreen' if @options[:fullscreen]
     end

data/lib/ui_bibz/ui/extensions/core/component/glyph_extension.rb

@@ -3,39 +3,27 @@
 module GlyphExtension
   # Render glyph and content html
   def glyph_and_content_html(content_html = nil)
-    [glyph_with_space, ct_html(content_html)].compact.join(' ').html_safe
-  end
-
-  def ct_html(content_html)
-    content_html || content if options[:text].nil? || options[:text] == true
-  end
-
-  # Render glyph with space html
-  def glyph_with_space
-    out = [glyph]
-    out << ' ' if options[:text] != false
-    out << content_tag(:span, ' ', class: 'empty-space') if options[:text] == false
-    out.join unless glyph.nil?
+    options[:glyph] ? generate_glyph(content_html) : content_html || content
   end
 
   # Render glyph html
-  def glyph
-    options[:content] = content if options[:text] == false
-
-    glyph_options = case options[:glyph]
-                    when Hash
+  def generate_glyph(content_html)
+    glyph_options = if options[:glyph].is_a?(Hash)
                       options[:glyph]
-                    when String
+                    elsif options[:glyph]
                       { name: options[:glyph] }
                     else
                       {}
                     end
 
-    glyph_options[:text]       = options[:text] unless options[:text].nil?
-    glyph_options[:content]    = options[:content] unless options[:content].nil?
-    glyph_options[:shortcut]   = options[:shortcut] unless options[:shortcut].nil?
-    glyph_options[:html_options] = options[:html_options]  unless options[:html_options].nil?
+    glyph_options = glyph_options.tap do |h|
+      h[:text] = options[:text]
+      h[:label] = options[:label] || content_html || content
+      h[:shortcut] = options[:shortcut] unless options[:shortcut].nil?
+      h[:html_options] = options[:html_options] unless options[:html_options].nil?
+    end
 
-    UiBibz::Utils::GlyphChanger.new(glyph_options[:name], glyph_options).render unless glyph_options[:name].nil?
+    # UiBibz::Utils::GlyphChanger.new(glyph_options[:name], glyph_options).render unless glyph_options[:name].nil?
+    UiBibz::Ui::Core::Icons::Glyph.new(glyph_options[:name], glyph_options).render if glyph_options[:name].present?
   end
 end

data/lib/ui_bibz/ui/extensions/core/forms/surround_extension.rb

@@ -7,7 +7,7 @@ module SurroundExtension
   private
 
   def surrounded?
-    !options[:append].nil? || !options[:prepend].nil? || !options[:refresh].nil? || !options[:surrounded].nil?
+    options[:append].present? || options[:prepend].present? || options[:refresh].present? || options[:surrounded].present?
   end
 
   def surround_wrapper_tag(ct_tag)

data/lib/ui_bibz/ui/ux/containers/components/panel_header.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'ui_bibz/ui/ux/containers/components/panel_tab_group'
+require 'ui_bibz/ui/ux/containers/components/panel_header_title'
 module UiBibz::Ui::Ux::Containers::Components
   # Create a panel header
   #
@@ -42,8 +43,8 @@ module UiBibz::Ui::Ux::Containers::Components
       end
     end
 
-    def title(text)
-      @content = content_tag :div, text, class: 'panel-title'
+    def title(content = nil, options = nil, html_options = nil, &block)
+      @content = PanelHeaderTitle.new(content, options, html_options, &block).render
     end
 
     def actions(content = nil, options = nil, html_options = nil, &block)

data/lib/ui_bibz/ui/ux/containers/components/panel_header_title.rb

@@ -0,0 +1,47 @@
+# frozen_string_literal: true
+
+module UiBibz::Ui::Ux::Containers::Components
+  # Create a panel header
+  #
+  # ==== Attributes
+  #
+  # * +content+ - Content of element
+  # * +options+ - Options of element
+  # * +html_options+ - Html Options of element
+  #
+  # ==== Options
+  #
+  # You can add HTML attributes using the +html_options+.
+  # You can pass arguments in options attribute:
+  #
+  # ==== Signatures
+  #
+  #   UiBibz::Ui::Core::Boxes::PanelHeader.new(content, options = nil, html_options = nil)
+  #
+  #   UiBibz::Ui::Core::Boxes::CarHeader.new(options = nil, html_options = nil) do
+  #     content
+  #   end
+  #
+  # ==== Examples
+  #
+  #   UiBibz::Ui::Core::Boxes::PanelHeader.new.render
+  #
+  #   UiBibz::Ui::Core::Boxes::PanelHeader.new do
+  #     'Exemple'
+  #   end.render
+  #
+  class PanelHeaderTitle < UiBibz::Ui::Core::Component
+    # See UiBibz::Ui::Core::Component.initialize
+
+    # Render html tag
+    def pre_render
+      content_tag :div, @content, html_options
+    end
+
+    private
+
+    def component_html_classes
+      'panel-title'
+    end
+  end
+end

data/lib/ui_bibz/ui/ux/tables/table_pagination_per_page.rb

@@ -34,12 +34,12 @@ module UiBibz::Ui::Ux::Tables
 
     # Render html tag
     def render
-      if @per_page_field.options[:wrap_form] != false
+      if @per_page_field.options[:wrap_form] == false
+        per_page_html
+      else
         form_tag(url_for(url_parameters), method: :get) do
           per_page_html_in_wrap
         end
-      else
-        per_page_html
       end
     end
 

data/lib/ui_bibz/ui/ux/tables/table_search_field.rb

@@ -13,12 +13,12 @@ module UiBibz::Ui::Ux::Tables
 
     # Render html tag
     def pre_render
-      if options[:wrap_form] != false
+      if options[:wrap_form] == false
+        search_field_html
+      else
         form_tag(url_for(url_parameters), method: :get, class: 'form-table-search-field') do
           search_field_html_in_wrap
         end
-      else
-        search_field_html
       end
     end
 
@@ -69,7 +69,7 @@ module UiBibz::Ui::Ux::Tables
     end
 
     def clear_button
-      content_tag :button, UiBibz::Ui::Core::Icons::Glyph.new('times-circle').render, type: :button, class: 'btn btn-secondary input-group-btn clear-search-btn'
+      content_tag :button, UiBibz::Ui::Core::Icons::Glyph.new('times-circle', text: false, label: 'Clear Search').render, type: :button, class: 'btn btn-secondary input-group-btn clear-search-btn'
     end
 
     def component_html_classes

data/lib/ui_bibz/utils/breakdown_class_name_generator.rb

@@ -3,7 +3,7 @@
 module UiBibz::Utils
   # Generate the col class name
   class BreakdownClassNameGenerator
-    POSITIONING = %i[num offset push pull].freeze
+    POSITIONING = %i[num offset push pull order].freeze
     BREAKPOINTS = UiBibz::Ui::Core::Component::BREAKPOINTS
     PARAMETERS =  BREAKPOINTS + POSITIONING + [:position]
 
@@ -12,6 +12,8 @@ module UiBibz::Utils
       @klass_name = klass_name
     end
 
+    # Possible options
+    # 3 or md: 3 or md: { num: 3 }, xs: { num: 4 }
     def class_names
       return @klass_name unless col_options?
 
@@ -19,9 +21,9 @@ module UiBibz::Utils
       @options.each do |key, value|
         kl << write_classes(key.to_sym, value) if BREAKPOINTS.include?(key.to_sym)
       end
-      kl << write_classes(nil, @options) if kl.empty? || @options.key?('num')
+      kl << write_classes(nil, @options)
 
-      kl
+      kl.delete_if(&:blank?)
     end
 
     private
@@ -30,11 +32,17 @@ module UiBibz::Utils
       (@options.keys.map(&:to_sym) & PARAMETERS).present?
     end
 
+    # md: 8 or md: { num: 3}, xs: { num: 4 }
     def write_classes(size, opts)
-      @position = opts[:position]
-      opts.map do |k, v|
-        send(k, size, v) if POSITIONING.include?(k.to_sym)
-      end.compact.join(' ')
+      if opts.is_a?(Hash)
+        @position = opts[:position]
+
+        opts.map do |k, v|
+          send(k, size, v) if POSITIONING.include?(k.to_sym)
+        end.compact.join(' ')
+      else
+        send('num', size, opts)
+      end
     end
 
     # col-md-9
@@ -52,6 +60,11 @@ module UiBibz::Utils
       [@klass_name, size, 'push', number].compact.join('-')
     end
 
+    # order-md-9
+    def order(size, number)
+      ['order', size, number].compact.join('-')
+    end
+
     # col-md-pull-9
     def pull(size, number)
       [@klass_name, size, 'pull', number].compact.join('-')

data/lib/ui_bibz/utils/internationalization.rb

@@ -12,7 +12,7 @@ module UiBibz::Utils
     end
 
     def translate
-      I18n.t(@translation, options_with_default)
+      I18n.t(@translation, **options_with_default)
     end
 
     private

data/test/simple_form_test.rb

@@ -42,28 +42,6 @@ class SimpleFormTest < ActionView::TestCase
     assert_equal expected, actual
   end
 
-  test 'dropdown field select input in simple form' do
-    actual = simple_form_for @user do |f|
-      f.input :name_fr, as: :ui_dropdown_select_field, collection: @users, label_method: :name_fr
-    end
-
-    expected = "<form class=\"simple_form edit_user\" id=\"edit_user_1\" action=\"/users/1\" accept-charset=\"UTF-8\" method=\"post\"><input type=\"hidden\" name=\"_method\" value=\"patch\" /><div class=\"form-group ui_dropdown_select_field optional user_name_fr\"><label class=\"control-label ui_dropdown_select_field optional\" for=\"user_name_fr\">Name fr</label><select name=\"user[name_fr]\" id=\"user_name_fr\" class=\"dropdown-select-field\" data-style=\"btn-secondary\"><option value=\"1\">test1</option>
-<option value=\"2\">test2</option></select></div></form>"
-
-    assert_equal expected, actual
-  end
-
-  test 'dropdown field select input with grouped option in simple form' do
-    actual = simple_form_for @user do |f|
-      f.input :name_fr, as: :ui_dropdown_select_field, collection: @continents, toto: 'lala', grouped: true, group_method: :countries
-    end
-
-    expected = "<form class=\"simple_form edit_user\" id=\"edit_user_1\" action=\"/users/1\" accept-charset=\"UTF-8\" method=\"post\"><input type=\"hidden\" name=\"_method\" value=\"patch\" /><div class=\"form-group ui_dropdown_select_field optional user_name_fr\"><label class=\"control-label ui_dropdown_select_field optional\" for=\"user_name_fr\">Name fr</label><select name=\"user[name_fr]\" id=\"user_name_fr\" class=\"dropdown-select-field\" data-style=\"btn-secondary\"><optgroup label=\"Europe\"><option value=\"1\">France</option>
-<option value=\"2\">Deutchland</option></optgroup></select></div></form>"
-
-    assert_equal expected, actual
-  end
-
   test 'formula field input in simple form' do
     @user.price         = 3.0
     @user.price_formula = '1+2'
@@ -101,10 +79,10 @@ test1</textarea></div></form>"
 
   test 'multi select field input in simple form' do
     actual = simple_form_for @user do |f|
-      f.input :name_fr, as: :ui_multi_select_field, collection: @users, label_method: :name_fr
+      f.input :name_fr, as: :ui_dropdown_select_field, multiple: true, collection: @users, label_method: :name_fr
     end
 
-    expected = "<form class=\"simple_form edit_user\" id=\"edit_user_1\" action=\"/users/1\" accept-charset=\"UTF-8\" method=\"post\"><input type=\"hidden\" name=\"_method\" value=\"patch\" /><div class=\"form-group ui_multi_select_field optional user_name_fr\"><label class=\"control-label ui_multi_select_field optional\" for=\"user_name_fr\">Name fr</label><select name=\"user[name_fr][]\" id=\"user_name_fr\" class=\"btn-secondary multi-select-field\" multiple=\"multiple\"><option value=\"1\">test1</option>
+    expected = "<form class=\"simple_form edit_user\" id=\"edit_user_1\" action=\"/users/1\" accept-charset=\"UTF-8\" method=\"post\"><input type=\"hidden\" name=\"_method\" value=\"patch\" /><div class=\"form-group ui_dropdown_select_field optional user_name_fr\"><label class=\"control-label ui_dropdown_select_field optional\" for=\"user_name_fr\">Name fr</label><select name=\"user[name_fr][]\" id=\"user_name_fr\" class=\"btn-secondary multi-select-field\" multiple=\"multiple\"><option value=\"1\">test1</option>
 <option value=\"2\">test2</option></select></div></form>"
 
     assert_equal expected, actual
@@ -112,10 +90,10 @@ test1</textarea></div></form>"
 
   test 'multi select input with grouped option in simple form' do
     actual = simple_form_for @user do |f|
-      f.input :name_fr, as: :ui_multi_select_field, collection: @continents, toto: 'lala', grouped: true, group_method: :countries
+      f.input :name_fr, as: :ui_dropdown_select_field, multiple: true, collection: @continents, toto: 'lala', grouped: true, group_method: :countries
     end
 
-    expected = "<form class=\"simple_form edit_user\" id=\"edit_user_1\" action=\"/users/1\" accept-charset=\"UTF-8\" method=\"post\"><input type=\"hidden\" name=\"_method\" value=\"patch\" /><div class=\"form-group ui_multi_select_field optional user_name_fr\"><label class=\"control-label ui_multi_select_field optional\" for=\"user_name_fr\">Name fr</label><select name=\"user[name_fr][]\" id=\"user_name_fr\" class=\"btn-secondary multi-select-field\" multiple=\"multiple\"><optgroup label=\"Europe\"><option value=\"1\">France</option>
+    expected = "<form class=\"simple_form edit_user\" id=\"edit_user_1\" action=\"/users/1\" accept-charset=\"UTF-8\" method=\"post\"><input type=\"hidden\" name=\"_method\" value=\"patch\" /><div class=\"form-group ui_dropdown_select_field optional user_name_fr\"><label class=\"control-label ui_dropdown_select_field optional\" for=\"user_name_fr\">Name fr</label><select name=\"user[name_fr][]\" id=\"user_name_fr\" class=\"btn-secondary multi-select-field\" multiple=\"multiple\"><optgroup label=\"Europe\"><option value=\"1\">France</option>
 <option value=\"2\">Deutchland</option></optgroup></select></div></form>"
 
     assert_equal expected, actual
@@ -169,7 +147,7 @@ test1</textarea></div></form>"
     end
 
     expected = "<form class=\"simple_form edit_user\" id=\"edit_user_1\" action=\"/users/1\" accept-charset=\"UTF-8\" method=\"post\"><input type=\"hidden\" name=\"_method\" value=\"patch\" /><div class=\"form-group ui_select_field optional user_name_fr\"><label class=\"control-label ui_select_field optional\" for=\"user_name_fr\">Name fr</label><div class=\"field-refresh input-group ui_surround_field\"><select name=\"user[name_fr]\" id=\"user_name_fr\" class=\"form-control select-field form-select\"><option value=\"1\">test1</option>
-<option value=\"2\">test2</option></select><span data-connect=\"{&quot;events&quot;:&quot;click&quot;,&quot;mode&quot;:&quot;remote&quot;,&quot;target&quot;:{&quot;selector&quot;:&quot;#user_name_fr&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></form>"
+<option value=\"2\">test2</option></select><span data-connect=\"{&quot;events&quot;:&quot;click&quot;,&quot;mode&quot;:&quot;remote&quot;,&quot;target&quot;:{&quot;selector&quot;:&quot;#user_name_fr&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></form>"
 
     assert_equal expected, actual
   end
@@ -244,7 +222,7 @@ test1</textarea></div></form>"
       f.input :name_en, as: :ui_slider_field
     end
 
-    expected = "<form class=\"simple_form edit_user\" id=\"edit_user_1\" action=\"/users/1\" accept-charset=\"UTF-8\" method=\"post\"><input type=\"hidden\" name=\"_method\" value=\"patch\" /><div class=\"form-group ui_slider_field optional user_name_en\"><label class=\"control-label ui_slider_field optional\" for=\"user_name_en\">Name en</label><div class=\"ui_slider_field optional 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=\"user[name_en_min]\" id=\"user_name_en_min\" value=\"0\" max=\"100\" min=\"0\" step=\"1\" /><input type=\"range\" name=\"user[name_en_max]\" id=\"user_name_en_max\" value=\"100\" max=\"100\" min=\"0\" step=\"1\" /></div></div></form>"
+    expected = "<form class=\"simple_form edit_user\" id=\"edit_user_1\" action=\"/users/1\" accept-charset=\"UTF-8\" method=\"post\"><input type=\"hidden\" name=\"_method\" value=\"patch\" /><div class=\"form-group ui_slider_field optional user_name_en\"><label class=\"control-label ui_slider_field optional\" for=\"user_name_en\">Name en</label><div class=\"ui_slider_field optional slider\" id=\"user_name_en_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=\"user[name_en_min]\" id=\"user_name_en_min\" value=\"0\" max=\"100\" min=\"0\" step=\"1\" /><input type=\"range\" name=\"user[name_en_max]\" id=\"user_name_en_max\" value=\"100\" max=\"100\" min=\"0\" step=\"1\" /></div></div></form>"
 
     assert_equal expected, actual
   end

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

@@ -59,7 +59,7 @@ class CardTest < ActionView::TestCase
       p.body 'state'
       p.footer 'state'
     end
-    expected = '<div class="state card"><div class="card-header"><i class="glyph fas fa-eye"></i>  state</div><div class="card-body">state</div><div class="card-footer">state</div></div>'
+    expected = "<div class=\"state card\"><div class=\"card-header\"><i class=\"glyph fas fa-eye\"></i> state</div><div class=\"card-body\">state</div><div class=\"card-footer\">state</div></div>"
 
     assert_equal expected, actual
   end
@@ -145,7 +145,7 @@ class CardTest < ActionView::TestCase
         end
       end
     end
-    expected = '<div class="card"><div class="card-header"><ul class="nav nav-tabs card-header-tabs"><li class="nav-item"><a class="nav-link" data-toggle="tab" role="tab" href="#link1">link1</a></li><li class="nav-item"><a class="nav-link" data-toggle="tab" role="tab" href="#link2">link2</a></li></ul></div></div>'
+    expected = "<div class=\"card\"><div class=\"card-header\"><ul class=\"nav nav-tabs card-header-tabs\" role=\"tablist\"><li class=\"nav-item\"><a href=\"#link1\" class=\"nav-link\" data-toggle=\"tab\" role=\"tab\">link1</a></li><li class=\"nav-item\"><a href=\"#link2\" class=\"nav-link\" data-toggle=\"tab\" role=\"tab\">link2</a></li></ul></div></div>"
 
     assert_equal expected, actual
   end

data/test/ui/core/component_test.rb

@@ -5,7 +5,7 @@ require 'test_helper'
 class ComponentTest < ActionView::TestCase
   test 'create complex component' do
     actual = UiBibz::Ui::Core::Component.new('New component', { state: :active, glyph: 'add' }, { class: 'new-class' }).render
-    expected = '<i class="glyph fas fa-add"></i>  New component'
+    expected = "<i class=\"glyph fas fa-add\"></i> New component"
 
     assert_equal expected, actual
   end
@@ -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><span class="empty-space"> </span>'
+    expected = "<i class=\"glyph fas fa-diamond\"></i> <span class=\"visually-hidden\">My text</span>"
 
     assert_equal expected, actual
   end

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

@@ -43,11 +43,11 @@ 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
-    expected = '<div class="btn-group" role="group"><div id="dropdown-test" class="dropup btn-group"><button class="btn btn-success dropdown-toggle" type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" id="dropdown-test">Dropdown</button><div class="dropdown-menu" arial-labelledby="dropdown-test"><a class="dropdown-item" href="#link1"><i class="glyph fas fa-eye"></i>  Link 1</a></div></div></div>'
+    expected = "<div class=\"btn-group\" role=\"group\"><div id=\"dropdown-test\" class=\"dropup btn-group\"><button class=\"btn btn-success dropdown-toggle\" type=\"button\" data-toggle=\"dropdown\" aria-haspopup=\"true\" aria-expanded=\"false\" id=\"dropdown-test\">Dropdown</button><div class=\"dropdown-menu\" arial-labelledby=\"dropdown-test\"><a class=\"dropdown-item\" href=\"#link1\"><i class=\"glyph fas fa-eye\"></i> Link 1</a></div></div></div>"
 
     assert_equal expected, actual
   end

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

@@ -54,13 +54,6 @@ class ButtonLinkTest < ActionView::TestCase
     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>'
@@ -77,7 +70,7 @@ class ButtonLinkTest < ActionView::TestCase
 
   test 'button_link glyph' do
     actual   = ui_button_link('state', glyph: 'diamond')
-    expected = '<a class="btn-secondary btn" role="button" href="#"><i class="glyph fas fa-diamond"></i>  state</a>'
+    expected = '<a class="btn-secondary btn" role="button" href="#"><i class="glyph fas fa-diamond"></i> state</a>'
 
     assert_equal expected, actual
   end

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

@@ -5,7 +5,7 @@ require 'test_helper'
 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 btn input-refresh-button"><i class="glyph fas fa-sync-alt"></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 fas fa-sync-alt\"></i> state</span>"
 
     assert_equal expected, actual
   end

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

@@ -47,13 +47,6 @@ class ButtonTest < ActionView::TestCase
     assert_equal expected, actual
   end
 
-  test 'button block' do
-    actual   = ui_button('state', type: :block)
-    expected = '<button class="btn-secondary btn btn-block">state</button>'
-
-    assert_equal expected, actual
-  end
-
   test 'button size' do
     actual   = ui_button('state', size: :sm)
     expected = '<button class="btn-secondary btn btn-sm">state</button>'
@@ -70,14 +63,14 @@ class ButtonTest < ActionView::TestCase
 
   test 'button glyph' do
     actual   = ui_button('state', glyph: 'diamond')
-    expected = '<button class="btn-secondary btn"><i class="glyph fas fa-diamond"></i>  state</button>'
+    expected = "<button class=\"btn-secondary btn\"><i class=\"glyph fas 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-secondary btn without-text"><i class="glyph fas fa-diamond"></i><span class="empty-space"> </span></button>'
+    expected = "<button class=\"btn-secondary btn\"><i class=\"glyph fas fa-diamond\"></i> <span class=\"visually-hidden\">state</span></button>"
 
     assert_equal expected, actual
   end