Merge branch '119204-users-in-personal-trials-should-be-able-to-upgrade' into 'master'

Resolve "Users in Personal trials should be able to upgrade"

See merge request gitlab-org/gitlab!22270

ee/app/assets/javascripts/pages/profiles/billings/index.js

+import initSubscriptions from 'ee/billings';
 import PersistentUserCallout from '~/persistent_user_callout';
 
-document.addEventListener('DOMContentLoaded', () =>
-  PersistentUserCallout.factory(document.querySelector('.js-gold-trial-callout')),
-);
+document.addEventListener('DOMContentLoaded', () => {
+  PersistentUserCallout.factory(document.querySelector('.js-gold-trial-callout'));
+
+  initSubscriptions();
+});

ee/app/views/profiles/billings/index.html.haml

 - page_title 'Billing'
+- current_plan = subscription_plan_info(@plans_data, current_user.namespace.actual_plan_name)
 
 = render 'shared/billings/billing_plans', plans_data: @plans_data, namespace: current_user.namespace
+
+#js-billing-plans{ data: subscription_plan_data_attributes(current_user.namespace, current_plan) }

ee/changelogs/unreleased/119204-users-in-personal-trials-should-be-able-to-upgrade.yml

+---
+title: Add billing plans box to profiles
+merge_request: 22270
+author:
+type: fixed

ee/spec/features/billings/billing_plans_spec.rb

@@ -82,6 +82,16 @@ describe 'Billing plan pages', :feature do
     end
   end
 
+  shared_examples 'plan with subscription table' do
+    before do
+      visit page_path
+    end
+
+    it 'displays subscription table', :js do
+      expect(page).to have_selector('.js-subscription-table')
+    end
+  end
+
   context 'users profile billing page' do
     let(:page_path) { profile_billings_path }
 
@@ -129,6 +139,8 @@ describe 'Billing plan pages', :feature do
           end
         end
       end
+
+      it_behaves_like 'plan with subscription table'
     end
 
     context 'on bronze plan' do
@@ -141,6 +153,7 @@ describe 'Billing plan pages', :feature do
       it_behaves_like 'plan with header'
       it_behaves_like 'downgradable plan'
       it_behaves_like 'upgradable plan'
+      it_behaves_like 'plan with subscription table'
     end
 
     context 'on silver plan' do
@@ -153,6 +166,7 @@ describe 'Billing plan pages', :feature do
       it_behaves_like 'plan with header'
       it_behaves_like 'downgradable plan'
       it_behaves_like 'upgradable plan'
+      it_behaves_like 'plan with subscription table'
     end
 
     context 'on gold plan' do
@@ -165,6 +179,7 @@ describe 'Billing plan pages', :feature do
       it_behaves_like 'plan with header'
       it_behaves_like 'downgradable plan'
       it_behaves_like 'non-upgradable plan'
+      it_behaves_like 'plan with subscription table'
     end
   end