Fix tests + don't call upgrade API when saving

elastic · Oct 19, 2021 · eb0c5bc · eb0c5bc
1 parent 61bea60
commit eb0c5bc
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 29 deletions.
diff --git a/.../fleet/public/applications/fleet/sections/agent_policy/edit_package_policy_page/index.tsx b/.../fleet/public/applications/fleet/sections/agent_policy/edit_package_policy_page/index.tsx
@@ -41,7 +41,6 @@ import {
   sendGetOneAgentPolicy,
   sendGetOnePackagePolicy,
   sendGetPackageInfoByKey,
-  sendUpgradePackagePolicy,
   sendUpgradePackagePolicyDryRun,
 } from '../../../hooks';
 import {
@@ -364,29 +363,6 @@ export const EditPackagePolicyForm = memo<{
 
     const { error } = await savePackagePolicy();
     if (!error) {
-      if (isUpgrade) {
-        const { error: upgradeError } = await sendUpgradePackagePolicy([packagePolicyId]);
-
-        if (upgradeError) {
-          notifications.toasts.addError(upgradeError, {
-            title: i18n.translate('xpack.fleet.upgradePackagePolicy.failedNotificationTitle', {
-              defaultMessage: 'Error upgrading {packagePolicyName}',
-              values: {
-                packagePolicyName: packagePolicy.name,
-              },
-            }),
-            toastMessage: i18n.translate(
-              'xpack.fleet.editPackagePolicy.failedConflictNotificationMessage',
-              {
-                defaultMessage: `Data is out of date. Refresh the page to get the latest policy.`,
-              }
-            ),
-          });
-
-          return;
-        }
-      }
-
       application.navigateToUrl(successRedirectPath);
       notifications.toasts.addSuccess({
         title: i18n.translate('xpack.fleet.editPackagePolicy.updatedNotificationTitle', {

diff --git a/x-pack/test/fleet_api_integration/apis/package_policy/upgrade.ts b/x-pack/test/fleet_api_integration/apis/package_policy/upgrade.ts
@@ -146,18 +146,15 @@ export default function (providerContext: FtrProviderContext) {
 
       describe('upgrade', function () {
         it('should respond with an error when "dryRun: false" is provided', async function () {
-          const { body }: { body: UpgradePackagePolicyResponse } = await supertest
+          await supertest
             .post(`/api/fleet/package_policies/upgrade`)
             .set('kbn-xsrf', 'xxxx')
             .send({
               packagePolicyIds: [packagePolicyId],
               dryRun: false,
               packageVersion: '0.2.0-add-non-required-test-var',
             })
-            .expect(200);
-
-          expect(body.length).to.be(1);
-          expect(body[0].success).to.be(false);
+            .expect(400);
         });
       });
     });