Merge pull request #17917 from bdunne/fix_the_api_specs_after_17802

Ensure options is always a hash
ManageIQ · Aug 28, 2018 · 64f9089 · 64f9089
2 parents 5f129ad + 41fb53c
commit 64f9089
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/app/models/custom_button.rb b/app/models/custom_button.rb
@@ -1,7 +1,7 @@
 class CustomButton < ApplicationRecord
   has_one :resource_action, :as => :resource, :dependent => :destroy, :autosave => true
 
-  serialize :options
+  serialize :options, Hash
   serialize :visibility_expression
   serialize :enablement_expression
   serialize :visibility

diff --git a/spec/lib/task_helpers/exports/custom_buttons_spec.rb b/spec/lib/task_helpers/exports/custom_buttons_spec.rb
@@ -26,7 +26,7 @@
             "description"           => "Export Test",
             "applies_to_class"      => "Vm",
             "visibility_expression" => nil,
-            "options"               => nil,
+            "options"               => {},
             "userid"                => nil,
             "wait_for_complete"     => nil,
             "name"                  => "export_test_button",
@@ -44,7 +44,7 @@
          "description"           => "Export Test",
          "applies_to_class"      => "Service",
          "visibility_expression" => nil,
-         "options"               => nil,
+         "options"               => {},
          "userid"                => nil,
          "wait_for_complete"     => nil,
          "name"                  => "export_test_button2",

diff --git a/spec/models/custom_button_spec.rb b/spec/models/custom_button_spec.rb
@@ -251,7 +251,7 @@
         "disabled_text"         => nil,
         "enablement_expression" => nil,
         "applies_to_class"      => nil,
-        "options"               => nil,
+        "options"               => {},
         "userid"                => nil,
         "wait_for_complete"     => nil,
         "created_on"            => nil,