Merge branch 'banner-future-date-license' into 'master'

Do not display renewal banner if future dated license is applied

See merge request gitlab-org/gitlab!48283

ee/changelogs/unreleased/banner-future-date-license.yml

+---
+title: 'Do not display renewal banner if future dated license is applied'
+merge_request: 48283
+author:
+type: changed

ee/lib/gitlab/expiring_subscription_message.rb

@@ -120,7 +120,7 @@ module Gitlab
     end
 
     def require_notification?
-      return false if expiring_auto_renew?
+      return false if expiring_auto_renew? || ::License.future_dated.present?
 
       auto_renew_choice_exists? && expired_subscribable_within_notification_window?
     end

ee/spec/helpers/ee/subscribable_banner_helper_spec.rb

@@ -77,6 +77,19 @@ RSpec.describe EE::SubscribableBannerHelper do
           expect(subject).to eq(license)
         end
       end
+
+      context 'with a future dated license' do
+        let(:gl_license) { build(:gitlab_license, starts_at: Date.current + 1.month) }
+
+        before do
+          allow(::Gitlab::CurrentSettings).to receive(:should_check_namespace_plan?).and_return(true)
+        end
+
+        it 'returns the current license' do
+          allow(License).to receive(:current).and_return(license)
+          expect(subject).to eq(license)
+        end
+      end
     end
   end
 

ee/spec/lib/gitlab/expiring_subscription_message_spec.rb

@@ -162,6 +162,16 @@ RSpec.describe Gitlab::ExpiringSubscriptionMessage do
               end
             end
 
+            context 'when a future dated license is applied' do
+              before do
+                create(:license, created_at: Time.current, data: build(:gitlab_license, starts_at: expired_date, expires_at: Date.current + 13.months).export)
+              end
+
+              it 'returns nil' do
+                expect(subject).to be nil
+              end
+            end
+
             context 'with namespace' do
               let(:namespace) { double(:namespace, name: 'No Limit Records') }