Commit 65ea7441 authored by Illya Klymov's avatar Illya Klymov

Merge branch 'sy-update-security-discovery-feedback-cta' into 'master'

Change security discovery feedback icon to button

See merge request gitlab-org/gitlab!76120
parents 71681803 84876209
...@@ -86,7 +86,7 @@ export default { ...@@ -86,7 +86,7 @@ export default {
discoverTitle: s__( discoverTitle: s__(
'Discover|Security capabilities, integrated into your development lifecycle', 'Discover|Security capabilities, integrated into your development lifecycle',
), ),
discoverFeedbackLabel: s__('Discover|Give feedback for this page'), discoverFeedbackLabel: s__('Discover|Send feedback'),
discoverUpgradeLabel: s__('Discover|Upgrade now'), discoverUpgradeLabel: s__('Discover|Upgrade now'),
discoverTrialLabel: s__('Discover|Start a free trial'), discoverTrialLabel: s__('Discover|Start a free trial'),
carouselCaptions: [ carouselCaptions: [
...@@ -182,12 +182,7 @@ export default { ...@@ -182,12 +182,7 @@ export default {
</div> </div>
<div id="tooltipcontainer" class="discover-feedback gl-fixed"> <div id="tooltipcontainer" class="discover-feedback gl-fixed">
<gl-button <gl-button
v-gl-tooltip:tooltipcontainer.left class="discover-button-feedback"
:title="$options.i18n.discoverFeedbackLabel"
:aria-label="$options.i18n.discoverFeedbackLabel"
icon="slight-smile"
size="medium"
class="discover-feedback-icon"
category="secondary" category="secondary"
variant="default" variant="default"
target="_blank" target="_blank"
...@@ -196,7 +191,9 @@ export default { ...@@ -196,7 +191,9 @@ export default {
data-track-label="security-discover-feedback-cta" data-track-label="security-discover-feedback-cta"
:data-track-property="slide" :data-track-property="slide"
:href="linkFeedback" :href="linkFeedback"
/> >
{{ $options.i18n.discoverFeedbackLabel }}
</gl-button>
</div> </div>
</div> </div>
</template> </template>
...@@ -39,10 +39,8 @@ describe('Card security discover app', () => { ...@@ -39,10 +39,8 @@ describe('Card security discover app', () => {
); );
}); });
it('renders feedback icon link properly', () => { it('renders discover feedback link properly', () => {
expect(wrapper.find('.discover-feedback-icon').html()).toContain( expect(wrapper.find('.discover-button-feedback').html()).toContain('Send feedback');
'Give feedback for this page',
);
}); });
it('renders discover upgrade links properly', () => { it('renders discover upgrade links properly', () => {
...@@ -91,7 +89,7 @@ describe('Card security discover app', () => { ...@@ -91,7 +89,7 @@ describe('Card security discover app', () => {
}); });
it('tracks an event when clicked on feedback', () => { it('tracks an event when clicked on feedback', () => {
wrapper.find('.discover-feedback-icon').trigger('click'); wrapper.find('.discover-button-feedback').trigger('click');
expect(spy).toHaveBeenCalledWith('_category_', 'click_button', { expect(spy).toHaveBeenCalledWith('_category_', 'click_button', {
label: 'security-discover-feedback-cta', label: 'security-discover-feedback-cta',
......
...@@ -12381,15 +12381,15 @@ msgstr "" ...@@ -12381,15 +12381,15 @@ msgstr ""
msgid "Discover|GitLab will perform static and dynamic tests on the code of your application, looking for known flaws and report them in the merge request so you can fix them before merging." msgid "Discover|GitLab will perform static and dynamic tests on the code of your application, looking for known flaws and report them in the merge request so you can fix them before merging."
msgstr "" msgstr ""
msgid "Discover|Give feedback for this page"
msgstr ""
msgid "Discover|Security capabilities, integrated into your development lifecycle" msgid "Discover|Security capabilities, integrated into your development lifecycle"
msgstr "" msgstr ""
msgid "Discover|See the other features of the %{linkStart}ultimate plan%{linkEnd}" msgid "Discover|See the other features of the %{linkStart}ultimate plan%{linkEnd}"
msgstr "" msgstr ""
msgid "Discover|Send feedback"
msgstr ""
msgid "Discover|Start a free trial" msgid "Discover|Start a free trial"
msgstr "" msgstr ""
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment