Commit 331db0e9 authored by Mayra Cabrera's avatar Mayra Cabrera

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

Fix: update links in billing page

See merge request gitlab-org/gitlab!72259
parents 537f4c2b c8d6f734
- faq_link = link_to s_("BillingPlans|frequently asked questions"), "https://about.gitlab.com/gitlab-com/#faq" - faq_link = link_to s_("BillingPlans|frequently asked questions"), Gitlab::Saas.about_pricing_faq_url
- pricing_page_link = link_to s_("BillingPlans|Pricing page"), "https://about.gitlab.com/pricing" - pricing_page_link = link_to s_("BillingPlans|Pricing page"), Gitlab::Saas.about_pricing_url
- if show_start_free_trial_messages?(namespace) - 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 } = 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 }
......
...@@ -36,6 +36,14 @@ module Gitlab ...@@ -36,6 +36,14 @@ module Gitlab
def self.gitlab_com_status_url def self.gitlab_com_status_url
'https://status.gitlab.com' 'https://status.gitlab.com'
end 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
end end
......
...@@ -45,6 +45,14 @@ RSpec.describe ::Gitlab::SubscriptionPortal do ...@@ -45,6 +45,14 @@ RSpec.describe ::Gitlab::SubscriptionPortal do
end end
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 context 'url methods' do
where(:method_name, :result) do where(:method_name, :result) do
:default_subscriptions_url | 'https://customers.stg.gitlab.com' :default_subscriptions_url | 'https://customers.stg.gitlab.com'
...@@ -56,7 +64,6 @@ RSpec.describe ::Gitlab::SubscriptionPortal do ...@@ -56,7 +64,6 @@ RSpec.describe ::Gitlab::SubscriptionPortal do
:subscriptions_plans_url | 'https://customers.stg.gitlab.com/plans' :subscriptions_plans_url | 'https://customers.stg.gitlab.com/plans'
:subscriptions_instance_review_url | 'https://customers.stg.gitlab.com/instance_review' :subscriptions_instance_review_url | 'https://customers.stg.gitlab.com/instance_review'
:subscriptions_gitlab_plans_url | 'https://customers.stg.gitlab.com/gitlab_plans' :subscriptions_gitlab_plans_url | 'https://customers.stg.gitlab.com/gitlab_plans'
:subscriptions_comparison_url | 'https://about.gitlab.com/pricing/gitlab-com/feature-comparison'
end end
with_them do with_them do
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment