foreman_openscap 1.0.5 → 1.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0b6304ecdc7fd28bb61ee2274acf8bf5a281bad437a67aa4b0fbe8214b438432
-  data.tar.gz: e7545538f9f374458f0b1d3b365367bf21532971d2043068fd83b3b7afbe7db8
+  metadata.gz: '0895db81e437924a55b31bb9abe2f1a4f217d6e6108b1324fc52af3950aacd33'
+  data.tar.gz: 5031307c30cddd992d58e0cd4b855b3cdc7e43dfe766947df66adf8154d8a048
 SHA512:
-  metadata.gz: 8206badfe4852a6a74ba2ced8aeb863f1fdb09383b4522c92604eb255fed2ee0fbe98bb3544b81be75969de2b581c2123ad5619f01f9e324e30f081a7224239f
-  data.tar.gz: baf9118c0c690b4c446f565848848cd11368345c59bcd44b44b4e443f387ba26c631e173d352cdc5de150a2cd792bad3cadb55b292c325cd7c93642e88eaf47d
+  metadata.gz: fa6478fc462f96ca1ba815c8369476e58e253bb1ed01307e81895c28ed6e7684602029949233a7e7d89ba8cba6f73d197f5fef76746273120f94ab26aa3acec8
+  data.tar.gz: 0a97a049d86e101f303316b4b49d0b21864c207884fd1ca45b19456735159f8cb1e2b4d762057d078668dcfe7c729b50665d3f7290dab2c20e2b3995ee15128f

data/app/models/foreman_openscap/policy.rb

@@ -305,15 +305,15 @@ module ForemanOpenscap
         memo << assets.where(:assetable_type => class_name, :assetable_id => id).first_or_initialize
       end
       complimentary_class_name = class_name == 'Host::Base' ? 'Hostgroup' : 'Host::Base'
-      existing_assets = self.assets.where(:assetable_type => complimentary_class_name)
+      existing_assets = self.assets.select { |assigned_asset| assigned_asset.assetable_type == complimentary_class_name }
       self.assets = existing_assets + new_assets
     end
 
     def no_mixed_deployments
       assets.each do |asset|
         assetable = asset.assetable
-        unless assetable.policies.pluck(:deploy_by).all? { |deployed_by| deployed_by == deploy_by }
-          errors.add(:base, _("cannot assign to %s, all assigned policies must be deployed in the same way") % assetable.name)
+        unless assetable.policies.where.not(:id => id).pluck(:deploy_by).all? { |deployed_by| deployed_by == deploy_by }
+          errors.add(:base, _("cannot assign to %s, all assigned policies must be deployed in the same way, check 'deploy by' for each assigned policy") % assetable.name)
         end
       end
     end

data/app/views/job_templates/run_openscap_scans.erb

@@ -15,7 +15,9 @@ template_inputs:
 provider_type: SSH
 kind: job_template
 %>
-<% raise "Create and assign a policy to this host before proceeding" unless input('policies').respond_to? :map %>
+<% raise 'Cannot detect values for policies input, please make sure your host is properly configured for openscap' unless input('policies').respond_to?(:map) %>
+
+<% raise "Create and assign a policy to this host before proceeding" if input('policies').respond_to?(:empty?) && input('policies').empty? %>
 
 <% input('policies').map { |policy_config| policy_config['id'] }.each do |id| -%>
 /usr/bin/foreman_scap_client <%= id %>

data/lib/foreman_openscap/version.rb

@@ -1,3 +1,3 @@
 module ForemanOpenscap
-  VERSION = "1.0.5".freeze
+  VERSION = "1.0.6".freeze
 end

data/locale/de/foreman_openscap.edit.po

@@ -597,7 +597,7 @@ msgid "does not have the selected SCAP content profile"
 msgstr ""
 
 #: ../app/models/foreman_openscap/policy.rb:316
-msgid "cannot assign to %s, all assigned policies must be deployed in the same way"
+msgid "cannot assign to %s, all assigned policies must be deployed in the same way, check 'deploy by' for each assigned policy"
 msgstr ""
 
 #: ../app/services/foreman_openscap/arf_report_status_calculator.rb:30

