Merge pull request #17625 from eclarizio/BZ1593874

Ensure sorting does not happen when sort_by is set to "none"

app/models/dialog_field_sorted_item.rb

@@ -19,7 +19,7 @@ def initialize_with_values(dialog_values)
   end
 
   def sort_by
-    options[:sort_by] || :description
+    options[:sort_by].try(:to_sym) || :description
   end
 
   def sort_by=(value)

spec/models/dialog_field_sorted_item_spec.rb

@@ -350,6 +350,17 @@
             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)])
             end
+
+            context "when the values are in a seemingly random order" do
+              let(:values) { [%w(3 Three), %w(1 One), %w(2 Two)] }
+              before do
+                dialog_field.options[:sort_by] = "none"
+              end
+
+              it "does not attempt to sort them" do
+                expect(dialog_field.values).to eq([[nil, "<None>"], %w(3 Three), %w(1 One), %w(2 Two)])
+              end
+            end
           end
         end
       end