Merge branch '342865-update-links-in-billing-page' into 'master'

Fix: update links in billing page

See merge request gitlab-org/gitlab!72259

ee/app/views/shared/billings/_trial_status.html.haml

-- faq_link          = link_to s_("BillingPlans|frequently asked questions"), "https://about.gitlab.com/gitlab-com/#faq"
-- pricing_page_link = link_to s_("BillingPlans|Pricing page"), "https://about.gitlab.com/pricing"
+- faq_link          = link_to s_("BillingPlans|frequently asked questions"), Gitlab::Saas.about_pricing_faq_url
+- pricing_page_link = link_to s_("BillingPlans|Pricing page"), Gitlab::Saas.about_pricing_url
 
 - if show_start_free_trial_messages?(namespace)
   = html_escape(s_("BillingPlans|Learn more about each plan by reading our %{faq_link}, or start a free 30-day trial of GitLab.com Ultimate.")) % { faq_link: faq_link.html_safe }

lib/gitlab/saas.rb

@@ -36,6 +36,14 @@ module Gitlab
     def self.gitlab_com_status_url
       'https://status.gitlab.com'
     end
+
+    def self.about_pricing_url
+      "https://about.gitlab.com/pricing"
+    end
+
+    def self.about_pricing_faq_url
+      "https://about.gitlab.com/gitlab-com/#faq"
+    end
   end
 end
 

spec/lib/gitlab/subscription_portal_spec.rb

@@ -45,6 +45,14 @@ RSpec.describe ::Gitlab::SubscriptionPortal do
     end
   end
 
+  describe '.subscriptions_comparison_url' do
+    subject { described_class.subscriptions_comparison_url }
+
+    link_match = %r{\Ahttps://about\.gitlab\.((cn/pricing/saas)|(com/pricing/gitlab-com))/feature-comparison\z}
+
+    it { is_expected.to match(link_match) }
+  end
+
   context 'url methods' do
     where(:method_name, :result) do
       :default_subscriptions_url         | 'https://customers.stg.gitlab.com'
@@ -56,7 +64,6 @@ RSpec.describe ::Gitlab::SubscriptionPortal do
       :subscriptions_plans_url           | 'https://customers.stg.gitlab.com/plans'
       :subscriptions_instance_review_url | 'https://customers.stg.gitlab.com/instance_review'
       :subscriptions_gitlab_plans_url    | 'https://customers.stg.gitlab.com/gitlab_plans'
-      :subscriptions_comparison_url      | 'https://about.gitlab.com/pricing/gitlab-com/feature-comparison'
     end
 
     with_them do