Refs #37140 - fix some tests

Katello · Feb 5, 2024 · 1476a39 · 1476a39
1 parent 1f12933
commit 1476a39
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 45 deletions.
diff --git a/app/controllers/katello/api/v2/organizations_controller.rb b/app/controllers/katello/api/v2/organizations_controller.rb
@@ -80,11 +80,9 @@ def update
     param :organization, Hash do
       param :label, String, :required => false
     end
-    param :simple_content_access, :bool, :desc => N_('Whether to turn on Simple Content Access for the organization.'), :required => false, :default => true, deprecated: true
     def create
       @organization = Organization.new(resource_params)
-      sca = params.key?(:simple_content_access) ? ::Foreman::Cast.to_bool(params[:simple_content_access]) : true
-      creator = ::Katello::OrganizationCreator.new(@organization, sca: sca)
+      creator = ::Katello::OrganizationCreator.new(@organization)
       creator.create!
       @organization.reload
       # @taxonomy instance variable is necessary for foreman side

diff --git a/test/services/katello/organization_creator_test.rb b/test/services/katello/organization_creator_test.rb
@@ -53,22 +53,6 @@ def test_create
       validate_creator(creator)
     end
 
-    def test_create_with_sca_off
-      org = FactoryBot.build(:organization)
-      creator = Katello::OrganizationCreator.new(org, sca: false)
-
-      Katello::Ping.expects(:ping!).returns(true)
-      org.expects(:candlepin_owner_exists?).returns(false)
-      Katello::Resources::Candlepin::Owner.expects(:create).with(org.name, org.name, content_access_mode: 'entitlement').returns(true)
-      Katello::Resources::Candlepin::Owner.expects(:get_ueber_cert).returns(true)
-      Katello::ContentViewEnvironment.any_instance.expects(:exists_in_candlepin?).returns(false)
-      Katello::Resources::Candlepin::Environment.expects(:create).returns(true)
-
-      creator.create!
-      validate_org(org)
-      validate_creator(creator)
-    end
-
     def test_create_rollback
       org = FactoryBot.build(:organization, name: 'rollback_org')
       creator = Katello::OrganizationCreator.new(org)

diff --git a/webpack/scenes/Subscriptions/SubscriptionsPage.js b/webpack/scenes/Subscriptions/SubscriptionsPage.js
@@ -5,7 +5,7 @@ import Immutable from 'seamless-immutable';
 import { translate as __ } from 'foremanReact/common/I18n';
 import { propsToCamelCase } from 'foremanReact/common/helpers';
 import { isEmpty } from 'lodash';
-import { Grid, Row, Col, Alert } from 'patternfly-react';
+import { Grid, Row, Col } from 'patternfly-react';
 import { Popover, Flex, FlexItem } from '@patternfly/react-core';
 import { OutlinedQuestionCircleIcon } from '@patternfly/react-icons';
 import ModalProgressBar from 'foremanReact/components/common/ModalProgressBar';

diff --git a/webpack/scenes/Subscriptions/__tests__/__snapshots__/SubscriptionsPage.test.js.snap b/webpack/scenes/Subscriptions/__tests__/__snapshots__/SubscriptionsPage.test.js.snap
@@ -67,35 +67,13 @@ exports[`subscriptions page should render 1`] = `
         disableManifestActions={true}
         disabledReason="This is disabled because no connection could be made to the upstream Manifest."
         refresh={[Function]}
-        simpleContentAccess={false}
         taskInProgress={false}
         upload={[Function]}
       />
       <div
         className="modal-container"
         id="subscriptions-table"
       >
-        <Alert
-          className=""
-          onDismiss={null}
-          type="warning"
-        >
-          <FormattedMessage
-            defaultMessage="This organization is not using {scaLink}. Entitlement-based subscription management is deprecated and will be removed in Katello 4.12."
-            id="sca-alert"
-            values={
-              Object {
-                "scaLink": <a
-                  href="https://access.redhat.com/articles/simple-content-access"
-                  rel="noreferrer"
-                  target="_blank"
-                >
-                  Simple Content Access
-                </a>,
-              }
-            }
-          />
-        </Alert>
         <SubscriptionsTable
           canManageSubscriptionAllocations={false}
           emptyState={

diff --git a/webpack/scenes/Subscriptions/__tests__/__snapshots__/SubscriptionsSelectors.test.js.snap b/webpack/scenes/Subscriptions/__tests__/__snapshots__/SubscriptionsSelectors.test.js.snap
@@ -14,12 +14,9 @@ Object {
   "deleteModalOpened": false,
   "hasUpstreamConnection": false,
   "searchQuery": "some-query",
-  "simpleContentAccessEligible": false,
   "task": Object {},
   "taskModalOpened": false,
 }
 `;
 
-exports[`Subscriptions selectors should select whether we are simple content access eligible 1`] = `false`;
-
 exports[`Subscriptions selectors should select whether we have an upstream connection 1`] = `false`;