foreman_openscap 5.2.1 → 5.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 92bab404c3bb495719fa2ecf62c84cdcea0cf42a4fe9cdc7f07fc6a99341a803
-  data.tar.gz: 36cd15417a6f421c8424b4f24cfa21e1ec09f59d297955db6a0a8f97e90c6adf
+  metadata.gz: 91721fce685ae564d178a80978c2196d57dd6320d97a8fdd0ae1a98bafa41a90
+  data.tar.gz: 62f620936950eb8964353071eb16afb329245f63389f5e78d210420c832b86bd
 SHA512:
-  metadata.gz: d4713c26ae5f19cf96cf2ae88900a078457646e57a1fce213f1d63b430a1468d89d0a6ae0ae29cced95456c643a0c469f46c2eafeb5c9fe2f870f7c589b44ade
-  data.tar.gz: ebbfd812e483cd88aa6dc279f17734eac782c97a3c8696be7879a41961fe6e79ee3b7f6342726faa6220a275ea48b3edf8292bc14424a8f87f01968749cf3c72
+  metadata.gz: 4c11e0c0aad9eacae1765d6f39e94cf5f1559a2719b54520847a50ae324591807db1a1ba20d394828c2c8167322029758f582591e9ecbad0438df7eea141b834
+  data.tar.gz: 47fca0728c35aa94bd3b9c21195838219a9f119df5bd1df4ab4b116d55ac4c5f1e2132b2353a0c8ce75f2075f07205f32a443bc12405cee5f1d13478d6b90a52

data/app/services/foreman_openscap/client_config/ansible.rb

@@ -16,7 +16,7 @@ module ForemanOpenscap
       end
 
       def available?
-        defined?(ForemanAnsible)
+        Foreman::Plugin.installed?("foreman_ansible")
       end
 
       def inline_help

data/app/services/foreman_openscap/client_config/puppet.rb

@@ -10,7 +10,7 @@ module ForemanOpenscap
       end
 
       def available?
-        defined?(ForemanPuppet)
+        Foreman::Plugin.installed?("foreman_puppet")
       end
 
       def inline_help

data/db/migrate/20200117135424_migrate_port_overrides_to_int.rb

@@ -10,7 +10,7 @@ class MigratePortOverridesToInt < ActiveRecord::Migration[5.2]
   private
 
   def transform_lookup_values(method)
-    return unless defined?(ForemanPuppet)
+    return unless Foreman::Plugin.installed?("foreman_puppet")
     puppet_class = ::ForemanPuppet::Puppetclass.find_by :name => 'foreman_scap_client'
     return unless puppet_class
     port_key = puppet_class.class_params.find_by :key => 'port'

data/db/migrate/20200803065041_migrate_port_overrides_for_ansible.rb

@@ -10,7 +10,7 @@ class MigratePortOverridesForAnsible < ActiveRecord::Migration[6.0]
   private
 
   def transform_lookup_values(method)
-    return unless defined?(ForemanAnsible)
+    return unless Foreman::Plugin.installed?("foreman_ansible")
     role = AnsibleRole.find_by :name => 'theforeman.foreman_scap_client'
     return unless role
     port_key = role.ansible_variables.find_by :key => 'foreman_scap_client_port'

data/db/migrate/20201202110213_update_puppet_port_param_type.rb

@@ -10,7 +10,7 @@ class UpdatePuppetPortParamType < ActiveRecord::Migration[6.0]
   private
 
   def update_port_type(method)
-    return unless defined?(ForemanPuppet)
+    return unless Foreman::Plugin.installed?("foreman_puppet")
     puppet_class = ::ForemanPuppet::Puppetclass.find_by :name => 'foreman_scap_client'
     return unless puppet_class
     port_key = puppet_class.class_params.find_by :key => 'port'

data/lib/foreman_openscap/engine.rb

@@ -1,6 +1,6 @@
 module ForemanOpenscap
   def self.with_katello?
-    defined?(::Katello)
+    Foreman::Plugin.installed?("katello")
   end
 
   class Engine < ::Rails::Engine

data/lib/foreman_openscap/version.rb

@@ -1,3 +1,3 @@
 module ForemanOpenscap
-  VERSION = "5.2.1".freeze
+  VERSION = "5.2.2".freeze
 end

data/test/test_plugin_helper.rb

@@ -5,14 +5,14 @@ require 'test_helper'
 FactoryBot.definition_file_paths << File.join(File.dirname(__FILE__), 'factories')
 # Add factories from foreman_ansible
 FactoryBot.definition_file_paths << File.join(ForemanAnsible::Engine.root, '/test/factories')
