Merge branch 'master' into 'prettify-all-the-things-4'prettify-all-the-things-4

# Conflicts:
#   app/assets/javascripts/sidebar/components/time_tracking/collapsed_state.vue

1 files changed, 8 insertions, 2 deletions

diff --git a/spec/javascripts/ci_variable_list/native_form_variable_list_spec.js b/spec/javascripts/ci_variable_list/native_form_variable_list_spec.js
index 94a0c999d66..997d0d54d79 100644
--- a/spec/javascripts/ci_variable_list/native_form_variable_list_spec.js
+++ b/spec/javascripts/ci_variable_list/native_form_variable_list_spec.js
@@ -19,8 +19,14 @@ describe('NativeFormVariableList', () => {
   describe('onFormSubmit', () => {
     it('should clear out the `name` attribute on the inputs for the last empty row on form submission (avoid BE validation)', () => {
       const $row = $wrapper.find('.js-row');
-      expect($row.find('.js-ci-variable-input-key').attr('name')).toBe('schedule[variables_attributes][][key]');
-      expect($row.find('.js-ci-variable-input-value').attr('name')).toBe('schedule[variables_attributes][][secret_value]');
+
+      expect($row.find('.js-ci-variable-input-key').attr('name')).toBe(
+        'schedule[variables_attributes][][key]',
+      );
+
+      expect($row.find('.js-ci-variable-input-value').attr('name')).toBe(
+        'schedule[variables_attributes][][secret_value]',
+      );
 
       $wrapper.closest('form').trigger('trigger-submit');