ui_bibz 3.0.0.alpha6 → 3.0.0.alpha12

data/lib/ui_bibz/ui/core/icons/glyph.rb

@@ -61,7 +61,7 @@ module UiBibz::Ui::Core::Icons
 
     # Render html tag
     def pre_render
-      [content_tag(:i, '', html_options), options[:label]].compact.join(' ').html_safe
+      [content_tag(:i, '', html_options), label].compact.join(' ').html_safe
     end
 
     private
@@ -138,5 +138,13 @@ module UiBibz::Ui::Core::Icons
     def match_style
       { solid: 'fas', regular: 'far', light: 'fal', brands: 'fab' }
     end
+
+    def label
+      if options[:text] == false
+        content_tag :span, options[:label], class: 'visually-hidden'
+      else
+        options[:label]
+      end
+    end
   end
 end

data/lib/ui_bibz/ui/core/lists/list_group.rb

@@ -90,7 +90,7 @@ module UiBibz::Ui::Core::Lists
       options = options.merge({ tag_type: @options[:tag_type] }) unless @options[:tag_type].nil?
 
       @lists << if tapped?(block)
-                  content = (content || {}).merge(tap: true)
+                  content = (content || {}).merge(options)
                   UiBibz::Ui::Core::Lists::Components::List.new(content, options, html_options).tap(&block).render
                 else
                   UiBibz::Ui::Core::Lists::Components::List.new(content, options, html_options, &block).render

data/lib/ui_bibz/ui/core/navigations/components/nav_dropdown.rb

@@ -60,7 +60,7 @@ module UiBibz::Ui::Core::Navigations
     end
 
     def link_html
-      content_tag :a, button_content, class: join_classes(size, state, 'dropdown-toggle', 'nav-link'), 'data-toggle' => 'dropdown', 'aria-expanded' => false
+      content_tag :a, button_content, class: join_classes(size, state, 'dropdown-toggle', 'nav-link'), href: '#', 'data-toggle' => 'dropdown', 'aria-expanded' => false
     end
   end
 end

data/lib/ui_bibz/ui/core/navigations/components/nav_link_link.rb

@@ -45,7 +45,7 @@ module UiBibz::Ui::Core::Navigations
       when 'nav-tabs'
         html_tag_base
       when 'list-group'
-        html_tag_base.merge("aria-controls": sanitize_text(content))
+        html_tag_base.merge("aria-controls": sanitize_text(content).parameterize)
       else
         {}
       end.merge(options[:a_html] || {})

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

@@ -82,7 +82,7 @@ module UiBibz::Ui::Core::Navigations
     # Add nav link items
     # See UiBibz::Ui::Core::Navigations::NavLink
     def link(content = nil, options = {}, html_options = nil, &block)
-      if block_given?
+      if block
         content[:nav_type] = type
         content[:nav_tags] = nav_tags
       else
@@ -93,7 +93,7 @@ module UiBibz::Ui::Core::Navigations
     end
 
     def text(content = nil, options = {}, html_options = nil, &block)
-      block_given? ? content[:nav_type] = type : options[:nav_type] = type
+      block ? content[:nav_type] = type : options[:nav_type] = type
       @items << NavText.new(content, options, html_options, &block)
     end
 
@@ -120,7 +120,7 @@ module UiBibz::Ui::Core::Navigations
     end
 
     def component_html_options
-      @options[:type] == :list ? { role: 'tablist' } : super
+      %i[tabs list].include?(@options[:type]) ? { role: 'tablist' } : super
     end
 
     # tabs or pills

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

@@ -31,6 +31,8 @@ module UiBibz::Ui::Core::Navigations
   # * +title+ - String
   # * +container+ - Hash container options
   # * +container_html+ - Hash container html options
+  # * +expand_size+ - Symbol size
+  # (+:sm+, +:md+, +:lg+, +:xl+, +:xxl+)
   #
   # ==== Signatures
   #
@@ -132,11 +134,11 @@ module UiBibz::Ui::Core::Navigations
     end
 
     def navbar_toggle_html(content = nil, &block)
-      @navbar_toggle_html = if !block.nil?
+      @navbar_toggle_html = if block.nil?
+                              content
+                            else
                               context = eval('self', block.binding) # rubocop:disable Style/EvalWithLocation
                               context.capture(&block)
-                            else
-                              content
                             end
     end
 
@@ -165,7 +167,7 @@ module UiBibz::Ui::Core::Navigations
     end
 
     def expand_size
-      "navbar-expand-#{@options[:expand_size] || :lg}" # unless @options[:expand_size].nil?
+      "navbar-expand-#{@options[:expand_size] || :lg}" unless options[:collapsible] == false
     end
 
     def position

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

@@ -67,7 +67,7 @@ module UiBibz::Ui::Core::Navigations
     # Add nav link items
     # See UiBibz::Ui::Core::Navigations::NavLink
     def tab(content = nil, options = {}, html_options = nil, &block)
-      if block_given?
+      if block
         content[:nav_type] = type
         content[:tag_type] = @options[:tag_type]
       else
@@ -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/notifications/components/toast_header.rb