-FactoryBot.definition_file_paths << File.join(ForemanPuppet::Engine.root, '/test/factories') if defined?(ForemanPuppet)
+FactoryBot.definition_file_paths << File.join(ForemanPuppet::Engine.root, '/test/factories') if defined?(ForemanPuppet::Engine)
 FactoryBot.reload
 
 require "#{ForemanOpenscap::Engine.root}/test/fixtures/cve_fixtures"
 
 module ScapClientPuppetclass
   def puppet_available?
-    defined?(ForemanPuppet)
+    Foreman::Plugin.installed?("foreman_puppet")
   end
 
   def setup_puppet_class

data/webpack/components/IndexTable/IndexTableHelper.js

@@ -1,8 +1,5 @@
 import { addSearch } from '../../helpers/pageParamsHelper';
 
-export const preparePerPageOptions = opts =>
-  opts.map(item => ({ title: item.toString(), value: item }));
-
 export const refreshPage = (history, params = {}) => {
   const url = addSearch(history.location.pathname, params);
   history.push(url);

data/webpack/components/IndexTable/index.js

@@ -1,10 +1,9 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import { Table, TableHeader, TableBody } from '@patternfly/react-table';
-import { Pagination, Flex, FlexItem } from '@patternfly/react-core';
-import { usePaginationOptions } from 'foremanReact/components/Pagination/PaginationHooks';
-
-import { preparePerPageOptions, refreshPage } from './IndexTableHelper';
+import { Flex, FlexItem } from '@patternfly/react-core';
+import Pagination from 'foremanReact/components/Pagination';
+import { refreshPage } from './IndexTableHelper';
 
 const IndexTable = ({
   history,
@@ -15,16 +14,14 @@ const IndexTable = ({
   columns,
   ...rest
 }) => {
-  const handlePerPageSelected = (event, perPage) => {
+  const handlePerPageSelected = perPage => {
     refreshPage(history, { page: 1, perPage });
   };
 
-  const handlePageSelected = (event, page) => {
+  const handlePageSelected = page => {
     refreshPage(history, { ...pagination, page });
   };
 
-  const perPageOptions = preparePerPageOptions(usePaginationOptions());
-
   return (
     <React.Fragment>
       <Flex className="pf-u-pt-md">
@@ -36,7 +33,6 @@ const IndexTable = ({
             perPage={pagination.perPage}
             onSetPage={handlePageSelected}
             onPerPageSelect={handlePerPageSelected}
-            perPageOptions={perPageOptions}
             variant="top"
           />
         </FlexItem>

data/webpack/routes/OvalContents/OvalContentsIndex/__tests__/OvalContentsIndex.test.js

@@ -1,7 +1,5 @@
 import React from 'react';
 import { render, screen, waitFor } from '@testing-library/react';
-import { within } from '@testing-library/dom';
-import userEvent from '@testing-library/user-event';
 import '@testing-library/jest-dom';
 
 import OvalContentsIndex from '../';
@@ -13,13 +11,9 @@ import {
   tick,
   historyMock,
 } from '../../../../testHelper';
-import { ovalContentsPath } from '../../../../helpers/pathsHelper';
 
 import {
   mocks,
-  paginatedMocks,
-  pushMock,
-  pagePaginationHistoryMock,
   emptyMocks,
   errorMocks,
   viewerMocks,
@@ -32,9 +26,7 @@ const TestComponent = withRedux(
 
 describe('OvalContentsIndex', () => {
   it('should load page', async () => {
-    const { container } = render(
-      <TestComponent history={historyMock} mocks={mocks} location={{}} />
-    );
+    render(<TestComponent history={historyMock} mocks={mocks} location={{}} />);
     expect(screen.getByText('Loading')).toBeInTheDocument();
     await waitFor(tick);
     expect(screen.queryByText('Loading')).not.toBeInTheDocument();
@@ -46,31 +38,6 @@ describe('OvalContentsIndex', () => {
     ).toBeInTheDocument();
     expect(screen.getByText('openshift OVAL content')).toBeInTheDocument();
     expect(screen.getByText('openshift.oval.xml.bz2')).toBeInTheDocument();
-    const pageItems = container.querySelector('.pf-c-pagination__total-items');
-    expect(within(pageItems).getByText(/1 - 4/)).toBeInTheDocument();
-    expect(within(pageItems).getByText('of')).toBeInTheDocument();
-    expect(within(pageItems).getByText('4')).toBeInTheDocument();
-  });
-  it('should load page with pagination params', async () => {
-    const { container } = render(
-      <TestComponent
-        history={pagePaginationHistoryMock}
-        location={{}}
-        mocks={paginatedMocks}
-      />
-    );
-    await waitFor(tick);
-    const pageItems = container.querySelector('.pf-c-pagination__total-items');
-    expect(within(pageItems).getByText(/6 - 7/)).toBeInTheDocument();
-    expect(within(pageItems).getByText('of')).toBeInTheDocument();
-    expect(within(pageItems).getByText('7')).toBeInTheDocument();
-    userEvent.click(
-      screen.getByRole('button', { name: 'Go to previous page' })
-    );
-
-    expect(pushMock).toHaveBeenCalledWith(
-      `${ovalContentsPath}?page=1&perPage=5`
-    );
   });
   it('should show empty state', async () => {
     render(

data/webpack/routes/OvalPolicies/OvalPoliciesIndex/__tests__/OvalPoliciesIndex.test.js

@@ -1,7 +1,5 @@
 import React from 'react';
 import { render, screen, waitFor } from '@testing-library/react';
-import userEvent from '@testing-library/user-event';
-import { within } from '@testing-library/dom';
 import '@testing-library/jest-dom';
 
 import {
@@ -14,9 +12,6 @@ import {
 
 import {
   mocks,
-  pushMock,
-  pageParamsMocks,
-  pageParamsHistoryMock,
   emptyMocks,
   errorMocks,
   viewerMocks,
@@ -24,7 +19,6 @@ import {
 } from './OvalPoliciesIndex.fixtures';
 
 import OvalPoliciesIndex from '../index';
-import { ovalPoliciesPath } from '../../../../helpers/pathsHelper';
 
 const TestComponent = withRouter(
   withRedux(withMockedProvider(OvalPoliciesIndex))
@@ -32,19 +26,13 @@ const TestComponent = withRouter(
 
 describe('OvalPoliciesIndex', () => {
   it('should load page', async () => {
-    const { container } = render(
-      <TestComponent history={historyMock} mocks={mocks} />
-    );
+    render(<TestComponent history={historyMock} mocks={mocks} />);
     expect(screen.getByText('Loading')).toBeInTheDocument();
     await waitFor(tick);
     expect(screen.getByText('first policy')).toBeInTheDocument();
     expect(screen.getByText('second policy')).toBeInTheDocument();
     expect(screen.getByText('first content')).toBeInTheDocument();
     expect(screen.getByText('second content')).toBeInTheDocument();
-    const pageItems = container.querySelector('.pf-c-pagination__total-items');
-    expect(within(pageItems).getByText(/1 - 2/)).toBeInTheDocument();
-    expect(within(pageItems).getByText('of')).toBeInTheDocument();
-    expect(within(pageItems).getByText('2')).toBeInTheDocument();
 
     expect(screen.getByText('first policy').closest('a')).toHaveAttribute(
       'href',
@@ -55,23 +43,6 @@ describe('OvalPoliciesIndex', () => {
       '/experimental/compliance/oval_policies/40'
     );
   });
-  it('should load page with page params', async () => {
-    const { container } = render(
-      <TestComponent history={pageParamsHistoryMock} mocks={pageParamsMocks} />
-    );
-    await waitFor(tick);
-    const pageItems = container.querySelector('.pf-c-pagination__total-items');
-    expect(within(pageItems).getByText(/6 - 7/)).toBeInTheDocument();
-    expect(within(pageItems).getByText('of')).toBeInTheDocument();
-    expect(within(pageItems).getByText('7')).toBeInTheDocument();
-    userEvent.click(
-      screen.getByRole('button', { name: 'Go to previous page' })
-    );
-
-    expect(pushMock).toHaveBeenCalledWith(
-      `${ovalPoliciesPath}?page=1&perPage=5`
-    );
-  });
   it('should show empty state', async () => {
     render(<TestComponent history={historyMock} mocks={emptyMocks} />);
     expect(screen.getByText('Loading')).toBeInTheDocument();

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_openscap
 version: !ruby/object:Gem::Version
-  version: 5.2.1
+  version: 5.2.2
 platform: ruby
 authors:
 - slukasik@redhat.com
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-27 00:00:00.000000000 Z
+date: 2022-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -521,64 +521,64 @@ signing_key:
 specification_version: 4
 summary: Foreman plug-in for displaying OpenSCAP audit reports
 test_files:
+- test/factories/arf_report_factory.rb
 - test/factories/asset_factory.rb
-- test/factories/policy_arf_report_factory.rb
-- test/factories/policy_factory.rb
-- test/factories/scap_content_related.rb
 - test/factories/compliance_host_factory.rb
+- test/factories/compliance_log_factory.rb
 - test/factories/oval_content_factory.rb
 - test/factories/oval_policy_factory.rb
-- test/factories/arf_report_factory.rb
-- test/factories/compliance_log_factory.rb
+- test/factories/policy_arf_report_factory.rb
+- test/factories/policy_factory.rb
+- test/factories/scap_content_related.rb
 - test/files/arf_report/arf_report.bz2
 - test/files/arf_report/arf_report.html
 - test/files/arf_report/arf_report.json
 - test/files/arf_report/arf_report_msg_desc_changed.json
 - test/files/arf_report/arf_report_msg_value_changed.json
+- test/files/oval_contents/ansible-2.9.oval.xml.bz2
 - test/files/scap_contents/ssg-fedora-ds.xml
 - test/files/tailoring_files/ssg-firefox-ds-tailoring-2.xml
 - test/files/tailoring_files/ssg-firefox-ds-tailoring.xml
-- test/files/oval_contents/ansible-2.9.oval.xml.bz2
-- test/functional/api/v2/compliance/scap_content_profiles_controller_test.rb
-- test/functional/api/v2/compliance/scap_contents_controller_test.rb
-- test/functional/api/v2/compliance/tailoring_files_controller_test.rb
+- test/fixtures/cve_fixtures.rb
+- test/functional/api/v2/compliance/arf_reports_controller_test.rb
 - test/functional/api/v2/compliance/oval_contents_controller_test.rb
 - test/functional/api/v2/compliance/oval_policies_controller_test.rb
-- test/functional/api/v2/compliance/arf_reports_controller_test.rb
 - test/functional/api/v2/compliance/oval_reports_controller_test.rb
 - test/functional/api/v2/compliance/policies_controller_test.rb
+- test/functional/api/v2/compliance/scap_content_profiles_controller_test.rb
+- test/functional/api/v2/compliance/scap_contents_controller_test.rb
+- test/functional/api/v2/compliance/tailoring_files_controller_test.rb
 - test/functional/api/v2/hosts_controller_test.rb
 - test/functional/arf_reports_controller_test.rb
 - test/functional/openscap_proxies_controller_test.rb
 - test/functional/tailoring_files_controller_test.rb
+- test/graphql/mutations/oval_policies/delete_mutation_test.rb
+- test/graphql/queries/oval_content_query_test.rb
+- test/graphql/queries/oval_contents_query_test.rb
+- test/graphql/queries/oval_policies_query_test.rb
 - test/helpers/arf_report_dashboard_helper_test.rb
 - test/helpers/policy_dashboard_helper_test.rb
 - test/lib/foreman_openscap/bulk_upload_test.rb
-- test/unit/concerns/host_extensions_test.rb
-- test/unit/concerns/openscap_proxy_extenstions_test.rb
-- test/unit/services/tailoring_files_proxy_check_test.rb
-- test/unit/services/oval/setup_test.rb
-- test/unit/services/oval/cves_test.rb
-- test/unit/services/oval/setup_check_test.rb
-- test/unit/services/config_name_service_test.rb
-- test/unit/services/lookup_key_overrider_test.rb
-- test/unit/services/report_dashboard/data_test.rb
-- test/unit/services/hostgroup_overrider_test.rb
+- test/test_plugin_helper.rb
 - test/unit/arf_report_status_calculator_test.rb
+- test/unit/arf_report_test.rb
 - test/unit/compliance_status_test.rb
-- test/unit/policy_mailer_test.rb
-- test/unit/scap_content_test.rb
-- test/unit/tailoring_file_test.rb
+- test/unit/concerns/host_extensions_test.rb
+- test/unit/concerns/openscap_proxy_extenstions_test.rb
+- test/unit/message_cleaner_test.rb
+- test/unit/openscap_host_test.rb
 - test/unit/oval_host_test.rb
 - test/unit/oval_policy_test.rb
 - test/unit/oval_status_test.rb
+- test/unit/policy_mailer_test.rb
 - test/unit/policy_test.rb
-- test/unit/arf_report_test.rb
-- test/unit/message_cleaner_test.rb
-- test/unit/openscap_host_test.rb
-- test/fixtures/cve_fixtures.rb
-- test/graphql/queries/oval_contents_query_test.rb
-- test/graphql/queries/oval_policies_query_test.rb
-- test/graphql/queries/oval_content_query_test.rb
-- test/graphql/mutations/oval_policies/delete_mutation_test.rb
-- test/test_plugin_helper.rb
+- test/unit/scap_content_test.rb
+- test/unit/services/config_name_service_test.rb
+- test/unit/services/hostgroup_overrider_test.rb
+- test/unit/services/lookup_key_overrider_test.rb
+- test/unit/services/oval/cves_test.rb
+- test/unit/services/oval/setup_check_test.rb
+- test/unit/services/oval/setup_test.rb
+- test/unit/services/report_dashboard/data_test.rb
+- test/unit/services/tailoring_files_proxy_check_test.rb
+- test/unit/tailoring_file_test.rb