Validate bools with inclusion, since presence fails: false.blank? => …

…true
ManageIQ · Jun 25, 2019 · 947ceb9 · 947ceb9
1 parent 09a089d
commit 947ceb9
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 2 deletions.
diff --git a/app/models/dialog_field.rb b/app/models/dialog_field.rb
@@ -30,7 +30,7 @@ class DialogField < ApplicationRecord
 
   default_value_for :required, false
   default_value_for(:visible) { true }
-  validates :visible, :presence => true
+  validates :visible, inclusion: { in: [ true, false ] }
   default_value_for :load_values_on_init, true
 
   serialize :values

diff --git a/app/models/dialog_field_importer.rb b/app/models/dialog_field_importer.rb
@@ -19,6 +19,8 @@ def import_field(dialog_field_attributes, export_version = DialogImportService::
                                                        end
     end
 
+
+
     if DialogField::DIALOG_FIELD_TYPES.include?(dialog_field_attributes["type"])
       dialog_field_type_class = dialog_field_attributes["type"].constantize
       resource_action_attributes = dialog_field_attributes.delete("resource_action")
@@ -28,7 +30,7 @@ def import_field(dialog_field_attributes, export_version = DialogImportService::
       if dialog_field_attributes["type"] == "DialogFieldTagControl"
         set_category_for_tag_control(dialog_field, dialog_field_attributes)
       end
-      dialog_field.save
+      dialog_field.save!
 
       dialog_field
     elsif dialog_field_attributes["type"].nil?

diff --git a/spec/models/dialog_field_importer_spec.rb b/spec/models/dialog_field_importer_spec.rb
@@ -275,6 +275,38 @@
       end
     end
 
+    context "visible" do
+      let(:dialog_field) do
+        {
+          "type"    => "DialogFieldTextBox",
+          "name"    => "Something else",
+          "visible" => visible
+        }
+      end
+
+      context "without visible setting" do
+        let(:dialog_field) do
+          {
+            "type"    => "DialogFieldTextBox",
+            "name"    => "Something else"
+          }
+        end
+
+        it "defaults to true" do
+          dialog_field_importer.import_field(dialog_field)
+          expect(DialogField.first.visible).to eq(true)
+        end
+      end
+
+      context "set to false" do
+        let(:visible) { false }
+        it "false" do
+          dialog_field_importer.import_field(dialog_field)
+          expect(DialogField.first.visible).to eq(false)
+        end
+      end
+    end
+
     context "when the type of the dialog field is not included in DIALOG_FIELD_TYPES and not nil" do
       let(:type) { "potato" }