data/locale/de/foreman_openscap.po

@@ -5,7 +5,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_openscap 0.11.0\n"
+"Project-Id-Version: foreman_openscap 1.0.4\n"
 "Report-Msgid-Bugs-To: \n"
 "PO-Revision-Date: 2016-02-09 16:41-0500\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
@@ -888,7 +888,7 @@ msgstr ""
 msgid "You don't seem to have any ARF report. ARF report is a summary of a single scan occurrence on a particular host for a given Compliance Policy."
 msgstr ""
 
-msgid "cannot assign to %s, all assigned policies must be deployed in the same way"
+msgid "cannot assign to %s, all assigned policies must be deployed in the same way, check 'deploy by' for each assigned policy"
 msgstr ""
 
 msgid "documentation"

data/locale/en_GB/foreman_openscap.edit.po

@@ -597,7 +597,7 @@ msgid "does not have the selected SCAP content profile"
 msgstr ""
 
 #: ../app/models/foreman_openscap/policy.rb:316
-msgid "cannot assign to %s, all assigned policies must be deployed in the same way"
+msgid "cannot assign to %s, all assigned policies must be deployed in the same way, check 'deploy by' for each assigned policy"
 msgstr ""
 
 #: ../app/services/foreman_openscap/arf_report_status_calculator.rb:30

data/locale/en_GB/foreman_openscap.po

@@ -5,7 +5,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_openscap 0.11.0\n"
+"Project-Id-Version: foreman_openscap 1.0.4\n"
 "Report-Msgid-Bugs-To: \n"
 "PO-Revision-Date: 2016-02-09 16:41-0500\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
@@ -888,7 +888,7 @@ msgstr ""
 msgid "You don't seem to have any ARF report. ARF report is a summary of a single scan occurrence on a particular host for a given Compliance Policy."
 msgstr ""
 
-msgid "cannot assign to %s, all assigned policies must be deployed in the same way"
+msgid "cannot assign to %s, all assigned policies must be deployed in the same way, check 'deploy by' for each assigned policy"
 msgstr ""
 
 msgid "documentation"

data/locale/es/foreman_openscap.edit.po

@@ -597,7 +597,7 @@ msgid "does not have the selected SCAP content profile"
 msgstr ""
 
 #: ../app/models/foreman_openscap/policy.rb:316
-msgid "cannot assign to %s, all assigned policies must be deployed in the same way"
+msgid "cannot assign to %s, all assigned policies must be deployed in the same way, check 'deploy by' for each assigned policy"
 msgstr ""
 
 #: ../app/services/foreman_openscap/arf_report_status_calculator.rb:30

data/locale/es/foreman_openscap.po

@@ -5,7 +5,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_openscap 0.11.0\n"
+"Project-Id-Version: foreman_openscap 1.0.4\n"
 "Report-Msgid-Bugs-To: \n"
 "PO-Revision-Date: 2016-02-09 16:41-0500\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
@@ -888,7 +888,7 @@ msgstr ""
 msgid "You don't seem to have any ARF report. ARF report is a summary of a single scan occurrence on a particular host for a given Compliance Policy."
 msgstr ""
 
-msgid "cannot assign to %s, all assigned policies must be deployed in the same way"
+msgid "cannot assign to %s, all assigned policies must be deployed in the same way, check 'deploy by' for each assigned policy"
 msgstr ""
 
 msgid "documentation"

data/locale/foreman_openscap.pot

@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: foreman_openscap 1.0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-08-08 16:14+0200\n"
-"PO-Revision-Date: 2019-08-08 16:14+0200\n"
+"POT-Creation-Date: 2019-09-05 16:51+0200\n"
+"PO-Revision-Date: 2019-09-05 16:51+0200\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: \n"
@@ -649,7 +649,9 @@ msgid "does not have the selected SCAP content profile"
 msgstr ""
 
 #: ../app/models/foreman_openscap/policy.rb:316
