Merge branch 'ag/334405-add-blog-post-link' into 'master'

Update link to blog post

See merge request gitlab-org/gitlab!66130

ee/app/assets/javascripts/admin/subscriptions/show/components/subscription_activation_banner.vue

@@ -2,6 +2,7 @@
 import { GlBanner, GlLink, GlSprintf } from '@gitlab/ui';
 import {
   activateCloudLicense,
+  subscriptionBannerBlogPostUrl,
   subscriptionBannerText,
   subscriptionBannerTitle,
 } from '../constants';
@@ -11,6 +12,7 @@ export const CLOSE_ACTIVATE_SUBSCRIPTION_BANNER_EVENT = 'close';
 
 export default {
   name: 'SubscriptionActivationBanner',
+  subscriptionBannerBlogPostUrl,
   i18n: {
     bannerText: subscriptionBannerText,
     buttonText: activateCloudLicense,
@@ -45,7 +47,9 @@ export default {
     <p>
       <gl-sprintf :message="$options.i18n.bannerText">
         <template #blogPostLink="{ content }">
-          <gl-link href="#" target="_blank">{{ content }}</gl-link>
+          <gl-link :href="$options.subscriptionBannerBlogPostUrl" target="_blank">{{
+            content
+          }}</gl-link>
         </template>
         <template #portalLink="{ content }">
           <gl-link :href="customersPortalUrl" target="_blank">{{ content }}</gl-link>

ee/app/assets/javascripts/admin/subscriptions/show/constants.js

@@ -142,3 +142,5 @@ export const subscriptionBannerTitle = s__('SuperSonics|Cloud licensing');
 export const subscriptionBannerText = s__(
   "SuperSonics|Cloud licensing is now available. It's an easier way to activate instances and manage subscriptions. Read more about it in our %{blogPostLinkStart}blog post%{blogPostLinkEnd}. Activation codes are available in the %{portalLinkStart}Customers Portal%{portalLinkEnd}.",
 );
+export const subscriptionBannerBlogPostUrl =
+  'https://about.gitlab.com/blog/2021/07/20/improved-billing-and-subscription-management/';

ee/spec/frontend/admin/subscriptions/components/subscription_acivation_banner_spec.js → ee/spec/frontend/admin/subscriptions/components/subscription_activation_banner_spec.js

@@ -6,6 +6,7 @@ import SubscriptionActivationBanner, {
 } from 'ee/admin/subscriptions/show/components/subscription_activation_banner.vue';
 import {
   activateCloudLicense,
+  subscriptionBannerBlogPostUrl,
   subscriptionBannerText,
   subscriptionBannerTitle,
 } from 'ee/admin/subscriptions/show/constants';
@@ -51,7 +52,7 @@ describe('SubscriptionActivationBanner', () => {
   });
 
   it('contains a link to the blog post', () => {
-    expect(findLink(0).attributes('href')).toBe('#');
+    expect(findLink(0).attributes('href')).toBe(subscriptionBannerBlogPostUrl);
   });
 
   it('contains a link to the customers portal', () => {