Commit ed9cf147 authored by Jose Ivan Vargas's avatar Jose Ivan Vargas

Merge branch '322424-btn-confirm' into 'master'

Resolve "Change the `New feature flag` button to Primary Blue"

See merge request gitlab-org/gitlab!55204
parents 8c3f527d 084a9193
...@@ -213,7 +213,7 @@ export default { ...@@ -213,7 +213,7 @@ export default {
<gl-button <gl-button
v-if="newUserListPath" v-if="newUserListPath"
:href="newUserListPath" :href="newUserListPath"
variant="success" variant="confirm"
category="secondary" category="secondary"
class="gl-mb-3" class="gl-mb-3"
data-testid="ff-new-list-button" data-testid="ff-new-list-button"
...@@ -224,7 +224,7 @@ export default { ...@@ -224,7 +224,7 @@ export default {
<gl-button <gl-button
v-if="hasNewPath" v-if="hasNewPath"
:href="featureFlagsLimitExceeded ? '' : newFeatureFlagPath" :href="featureFlagsLimitExceeded ? '' : newFeatureFlagPath"
variant="success" variant="confirm"
data-testid="ff-new-button" data-testid="ff-new-button"
@click="onNewFeatureFlagCLick" @click="onNewFeatureFlagCLick"
> >
...@@ -301,7 +301,7 @@ export default { ...@@ -301,7 +301,7 @@ export default {
<gl-button <gl-button
v-if="newUserListPath" v-if="newUserListPath"
:href="newUserListPath" :href="newUserListPath"
variant="success" variant="confirm"
category="secondary" category="secondary"
class="gl-mb-0 gl-mr-4" class="gl-mb-0 gl-mr-4"
data-testid="ff-new-list-button" data-testid="ff-new-list-button"
...@@ -312,7 +312,7 @@ export default { ...@@ -312,7 +312,7 @@ export default {
<gl-button <gl-button
v-if="hasNewPath" v-if="hasNewPath"
:href="featureFlagsLimitExceeded ? '' : newFeatureFlagPath" :href="featureFlagsLimitExceeded ? '' : newFeatureFlagPath"
variant="success" variant="confirm"
data-testid="ff-new-button" data-testid="ff-new-button"
@click="onNewFeatureFlagCLick" @click="onNewFeatureFlagCLick"
> >
......
---
title: Change the button to Primary Blue
merge_request: 55204
author: Yogi (@yo)
type: changed
...@@ -104,7 +104,7 @@ RSpec.describe 'User sees feature flag list', :js do ...@@ -104,7 +104,7 @@ RSpec.describe 'User sees feature flag list', :js do
it 'shows empty page' do it 'shows empty page' do
expect(page).to have_text 'Get started with feature flags' expect(page).to have_text 'Get started with feature flags'
expect(page).to have_selector('.btn-success', text: 'New feature flag') expect(page).to have_selector('.btn-confirm', text: 'New feature flag')
expect(page).to have_selector('[data-qa-selector="configure_feature_flags_button"]', text: 'Configure') expect(page).to have_selector('[data-qa-selector="configure_feature_flags_button"]', text: 'Configure')
end end
end end
......
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