Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
c2c9a38f
Commit
c2c9a38f
authored
Dec 10, 2021
by
Alper Akgun
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove in_app_hand_raise_pql PQL feature flags
parent
cd135faa
Changes
10
Show whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
13 additions
and
110 deletions
+13
-110
app/helpers/application_helper.rb
app/helpers/application_helper.rb
+0
-4
ee/app/controllers/trials_controller.rb
ee/app/controllers/trials_controller.rb
+0
-2
ee/app/helpers/billing_plans_helper.rb
ee/app/helpers/billing_plans_helper.rb
+0
-10
ee/app/views/shared/billings/_billing_plan_actions.html.haml
ee/app/views/shared/billings/_billing_plan_actions.html.haml
+1
-7
ee/config/feature_flags/development/in_app_hand_raise_pql.yml
...onfig/feature_flags/development/in_app_hand_raise_pql.yml
+0
-7
ee/spec/controllers/trials_controller_spec.rb
ee/spec/controllers/trials_controller_spec.rb
+0
-10
ee/spec/features/billings/billing_plans_spec.rb
ee/spec/features/billings/billing_plans_spec.rb
+12
-30
ee/spec/helpers/billing_plans_helper_spec.rb
ee/spec/helpers/billing_plans_helper_spec.rb
+0
-23
locale/gitlab.pot
locale/gitlab.pot
+0
-3
spec/helpers/application_helper_spec.rb
spec/helpers/application_helper_spec.rb
+0
-14
No files found.
app/helpers/application_helper.rb
View file @
c2c9a38f
...
...
@@ -206,10 +206,6 @@ module ApplicationHelper
'https://'
+
promo_host
end
def
contact_sales_url
promo_url
+
'/sales'
end
def
support_url
Gitlab
::
CurrentSettings
.
current_application_settings
.
help_page_support_url
.
presence
||
promo_url
+
'/getting-help/'
end
...
...
ee/app/controllers/trials_controller.rb
View file @
c2c9a38f
...
...
@@ -45,8 +45,6 @@ class TrialsController < ApplicationController
end
def
create_hand_raise_lead
return
render_404
unless
Feature
.
enabled?
(
:in_app_hand_raise_pql
,
@namespace
)
result
=
GitlabSubscriptions
::
CreateHandRaiseLeadService
.
new
.
execute
(
hand_raise_lead_params
)
if
result
.
success?
...
...
ee/app/helpers/billing_plans_helper.rb
View file @
c2c9a38f
...
...
@@ -152,16 +152,6 @@ module BillingPlansHelper
}
end
def
contact_sales_button_data
(
plan
)
data
=
{
track_action:
'click_button'
,
track_label:
'contact_sales'
,
track_property:
plan
.
code
}
add_billing_in_side_nav_attribute
(
data
)
end
def
billing_upgrade_button_data
(
plan
)
data
=
{
track_action:
'click_button'
,
...
...
ee/app/views/shared/billings/_billing_plan_actions.html.haml
View file @
c2c9a38f
-
if
show_contact_sales_button?
(
purchase_link
.
action
,
plan_offer_type
)
-
if
Feature
.
enabled?
(
:in_app_hand_raise_pql
,
namespace
)
.js-hand-raise-lead-button
{
data:
hand_raise_props
(
namespace
)
}
-
else
=
link_to
s_
(
'BillingPlan|Contact sales'
),
"
#{
contact_sales_url
}
?test=inappcontactsales
#{
plan
.
code
}
"
,
class:
[
"btn gl-button"
,
show_upgrade_button
?
"btn-confirm-secondary"
:
"btn-confirm"
],
data:
contact_sales_button_data
(
plan
)
-
if
show_upgrade_button
=
link_to
upgrade_button_text
(
plan_offer_type
),
plan_purchase_or_upgrade_url
(
namespace
,
plan
),
...
...
ee/config/feature_flags/development/in_app_hand_raise_pql.yml
deleted
100644 → 0
View file @
cd135faa
name
:
in_app_hand_raise_pql
introduced_by_url
:
rollout_issue_url
:
https://gitlab.com/gitlab-org/gitlab/-/issues/334211
milestone
:
'
14.4'
type
:
development
group
:
group::conversion
default_enabled
:
false
ee/spec/controllers/trials_controller_spec.rb
View file @
c2c9a38f
...
...
@@ -284,8 +284,6 @@ RSpec.describe TrialsController, :saas do
end
before
do
stub_feature_flags
(
in_app_hand_raise_pql:
true
)
allow_next_instance_of
(
GitlabSubscriptions
::
CreateHandRaiseLeadService
)
do
|
service
|
allow
(
service
).
to
receive
(
:execute
).
and_return
(
create_hand_raise_lead_result
?
ServiceResponse
.
success
:
ServiceResponse
.
error
(
message:
'failed'
))
end
...
...
@@ -299,14 +297,6 @@ RSpec.describe TrialsController, :saas do
it
{
is_expected
.
to
have_gitlab_http_status
(
:not_found
)
}
end
context
'when in_app_hand_raise_pql feature flag is disabled'
do
before
do
stub_feature_flags
(
in_app_hand_raise_pql:
false
)
end
it
{
is_expected
.
to
have_gitlab_http_status
(
:not_found
)
}
end
context
'when cannot find the namespace'
do
let
(
:namespace_id
)
{
non_existing_record_id
.
to_s
}
...
...
ee/spec/features/billings/billing_plans_spec.rb
View file @
c2c9a38f
...
...
@@ -64,28 +64,11 @@ RSpec.describe 'Billing plan pages', :feature, :js do
end
shared_examples
'can contact sales'
do
context
'with in app hand raise feature flag off'
do
before
do
stub_feature_flags
(
in_app_hand_raise_pql:
false
)
visit
page_path
end
it
'displays the contact sales link'
do
# see ApplicationHelper#contact_sales_url
contact_sales_url
=
"https://
#{
ApplicationHelper
.
promo_host
}
/sales"
page
.
within
(
'.content'
)
do
expect
(
page
).
to
have_link
(
'Contact sales'
,
href:
%r{
#{
contact_sales_url
}
\?
test=inappcontactsales(bronze|premium|gold)}
)
end
end
end
context
'with in app hand raise feature flag on'
do
before
do
stub_feature_flags
(
in_app_hand_raise_pql:
namespace
)
visit
page_path
end
it
'displays the in-app hand raise lead'
do
it
'displays the in-app hand raise lead'
,
:aggregate_failures
do
if
namespace
.
group_namespace?
page
.
within
(
'[data-testid="plan-card-premium"]'
)
do
click_button
'Contact sales'
...
...
@@ -99,7 +82,6 @@ RSpec.describe 'Billing plan pages', :feature, :js do
end
end
end
end
shared_examples
'non-upgradable plan'
do
before
do
...
...
ee/spec/helpers/billing_plans_helper_spec.rb
View file @
c2c9a38f
...
...
@@ -587,29 +587,6 @@ RSpec.describe BillingPlansHelper, :saas do
end
end
describe
'#contact_sales_button_data'
do
let
(
:plan
)
{
double
(
'Plan'
,
code:
'_code_'
)
}
let
(
:data
)
do
{
track_action:
'click_button'
,
track_label:
'contact_sales'
,
track_property:
plan
.
code
}
end
it
'has experiment attribute'
do
allow
(
helper
).
to
receive
(
:params
).
and_return
({
from:
'side_nav'
})
expect
(
helper
.
contact_sales_button_data
(
plan
)).
to
eq
data
.
merge
(
track_experiment: :billing_in_side_nav
)
end
it
'does not have experiment attribute'
do
allow
(
helper
).
to
receive
(
:params
).
and_return
({})
expect
(
helper
.
contact_sales_button_data
(
plan
)).
to
eq
data
end
end
describe
'#billing_upgrade_button_data'
do
let
(
:plan
)
{
double
(
'Plan'
,
code:
'_code_'
)
}
let
(
:data
)
do
...
...
locale/gitlab.pot
View file @
c2c9a38f
...
...
@@ -5421,9 +5421,6 @@ msgstr ""
msgid "BillingPlans|per user"
msgstr ""
msgid "BillingPlan|Contact sales"
msgstr ""
msgid "BillingPlan|Upgrade"
msgstr ""
...
...
spec/helpers/application_helper_spec.rb
View file @
c2c9a38f
...
...
@@ -192,20 +192,6 @@ RSpec.describe ApplicationHelper do
end
end
describe
'#contact_sales_url'
do
subject
{
helper
.
contact_sales_url
}
it
'returns the url'
do
is_expected
.
to
eq
(
"https://
#{
helper
.
promo_host
}
/sales"
)
end
it
'changes if promo_url changes'
do
allow
(
helper
).
to
receive
(
:promo_url
).
and_return
(
'https://somewhere.else'
)
is_expected
.
to
eq
(
'https://somewhere.else/sales'
)
end
end
describe
'#support_url'
do
context
'when alternate support url is specified'
do
let
(
:alternate_url
)
{
'http://company.example.com/getting-help'
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment