Merge branch 'astoicescu-remove-limit-of-features-on-billing-page' into 'master'

Remove limit of four features per plan

See merge request gitlab-org/gitlab!51264

changelogs/unreleased/astoicescu-remove-limit-of-features-on-billing-page.yml

+---
+title: Remove limit of four features per plan
+merge_request: 51264
+author:
+type: changed

ee/app/helpers/billing_plans_helper.rb

@@ -45,10 +45,10 @@ module BillingPlansHelper
     }
   end
 
-  def plan_feature_short_list(plan)
+  def plan_feature_list(plan)
     return [] unless plan.features
 
-    plan.features.sort_by! { |feature| feature.highlight ? 0 : 1 }[0...4]
+    plan.features.sort_by! { |feature| feature.highlight ? 0 : 1 }
   end
 
   def plan_purchase_or_upgrade_url(group, plan)

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

@@ -32,7 +32,7 @@
       %hr.gl-my-3
 
       %ul.unstyled-list
-        - plan_feature_short_list(plan).each do |feature|
+        - plan_feature_list(plan).each do |feature|
           - feature_class = "gl-p-0!"
           - if feature.highlight
             - feature_class += " gl-font-weight-bold"

ee/spec/helpers/billing_plans_helper_spec.rb

@@ -152,6 +152,18 @@ RSpec.describe BillingPlansHelper do
     end
   end
 
+  describe '#plan_feature_list' do
+    let(:plan) do
+      Hashie::Mash.new(features: (1..3).map { |i| { title: "feat 0#{i}", highlight: i.even? } })
+    end
+
+    it 'returns features list sorted by highlight attribute' do
+      expect(helper.plan_feature_list(plan)).to eq([{ 'title' => 'feat 02', 'highlight' => true },
+                                                    { 'title' => 'feat 01', 'highlight' => false },
+                                                    { 'title' => 'feat 03', 'highlight' => false }])
+    end
+  end
+
   describe '#seats_data_last_update_info' do
     before do
       allow(UpdateMaxSeatsUsedForGitlabComSubscriptionsWorker).to receive(:last_enqueue_time).and_return(enqueue_time)