Merge branch 'ag-cloud-modal-link' into 'master'

Update link on alert to point to the correct place

See merge request gitlab-org/gitlab!61922

ee/app/assets/javascripts/pages/admin/cloud_licenses/components/subscription_activation_errors.vue

@@ -89,7 +89,9 @@ export default {
     >
       <gl-sprintf :message="$options.i18n.howToActivateSubscription">
         <template #link="{ content }">
-          <gl-link :href="$options.links.adminLicenseUrl" target="_blank">{{ content }}</gl-link>
+          <gl-link :href="$options.links.subscriptionActivationHelpLink" target="_blank">{{
+            content
+          }}</gl-link>
         </template>
       </gl-sprintf>
     </gl-alert>

ee/spec/frontend/admin/cloud_licenses/components/subscription_activation_errors_spec.js

@@ -45,8 +45,10 @@ describe('SubscriptionActivationErrors', () => {
     it('shows some help links', () => {
       const alert = findConnectivityErrorAlert();
 
-      expect(alert.findAll(GlLink).at(0).props('href')).toBe(subscriptionActivationHelpLink);
-      expect(alert.findAll(GlLink).at(1).props('href')).toBe(troubleshootingHelpLink);
+      expect(alert.findAllComponents(GlLink).at(0).props('href')).toBe(
+        subscriptionActivationHelpLink,
+      );
+      expect(alert.findAllComponents(GlLink).at(1).props('href')).toBe(troubleshootingHelpLink);
     });
 
     it('does not show other alerts', () => {
@@ -63,6 +65,12 @@ describe('SubscriptionActivationErrors', () => {
       expect(findGeneralErrorAlert().props('title')).toBe(generalActivationError);
     });
 
+    it('shows a help link', () => {
+      expect(findGeneralErrorAlert().findComponent(GlLink).props('href')).toBe(
+        subscriptionActivationHelpLink,
+      );
+    });
+
     it('shows a a text to help the user', () => {
       expect(findGeneralErrorAlert().text()).toBe('Learn how to activate your subscription.');
     });