Merge pull request #15455 from eclarizio/BZ1463827

Fix for Drop Down List Dialog does not keep default value for Integer type
(cherry picked from commit 65ae59e)

https://bugzilla.redhat.com/show_bug.cgi?id=1468370

app/models/dialog_field_sorted_item.rb

@@ -102,7 +102,7 @@ def use_first_value_as_default
   end
 
   def default_value_included_in_raw_values?
-    @raw_values.collect { |value_pair| value_pair[0] }.include?(default_value.send(value_modifier))
+    @raw_values.collect { |value_pair| value_pair[0].send(value_modifier) }.include?(default_value.send(value_modifier))
   end
 
   def static_raw_values

spec/models/dialog_field_drop_down_list_spec.rb

@@ -221,9 +221,9 @@
               expect(dialog_field.values).to eq([[0, "zero"], [10, "ten"], [5, "five"]])
             end
 
-            it "sets the value to the first value" do
+            it "sets the value to the default value as a string" do
               dialog_field.values
-              expect(dialog_field.value).to eq("0")
+              expect(dialog_field.value).to eq("5")
             end
           end
         end

spec/models/dialog_field_sorted_item_spec.rb

@@ -189,8 +189,40 @@
       end
 
       context "when the field is not required" do
-        it "returns the values with the first option being a nil 'None' option" do
-          expect(dialog_field.values).to eq([[nil, "<None>"], %w(test test), %w(abc abc)])
+        context "when the data type is an integer" do
+          let(:data_type) { "integer" }
+
+          before do
+            dialog_field.data_type = data_type
+          end
+
+          context "when there is a default value that matches a value in the values list" do
+            let(:default_value) { "2" }
+            let(:values) { [%w(1 1), %w(2 2), %w(3 3)] }
+
+            it "sets the default value to the matching value" do
+              dialog_field.values
+              expect(dialog_field.default_value).to eq("2")
+            end
+
+            it "returns the values with the first option being a nil 'None' option" do
+              expect(dialog_field.values).to eq([[nil, "<None>"], %w(1 1), %w(2 2), %w(3 3)])
+            end
+          end
+
+          context "when there is a default value that does not match a value in the values list" do
+            let(:default_value) { "4" }
+            let(:values) { [%w(1 1), %w(2 2), %w(3 3)] }
+
+            it "sets the default value to nil" do
+              dialog_field.values
+              expect(dialog_field.default_value).to eq(nil)
+            end
+
+            it "returns the values with the first option being a nil 'None' option" do
+              expect(dialog_field.values).to eq([[nil, "<None>"], %w(1 1), %w(2 2), %w(3 3)])
+            end
+          end
         end
       end
     end