Merge pull request #16529 from elad661/default-name-to-description

Default name to description for MiqAlertSet and MiqPolicySet

app/models/miq_alert_set.rb

@@ -1,7 +1,7 @@
 class MiqAlertSet < ApplicationRecord
   acts_as_miq_set
 
-  before_validation :default_name_to_guid, :on => :create
+  before_validation :default_name_to_description, :on => :create
 
   include AssignmentMixin
 
@@ -48,4 +48,10 @@ def self.seed
     return unless File.exist?(fixture_file)
     File.open(fixture_file) { |fd| MiqAlertSet.import_from_yaml(fd, :save => true) }
   end
+
+  private
+
+  def default_name_to_description
+    self.name ||= description
+  end
 end

app/models/miq_policy_set.rb

@@ -1,7 +1,7 @@
 class MiqPolicySet < ApplicationRecord
   acts_as_miq_set
 
-  before_validation :default_name_to_guid, :on => :create
+  before_validation :default_name_to_description, :on => :create
   before_destroy    :destroy_policy_tags
 
   attr_accessor :reserved
@@ -84,4 +84,10 @@ def self.seed
       end
     end
   end
+
+  private
+
+  def default_name_to_description
+    self.name ||= description
+  end
 end # class MiqPolicySet

spec/models/miq_policy_spec.rb

@@ -6,11 +6,11 @@
     # calling conditions.
 
     before(:each) do
-      @ps = FactoryGirl.create(:miq_policy_set)
+      @ps = FactoryGirl.create(:miq_policy_set, :name => "ps")
       @p  = FactoryGirl.create(:miq_policy)
       @ps.add_member(@p)
 
-      @ps2 = FactoryGirl.create(:miq_policy_set)
+      @ps2 = FactoryGirl.create(:miq_policy_set, :name => "ps2")
       @p2  = FactoryGirl.create(:miq_policy)
     end
 
@@ -159,8 +159,8 @@
 
     let(:profiles) do
       [
-        FactoryGirl.create(:miq_policy_set).tap { |pf| pf.add_member(policies[0]) },
-        FactoryGirl.create(:miq_policy_set).tap { |pf| pf.add_member(policies[1]) },
+        FactoryGirl.create(:miq_policy_set, :name => "ps3").tap { |pf| pf.add_member(policies[0]) },
+        FactoryGirl.create(:miq_policy_set, :name => "ps4").tap { |pf| pf.add_member(policies[1]) },
       ]
     end