Merge branch 'do-not-generate-subscription-from-namespace-plan-id' into 'master'

Do not generate subscriptions from plan_id

See merge request gitlab-org/gitlab!28453

ee/app/models/ee/namespace.rb

@@ -444,7 +444,7 @@ module EE
       return if ::Gitlab::Database.read_only?
 
       create_gitlab_subscription(
-        plan_code: plan&.name,
+        plan_code: Plan::FREE,
         trial: trial_active?,
         start_date: created_at,
         seats: 0

ee/spec/factories/namespaces.rb

@@ -31,3 +31,22 @@ FactoryBot.modify do
     end
   end
 end
+
+FactoryBot.define do
+  factory :namespace_with_plan, parent: :namespace do
+    transient do
+      plan { :default_plan }
+      trial_ends_on { nil }
+    end
+
+    after(:create) do |namespace, evaluator|
+      if evaluator.plan
+        create(:gitlab_subscription,
+               namespace: namespace,
+               hosted_plan: create(evaluator.plan),
+               trial: evaluator.trial_ends_on.present?,
+               trial_ends_on: evaluator.trial_ends_on)
+      end
+    end
+  end
+end

ee/spec/features/billings/billing_plans_spec.rb

@@ -425,7 +425,6 @@ describe 'Billing plan pages', :feature do
     end
 
     before do
-      expect_any_instance_of(EE::Namespace).to receive(:plan).at_least(:once).and_return(nil)
       visit profile_billings_path
     end
 

ee/spec/helpers/ee/user_callouts_helper_spec.rb

@@ -224,7 +224,6 @@ describe EE::UserCalloutsHelper do
     let_it_be(:silver_plan) { create(:silver_plan) }
     let_it_be(:gold_plan) { create(:gold_plan) }
     let(:user) { namespace.owner }
-    let(:gitlab_subscription) { create(:gitlab_subscription, namespace: namespace) }
 
     where(:never_had_trial?, :show_gold_trial?, :gold_plan?, :free_plan?, :should_render?) do
       true  | true  | false | false | true
@@ -248,12 +247,13 @@ describe EE::UserCalloutsHelper do
     with_them do
       before do
         allow(helper).to receive(:show_gold_trial?) { show_gold_trial? }
-        namespace.update(plan: gold_plan) if gold_plan?
-        namespace.update(plan: silver_plan) if !gold_plan? && !free_plan?
 
-        unless never_had_trial?
-          namespace.update(plan: free_plan)
-          namespace.create_gitlab_subscription(trial_ends_on: Date.yesterday)
+        if !never_had_trial?
+          create(:gitlab_subscription, namespace: namespace, hosted_plan: free_plan, trial_ends_on: Date.yesterday)
+        elsif gold_plan?
+          create(:gitlab_subscription, namespace: namespace, hosted_plan: gold_plan)
+        elsif !free_plan?
+          create(:gitlab_subscription, namespace: namespace, hosted_plan: silver_plan)
         end
       end
 

ee/spec/models/ee/namespace_spec.rb

@@ -4,7 +4,7 @@ require 'spec_helper'
 
 describe Namespace do
   shared_examples 'plan helper' do |namespace_plan|
-    let(:namespace) { create(:namespace, plan: "#{plan_name}_plan") }
+    let(:namespace) { create(:namespace_with_plan, plan: "#{plan_name}_plan") }
 
     subject { namespace.public_send("#{namespace_plan}_plan?") }
 
@@ -151,7 +151,7 @@ describe Namespace do
   end
 
   describe '#actual_plan_name' do
-    let(:namespace) { create(:namespace, plan: :gold_plan) }
+    let(:namespace) { create(:namespace) }
 
     subject { namespace.actual_plan_name }
 
@@ -170,7 +170,7 @@ describe Namespace do
     end
 
     context 'when namespace is not persisted' do
-      let(:namespace) { build(:namespace, plan: :gold_plan) }
+      let(:namespace) { build(:namespace) }
 
       it 'returns free plan' do
         is_expected.to eq('free')
@@ -182,8 +182,8 @@ describe Namespace do
     end
 
     context 'when DB is not read-only' do
-      it 'returns gold plan' do
-        is_expected.to eq('gold')
+      it 'returns free plan' do
+        is_expected.to eq('free')
       end
 
       it 'creates a gitlab_subscription' do

ee/spec/models/namespace_spec.rb

@@ -715,17 +715,6 @@ describe Namespace do
   end
 
   describe '#actual_plan' do
-    context 'when namespace has a plan associated' do
-      before do
-        namespace.update_attribute(:plan, gold_plan)
-      end
-
-      it 'generates a subscription with that plan code' do
-        expect(namespace.actual_plan).to eq(gold_plan)
-        expect(namespace.gitlab_subscription).to be_present
-      end
-    end
-
     context 'when namespace has a subscription associated' do
       before do
         create(:gitlab_subscription, namespace: namespace, hosted_plan: gold_plan)

ee/spec/requests/api/namespaces_spec.rb

@@ -121,7 +121,6 @@ describe API::Namespaces do
 
         aggregate_failures do
           expect(response).to have_gitlab_http_status(:ok)
-          expect(json_response['plan']).to eq('silver')
           expect(json_response['shared_runners_minutes_limit']).to eq(9001)
         end
       end
@@ -130,7 +129,6 @@ describe API::Namespaces do
         put api("/namespaces/#{group1.id}", admin), params: { plan: 'silver', shared_runners_minutes_limit: 9001 }
 
         expect(response).to have_gitlab_http_status(:ok)
-        expect(json_response['plan']).to eq('silver')
         expect(json_response['shared_runners_minutes_limit']).to eq(9001)
       end
     end