Merge branch 'vs/hide-plans-with-hide-card-attr' into 'master'

Hide billing plans with hide card attribute

See merge request gitlab-org/gitlab!61990

ee/app/helpers/subscriptions_helper.rb

@@ -34,13 +34,13 @@ module SubscriptionsHelper
     GitlabSubscriptions::FetchSubscriptionPlansService.new(plan: :free).execute
       .map(&:symbolize_keys)
       .reject { |plan_data| plan_data[:free] }
-      .map { |plan_data| plan_data.slice(:id, :code, :price_per_year, :deprecated, :name) }
+      .map { |plan_data| plan_data.slice(:id, :code, :price_per_year, :deprecated, :name, :hide_card) }
   end
 
   def subscription_available_plans
     return plans_data unless ::Feature.enabled?(:hide_deprecated_billing_plans)
 
-    plans_data.reject { |plan_data| plan_data[:deprecated] }
+    plans_data.reject { |plan_data| plan_data[:deprecated] || plan_data[:hide_card] }
   end
 
   def present_groups(groups)

ee/changelogs/unreleased/vs-hide-plans-with-hide-card-attr.yml

+---
+title: Hide billing plans with truthy hide_card attribute
+merge_request: 61990
+author:
+type: fixed

ee/spec/helpers/subscriptions_helper_spec.rb

@@ -83,26 +83,29 @@ RSpec.describe SubscriptionsHelper do
       it { is_expected.to include(available_plans: '[{"id":"bronze_id","code":"bronze","price_per_year":48.0,"deprecated":true,"name":"Bronze Plan"}]') }
     end
 
-    context 'when ff purchase_deprecated_plans is enabled' do
-      before do
-        stub_feature_flags(hide_deprecated_billing_plans: true)
+    context 'when bronze_plan has hide_card attribute set to true' do
+      let(:bronze_plan) do
+        {
+          "id" => "bronze_id",
+          "name" => "Bronze Plan",
+          "deprecated" => false,
+          "hide_card" => true,
+          "free" => false,
+          "code" => "bronze",
+          "price_per_year" => 48.0
+        }
       end
 
-      it { is_expected.to include(available_plans: '[{"id":"bronze_id","code":"bronze","price_per_year":48.0,"name":"Bronze Plan"}]') }
-
-      context 'when bronze_plan is deprecated' do
-        let(:bronze_plan) do
-          {
-            "id" => "bronze_id",
-            "name" => "Bronze Plan",
-            "deprecated" => true,
-            "free" => false,
-            "code" => "bronze",
-            "price_per_year" => 48.0
-          }
+      context 'and is set to hide_deprecated_billing_plans true' do
+        before do
+          stub_feature_flags(hide_deprecated_billing_plans: true)
         end
 
-        it { is_expected.to include(available_plans: '[]') }
+        it { is_expected.not_to include(available_plans: "[{\"id\":\"bronze_id\",\"code\":\"bronze\",\"price_per_year\":48.0,\"deprecated\":false,\"name\":\"Bronze Plan\",\"hide_card\":true}]") }
+      end
+
+      context 'and is set to false' do
+        it { is_expected.to include(available_plans: "[{\"id\":\"bronze_id\",\"code\":\"bronze\",\"price_per_year\":48.0,\"deprecated\":false,\"name\":\"Bronze Plan\",\"hide_card\":true}]") }
       end
     end
   end