Merge branch '267537-edit-custom-vsa-feature-specs' into 'master'

Add edit value stream feature specs

See merge request gitlab-org/gitlab!54209

ee/app/assets/javascripts/analytics/cycle_analytics/components/create_value_stream_form/constants.js

@@ -7,7 +7,7 @@ export const i18n = {
   EDIT_FORM_TITLE: s__('CreateValueStreamForm|Edit Value Stream'),
   EDIT_FORM_ACTION: s__('CreateValueStreamForm|Save Value Stream'),
   FORM_CREATED: s__("CreateValueStreamForm|'%{name}' Value Stream created"),
-  FORM_EDITED: s__("CreateValueStreamForm|'%{name}' Value Stream edited"),
+  FORM_EDITED: s__("CreateValueStreamForm|'%{name}' Value Stream saved"),
   RECOVER_HIDDEN_STAGE: s__('CreateValueStreamForm|Recover hidden stage'),
   RESTORE_HIDDEN_STAGE: s__('CreateValueStreamForm|Restore stage'),
   RESTORE_DEFAULTS: s__('CreateValueStreamForm|Restore defaults'),

ee/app/assets/javascripts/analytics/cycle_analytics/components/create_value_stream_form/custom_stage_fields.vue

@@ -89,7 +89,7 @@ export default {
 };
 </script>
 <template>
-  <div>
+  <div data-testid="value-stream-stage-fields">
     <div class="gl-display-flex">
       <gl-form-group
         class="gl-flex-grow-1"

ee/app/assets/javascripts/analytics/cycle_analytics/components/create_value_stream_form/default_stage_fields.vue

@@ -59,7 +59,7 @@ export default {
 };
 </script>
 <template>
-  <div class="gl-mb-4">
+  <div class="gl-mb-4" data-testid="value-stream-stage-fields">
     <div class="gl-display-flex">
       <gl-form-group
         class="gl-flex-grow-1 gl-mb-0"

ee/spec/features/groups/analytics/cycle_analytics/multiple_value_streams_spec.rb

@@ -42,9 +42,15 @@ RSpec.describe 'Multiple value streams', :js do
 
   def add_custom_stage_to_form
     page.find_button(s_('CreateValueStreamForm|Add another stage')).click
-    fill_in "custom-stage-name-6", with: "Cool custom stage - name"
-    select_dropdown_option_by_value "custom-stage-start-event-6", :merge_request_created
-    select_dropdown_option_by_value "custom-stage-end-event-6", :merge_request_merged
+
+    index = page.all('[data-testid="value-stream-stage-fields"]').length
+    last_stage = page.all('[data-testid="value-stream-stage-fields"]').last
+
+    within last_stage do
+      find('[name*="custom-stage-name-"]').fill_in with: "Cool custom stage - name #{index}"
+      select_dropdown_option_by_value "custom-stage-start-event-", :merge_request_created
+      select_dropdown_option_by_value "custom-stage-end-event-", :merge_request_merged
+    end
   end
 
   def create_value_stream
@@ -54,6 +60,14 @@ RSpec.describe 'Multiple value streams', :js do
     wait_for_requests
   end
 
+  def create_custom_value_stream
+    toggle_value_stream_dropdown
+    page.find_button(_('Create new Value Stream')).click
+
+    add_custom_stage_to_form
+    create_value_stream
+  end
+
   describe 'Create value stream' do
     before do
       select_group(group)
@@ -87,6 +101,40 @@ RSpec.describe 'Multiple value streams', :js do
     end
   end
 
+  describe 'Edit value stream' do
+    before do
+      select_group(group)
+
+      create_custom_value_stream
+
+      page.find_button(_('Edit')).click
+    end
+
+    it 'includes additional form fields' do
+      expect(page).to have_selector(extended_form_fields_selector)
+      expect(page).to have_button("Save Value Stream")
+    end
+
+    it 'can update the value stream name' do
+      edited_name = "Edit new value stream"
+      fill_in 'create-value-stream-name', with: edited_name
+
+      page.find_button(_('Save Value Stream')).click
+      wait_for_requests
+
+      expect(page).to have_text(_("'%{name}' Value Stream saved") % { name: edited_name })
+    end
+
+    it 'can add a custom stage' do
+      add_custom_stage_to_form
+
+      page.find_button(_('Save Value Stream')).click
+      wait_for_requests
+
+      expect(page).to have_text(_("'%{name}' Value Stream saved") % { name: custom_value_stream_name })
+    end
+  end
+
   describe 'with the `value_stream_analytics_extended_form` feature flag disabled' do
     before do
       stub_licensed_features(cycle_analytics_for_groups: true, type_of_work_analytics: true)

ee/spec/frontend/analytics/cycle_analytics/components/value_stream_form_spec.js

@@ -275,12 +275,9 @@ describe('ValueStreamForm', () => {
           });
 
           it('displays a toast message', () => {
-            expect(mockToastShow).toHaveBeenCalledWith(
-              `'${initialData.name}' Value Stream edited`,
-              {
-                position: 'top-center',
-              },
-            );
+            expect(mockToastShow).toHaveBeenCalledWith(`'${initialData.name}' Value Stream saved`, {
+              position: 'top-center',
+            });
           });
         });
 

locale/gitlab.pot

@@ -976,6 +976,9 @@ msgstr ""
 msgid "'%{name}' Value Stream deleted"
 msgstr ""
 
+msgid "'%{name}' Value Stream saved"
+msgstr ""
+
 msgid "'%{name}' stage already exists"
 msgstr ""
 
@@ -8707,7 +8710,7 @@ msgstr ""
 msgid "CreateValueStreamForm|'%{name}' Value Stream created"
 msgstr ""
 
-msgid "CreateValueStreamForm|'%{name}' Value Stream edited"
+msgid "CreateValueStreamForm|'%{name}' Value Stream saved"
 msgstr ""
 
 msgid "CreateValueStreamForm|Add another stage"
@@ -25962,6 +25965,9 @@ msgstr ""
 msgid "Save Changes"
 msgstr ""
 
+msgid "Save Value Stream"
+msgstr ""
+
 msgid "Save application"
 msgstr ""
 

spec/support/helpers/cycle_analytics_helpers.rb

@@ -15,7 +15,7 @@ module CycleAnalyticsHelpers
   end
 
   def toggle_dropdown(field)
-    page.within("[data-testid='#{field}']") do
+    page.within("[data-testid*='#{field}']") do
       find('.dropdown-toggle').click
 
       wait_for_requests
@@ -26,7 +26,7 @@ module CycleAnalyticsHelpers
 
   def select_dropdown_option_by_value(name, value, elem = '.dropdown-item')
     toggle_dropdown name
-    page.find("[data-testid='#{name}'] .dropdown-menu").find("#{elem}[value='#{value}']").click
+    page.find("[data-testid*='#{name}'] .dropdown-menu").find("#{elem}[value='#{value}']").click
   end
 
   def create_commit_referencing_issue(issue, branch_name: generate(:branch))