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
fd52a93d
Commit
fd52a93d
authored
Oct 22, 2021
by
Rishabh Gupta
Committed by
Martin Wortschack
Oct 22, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix: Buttons text update with proper capitalization
parent
ddb2c3ae
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
16 additions
and
15 deletions
+16
-15
ee/app/assets/javascripts/analytics/cycle_analytics/components/create_value_stream_form/constants.js
...nalytics/components/create_value_stream_form/constants.js
+1
-1
ee/spec/features/groups/analytics/cycle_analytics/charts_spec.rb
.../features/groups/analytics/cycle_analytics/charts_spec.rb
+1
-1
ee/spec/features/groups/analytics/cycle_analytics/multiple_value_streams_spec.rb
.../analytics/cycle_analytics/multiple_value_streams_spec.rb
+7
-7
ee/spec/frontend/analytics/cycle_analytics/components/value_stream_form_spec.js
...tics/cycle_analytics/components/value_stream_form_spec.js
+2
-2
locale/gitlab.pot
locale/gitlab.pot
+1
-4
spec/support/helpers/cycle_analytics_helpers.rb
spec/support/helpers/cycle_analytics_helpers.rb
+4
-0
No files found.
ee/app/assets/javascripts/analytics/cycle_analytics/components/create_value_stream_form/constants.js
View file @
fd52a93d
...
@@ -5,7 +5,7 @@ export const NAME_MAX_LENGTH = 100;
...
@@ -5,7 +5,7 @@ export const NAME_MAX_LENGTH = 100;
export
const
i18n
=
{
export
const
i18n
=
{
FORM_TITLE
:
s__
(
'
CreateValueStreamForm|Create Value Stream
'
),
FORM_TITLE
:
s__
(
'
CreateValueStreamForm|Create Value Stream
'
),
EDIT_FORM_TITLE
:
s__
(
'
CreateValueStreamForm|Edit Value Stream
'
),
EDIT_FORM_TITLE
:
s__
(
'
CreateValueStreamForm|Edit Value Stream
'
),
EDIT_FORM_ACTION
:
s__
(
'
CreateValueStreamForm|Save
Value S
tream
'
),
EDIT_FORM_ACTION
:
s__
(
'
CreateValueStreamForm|Save
value s
tream
'
),
FORM_CREATED
:
s__
(
"
CreateValueStreamForm|'%{name}' Value Stream created
"
),
FORM_CREATED
:
s__
(
"
CreateValueStreamForm|'%{name}' Value Stream created
"
),
FORM_EDITED
:
s__
(
"
CreateValueStreamForm|'%{name}' Value Stream saved
"
),
FORM_EDITED
:
s__
(
"
CreateValueStreamForm|'%{name}' Value Stream saved
"
),
RECOVER_HIDDEN_STAGE
:
s__
(
'
CreateValueStreamForm|Recover hidden stage
'
),
RECOVER_HIDDEN_STAGE
:
s__
(
'
CreateValueStreamForm|Recover hidden stage
'
),
...
...
ee/spec/features/groups/analytics/cycle_analytics/charts_spec.rb
View file @
fd52a93d
...
@@ -64,7 +64,7 @@ RSpec.describe 'Value stream analytics charts', :js do
...
@@ -64,7 +64,7 @@ RSpec.describe 'Value stream analytics charts', :js do
def
hide_vsa_stage
(
index
=
0
)
def
hide_vsa_stage
(
index
=
0
)
page
.
find_button
(
_
(
'Edit'
)).
click
page
.
find_button
(
_
(
'Edit'
)).
click
page
.
find
(
"[data-testid='stage-action-hide-
#{
index
}
']"
).
click
page
.
find
(
"[data-testid='stage-action-hide-
#{
index
}
']"
).
click
page
.
find_button
(
_
(
'Save Value Stream'
)).
click
click_save_value_stream_button
wait_for_requests
wait_for_requests
end
end
...
...
ee/spec/features/groups/analytics/cycle_analytics/multiple_value_streams_spec.rb
View file @
fd52a93d
...
@@ -101,7 +101,7 @@ RSpec.describe 'Multiple value streams', :js do
...
@@ -101,7 +101,7 @@ RSpec.describe 'Multiple value streams', :js do
page
.
all
(
"[data-testid*='stage-action-move-down-']"
).
first
.
click
page
.
all
(
"[data-testid*='stage-action-move-down-']"
).
first
.
click
page
.
all
(
"[data-testid*='stage-action-move-up-']"
).
last
.
click
page
.
all
(
"[data-testid*='stage-action-move-up-']"
).
last
.
click
page
.
find_button
(
_
(
'Save Value Stream'
)).
click
click_save_value_stream_button
wait_for_requests
wait_for_requests
expect
(
path_nav_stage_names_without_median
).
to
eq
([
"Overview"
,
"Plan"
,
"Issue"
,
"Code"
,
"Test"
,
"Review"
,
"Cool custom stage - name 7"
,
"Staging"
])
expect
(
path_nav_stage_names_without_median
).
to
eq
([
"Overview"
,
"Plan"
,
"Issue"
,
"Code"
,
"Test"
,
"Review"
,
"Cool custom stage - name 7"
,
"Staging"
])
...
@@ -114,14 +114,14 @@ RSpec.describe 'Multiple value streams', :js do
...
@@ -114,14 +114,14 @@ RSpec.describe 'Multiple value streams', :js do
it
'includes additional form fields'
do
it
'includes additional form fields'
do
expect
(
page
).
to
have_selector
(
extended_form_fields_selector
)
expect
(
page
).
to
have_selector
(
extended_form_fields_selector
)
expect
(
page
).
to
have_button
(
"Save
Value S
tream"
)
expect
(
page
).
to
have_button
(
"Save
value s
tream"
)
end
end
it
'can update the value stream name'
do
it
'can update the value stream name'
do
edited_name
=
"Edit new value stream"
edited_name
=
"Edit new value stream"
fill_in
'create-value-stream-name'
,
with:
edited_name
fill_in
'create-value-stream-name'
,
with:
edited_name
page
.
find_button
(
_
(
'Save Value Stream'
)).
click
click_save_value_stream_button
wait_for_requests
wait_for_requests
expect
(
page
).
to
have_text
(
_
(
"'%{name}' Value Stream saved"
)
%
{
name:
edited_name
})
expect
(
page
).
to
have_text
(
_
(
"'%{name}' Value Stream saved"
)
%
{
name:
edited_name
})
...
@@ -131,7 +131,7 @@ RSpec.describe 'Multiple value streams', :js do
...
@@ -131,7 +131,7 @@ RSpec.describe 'Multiple value streams', :js do
add_custom_stage_to_form
add_custom_stage_to_form
add_custom_label_stage_to_form
add_custom_label_stage_to_form
page
.
find_button
(
_
(
'Save Value Stream'
)).
click
click_save_value_stream_button
wait_for_requests
wait_for_requests
expect
(
path_nav_elem
).
to
have_text
(
"Cool custom stage - name"
)
expect
(
path_nav_elem
).
to
have_text
(
"Cool custom stage - name"
)
...
@@ -146,7 +146,7 @@ RSpec.describe 'Multiple value streams', :js do
...
@@ -146,7 +146,7 @@ RSpec.describe 'Multiple value streams', :js do
page
.
all
(
"[data-testid*='stage-action-move-down-']"
).
first
.
click
page
.
all
(
"[data-testid*='stage-action-move-down-']"
).
first
.
click
page
.
all
(
"[data-testid*='stage-action-move-up-']"
).
last
.
click
page
.
all
(
"[data-testid*='stage-action-move-up-']"
).
last
.
click
page
.
find_button
(
_
(
'Save Value Stream'
)).
click
click_save_value_stream_button
wait_for_requests
wait_for_requests
expect
(
path_nav_elem
).
not_to
have_text
(
"Cool custom stage - name"
)
expect
(
path_nav_elem
).
not_to
have_text
(
"Cool custom stage - name"
)
...
@@ -157,7 +157,7 @@ RSpec.describe 'Multiple value streams', :js do
...
@@ -157,7 +157,7 @@ RSpec.describe 'Multiple value streams', :js do
click_action_button
(
'hide'
,
4
)
click_action_button
(
'hide'
,
4
)
click_action_button
(
'hide'
,
3
)
click_action_button
(
'hide'
,
3
)
click_
button
(
_
(
'Save Value Stream'
))
click_
save_value_stream_button
wait_for_requests
wait_for_requests
expect
(
page
).
to
have_text
(
_
(
"'%{name}' Value Stream saved"
)
%
{
name:
custom_value_stream_name
})
expect
(
page
).
to
have_text
(
_
(
"'%{name}' Value Stream saved"
)
%
{
name:
custom_value_stream_name
})
...
@@ -168,7 +168,7 @@ RSpec.describe 'Multiple value streams', :js do
...
@@ -168,7 +168,7 @@ RSpec.describe 'Multiple value streams', :js do
click_button
(
_
(
'Edit'
))
click_button
(
_
(
'Edit'
))
click_action_button
(
'restore'
,
0
)
click_action_button
(
'restore'
,
0
)
click_
button
(
_
(
'Save Value Stream'
))
click_
save_value_stream_button
wait_for_requests
wait_for_requests
expect
(
page
).
to
have_text
(
_
(
"'%{name}' Value Stream saved"
)
%
{
name:
custom_value_stream_name
})
expect
(
page
).
to
have_text
(
_
(
"'%{name}' Value Stream saved"
)
%
{
name:
custom_value_stream_name
})
...
...
ee/spec/frontend/analytics/cycle_analytics/components/value_stream_form_spec.js
View file @
fd52a93d
...
@@ -247,8 +247,8 @@ describe('ValueStreamForm', () => {
...
@@ -247,8 +247,8 @@ describe('ValueStreamForm', () => {
expect
(
findPresetSelector
().
exists
()).
toBe
(
false
);
expect
(
findPresetSelector
().
exists
()).
toBe
(
false
);
});
});
it
(
'
sets the submit action text to "Save
Value S
tream"
'
,
()
=>
{
it
(
'
sets the submit action text to "Save
value s
tream"
'
,
()
=>
{
expect
(
findBtn
(
'
actionPrimary
'
).
text
).
toBe
(
'
Save
Value S
tream
'
);
expect
(
findBtn
(
'
actionPrimary
'
).
text
).
toBe
(
'
Save
value s
tream
'
);
});
});
it
(
'
does not display any hidden stages
'
,
()
=>
{
it
(
'
does not display any hidden stages
'
,
()
=>
{
...
...
locale/gitlab.pot
View file @
fd52a93d
...
@@ -9829,7 +9829,7 @@ msgstr ""
...
@@ -9829,7 +9829,7 @@ msgstr ""
msgid "CreateValueStreamForm|Restore stage"
msgid "CreateValueStreamForm|Restore stage"
msgstr ""
msgstr ""
msgid "CreateValueStreamForm|Save
Value S
tream"
msgid "CreateValueStreamForm|Save
value s
tream"
msgstr ""
msgstr ""
msgid "CreateValueStreamForm|Select end event"
msgid "CreateValueStreamForm|Select end event"
...
@@ -29682,9 +29682,6 @@ msgstr ""
...
@@ -29682,9 +29682,6 @@ msgstr ""
msgid "Save Changes"
msgid "Save Changes"
msgstr ""
msgstr ""
msgid "Save Value Stream"
msgstr ""
msgid "Save application"
msgid "Save application"
msgstr ""
msgstr ""
...
...
spec/support/helpers/cycle_analytics_helpers.rb
View file @
fd52a93d
...
@@ -63,6 +63,10 @@ module CycleAnalyticsHelpers
...
@@ -63,6 +63,10 @@ module CycleAnalyticsHelpers
wait_for_requests
wait_for_requests
end
end
def
click_save_value_stream_button
click_button
(
_
(
'Save value stream'
))
end
def
create_custom_value_stream
(
custom_value_stream_name
)
def
create_custom_value_stream
(
custom_value_stream_name
)
toggle_value_stream_dropdown
toggle_value_stream_dropdown
page
.
find_button
(
_
(
'Create new Value Stream'
)).
click
page
.
find_button
(
_
(
'Create new Value Stream'
)).
click
...
...
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