Merge branch '335367-fix-improper-use-of-glex-for-trial-status-popover-experiment' into 'master'

Fix improper use of GLEX for trial status popover experiment

See merge request gitlab-org/gitlab!65781

ee/app/helpers/trial_status_widget_helper.rb

@@ -21,7 +21,7 @@ module TrialStatusWidgetHelper
     base_attrs.merge(
       group_name: group.name,
       purchase_href: ultimate_subscription_path_for_group(group),
-      start_initially_shown: in_forced_popover_experiment?(group) && force_popover_to_be_shown?(group.trial_days_remaining),
+      start_initially_shown: force_popover_to_be_shown?(group),
       target_id: base_attrs[:container_id],
       trial_end_date: group.trial_ends_on
     )
@@ -49,8 +49,18 @@ module TrialStatusWidgetHelper
     group.trial_active? && can?(current_user, :admin_namespace, group)
   end
 
-  def force_popover_to_be_shown?(days_remaining)
-    D14_CALLOUT_RANGE.cover?(days_remaining) || D3_CALLOUT_RANGE.cover?(days_remaining)
+  def force_popover_to_be_shown?(group)
+    experiment(:forcibly_show_trial_status_popover, group: group) do |e|
+      e.use { false }
+
+      e.try do
+        days_remaining = group.trial_days_remaining
+
+        D14_CALLOUT_RANGE.cover?(days_remaining) || D3_CALLOUT_RANGE.cover?(days_remaining)
+      end
+
+      e.run
+    end
   end
 
   def trial_status_common_data_attrs(group)
@@ -64,8 +74,4 @@ module TrialStatusWidgetHelper
   def ultimate_subscription_path_for_group(group)
     new_subscriptions_path(namespace_id: group.id, plan_id: ZUORA_ULTIMATE_PLAN_ID)
   end
-
-  def in_forced_popover_experiment?(group)
-    experiment(:forcibly_show_trial_status_popover, group: group).variant.group == :experiment
-  end
 end