Merge pull request ManageIQ#20430 from d-m-u/fix_get_policies

get_policies should maybe return policies in the set as well as the set itself
agrare · Aug 12, 2020 · 5f2a3a7 · 5f2a3a7
2 parents aa26b90 + 5a41715
commit 5f2a3a7
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/app/models/mixins/miq_policy_mixin.rb b/app/models/mixins/miq_policy_mixin.rb
@@ -31,7 +31,7 @@ def get_policies
       .map { |t| t.split("/").first(2) }
       .group_by(&:first)
       .select { |klass, _ids| ["miq_policy", "miq_policy_set"].include?(klass) }
-      .flat_map { |klass, ids| klass.camelize.constantize.where(:id => ids).to_a }
+      .flat_map { |klass, ids| klass.camelize.constantize.where(:id => ids.map(&:last)).to_a }
   end
 
   def resolve_policies(list, event = nil)

diff --git a/spec/support/examples_group/shared_examples_for_miq_policy_mixin.rb b/spec/support/examples_group/shared_examples_for_miq_policy_mixin.rb
@@ -2,7 +2,9 @@
 shared_examples_for "MiqPolicyMixin" do
   context "MiqPolicyMixin methods" do
     let(:policy) { FactoryBot.create(:miq_policy) }
+    let(:policy2) { FactoryBot.create(:miq_policy) }
     let(:policy_set) { FactoryBot.create(:miq_policy_set).tap { |ps| ps.add_member(policy) } }
+    let(:policy_set) { FactoryBot.create(:miq_policy_set).tap { |ps| ps.add_member(policy2) } }
 
     describe "#get_policies" do
       it "supports no policies" do
@@ -15,8 +17,10 @@
       end
 
       it "supports policy sets" do
+        subject.add_policy(policy)
+        subject.add_policy(policy2)
         subject.add_policy(policy_set)
-        expect(subject.get_policies).to eq([policy_set])
+        expect(subject.get_policies).to contain_exactly(policy_set, policy, policy2)
       end
     end