Merge pull request #19203 from djberg96/supports_feature_order

Add order option to SupportsFeatureMixin module
ManageIQ · Aug 26, 2019 · baeb7ba · baeb7ba
2 parents f30f408 + 69684c2
commit baeb7ba
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 0 deletions.
diff --git a/app/models/mixins/supports_feature_mixin.rb b/app/models/mixins/supports_feature_mixin.rb
@@ -99,6 +99,7 @@ module SupportsFeatureMixin
     :migrate                             => 'Migration',
     :capture                             => 'Capture of Capacity & Utilization Metrics',
     :openscap_scan                       => 'OpenSCAP security scan',
+    :order                               => 'Service Order',
     :provisioning                        => 'Provisioning',
     :publish                             => 'Publishing',
     :quick_stats                         => 'Quick Stats',

diff --git a/app/models/service_template.rb b/app/models/service_template.rb
@@ -1,4 +1,6 @@
 class ServiceTemplate < ApplicationRecord
+  include SupportsFeatureMixin
+
   DEFAULT_PROCESS_DELAY_BETWEEN_GROUPS = 120
 
   GENERIC_ITEM_SUBTYPES = {
@@ -84,6 +86,8 @@ class ServiceTemplate < ApplicationRecord
   scope :displayed,                                 ->         { where(:display => true) }
   scope :public_service_templates,                  ->         { where(:internal => [false, nil]) }
 
+  supports :order
+
   def self.with_tenant(tenant_id)
     tenant = Tenant.find(tenant_id)
     where(:tenant_id => tenant.ancestor_ids + [tenant_id])

diff --git a/spec/models/service_template_spec.rb b/spec/models/service_template_spec.rb
@@ -1113,6 +1113,13 @@
       end
     end
   end
+
+  context "#supports_order?" do
+    it "returns the expected boolean value" do
+      st = FactoryBot.create(:service_template)
+      expect(st.supports_order?).to eql(true)
+    end
+  end
 end
 
 def add_and_save_service(p, c)