-msgid "cannot assign to %s, all assigned policies must be deployed in the same way"
+msgid ""
+"cannot assign to %s, all assigned policies must be deployed in the same way, c"
+"heck 'deploy by' for each assigned policy"
 msgstr ""
 
 #: ../app/services/foreman_openscap/arf_report_status_calculator.rb:30

data/locale/fr/foreman_openscap.edit.po

@@ -597,7 +597,7 @@ msgid "does not have the selected SCAP content profile"
 msgstr ""
 
 #: ../app/models/foreman_openscap/policy.rb:316
-msgid "cannot assign to %s, all assigned policies must be deployed in the same way"
+msgid "cannot assign to %s, all assigned policies must be deployed in the same way, check 'deploy by' for each assigned policy"
 msgstr ""
 
 #: ../app/services/foreman_openscap/arf_report_status_calculator.rb:30

data/locale/fr/foreman_openscap.po

@@ -5,7 +5,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_openscap 0.11.0\n"
+"Project-Id-Version: foreman_openscap 1.0.4\n"
 "Report-Msgid-Bugs-To: \n"
 "PO-Revision-Date: 2016-02-09 16:41-0500\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
@@ -888,7 +888,7 @@ msgstr ""
 msgid "You don't seem to have any ARF report. ARF report is a summary of a single scan occurrence on a particular host for a given Compliance Policy."
 msgstr ""
 
-msgid "cannot assign to %s, all assigned policies must be deployed in the same way"
+msgid "cannot assign to %s, all assigned policies must be deployed in the same way, check 'deploy by' for each assigned policy"
 msgstr ""
 
 msgid "documentation"

data/locale/gl/foreman_openscap.edit.po

@@ -597,7 +597,7 @@ msgid "does not have the selected SCAP content profile"
 msgstr ""
 
 #: ../app/models/foreman_openscap/policy.rb:316
-msgid "cannot assign to %s, all assigned policies must be deployed in the same way"
+msgid "cannot assign to %s, all assigned policies must be deployed in the same way, check 'deploy by' for each assigned policy"
 msgstr ""
 
 #: ../app/services/foreman_openscap/arf_report_status_calculator.rb:30

data/locale/gl/foreman_openscap.po

@@ -5,7 +5,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_openscap 0.11.0\n"
+"Project-Id-Version: foreman_openscap 1.0.4\n"
 "Report-Msgid-Bugs-To: \n"
 "PO-Revision-Date: 2016-02-09 16:41-0500\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
@@ -888,7 +888,7 @@ msgstr ""
 msgid "You don't seem to have any ARF report. ARF report is a summary of a single scan occurrence on a particular host for a given Compliance Policy."
 msgstr ""
 
-msgid "cannot assign to %s, all assigned policies must be deployed in the same way"
+msgid "cannot assign to %s, all assigned policies must be deployed in the same way, check 'deploy by' for each assigned policy"
 msgstr ""
 
 msgid "documentation"

data/locale/it/foreman_openscap.edit.po

@@ -597,7 +597,7 @@ msgid "does not have the selected SCAP content profile"
 msgstr ""
 
 #: ../app/models/foreman_openscap/policy.rb:316
-msgid "cannot assign to %s, all assigned policies must be deployed in the same way"
+msgid "cannot assign to %s, all assigned policies must be deployed in the same way, check 'deploy by' for each assigned policy"
 msgstr ""
 
 #: ../app/services/foreman_openscap/arf_report_status_calculator.rb:30

data/locale/it/foreman_openscap.po

@@ -5,7 +5,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_openscap 0.11.0\n"
+"Project-Id-Version: foreman_openscap 1.0.4\n"
 "Report-Msgid-Bugs-To: \n"
 "PO-Revision-Date: 2016-02-09 16:41-0500\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
@@ -888,7 +888,7 @@ msgstr ""
 msgid "You don't seem to have any ARF report. ARF report is a summary of a single scan occurrence on a particular host for a given Compliance Policy."
 msgstr ""
 
