Merge branch '500354-follow-on-duo-trial-widget-improvements' into 'master'

Removing redundant factory trait(s)

See merge request https://gitlab.com/gitlab-org/gitlab/-/merge_requests/170333



Merged-by: Eugenia Grieff <egrieff@gitlab.com>
Approved-by: Tan Le <tle@gitlab.com>
Approved-by: Eugenia Grieff <egrieff@gitlab.com>
Co-authored-by: Buck OLeary <bucoleary@gitlab.com>

ee/spec/presenters/gitlab_subscriptions/trials/status_widget_presenter_spec.rb

@@ -28,7 +28,7 @@
 
     context 'when trial has just ended and group is unpaid' do
       before do
-        build(:gitlab_subscription, :ultimate_trial, :expired_trial, :free, namespace: group,
+        build(:gitlab_subscription, :free, :expired_trial, namespace: group,
           trial_starts_on: (trial_duration + 5).days.ago,
           trial_ends_on: 5.days.ago)
       end
@@ -48,7 +48,7 @@
 
     context 'when trial ended more than 10 days ago' do
       before do
-        build(:gitlab_subscription, :ultimate_trial, :free, :expired_trial, namespace: group,
+        build(:gitlab_subscription, :free, :expired_trial, namespace: group,
           trial_starts_on: (trial_duration + 11).days.ago,
           trial_ends_on: 11.days.ago)
       end