@@ -31,12 +31,13 @@ module UiBibz::Ui::Core::Notifications::Components
   #   end.render
   #
   class ToastHeader < UiBibz::Ui::Core::Component
+    include Webpacker::Helper if defined?(Webpacker)
     # See UiBibz::Ui::Core::Component.initialize
 
     def pre_render
       content_tag :div, html_options do
         concat UiBibz::Ui::Core::Icons::Glyph.new(options[:glyph], class: 'mr-2').render unless options[:glyph].nil?
-        concat image_tag(options[:img], class: 'rounded mr-2') unless options[:img].nil?
+        concat image unless options[:image].nil?
         concat content_tag(:strong, content, class: 'mr-auto')
         concat content_tag(:small, options[:time], class: 'text-muted') unless options[:time].nil?
         concat close_button
@@ -45,6 +46,19 @@ module UiBibz::Ui::Core::Notifications::Components
 
     private
 
+    def image
+      if options[:image].is_a?(String)
+        image_tag(options[:image], class: 'rounded mr-2', alt: sanitize_text(options[:image])) unless options[:image].nil?
+      else
+        options[:image][:class] = UiBibz::Utils::Screwdriver.join_classes(options[:image][:class], 'rounded mr-2')
+        if options[:image].delete(:pack)
+          image_pack_tag(options[:image].delete(:href), **options[:image])
+        else
+          image_tag(options[:image].delete(:href), **options[:image])
+        end
+      end
+    end
+
     def close_button
       content_tag :button, '', class: 'ml-2 mb-1 btn-close', "data-dismiss": 'toast', "aria-label": 'Close'
     end

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

@@ -3,28 +3,11 @@
 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
-             content_tag(:span, ' ', class: 'empty-space')
-           else
-             ' '
-           end
-    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
-
+  def generate_glyph(content_html)
     glyph_options = if options[:glyph].is_a?(Hash)
                       options[:glyph]
                     elsif options[:glyph]
@@ -33,11 +16,13 @@ module GlyphExtension
                       {}
                     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?
+    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/component/popover_extension.rb

@@ -28,7 +28,7 @@ module PopoverExtension
       TOOLTIP_METHODS.each { |mth| add_html_data(mth, value: options[:tooltip].try(:[], mth)) unless options[:tooltip].try(:[], mth).nil? }
       add_html_data :placement, value: options[:tooltip].try(:[], :position) unless options[:tooltip].try(:[], :position).nil?
     else
-      add_html_data :title, value: options[:tooltip]
+      add_html_data :title, value: options[:tooltip] == true ? sanitize_text(content) : options[:tooltip]
     end
   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/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/test/simple_form_test.rb

@@ -82,7 +82,7 @@ test1</textarea></div></form>"
       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_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>
+    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\" data-dropdown-classes=\"dropdown\"><option value=\"1\">test1</option>
 <option value=\"2\">test2</option></select></div></form>"
 
     assert_equal expected, actual
@@ -93,7 +93,7 @@ test1</textarea></div></form>"
       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_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>
+    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\" data-dropdown-classes=\"dropdown\"><optgroup label=\"Europe\"><option value=\"1\">France</option>
 <option value=\"2\">Deutchland</option></optgroup></select></div></form>"
 
     assert_equal expected, actual
@@ -104,7 +104,7 @@ test1</textarea></div></form>"
       f.input :name_fr, as: :ui_text_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_text_field optional user_name_fr\"><label class=\"control-label ui_text_field optional\" for=\"user_name_fr\">Name fr</label><input type=\"ui_text_field\" name=\"user[name_fr]\" id=\"user_name_fr\" value=\"test1\" class=\"form-control string ui_text_field optional\" /></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_text_field optional user_name_fr\"><label class=\"control-label ui_text_field optional\" for=\"user_name_fr\">Name fr</label><input type=\"text\" name=\"user[name_fr]\" id=\"user_name_fr\" value=\"test1\" class=\"form-control string ui_text_field optional\" /></div></form>"
 
     assert_equal expected, actual
   end
@@ -147,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

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 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>"
+    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

@@ -47,7 +47,7 @@ class ButtonGroupTest < ActionView::TestCase
         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

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

@@ -11,7 +11,7 @@ class ChoiceGroupTest < ActionView::TestCase
       bc.choice 'Checkbox 2', state: :active
     end
 
-    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>"
+    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\" 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\" aria-pressed=\"true\" for=\"#{actual.items.last.input_options[:id]}\">Checkbox 2</label></div>"
 
     assert_equal expected, actual.render
   end
@@ -22,7 +22,7 @@ class ChoiceGroupTest < ActionView::TestCase
       bc.choice 'Radio 2', state: :active
     end
 
-    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>"
+    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\" 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\" aria-pressed=\"true\" for=\"#{actual.items.last.input_options[:id]}\">Radio 2</label></div>"
 
     assert_equal expected, actual.render
   end
@@ -32,7 +32,7 @@ class ChoiceGroupTest < ActionView::TestCase
       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\"><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>"
+    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\" 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\" aria-pressed=\"true\" for=\"#{actual.items.last.input_options[:id]}\">Radio 2</label></div>"
 
     assert_equal expected, actual.render
   end