-msgid "cannot assign to %s, all assigned policies must be deployed in the same way"
+msgid "cannot assign to %s, all assigned policies must be deployed in the same way, check 'deploy by' for each assigned policy"
 msgstr ""
 
 msgid "documentation"

data/locale/ja/foreman_openscap.edit.po

@@ -597,7 +597,7 @@ msgid "does not have the selected SCAP content profile"
 msgstr ""
 
 #: ../app/models/foreman_openscap/policy.rb:316
-msgid "cannot assign to %s, all assigned policies must be deployed in the same way"
+msgid "cannot assign to %s, all assigned policies must be deployed in the same way, check 'deploy by' for each assigned policy"
 msgstr ""
 
 #: ../app/services/foreman_openscap/arf_report_status_calculator.rb:30

data/locale/ja/foreman_openscap.po

@@ -5,7 +5,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_openscap 0.11.0\n"
+"Project-Id-Version: foreman_openscap 1.0.4\n"
 "Report-Msgid-Bugs-To: \n"
 "PO-Revision-Date: 2016-02-09 16:41-0500\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
@@ -888,7 +888,7 @@ msgstr ""
 msgid "You don't seem to have any ARF report. ARF report is a summary of a single scan occurrence on a particular host for a given Compliance Policy."
 msgstr ""
 
-msgid "cannot assign to %s, all assigned policies must be deployed in the same way"
+msgid "cannot assign to %s, all assigned policies must be deployed in the same way, check 'deploy by' for each assigned policy"
 msgstr ""
 
 msgid "documentation"

data/locale/ko/foreman_openscap.edit.po

@@ -597,7 +597,7 @@ msgid "does not have the selected SCAP content profile"
 msgstr ""
 
 #: ../app/models/foreman_openscap/policy.rb:316
-msgid "cannot assign to %s, all assigned policies must be deployed in the same way"
+msgid "cannot assign to %s, all assigned policies must be deployed in the same way, check 'deploy by' for each assigned policy"
 msgstr ""
 
 #: ../app/services/foreman_openscap/arf_report_status_calculator.rb:30

data/locale/ko/foreman_openscap.po

@@ -5,7 +5,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_openscap 0.11.0\n"
+"Project-Id-Version: foreman_openscap 1.0.4\n"
 "Report-Msgid-Bugs-To: \n"
 "PO-Revision-Date: 2016-02-09 16:41-0500\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
@@ -888,7 +888,7 @@ msgstr ""
 msgid "You don't seem to have any ARF report. ARF report is a summary of a single scan occurrence on a particular host for a given Compliance Policy."
 msgstr ""
 
-msgid "cannot assign to %s, all assigned policies must be deployed in the same way"
+msgid "cannot assign to %s, all assigned policies must be deployed in the same way, check 'deploy by' for each assigned policy"
 msgstr ""
 
 msgid "documentation"

data/locale/pt_BR/foreman_openscap.edit.po

@@ -597,7 +597,7 @@ msgid "does not have the selected SCAP content profile"
 msgstr ""
 
 #: ../app/models/foreman_openscap/policy.rb:316
-msgid "cannot assign to %s, all assigned policies must be deployed in the same way"
+msgid "cannot assign to %s, all assigned policies must be deployed in the same way, check 'deploy by' for each assigned policy"
 msgstr ""
 
 #: ../app/services/foreman_openscap/arf_report_status_calculator.rb:30

data/locale/pt_BR/foreman_openscap.po

@@ -5,7 +5,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_openscap 0.11.0\n"
+"Project-Id-Version: foreman_openscap 1.0.4\n"
 "Report-Msgid-Bugs-To: \n"
 "PO-Revision-Date: 2016-02-09 16:41-0500\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
@@ -888,7 +888,7 @@ msgstr ""
 msgid "You don't seem to have any ARF report. ARF report is a summary of a single scan occurrence on a particular host for a given Compliance Policy."
 msgstr ""
 
