ui_bibz 3.0.0.alpha9 → 3.0.0.beta2

data/lib/ui_bibz/ui/core/forms/surrounds/components/surround_button_link.rb

@@ -1,11 +1,5 @@
 # frozen_string_literal: true
 
 module UiBibz::Ui::Core::Forms::Surrounds
-  class SurroundButtonLink < UiBibz::Ui::Core::Forms::Buttons::ButtonLink
-    # See UiBibz::Ui::Core::Dropdown.initialize
-
-    def pre_render
-      button_link_html_tag
-    end
-  end
+  class SurroundButtonLink < UiBibz::Ui::Core::Forms::Buttons::ButtonLink; end
 end

data/lib/ui_bibz/ui/core/forms/surrounds/components/surround_dropdown.rb

@@ -4,10 +4,11 @@ module UiBibz::Ui::Core::Forms::Surrounds
   class SurroundDropdown < UiBibz::Ui::Core::Forms::Dropdowns::Dropdown
     # See UiBibz::Ui::Core::Dropdown.initialize
 
-    private
-
-    def component_html_classes
-      super << 'input-group-btn'
+    def pre_render
+      capture do
+        concat button_html
+        concat ul_html
+      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'), href: '#', 'data-toggle' => 'dropdown', 'aria-expanded' => false
+      content_tag :a, button_content, class: join_classes(size, state, 'dropdown-toggle', 'nav-link'), href: '#', 'data-bs-toggle' => 'dropdown', 'aria-expanded' => false
     end
   end
 end

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

@@ -40,7 +40,7 @@ module UiBibz::Ui::Core::Navigations
     end
 
     def component_html_options
-      html_tag_base = { 'data-toggle' => 'tab', role: 'tab' }
+      html_tag_base = { 'data-bs-toggle' => 'tab', role: 'tab' }
       case options[:nav_type]
       when 'nav-tabs'
         html_tag_base

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

@@ -36,7 +36,7 @@ module UiBibz::Ui::Core::Navigations
     end
 
     def component_html_options
-      { 'data-toggle' => 'tab', role: 'tab' }
+      { 'data-bs-toggle' => 'tab', role: 'tab' }
     end
 
     def component_html_data

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

@@ -40,7 +40,7 @@ module UiBibz::Ui::Core::Navigations
     end
 
     def component_html_options
-      options[:nav_type] == 'nav-tabs' ? { 'data-toggle' => 'tab', role: 'tab' } : {}
+      options[:nav_type] == 'nav-tabs' ? { 'data-bs-toggle' => 'tab', role: 'tab' } : {}
     end
   end
 end

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

