From bd72d666832048f7b20d221a397c7eb19e2d1a16 Mon Sep 17 00:00:00 2001
From: Roy Liu <rliu@gitlab.com>
Date: Tue, 23 Jul 2024 14:23:06 +0000
Subject: [PATCH] Follow-up from "Add new duo pro discover page"
---
.../subscriptions/hand_raise_leads_helper.rb | 1 -
.../discover_duo_pro_hand_raise_lead_spec.rb | 14 +++-----------
.../subscriptions/hand_raise_leads_helper_spec.rb | 1 -
.../gitlab_subscriptions/trials/duo_pro_spec.rb | 2 +-
4 files changed, 4 insertions(+), 14 deletions(-)
diff --git a/ee/app/helpers/subscriptions/hand_raise_leads_helper.rb b/ee/app/helpers/subscriptions/hand_raise_leads_helper.rb
index b192c78446715..210a178b38132 100644
--- a/ee/app/helpers/subscriptions/hand_raise_leads_helper.rb
+++ b/ee/app/helpers/subscriptions/hand_raise_leads_helper.rb
@@ -61,7 +61,6 @@ def discover_duo_pro_hand_raise_lead_data(namespace)
label: 'duo_pro_active_trial' # label needs to be dynamic for upcoming expired widget navigation
}.to_json,
button_attributes: {
- 'data-testid': 'discover-duo-pro-hand-raise-lead-button',
category: 'secondary',
variant: 'confirm'
}.to_json
diff --git a/ee/spec/features/groups/add_ons/discover_duo_pro_hand_raise_lead_spec.rb b/ee/spec/features/groups/add_ons/discover_duo_pro_hand_raise_lead_spec.rb
index e558ea6411ebc..94c692446a82f 100644
--- a/ee/spec/features/groups/add_ons/discover_duo_pro_hand_raise_lead_spec.rb
+++ b/ee/spec/features/groups/add_ons/discover_duo_pro_hand_raise_lead_spec.rb
@@ -22,17 +22,9 @@
visit group_add_ons_discover_duo_pro_path(group)
end
- context 'when user interacts with hand raise lead and submits' do
- it 'renders and submits the top of the page instance' do
- all_by_testid('discover-duo-pro-hand-raise-lead-button').first.click
+ it 'renders and submits when user interacts with hand raise lead trigger' do
+ find_button("Contact sales").click
- fill_in_and_submit_hand_raise_lead(user, group, glm_content: 'discover-duo-pro')
- end
-
- it 'renders and submits the bottom of the page instance' do
- all_by_testid('discover-duo-pro-hand-raise-lead-button').last.click
-
- fill_in_and_submit_hand_raise_lead(user, group, glm_content: 'discover-duo-pro')
- end
+ fill_in_and_submit_hand_raise_lead(user, group, glm_content: 'discover-duo-pro')
end
end
diff --git a/ee/spec/helpers/subscriptions/hand_raise_leads_helper_spec.rb b/ee/spec/helpers/subscriptions/hand_raise_leads_helper_spec.rb
index 704a75a940cfe..fe5060c9481e4 100644
--- a/ee/spec/helpers/subscriptions/hand_raise_leads_helper_spec.rb
+++ b/ee/spec/helpers/subscriptions/hand_raise_leads_helper_spec.rb
@@ -103,7 +103,6 @@
label: 'duo_pro_active_trial'
}.to_json,
button_attributes: {
- 'data-testid': 'discover-duo-pro-hand-raise-lead-button',
category: 'secondary',
variant: 'confirm'
}.to_json
diff --git a/ee/spec/models/gitlab_subscriptions/trials/duo_pro_spec.rb b/ee/spec/models/gitlab_subscriptions/trials/duo_pro_spec.rb
index 87e284e0a795a..94c0f2ab37ed7 100644
--- a/ee/spec/models/gitlab_subscriptions/trials/duo_pro_spec.rb
+++ b/ee/spec/models/gitlab_subscriptions/trials/duo_pro_spec.rb
@@ -61,7 +61,7 @@
it { is_expected.to be_falsey }
end
- context 'when licensed feature `subscriptions_trials` is not available' do
+ context 'when the `subscriptions_trials` feature is not available' do
before do
stub_saas_features(subscriptions_trials: false)
end
--
GitLab