-msgid "cannot assign to %s, all assigned policies must be deployed in the same way"
+msgid "cannot assign to %s, all assigned policies must be deployed in the same way, check 'deploy by' for each assigned policy"
 msgstr ""
 
 msgid "documentation"

data/locale/ru/foreman_openscap.edit.po

@@ -598,7 +598,7 @@ msgid "does not have the selected SCAP content profile"
 msgstr ""
 
 #: ../app/models/foreman_openscap/policy.rb:316
-msgid "cannot assign to %s, all assigned policies must be deployed in the same way"
+msgid "cannot assign to %s, all assigned policies must be deployed in the same way, check 'deploy by' for each assigned policy"
 msgstr ""
 
 #: ../app/services/foreman_openscap/arf_report_status_calculator.rb:30

data/locale/ru/foreman_openscap.po

@@ -5,7 +5,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_openscap 0.11.0\n"
+"Project-Id-Version: foreman_openscap 1.0.4\n"
 "Report-Msgid-Bugs-To: \n"
 "PO-Revision-Date: 2016-02-09 16:41-0500\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
@@ -889,7 +889,7 @@ msgstr ""
 msgid "You don't seem to have any ARF report. ARF report is a summary of a single scan occurrence on a particular host for a given Compliance Policy."
 msgstr ""
 
-msgid "cannot assign to %s, all assigned policies must be deployed in the same way"
+msgid "cannot assign to %s, all assigned policies must be deployed in the same way, check 'deploy by' for each assigned policy"
 msgstr ""
 
 msgid "documentation"

data/locale/sv_SE/foreman_openscap.edit.po

@@ -597,7 +597,7 @@ msgid "does not have the selected SCAP content profile"
 msgstr ""
 
 #: ../app/models/foreman_openscap/policy.rb:316
-msgid "cannot assign to %s, all assigned policies must be deployed in the same way"
+msgid "cannot assign to %s, all assigned policies must be deployed in the same way, check 'deploy by' for each assigned policy"
 msgstr ""
 
 #: ../app/services/foreman_openscap/arf_report_status_calculator.rb:30

data/locale/sv_SE/foreman_openscap.po

@@ -5,7 +5,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_openscap 0.11.0\n"
+"Project-Id-Version: foreman_openscap 1.0.4\n"
 "Report-Msgid-Bugs-To: \n"
 "PO-Revision-Date: 2016-02-09 16:41-0500\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
@@ -888,7 +888,7 @@ msgstr ""
 msgid "You don't seem to have any ARF report. ARF report is a summary of a single scan occurrence on a particular host for a given Compliance Policy."
 msgstr ""
 
-msgid "cannot assign to %s, all assigned policies must be deployed in the same way"
+msgid "cannot assign to %s, all assigned policies must be deployed in the same way, check 'deploy by' for each assigned policy"
 msgstr ""
 
 msgid "documentation"

data/locale/zh_CN/foreman_openscap.edit.po

@@ -597,7 +597,7 @@ msgid "does not have the selected SCAP content profile"
 msgstr ""
 
 #: ../app/models/foreman_openscap/policy.rb:316
-msgid "cannot assign to %s, all assigned policies must be deployed in the same way"
+msgid "cannot assign to %s, all assigned policies must be deployed in the same way, check 'deploy by' for each assigned policy"
 msgstr ""
 
 #: ../app/services/foreman_openscap/arf_report_status_calculator.rb:30

data/locale/zh_CN/foreman_openscap.po

@@ -5,7 +5,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_openscap 0.11.0\n"
+"Project-Id-Version: foreman_openscap 1.0.4\n"
 "Report-Msgid-Bugs-To: \n"
 "PO-Revision-Date: 2016-02-09 16:41-0500\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
@@ -888,7 +888,7 @@ msgstr ""
 msgid "You don't seem to have any ARF report. ARF report is a summary of a single scan occurrence on a particular host for a given Compliance Policy."
 msgstr ""
 
