Merge pull request #16011 from d-m-u/add_description_to_automate_edit…

…able_fields Add dialog field description to list of values updatable by automate
ManageIQ · Sep 22, 2017 · 8a2e507 · 8a2e507
2 parents 0cd3474 + a06fd3a
commit 8a2e507
Show file tree

Hide file tree

Showing 11 changed files with 35 additions and 10 deletions.
diff --git a/app/models/dialog_field_check_box.rb b/app/models/dialog_field_check_box.rb
@@ -1,5 +1,5 @@
 class DialogFieldCheckBox < DialogField
-  AUTOMATE_VALUE_FIELDS = %w(required read_only visible).freeze
+  AUTOMATE_VALUE_FIELDS = %w(required read_only visible description).freeze
 
   def checked?
     value == "t"

diff --git a/app/models/dialog_field_date_control.rb b/app/models/dialog_field_date_control.rb
@@ -1,5 +1,5 @@
 class DialogFieldDateControl < DialogField
-  AUTOMATE_VALUE_FIELDS = %w(show_past_dates read_only visible).freeze
+  AUTOMATE_VALUE_FIELDS = %w(show_past_dates read_only visible description).freeze
 
   include TimezoneMixin
 

diff --git a/app/models/dialog_field_date_time_control.rb b/app/models/dialog_field_date_time_control.rb
@@ -1,5 +1,5 @@
 class DialogFieldDateTimeControl < DialogFieldDateControl
-  AUTOMATE_VALUE_FIELDS = %w(show_past_dates read_only visible).freeze
+  AUTOMATE_VALUE_FIELDS = %w(show_past_dates read_only visible description).freeze
 
   def automate_output_value
     return nil if @value.blank?

diff --git a/app/models/dialog_field_sorted_item.rb b/app/models/dialog_field_sorted_item.rb
@@ -1,5 +1,5 @@
 class DialogFieldSortedItem < DialogField
-  AUTOMATE_VALUE_FIELDS = %w(sort_by sort_order data_type default_value required read_only visible).freeze
+  AUTOMATE_VALUE_FIELDS = %w(sort_by sort_order data_type default_value required read_only visible description).freeze
 
   def initialize_with_values(dialog_values)
     if load_values_on_init?

diff --git a/app/models/dialog_field_text_area_box.rb b/app/models/dialog_field_text_area_box.rb
@@ -1,3 +1,3 @@
 class DialogFieldTextAreaBox < DialogFieldTextBox
-  AUTOMATE_VALUE_FIELDS = %w(required read_only visible).freeze
+  AUTOMATE_VALUE_FIELDS = %w(required read_only visible description).freeze
 end
diff --git a/app/models/dialog_field_text_box.rb b/app/models/dialog_field_text_box.rb
@@ -1,5 +1,5 @@
 class DialogFieldTextBox < DialogField
-  AUTOMATE_VALUE_FIELDS = %w(data_type protected required validator_rule validator_type read_only visible).freeze
+  AUTOMATE_VALUE_FIELDS = %w(data_type protected required validator_rule validator_type read_only visible description).freeze
 
   def value
     @value = values_from_automate if dynamic && @value.blank?

diff --git a/spec/models/dialog_field_check_box_spec.rb b/spec/models/dialog_field_check_box_spec.rb
@@ -76,9 +76,10 @@
     let(:dialog_field) { described_class.new }
     let(:automate_hash) do
       {
-        "value"     => value,
-        "required"  => true,
-        "read_only" => true
+        "value"       => value,
+        "required"    => true,
+        "read_only"   => true,
+        "description" => "description"
       }
     end
 
@@ -94,6 +95,10 @@
       it "sets the read_only" do
         expect(dialog_field.read_only).to be_truthy
       end
+
+      it "sets the description" do
+        expect(dialog_field.description).to eq("description")
+      end
     end
 
     context "when the automate hash has a value" do

diff --git a/spec/models/dialog_field_date_control_spec.rb b/spec/models/dialog_field_date_control_spec.rb
@@ -59,7 +59,8 @@
       {
         "value"           => value,
         "show_past_dates" => true,
-        "read_only"       => true
+        "read_only"       => true,
+        "description"     => "description"
       }
     end
 
@@ -79,6 +80,10 @@
       it "sets the read_only" do
         expect(dialog_field.read_only).to be_truthy
       end
+
+      it "sets the description" do
+        expect(dialog_field.description).to eq("description")
+      end
     end
 
     context "when the automate hash has a value" do

diff --git a/spec/models/dialog_field_sorted_item_spec.rb b/spec/models/dialog_field_sorted_item_spec.rb
@@ -302,6 +302,7 @@
         "sort_order"    => "descending",
         "data_type"     => "datatype",
         "default_value" => "default",
+        "description"   => "description",
         "required"      => true,
         "read_only"     => true,
         "values"        => values
@@ -321,6 +322,10 @@
         expect(dialog_field.sort_order).to eq(:descending)
       end
 
+      it "sets the description" do
+        expect(dialog_field.description).to eq("description")
+      end
+
       it "sets the data_type" do
         expect(dialog_field.data_type).to eq("datatype")
       end

diff --git a/spec/models/dialog_field_text_area_box_spec.rb b/spec/models/dialog_field_text_area_box_spec.rb
@@ -7,6 +7,7 @@
         "data_type"      => "datatype",
         "value"          => value,
         "protected"      => true,
+        "description"    => "description",
         "required"       => true,
         "read_only"      => true,
         "validator_rule" => "rule",
@@ -35,6 +36,10 @@
         expect(dialog_field.required).to be_truthy
       end
 
+      it "sets the description" do
+        expect(dialog_field.description).to eq("description")
+      end
+
       it "sets the read_only" do
         expect(dialog_field.read_only).to be_truthy
       end

diff --git a/spec/models/dialog_field_text_box_spec.rb b/spec/models/dialog_field_text_box_spec.rb
@@ -283,6 +283,7 @@
         "data_type"      => "datatype",
         "value"          => value,
         "protected"      => true,
+        "description"    => "description",
         "required"       => true,
         "read_only"      => true,
         "validator_type" => "regex",
@@ -303,6 +304,10 @@
         expect(dialog_field.required).to be_truthy
       end
 
+      it "sets the description" do
+        expect(dialog_field.description).to eq("description")
+      end
+
       it "sets the read_only" do
         expect(dialog_field.read_only).to be_truthy
       end