Fix invite url on invited emails

- experiment params leaked into non experiment

Changelog: fixed

app/helpers/notify_helper.rb

@@ -20,4 +20,14 @@ module NotifyHelper
 
     (source.description || default_description).truncate(200, separator: ' ')
   end
+
+  def invited_join_url(token, member)
+    additional_params = { invite_type: Emails::Members::INITIAL_INVITE }
+
+    if experiment(:invite_email_preview_text, actor: member).enabled?
+      additional_params[:experiment_name] = 'invite_email_preview_text'
+    end
+
+    invite_url(token, additional_params)
+  end
 end

app/views/notify/member_invited_email.html.haml

@@ -5,7 +5,6 @@
   br_tag: '<br/>'.html_safe,
   role: member.human_access.downcase }
 - join_text =  s_('InviteEmail|Join now')
-- join_url = invite_url(@token, invite_type: Emails::Members::INITIAL_INVITE, experiment_name: 'invite_email_preview_text')
 - inviter_name = member.created_by.name if member.created_by
 
 - experiment(:invite_email_preview_text, actor: member) do |experiment_instance|
@@ -17,7 +16,7 @@
           = s_('InviteEmail|Join your team on GitLab! %{inviter} invited you to %{project_or_group_name}') % { inviter: inviter_name, project_or_group_name: placeholders[:project_or_group_name] }
         - else
           = s_('InviteEmail|Join your team on GitLab! You are invited to %{project_or_group_name}') % { project_or_group_name: placeholders[:project_or_group_name] }
-      = gmail_goto_action(join_text, join_url)
+      = gmail_goto_action(join_text, invited_join_url(@token, member))
 
 %tr
   %td.text-content{ colspan: 2 }
@@ -28,7 +27,7 @@
       - else
         = html_escape(s_("InviteEmail|You are invited to join the %{strong_start}%{project_or_group_name}%{strong_end}%{br_tag}%{project_or_group} as a %{role}")) % placeholders
     %p.invite-actions
-      = link_to join_text, join_url, class: 'invite-btn-join'
+      = link_to join_text, invited_join_url(@token, member), class: 'invite-btn-join'
 %tr.border-top
   %td.text-content.mailer-align-left.half-width
     %h4

spec/helpers/notify_helper_spec.rb

@@ -55,4 +55,31 @@ RSpec.describe NotifyHelper do
   def reference_link(entity, url)
     "<a href=\"#{url}\">#{entity.to_reference}</a>"
   end
+
+  describe '#invited_join_url' do
+    let_it_be(:member) { create(:project_member) }
+
+    let(:token) { '_token_' }
+
+    context 'when invite_email_preview_text is enabled', :experiment do
+      before do
+        stub_experiments(invite_email_preview_text: :control)
+      end
+
+      it 'has correct params' do
+        expect(helper.invited_join_url(token, member))
+          .to eq("http://test.host/-/invites/#{token}?experiment_name=invite_email_preview_text&invite_type=initial_email")
+      end
+    end
+
+    context 'when invite_email_preview_text is disabled' do
+      before do
+        stub_feature_flags(invite_email_preview_text: false)
+      end
+
+      it 'has correct params' do
+        expect(helper.invited_join_url(token, member)).to eq("http://test.host/-/invites/#{token}?invite_type=initial_email")
+      end
+    end
+  end
 end

spec/mailers/notify_spec.rb

@@ -800,8 +800,7 @@ RSpec.describe Notify do
           is_expected.to have_body_text project_member.invite_token
           is_expected.to have_link('Join now',
                                    href: invite_url(project_member.invite_token,
-                                                    invite_type: Emails::Members::INITIAL_INVITE,
-                                                    experiment_name: 'invite_email_preview_text'))
+                                                    invite_type: Emails::Members::INITIAL_INVITE))
           is_expected.to have_content("#{inviter.name} invited you to join the")
           is_expected.to have_content('Project details')
           is_expected.to have_content("What's it about?")
@@ -818,13 +817,25 @@ RSpec.describe Notify do
           is_expected.to have_body_text project_member.invite_token
           is_expected.to have_link('Join now',
                                    href: invite_url(project_member.invite_token,
-                                                    invite_type: Emails::Members::INITIAL_INVITE,
-                                                    experiment_name: 'invite_email_preview_text'))
+                                                    invite_type: Emails::Members::INITIAL_INVITE))
           is_expected.to have_content('Project details')
           is_expected.to have_content("What's it about?")
         end
       end
 
+      context 'with invite_email_preview_text enabled', :experiment do
+        before do
+          stub_experiments(invite_email_preview_text: :control)
+        end
+
+        it 'has the correct invite_url with params' do
+          is_expected.to have_link('Join now',
+                                   href: invite_url(project_member.invite_token,
+                                                    invite_type: Emails::Members::INITIAL_INVITE,
+                                                    experiment_name: 'invite_email_preview_text'))
+        end
+      end
+
       context 'when invite email sent is tracked', :snowplow do
         it 'tracks the sent invite' do
           invite_email.deliver_now