@@ -58,7 +58,7 @@ module UiBibz::Ui::Core::Navigations
     def collapse
       {
         role: 'button',
-        data: { toggle: :collapse },
+        data: { "bs-toggle": :collapse },
         aria: {
           controls: options[:collapse],
           expanded: options[:active_collapse].nil? ? false : options[:active_collapse]

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
 
@@ -109,7 +109,7 @@ module UiBibz::Ui::Core::Navigations
     end
 
     def spacer(num = 'auto')
-      kls = " mr-#{num}"
+      kls = " me-#{num}"
       @items.last.html_options[:class].nil? ? @items.last.html_options[:class] = kls : @items.last.html_options[:class] << kls
     end
 

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

@@ -125,7 +125,7 @@ module UiBibz::Ui::Core::Navigations
     end
 
     def spacer(num = 'auto')
-      kls = " mr-#{num}"
+      kls = " me-#{num}"
       @items.last.html_options[:class].nil? ? @items.last.html_options[:class] = kls : @items.last.html_options[:class] << kls
     end
 
@@ -163,7 +163,7 @@ module UiBibz::Ui::Core::Navigations
     end
 
     def navbar_toggle_button_html
-      content_tag :button, '☰', class: 'navbar-toggler hidden-sm-up', type: :button, data: { toggle: 'collapse', target: "##{id}" }
+      content_tag :button, '☰', class: 'navbar-toggler hidden-sm-up', type: :button, data: { "bs-toggle": 'collapse', target: "##{id}" }
     end
 
     def expand_size

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

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

@@ -72,7 +72,7 @@ module UiBibz::Ui::Core::Navigations
     end
 
     def spacer(num = 'auto')
-      kls = "mr-#{num}"
+      kls = "me-#{num}"
       @items.last.html_options['class'] = join_classes(@items.last.html_options.delete(:class), @items.last.html_options[:class], kls)
     end
 

data/lib/ui_bibz/ui/core/notifications/components/alert_header.rb

@@ -54,7 +54,7 @@ module UiBibz::Ui::Core::Notifications::Components
     end
 
     def close_html
-      content_tag :button, '', type: 'button', class: 'btn-close', 'data-dismiss' => 'alert', 'aria-label' => 'Close'
+      content_tag :button, '', type: 'button', class: 'btn-close', 'data-bs-dismiss' => 'alert', 'aria-label' => 'Close'
     end
   end
 end

data/lib/ui_bibz/ui/core/notifications/components/toast_header.rb

@@ -31,13 +31,14 @@ 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 content_tag(:strong, content, class: 'mr-auto')
+        concat UiBibz::Ui::Core::Icons::Glyph.new(options[:glyph], class: 'me-2').render unless options[:glyph].nil?
+        concat image unless options[:image].nil?
+        concat content_tag(:strong, content, class: 'me-auto')
         concat content_tag(:small, options[:time], class: 'text-muted') unless options[:time].nil?
         concat close_button
       end
@@ -45,8 +46,21 @@ module UiBibz::Ui::Core::Notifications::Components
 
     private
 
+    def image
+      if options[:image].is_a?(String)
+        image_tag(options[:image], class: 'rounded me-2', alt: sanitize_text(options[:image])) unless options[:image].nil?
+      else
+        options[:image][:class] = UiBibz::Utils::Screwdriver.join_classes(options[:image][:class], 'rounded me-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'
+      content_tag :button, '', class: 'ml-2 mb-1 btn-close', "data-bs-dismiss": 'toast', "aria-label": 'Close'
     end
 
     def component_html_classes

data/lib/ui_bibz/ui/core/notifications/toast.rb

@@ -91,7 +91,7 @@ module UiBibz::Ui::Core::Notifications
 
     def component_html_data
       super
-      add_html_data 'autohide', value: options[:auto_hide] if options[:auto_hide]
+      add_html_data 'bs-autohide', value: options[:auto_hide] if options[:auto_hide]
     end
 
     def status

data/lib/ui_bibz/ui/core/windows/components/modal_header.rb

@@ -48,7 +48,7 @@ module UiBibz::Ui::Core::Windows::Components
     end
 
     def close_button_html
-      content_tag :button, '', class: 'btn-close', 'data-dismiss' => 'modal', 'aria-label' => 'Close'
+      content_tag :button, '', class: 'btn-close', 'data-bs-dismiss' => 'modal', 'aria-label' => 'Close'
     end
   end
 end

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

@@ -146,8 +146,8 @@ module UiBibz::Ui::Core::Windows
     def backdrop
       return unless @options[:backdrop]
 
-      add_html_data 'backdrop', value: @options[:backdrop]
-      add_html_data 'keyboard', value: 'false'
+      add_html_data 'bs-backdrop', value: @options[:backdrop]
+      add_html_data 'bs-keyboard', value: 'false'
     end
   end
 end

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

@@ -20,7 +20,6 @@ module GlyphExtension
       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?

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

@@ -4,31 +4,31 @@ module PopoverExtension
   TOOLTIP_METHODS = %i[animation container delay html placement selector template title trigger
                        offset fallback_placement boundary sanitize white_list santitize_fn].freeze
 
-  POPOVER_METHODS = %i[animation container content delay html placement selector template title
+  POPOVER_METHODS = %i[animation container delay html placement selector template title
                        trigger offset fallback_placement boundary sanitize white_list sanitize_fn].freeze
 
   def popover_data_html
     if options[:popover].present?
-      add_html_data :toggle, value: 'popover'
-      add_html_data :content, value: (options[:popover].is_a?(String) ? options[:popover] : options[:popover][:content])
+      add_html_data 'bs-toggle', value: 'popover'
+      add_html_data 'bs-content', value: (options[:popover].is_a?(String) ? options[:popover] : options[:popover][:content])
     end
 
     return unless options[:popover].is_a?(Hash)
 
     POPOVER_METHODS.each { |mth| add_html_data(mth, value: options[:popover].try(:[], mth)) unless options[:popover].try(:[], mth).nil? }
-    add_html_data :placement, value: options[:popover].try(:[], :position) unless options[:popover].try(:[], :position).nil?
+    add_html_data 'bs-placement', value: options[:popover].try(:[], :position) unless options[:popover].try(:[], :position).nil?
   end
 
   def tooltip_data_html
     return if options[:tooltip].nil?
 
-    add_html_data :toggle, value: 'tooltip'
+    add_html_data 'bs-toggle', value: 'tooltip'
 
     if options[:tooltip].is_a?(Hash)
       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?
+      add_html_data 'bs-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/test/simple_form_test.rb

@@ -50,7 +50,7 @@ class SimpleFormTest < ActionView::TestCase
       f.input :price, as: :ui_formula_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_formula_field optional user_price"><label class="control-label ui_formula_field optional" for="user_price">Price</label><div class="formula_field input-group ui_surround_field"><input type="text" name="user[price_formula]" id="user_price_formula" value="1+2" class="ui_formula_field optional formula-field form-control" formula_field_value="1+2" /><span class="formula-field-sign input-group-text">=</span><input type="text" name="user[price]" id="user_price" value="3.0" 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></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_formula_field optional user_price"><label class="control-label ui_formula_field optional" for="user_price">Price</label><div class="formula_field input-group ui_surround_field"><input type="text" name="user[price_formula]" id="user_price_formula" value="1+2" class="ui_formula_field optional formula-field form-control" formula_field_value="1+2" /><span class="formula-field-sign input-group-text">=</span><input type="text" name="user[price]" id="user_price" value="3.0" class="formula-field-result form-control" readonly="readonly" /><span data-bs-toggle="tooltip" class="formula-field-alert input-group-text"><i class="glyph-danger glyph fas fa-exclamation-triangle"></i></span></div></div></form>'
 
     assert_equal expected, actual
   end
@@ -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

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

@@ -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\" 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>"
+    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-bs-toggle=\"tab\" role=\"tab\">link1</a></li><li class=\"nav-item\"><a href=\"#link2\" class=\"nav-link\" data-bs-toggle=\"tab\" role=\"tab\">link2</a></li></ul></div></div>"
 
     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-bs-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

@@ -63,7 +63,7 @@ class ButtonLinkTest < ActionView::TestCase
 
   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>'
+    expected = '<a class="btn-secondary btn" data-bs-toggle="button" aria-pressed="false" autocomplete="off" role="button" href="#">state</a>'
 
     assert_equal expected, actual
   end

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

@@ -56,7 +56,7 @@ class ButtonTest < ActionView::TestCase
 
   test 'button toggle' do
     actual   = ui_button('state', toggle: true)
-    expected = '<button class="btn-secondary btn" data-toggle="button" aria-pressed="false" autocomplete="off">state</button>'
+    expected = '<button class="btn-secondary btn" data-bs-toggle="button" aria-pressed="false" autocomplete="off">state</button>'
 
     assert_equal expected, actual
   end
@@ -77,35 +77,35 @@ class ButtonTest < ActionView::TestCase
 
   test 'button with collapse' do
     actual   = ui_button('state', collapse: 'collapse-id')
-    expected = '<button class="btn-secondary btn" data-toggle="collapse" data-target="#collapse-id" aria-controls="collapse-id" aria-expanded="false">state</button>'
+    expected = '<button class="btn-secondary btn" data-bs-toggle="collapse" data-bs-target="#collapse-id" aria-controls="collapse-id" aria-expanded="false">state</button>'
 
     assert_equal expected, actual
   end
 
   test 'button with simple popover' do
     actual = ui_button('My Button', popover: 'My popover')
-    expected = '<button data-toggle="popover" data-content="My popover" class="btn-secondary btn">My Button</button>'
+    expected = '<button data-bs-toggle="popover" data-bs-content="My popover" class="btn-secondary btn">My Button</button>'
 
     assert_equal expected, actual
   end
 
   test 'button with complex popover' do
     actual = ui_button('My Button', popover: { content: 'My popover', position: :left })
-    expected = '<button data-toggle="popover" data-content="My popover" data-placement="left" class="btn-secondary btn">My Button</button>'
+    expected = '<button data-bs-toggle="popover" data-bs-content="My popover" data-bs-placement="left" class="btn-secondary btn">My Button</button>'
 
     assert_equal expected, actual
   end
 
   test 'button with simple tooltip' do
     actual = ui_button('My Button', { tooltip: 'My Button' }, { title: 'My tooltip' })
-    expected = '<button title="My tooltip" data-toggle="tooltip" data-title="My Button" class="btn-secondary btn">My Button</button>'
+    expected = '<button title="My tooltip" data-bs-toggle="tooltip" data-title="My Button" class="btn-secondary btn">My Button</button>'
 
     assert_equal expected, actual
   end
 
   test 'button with complex tooltip' do
     actual = ui_button('My Button', tooltip: { title: 'My tooltip', position: :left })
-    expected = '<button data-toggle="tooltip" data-title="My tooltip" data-placement="left" class="btn-secondary btn">My Button</button>'
+    expected = '<button data-bs-toggle="tooltip" data-title="My tooltip" data-bs-placement="left" class="btn-secondary btn">My Button</button>'
 
     assert_equal expected, actual
   end

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

@@ -8,7 +8,7 @@ class DropdownTest < ActionView::TestCase
     actual = UiBibz::Ui::Core::Forms::Dropdowns::Dropdown.new('Dropdown').tap do |d|
       d.link 'link'
     end
-    expected = "<div class=\"dropdown\"><button class=\"btn btn-secondary dropdown-toggle\" type=\"button\" data-toggle=\"dropdown\" aria-haspopup=\"true\" aria-expanded=\"false\" id=\"#{actual.id}\">Dropdown</button><div class=\"dropdown-menu\" arial-labelledby=\"#{actual.id}\"><a class=\"dropdown-item\" href=\"#\">link</a></div></div>"
+    expected = "<div class=\"dropdown\"><button class=\"btn btn-secondary dropdown-toggle\" type=\"button\" data-bs-toggle=\"dropdown\" aria-haspopup=\"true\" aria-expanded=\"false\" id=\"#{actual.id}\">Dropdown</button><div class=\"dropdown-menu\" arial-labelledby=\"#{actual.id}\"><a class=\"dropdown-item\" href=\"#\">link</a></div></div>"
 
     assert_equal expected, actual.render
   end
@@ -17,7 +17,7 @@ class DropdownTest < ActionView::TestCase
     actual = UiBibz::Ui::Core::Forms::Dropdowns::Dropdown.new('Dropdown', status: :primary).tap do |d|
       d.link 'link'
     end
-    expected = "<div class=\"dropdown\"><button class=\"btn btn-primary dropdown-toggle\" type=\"button\" data-toggle=\"dropdown\" aria-haspopup=\"true\" aria-expanded=\"false\" id=\"#{actual.id}\">Dropdown</button><div class=\"dropdown-menu\" arial-labelledby=\"#{actual.id}\"><a class=\"dropdown-item\" href=\"#\">link</a></div></div>"
+    expected = "<div class=\"dropdown\"><button class=\"btn btn-primary dropdown-toggle\" type=\"button\" data-bs-toggle=\"dropdown\" aria-haspopup=\"true\" aria-expanded=\"false\" id=\"#{actual.id}\">Dropdown</button><div class=\"dropdown-menu\" arial-labelledby=\"#{actual.id}\"><a class=\"dropdown-item\" href=\"#\">link</a></div></div>"
 
     assert_equal expected, actual.render
   end
@@ -26,7 +26,7 @@ class DropdownTest < ActionView::TestCase
     actual = UiBibz::Ui::Core::Forms::Dropdowns::Dropdown.new('Dropdown', status: :primary, outline: true).tap do |d|
       d.link 'link'
     end
-    expected = "<div class=\"dropdown\"><button class=\"btn btn-outline-primary dropdown-toggle\" type=\"button\" data-toggle=\"dropdown\" aria-haspopup=\"true\" aria-expanded=\"false\" id=\"#{actual.id}\">Dropdown</button><div class=\"dropdown-menu\" arial-labelledby=\"#{actual.id}\"><a class=\"dropdown-item\" href=\"#\">link</a></div></div>"
+    expected = "<div class=\"dropdown\"><button class=\"btn btn-outline-primary dropdown-toggle\" type=\"button\" data-bs-toggle=\"dropdown\" aria-haspopup=\"true\" aria-expanded=\"false\" id=\"#{actual.id}\">Dropdown</button><div class=\"dropdown-menu\" arial-labelledby=\"#{actual.id}\"><a class=\"dropdown-item\" href=\"#\">link</a></div></div>"
 
     assert_equal expected, actual.render
   end
@@ -39,7 +39,7 @@ class DropdownTest < ActionView::TestCase
       d.divider
       d.link 'Link3', url: '#link3'
     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\" 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>"
+    expected = "<div class=\"dropup btn-group\"><button class=\"btn btn-success dropdown-toggle\" type=\"button\" data-bs-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
@@ -48,7 +48,7 @@ class DropdownTest < ActionView::TestCase
     actual = UiBibz::Ui::Core::Forms::Dropdowns::Dropdown.new('Split Dropdown').tap do |d|
       d.link 'state'
     end
-    expected = "<div class=\"dropdown\"><button class=\"btn btn-secondary dropdown-toggle\" type=\"button\" data-toggle=\"dropdown\" aria-haspopup=\"true\" aria-expanded=\"false\" id=\"#{actual.id}\">Split Dropdown</button><div class=\"dropdown-menu\" arial-labelledby=\"#{actual.id}\"><a class=\"dropdown-item\" href=\"#\">state</a></div></div>"
+    expected = "<div class=\"dropdown\"><button class=\"btn btn-secondary dropdown-toggle\" type=\"button\" data-bs-toggle=\"dropdown\" aria-haspopup=\"true\" aria-expanded=\"false\" id=\"#{actual.id}\">Split Dropdown</button><div class=\"dropdown-menu\" arial-labelledby=\"#{actual.id}\"><a class=\"dropdown-item\" href=\"#\">state</a></div></div>"
 
     assert_equal expected, actual.render
   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-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>'
+    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-bs-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