-msgid "cannot assign to %s, all assigned policies must be deployed in the same way"
+msgid "cannot assign to %s, all assigned policies must be deployed in the same way, check 'deploy by' for each assigned policy"
 msgstr ""
 
 msgid "documentation"

data/locale/zh_TW/foreman_openscap.edit.po

@@ -597,7 +597,7 @@ msgid "does not have the selected SCAP content profile"
 msgstr ""
 
 #: ../app/models/foreman_openscap/policy.rb:316
-msgid "cannot assign to %s, all assigned policies must be deployed in the same way"
+msgid "cannot assign to %s, all assigned policies must be deployed in the same way, check 'deploy by' for each assigned policy"
 msgstr ""
 
 #: ../app/services/foreman_openscap/arf_report_status_calculator.rb:30

data/locale/zh_TW/foreman_openscap.po

@@ -5,7 +5,7 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: foreman_openscap 0.11.0\n"
+"Project-Id-Version: foreman_openscap 1.0.4\n"
 "Report-Msgid-Bugs-To: \n"
 "PO-Revision-Date: 2016-02-09 16:41-0500\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
@@ -888,7 +888,7 @@ msgstr ""
 msgid "You don't seem to have any ARF report. ARF report is a summary of a single scan occurrence on a particular host for a given Compliance Policy."
 msgstr ""
 
-msgid "cannot assign to %s, all assigned policies must be deployed in the same way"
+msgid "cannot assign to %s, all assigned policies must be deployed in the same way, check 'deploy by' for each assigned policy"
 msgstr ""
 
 msgid "documentation"

data/test/factories/compliance_host_factory.rb

@@ -6,7 +6,7 @@ FactoryBot.define do
   factory :openscap_proxy, :class => SmartProxy do
     sequence(:name) { |n| "openscap_proxy#{n}" }
     sequence(:url) { |n| "https://anywhere#{n}.net:8443" }
-    features { |sp| [sp.association(:openscap_feature)] }
+    features { [Feature.find_by(:name => 'Openscap') || FactoryBot.create(:openscap_feature)] }
   end
 
   factory :compliance_host, :class => Host::Managed do

data/test/unit/policy_test.rb

@@ -250,6 +250,33 @@ class PolicyTest < ActiveSupport::TestCase
     puppet_policy = FactoryBot.create(:policy, :deploy_by => 'puppet')
     puppet_policy.host_ids = [host.id]
     refute puppet_policy.save
-    assert_equal "cannot assign to #{host.name}, all assigned policies must be deployed in the same way", puppet_policy.errors[:base].first
+    assert_equal "cannot assign to #{host.name}, all assigned policies must be deployed in the same way, check 'deploy by' for each assigned policy", puppet_policy.errors[:base].first
+  end
+
+  test "should change deployment option when there is 1 policy assigned to hostgroup" do
+    hg = FactoryBot.create(:hostgroup)
+    asset = FactoryBot.create(:asset, :assetable_type => 'Hostgroup', :assetable_id => hg.id)
+    policy = FactoryBot.create(:policy, :assets => [asset], :deploy_by => 'manual')
+    policy.stubs(:assign_policy_to_hostgroups).returns(:true)
+    policy.deploy_by = 'puppet'
+    assert policy.save
+  end
+
+  test "should assign host and hostgroup at the same time" do
+    hostgroup = FactoryBot.create(:hostgroup)
+    host = FactoryBot.create(:host)
+    policy = ForemanOpenscap::Policy.create(
+      :name => 'random',
+      :scap_content_id => @scap_content.id,
+      :scap_content_profile_id => @scap_profile.id,
+      :period => 'custom',
+      :cron_line => '10 * * * *',
+      :deploy_by => 'manual',
+      :hostgroup_ids => [hostgroup.id],
+      :host_ids => [host.id]
+    )
+    assert policy.save
+    refute policy.hostgroups.empty?
+    refute policy.hosts.empty?
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_openscap
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.0.6
 platform: ruby
 authors:
 - slukasik@redhat.com
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-08 00:00:00.000000000 Z
+date: 2019-09-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deface