Merge pull request #16 from matestack/disabled_switch_and_select

Disabled switch and select

Author: jonasjabari

lib/matestack/ui/bootstrap/form/checkbox.rb

@@ -19,6 +19,15 @@ def response
 
   private
 
+  def bootstrap_attributes
+    classes = 'form-check-input'
+    classes = [options[:class], classes].join(' ')
+    {
+      class: classes,
+      disabled: context.disabled
+    }
+  end
+
   def multiple?
    checkbox_options.present?
   end
@@ -28,15 +37,15 @@ def render_options
     if multiple?
      checkbox_options.to_a.each do |item|
         checkbox_wrapper do
-          input options.merge(checkbox_attributes(item)).merge(class: 'form-check-input')
+          input options.merge(checkbox_attributes(item)).merge(bootstrap_attributes)
           bootstrap_label text: item_label(item), for_input: item_id(item)
         end
       end
     # checked/unchecked checkbox (true/false checkbox)
     else
       checkbox_wrapper do
         input true_false_checkbox_attributes.merge(type: :hidden, id: nil, value: 0)
-        input true_false_checkbox_attributes.merge(type: :checkbox, id: item_id(1), class: 'form-check-input')
+        input true_false_checkbox_attributes.merge(type: :checkbox, id: item_id(1)).merge(bootstrap_attributes)
 
         bootstrap_label text: input_label, for_input: item_id(1)
       end

lib/matestack/ui/bootstrap/form/radio.rb

@@ -26,10 +26,12 @@ def response
 
   end
 
+  private
 
   def bootstrap_radio_attributes
+    classes = 'form-check-input'
     {
-      class: (options[:class] || "") << (" form-check-input"),
+      class: (options[:class] || "") << classes,
       disabled: context.disabled
     }
   end

spec/test/form/checkbox_spec.rb

@@ -203,8 +203,8 @@
       end
     end
     visit example_path
-    have_xpath('//form//input[@id="foo_1" and @disabled="disabled" and contains(@class, "is-invalid")]')
-    have_xpath('//form//input[@id="foo_2" and @disabled="disabled" and contains(@class, "is-invalid")]')
+    expect(page).to have_xpath('//form//input[@id="foo_1" and @disabled="disabled"]')
+    expect(page).to have_xpath('//form//input[@id="foo_2" and @disabled="disabled"]')
   end
 
   it 'renders bootstrap checkbox button with label' do

spec/test/form/radio_spec.rb

@@ -33,7 +33,7 @@
     expect(page).to have_selector('form > div.matestack-ui-bootstrap-radio > .form-check > label.form-check-label[for="foo_2"]')
 
     find('#foo_1').click
-  
+
     expect_any_instance_of(FormTestController).to receive(:expect_params)
       .with(hash_including(wrapper: { foo: 1 }))
 
@@ -201,8 +201,8 @@
       end
     end
     visit example_path
-    have_xpath('//form//input[@id="foo_1" and @disabled="disabled" and contains(@class, "is-invalid")]')
-    have_xpath('//form//input[@id="foo_2" and @disabled="disabled" and contains(@class, "is-invalid")]')
+    expect(page).to have_xpath('//form//input[@id="foo_1" and @disabled="disabled"]')
+    expect(page).to have_xpath('//form//input[@id="foo_2" and @disabled="disabled"]')
   end
 
 end

spec/test/form/switch_spec.rb

@@ -178,17 +178,19 @@
   end
 
   it 'renders bootstrap switch button with additional custom class' do
-# add additional custom class to bootstrap switch
-
-#     form_config = get_form_config(path: switch_success_form_test_path)
-#     matestack_render do
-#       matestack_form form_config do
-#         bs_form_switch key: :foo, options: [1, 2], class: "some-class"
-#         bs_form_submit text: "Submit"
-#       end
-#     end
-#     visit example_path
-#     expect(page).to have_xpath('//form//switch[@id="foo" and contains(@class, "form-switch") and contains(@class, "some-class")]')
+
+    # add additional custom class to bootstrap switch
+    form_config = get_form_config(path: switch_success_form_test_path)
+    matestack_render do
+      matestack_form form_config do
+        bs_form_switch key: :foo, options: [1, 2], class: "some-class"
+        bs_form_submit text: "Submit"
+      end
+    end
+    visit example_path
+    # expect(page).to have_xpath('//form//switch[@id="foo_1" and contains(@class, "form-switch") and contains(@class, "some-class")]')
+    expect(page).to have_xpath('//form//input[@id="foo_1" and contains(@class, "some-class")]')
+    expect(page).to have_xpath('//form//input[@id="foo_2" and contains(@class, "some-class")]')
   end
 
   it 'renders disabled bootstrap switch buttons' do
@@ -200,8 +202,8 @@
       end
     end
     visit example_path
-    have_xpath('//form//input[@id="_1" and @disabled="disabled" and contains(@class, "is-invalid")]')
-    have_xpath('//form//input[@id="_2" and @disabled="disabled" and contains(@class, "is-invalid")]')
+    expect(page).to have_xpath('//form//input[@id="foo_1" and @disabled="disabled"]')
+    expect(page).to have_xpath('//form//input[@id="foo_2" and @disabled="disabled"]')
   end
 
   it 'renders bootstrap switch button with label' do