Merge branch '219418-fix-case' into 'master'

Replace snake case with camel case

See merge request gitlab-org/gitlab!47966

ee/app/assets/javascripts/pages/projects/security/vulnerabilities/show/index.js

 import Vue from 'vue';
 import MainApp from 'ee/vulnerabilities/components/vulnerability.vue';
+import { convertObjectPropsToCamelCase } from '~/lib/utils/common_utils';
 
 (function createMainApp() {
   const el = document.getElementById('js-vulnerability-main');
-  const vulnerability = JSON.parse(el.dataset.vulnerability);
+  const vulnerability = convertObjectPropsToCamelCase(JSON.parse(el.dataset.vulnerability), {
+    deep: true,
+  });
 
   return new Vue({
     el,
 
     provide: {
-      reportType: vulnerability.report_type,
-      createIssueUrl: vulnerability.create_issue_url,
-      projectFingerprint: vulnerability.project_fingerprint,
+      reportType: vulnerability.reportType,
+      createIssueUrl: vulnerability.createIssueUrl,
+      projectFingerprint: vulnerability.projectFingerprint,
       vulnerabilityId: vulnerability.id,
       issueTrackingHelpPath: vulnerability.issueTrackingHelpPath,
       permissionsHelpPath: vulnerability.permissionsHelpPath,

ee/app/assets/javascripts/vulnerabilities/components/details.vue

@@ -23,7 +23,7 @@ export default {
       return this.vulnerability.location || {};
     },
     stacktraceSnippet() {
-      return this.vulnerability.stacktrace_snippet || '';
+      return this.vulnerability.stacktraceSnippet || '';
     },
     scanner() {
       return this.vulnerability.scanner || {};
@@ -32,10 +32,10 @@ export default {
       return (this.location.file || '') + (this.lineNumber ? `:${this.lineNumber}` : '');
     },
     fileUrl() {
-      return (this.location.blob_path || '') + (this.lineNumber ? `#L${this.lineNumber}` : '');
+      return (this.location.blobPath || '') + (this.lineNumber ? `#L${this.lineNumber}` : '');
     },
     lineNumber() {
-      const { start_line: start, end_line: end } = this.location;
+      const { startLine: start, endLine: end } = this.location;
       return end > start ? `${start}-${end}` : start;
     },
     scannerUrl() {
@@ -58,10 +58,10 @@ export default {
       };
     },
     assertion() {
-      return this.vulnerability.evidence_source?.name;
+      return this.vulnerability.evidenceSource?.name;
     },
     recordedMessage() {
-      return this.vulnerability?.supporting_messages?.find(
+      return this.vulnerability?.supportingMessages?.find(
         msg => msg.name === SUPPORTING_MESSAGE_TYPES.RECORDED,
       )?.response;
     },
@@ -115,12 +115,12 @@ export default {
     },
     shouldShowLocation() {
       return (
-        this.location.crash_address ||
-        this.location.crash_type ||
-        this.location.stacktrace_snippet ||
+        this.location.crashAddress ||
+        this.location.crashType ||
+        this.location.stacktraceSnippet ||
         this.location.file ||
         this.location.image ||
-        this.location.operating_system
+        this.location.operatingSystem
       );
     },
     hasRequest() {
@@ -181,7 +181,7 @@ export default {
         <severity-badge :severity="vulnerability.severity" class="gl-display-inline ml-1" />
       </detail-item>
       <detail-item :sprintf-message="__('%{labelStart}Scan Type:%{labelEnd} %{reportType}')"
-        >{{ vulnerability.report_type }}
+        >{{ vulnerability.reportType }}
       </detail-item>
       <detail-item
         v-if="scanner.name"
@@ -229,9 +229,9 @@ export default {
           >{{ location.image }}
         </detail-item>
         <detail-item
-          v-if="location.operating_system"
+          v-if="location.operatingSystem"
           :sprintf-message="__('%{labelStart}Namespace:%{labelEnd} %{namespace}')"
-          >{{ location.operating_system }}
+          >{{ location.operatingSystem }}
         </detail-item>
         <detail-item
           v-if="location.file"
@@ -240,15 +240,15 @@ export default {
           <gl-link :href="fileUrl" target="_blank">{{ fileText }}</gl-link>
         </detail-item>
         <detail-item
-          v-if="location.crash_address"
+          v-if="location.crashAddress"
           :sprintf-message="__('%{labelStart}Crash Address:%{labelEnd} %{crash_address}')"
-          >{{ location.crash_address }}
+          >{{ location.crashAddress }}
         </detail-item>
         <detail-item
-          v-if="location.stacktrace_snippet"
+          v-if="location.stacktraceSnippet"
           :sprintf-message="__('%{labelStart}Crash State:%{labelEnd} %{stacktrace_snippet}')"
         >
-          <code-block :code="location.stacktrace_snippet" max-height="225px" />
+          <code-block :code="location.stacktraceSnippet" max-height="225px" />
         </detail-item>
       </ul>
     </template>

ee/app/assets/javascripts/vulnerabilities/components/footer.vue

@@ -6,6 +6,7 @@ import Api from 'ee/api';
 import { VULNERABILITY_STATE_OBJECTS } from 'ee/vulnerabilities/constants';
 import { GlIcon } from '@gitlab/ui';
 import axios from '~/lib/utils/axios_utils';
+import { convertObjectPropsToCamelCase } from '~/lib/utils/common_utils';
 import Poll from '~/lib/utils/poll';
 import { deprecatedCreateFlash as createFlash } from '~/flash';
 import { s__, __ } from '~/locale';
@@ -50,12 +51,12 @@ export default {
     },
     project() {
       return {
-        url: this.vulnerability.project.full_path,
-        value: this.vulnerability.project.full_name,
+        url: this.vulnerability.project.fullPath,
+        value: this.vulnerability.project.fullName,
       };
     },
     solutionInfo() {
-      const { solution, has_mr: hasMr, remediations, state } = this.vulnerability;
+      const { solution, hasMr, remediations, state } = this.vulnerability;
 
       const remediation = remediations?.[0];
       const hasDownload = Boolean(
@@ -103,7 +104,7 @@ export default {
     },
     fetchDiscussions() {
       axios
-        .get(this.vulnerability.discussions_url)
+        .get(this.vulnerability.discussionsUrl)
         .then(({ data, headers: { date } }) => {
           this.discussionsDictionary = data.reduce((acc, discussion) => {
             acc[discussion.id] = discussion;
@@ -139,13 +140,13 @@ export default {
       this.poll = new Poll({
         resource: {
           fetchNotes: () =>
-            axios.get(this.vulnerability.notes_url, {
+            axios.get(this.vulnerability.notesUrl, {
               headers: { 'X-Last-Fetched-At': this.lastFetchedAt },
             }),
         },
         method: 'fetchNotes',
         successCallback: ({ data: { notes, last_fetched_at: lastFetchedAt } }) => {
-          this.updateNotes(notes);
+          this.updateNotes(convertObjectPropsToCamelCase(notes, { deep: true }));
           this.lastFetchedAt = lastFetchedAt;
         },
         errorCallback: () =>
@@ -158,23 +159,23 @@ export default {
       notes.forEach(note => {
         // If the note exists, update it.
         if (this.noteDictionary[note.id]) {
-          const updatedDiscussion = { ...this.discussionsDictionary[note.discussion_id] };
+          const updatedDiscussion = { ...this.discussionsDictionary[note.discussionId] };
           updatedDiscussion.notes = updatedDiscussion.notes.map(curr =>
             curr.id === note.id ? note : curr,
           );
-          this.discussionsDictionary[note.discussion_id] = updatedDiscussion;
+          this.discussionsDictionary[note.discussionId] = updatedDiscussion;
         }
         // If the note doesn't exist, but the discussion does, add the note to the discussion.
-        else if (this.discussionsDictionary[note.discussion_id]) {
-          const updatedDiscussion = { ...this.discussionsDictionary[note.discussion_id] };
+        else if (this.discussionsDictionary[note.discussionId]) {
+          const updatedDiscussion = { ...this.discussionsDictionary[note.discussionId] };
           updatedDiscussion.notes.push(note);
-          this.discussionsDictionary[note.discussion_id] = updatedDiscussion;
+          this.discussionsDictionary[note.discussionId] = updatedDiscussion;
         }
         // If the discussion doesn't exist, create it.
         else {
           const newDiscussion = {
-            id: note.discussion_id,
-            reply_id: note.discussion_id,
+            id: note.discussionId,
+            replyId: note.discussionId,
             notes: [note],
           };
           this.$set(this.discussionsDictionary, newDiscussion.id, newDiscussion);
@@ -198,9 +199,9 @@ export default {
   <div data-qa-selector="vulnerability_footer">
     <solution-card v-if="hasSolution" v-bind="solutionInfo" />
 
-    <div v-if="vulnerability.merge_request_feedback" class="card gl-mt-5">
+    <div v-if="vulnerability.mergeRequestFeedback" class="card gl-mt-5">
       <merge-request-note
-        :feedback="vulnerability.merge_request_feedback"
+        :feedback="vulnerability.mergeRequestFeedback"
         :project="project"
         class="card-body"
       />
@@ -208,9 +209,9 @@ export default {
 
     <related-issues
       :endpoint="issueLinksEndpoint"
-      :can-modify-related-issues="vulnerability.can_modify_related_issues"
+      :can-modify-related-issues="vulnerability.canModifyRelatedIssues"
       :project-path="project.url"
-      :help-path="vulnerability.related_issues_help_path"
+      :help-path="vulnerability.relatedIssuesHelpPath"
     />
 
     <div class="notes" data-testid="detection-note">
@@ -233,7 +234,7 @@ export default {
         v-for="discussion in discussions"
         :key="discussion.id"
         :discussion="discussion"
-        :notes-url="vulnerability.notes_url"
+        :notes-url="vulnerability.notesUrl"
       />
     </ul>
   </div>

ee/app/assets/javascripts/vulnerabilities/components/header.vue

@@ -5,6 +5,10 @@ import { CancelToken } from 'axios';
 import SplitButton from 'ee/vue_shared/security_reports/components/split_button.vue';
 import axios from '~/lib/utils/axios_utils';
 import download from '~/lib/utils/downloader';
+import {
+  convertObjectPropsToSnakeCase,
+  convertObjectPropsToCamelCase,
+} from '~/lib/utils/common_utils';
 import { redirectTo } from '~/lib/utils/url_utility';
 import { deprecatedCreateFlash as createFlash } from '~/flash';
 import { s__ } from '~/locale';
@@ -78,7 +82,7 @@ export default {
       );
     },
     hasIssue() {
-      return Boolean(this.vulnerability.issue_feedback?.issue_iid);
+      return Boolean(this.vulnerability.issueFeedback?.issueIid);
     },
     hasRemediation() {
       const { remediations } = this.vulnerability;
@@ -86,14 +90,14 @@ export default {
     },
     canCreateMergeRequest() {
       return (
-        !this.vulnerability.merge_request_feedback?.merge_request_path &&
-        Boolean(this.vulnerability.create_mr_url) &&
+        !this.vulnerability.mergeRequestFeedback?.mergeRequestPath &&
+        Boolean(this.vulnerability.createMrUrl) &&
         this.hasRemediation
       );
     },
     showResolutionAlert() {
       return (
-        this.vulnerability.resolved_on_default_branch &&
+        this.vulnerability.resolvedOnDefaultBranch &&
         this.vulnerability.state !== VULNERABILITY_STATE_OBJECTS.resolved.state
       );
     },
@@ -103,7 +107,7 @@ export default {
     'vulnerability.state': {
       immediate: true,
       handler(state) {
-        const id = this.vulnerability[`${state}_by_id`];
+        const id = this.vulnerability[`${state}ById`];
 
         if (id === undefined) return; // Don't do anything if there's no ID.
 
@@ -133,7 +137,7 @@ export default {
 
       Api.changeVulnerabilityState(this.vulnerability.id, newState)
         .then(({ data }) => {
-          Object.assign(this.vulnerability, data);
+          Object.assign(this.vulnerability, convertObjectPropsToCamelCase(data));
           this.$emit('vulnerability-state-change');
         })
         .catch(() => {
@@ -151,26 +155,26 @@ export default {
       this.isProcessingAction = true;
 
       const {
-        report_type: category,
+        reportType: category,
         pipeline: { sourceBranch },
-        project_fingerprint: projectFingerprint,
+        projectFingerprint,
       } = this.vulnerability;
 
       axios
-        .post(this.vulnerability.create_mr_url, {
+        .post(this.vulnerability.createMrUrl, {
           vulnerability_feedback: {
             feedback_type: FEEDBACK_TYPES.MERGE_REQUEST,
             category,
             project_fingerprint: projectFingerprint,
             vulnerability_data: {
-              ...this.vulnerability,
+              ...convertObjectPropsToSnakeCase(this.vulnerability),
               category,
               target_branch: sourceBranch,
             },
           },
         })
-        .then(({ data: { merge_request_path } }) => {
-          redirectTo(merge_request_path);
+        .then(({ data: { merge_request_path: mergeRequestPath } }) => {
+          redirectTo(mergeRequestPath);
         })
         .catch(() => {
           this.isProcessingAction = false;
@@ -225,7 +229,7 @@ export default {
     <resolution-alert
       v-if="showResolutionAlert"
       :vulnerability-id="vulnerability.id"
-      :default-branch-name="vulnerability.project_default_branch"
+      :default-branch-name="vulnerability.projectDefaultBranch"
     />
     <div class="detail-page-header">
       <div class="detail-page-header-body align-items-center">

ee/app/assets/javascripts/vulnerabilities/components/history_entry.vue

@@ -59,8 +59,8 @@ export default {
     <event-item
       :id="systemNote.id"
       :author="systemNote.author"
-      :created-at="systemNote.updated_at"
-      :icon-name="systemNote.system_note_icon_name"
+      :created-at="systemNote.updatedAt"
+      :icon-name="systemNote.systemNoteIconName"
       icon-class="timeline-icon m-0"
       class="m-3"
     >
@@ -74,7 +74,7 @@ export default {
         :key="comment.id"
         ref="existingComment"
         :comment="comment"
-        :discussion-id="discussion.reply_id"
+        :discussion-id="discussion.replyId"
         :notes-url="notesUrl"
         @onCommentUpdated="updateComment"
         @onCommentDeleted="removeComment"
@@ -84,7 +84,7 @@ export default {
     <history-comment
       v-else
       ref="newComment"
-      :discussion-id="discussion.reply_id"
+      :discussion-id="discussion.replyId"
       :notes-url="notesUrl"
       @onCommentAdded="addComment"
     />

ee/app/assets/javascripts/vulnerabilities/components/status_description.vue

@@ -50,8 +50,8 @@ export default {
     time() {
       const { state } = this.vulnerability;
       return state === 'detected'
-        ? this.vulnerability.pipeline.created_at
-        : this.vulnerability[`${this.vulnerability.state}_at`];
+        ? this.vulnerability.pipeline.createdAt
+        : this.vulnerability[`${this.vulnerability.state}At`];
     },
 
     statusText() {

ee/spec/frontend/vulnerabilities/details_spec.js

@@ -12,7 +12,7 @@ describe('Vulnerability Details', () => {
     title: 'some title',
     severity: 'bad severity',
     confidence: 'high confidence',
-    report_type: 'nice report_type',
+    reportType: 'nice report_type',
     description: 'vulnerability description',
   };
 
@@ -37,7 +37,7 @@ describe('Vulnerability Details', () => {
     expect(getText('title')).toBe(vulnerability.title);
     expect(getText('description')).toBe(vulnerability.description);
     expect(wrapper.find(SeverityBadge).props('severity')).toBe(vulnerability.severity);
-    expect(getText('reportType')).toBe(`Scan Type: ${vulnerability.report_type}`);
+    expect(getText('reportType')).toBe(`Scan Type: ${vulnerability.reportType}`);
 
     expect(getById('image').exists()).toBe(false);
     expect(getById('os').exists()).toBe(false);
@@ -56,7 +56,7 @@ describe('Vulnerability Details', () => {
   });
 
   it('shows the operating system if it exists', () => {
-    createWrapper({ location: { operating_system: 'linux' } });
+    createWrapper({ location: { operatingSystem: 'linux' } });
     expect(getText('namespace')).toBe(`Namespace: linux`);
   });
 
@@ -111,14 +111,14 @@ describe('Vulnerability Details', () => {
     const file = () => getById('file').find(GlLink);
 
     it('shows only the file name if there is no start line', () => {
-      createWrapper({ location: { file: 'test.txt', blob_path: 'blob_path.txt' } });
+      createWrapper({ location: { file: 'test.txt', blobPath: 'blob_path.txt' } });
       expect(file().attributes('target')).toBe('_blank');
       expect(file().attributes('href')).toBe('blob_path.txt');
       expect(file().text()).toBe('test.txt');
     });
 
     it('shows the correct line number when there is a start line', () => {
-      createWrapper({ location: { file: 'test.txt', start_line: 24, blob_path: 'blob.txt' } });
+      createWrapper({ location: { file: 'test.txt', startLine: 24, blobPath: 'blob.txt' } });
       expect(file().attributes('target')).toBe('_blank');
       expect(file().attributes('href')).toBe('blob.txt#L24');
       expect(file().text()).toBe('test.txt:24');
@@ -126,7 +126,7 @@ describe('Vulnerability Details', () => {
 
     it('shows the correct line numbers when there is a start and end line', () => {
       createWrapper({
-        location: { file: 'test.txt', start_line: 24, end_line: 27, blob_path: 'blob.txt' },
+        location: { file: 'test.txt', startLine: 24, endLine: 27, blobPath: 'blob.txt' },
       });
       expect(file().attributes('target')).toBe('_blank');
       expect(file().attributes('href')).toBe('blob.txt#L24-27');
@@ -135,7 +135,7 @@ describe('Vulnerability Details', () => {
 
     it('shows only the start line when the end line is the same', () => {
       createWrapper({
-        location: { file: 'test.txt', start_line: 24, end_line: 24, blob_path: 'blob.txt' },
+        location: { file: 'test.txt', startLine: 24, endLine: 24, blobPath: 'blob.txt' },
       });
       expect(file().attributes('target')).toBe('_blank');
       expect(file().attributes('href')).toBe('blob.txt#L24');
@@ -237,7 +237,7 @@ describe('Vulnerability Details', () => {
     });
 
     it.each`
-      supporting_messages                                                                                                                                          | expectedData
+      supportingMessages                                                                                                                                           | expectedData
       ${null}                                                                                                                                                      | ${null}
       ${[]}                                                                                                                                                        | ${null}
       ${[{}]}                                                                                                                                                      | ${null}
@@ -247,8 +247,8 @@ describe('Vulnerability Details', () => {
       ${[{}, { response: { headers: TEST_HEADERS, body: '[{"user_id":1,}]', status_code: '200' } }]}                                                               | ${null}
       ${[{}, { response: { headers: TEST_HEADERS, body: '[{"user_id":1,}]', status_code: '200', reason_phrase: 'OK' } }]}                                          | ${null}
       ${[{}, { name: SUPPORTING_MESSAGE_TYPES.RECORDED, response: { headers: TEST_HEADERS, body: '[{"user_id":1,}]', status_code: '200', reason_phrase: 'OK' } }]} | ${[EXPECT_RECORDED_RESPONSE]}
-    `('shows response data for $supporting_messages', ({ supporting_messages, expectedData }) => {
-      createWrapper({ supporting_messages });
+    `('shows response data for $supporting_messages', ({ supportingMessages, expectedData }) => {
+      createWrapper({ supportingMessages });
       expect(getSectionData('recorded-response')).toEqual(expectedData);
     });
   });

ee/spec/frontend/vulnerabilities/footer_spec.js

@@ -21,15 +21,15 @@ describe('Vulnerability Footer', () => {
 
   const vulnerability = {
     id: 1,
-    discussions_url: '/discussions',
-    notes_url: '/notes',
+    discussionsUrl: '/discussions',
+    notesUrl: '/notes',
     project: {
-      full_path: '/root/security-reports',
-      full_name: 'Administrator / Security Reports',
+      fullPath: '/root/security-reports',
+      fullName: 'Administrator / Security Reports',
     },
-    can_modify_related_issues: true,
-    related_issues_help_path: 'help/path',
-    has_mr: false,
+    canModifyRelatedIssues: true,
+    relatedIssuesHelpPath: 'help/path',
+    hasMr: false,
     pipeline: {},
   };
 
@@ -67,7 +67,7 @@ describe('Vulnerability Footer', () => {
         solution: properties.solution,
         remediation: properties.remediations[0],
         hasDownload: true,
-        hasMr: vulnerability.has_mr,
+        hasMr: vulnerability.hasMr,
       });
     });
 
@@ -89,14 +89,14 @@ describe('Vulnerability Footer', () => {
       // The object itself does not matter, we just want to make sure it's passed to the issue note.
       const mergeRequestFeedback = {};
 
-      createWrapper({ merge_request_feedback: mergeRequestFeedback });
+      createWrapper({ mergeRequestFeedback });
       expect(mergeRequestNote().exists()).toBe(true);
       expect(mergeRequestNote().props('feedback')).toBe(mergeRequestFeedback);
     });
   });
 
   describe('state history', () => {
-    const discussionUrl = vulnerability.discussions_url;
+    const discussionUrl = vulnerability.discussionsUrl;
 
     const historyList = () => wrapper.find({ ref: 'historyList' });
     const historyEntries = () => wrapper.findAll(HistoryEntry);
@@ -152,7 +152,7 @@ describe('Vulnerability Footer', () => {
       const createNotesRequest = (...notes) =>
         mockAxios
           .onGet(vulnerability.notes_url)
-          .replyOnce(200, { notes, last_fetched_at: Date.now() });
+          .replyOnce(200, { notes, lastFetchedAt: Date.now() });
 
       // Following #217184 the vulnerability polling uses an initial timeout
       // which we need to run and then wait for the subsequent request.
@@ -268,9 +268,9 @@ describe('Vulnerability Footer', () => {
       expect(relatedIssues().exists()).toBe(true);
       expect(relatedIssues().props()).toMatchObject({
         endpoint,
-        canModifyRelatedIssues: vulnerability.can_modify_related_issues,
-        projectPath: vulnerability.project.full_path,
-        helpPath: vulnerability.related_issues_help_path,
+        canModifyRelatedIssues: vulnerability.canModifyRelatedIssues,
+        projectPath: vulnerability.project.fullPath,
+        helpPath: vulnerability.relatedIssuesHelpPath,
       });
     });
   });

ee/spec/frontend/vulnerabilities/header_spec.js

@@ -10,6 +10,7 @@ import VulnerabilityStateDropdown from 'ee/vulnerabilities/components/vulnerabil
 import { FEEDBACK_TYPES, VULNERABILITY_STATE_OBJECTS } from 'ee/vulnerabilities/constants';
 import UsersMockHelper from 'helpers/user_mock_data_helper';
 import waitForPromises from 'helpers/wait_for_promises';
+import { convertObjectPropsToSnakeCase } from '~/lib/utils/common_utils';
 import { deprecatedCreateFlash as createFlash } from '~/flash';
 import axios from '~/lib/utils/axios_utils';
 import download from '~/lib/utils/downloader';
@@ -25,15 +26,15 @@ describe('Vulnerability Header', () => {
 
   const defaultVulnerability = {
     id: 1,
-    created_at: new Date().toISOString(),
-    report_type: 'sast',
+    createdAt: new Date().toISOString(),
+    reportType: 'sast',
     state: 'detected',
-    create_mr_url: '/create_mr_url',
-    create_issue_url: '/create_issue_url',
-    project_fingerprint: 'abc123',
+    createMrUrl: '/create_mr_url',
+    createIssueUrl: '/create_issue_url',
+    projectFingerprint: 'abc123',
     pipeline: {
       id: 2,
-      created_at: new Date().toISOString(),
+      createdAt: new Date().toISOString(),
       url: 'pipeline_url',
       sourceBranch: 'master',
     },
@@ -53,8 +54,8 @@ describe('Vulnerability Header', () => {
     return {
       remediations: shouldShowMergeRequestButton ? [{ diff }] : null,
       hasMr: !shouldShowDownloadPatchButton,
-      merge_request_feedback: {
-        merge_request_path: shouldShowMergeRequestButton ? null : 'some path',
+      mergeRequestFeedback: {
+        mergeRequestPath: shouldShowMergeRequestButton ? null : 'some path',
       },
     };
   };
@@ -196,23 +197,25 @@ describe('Vulnerability Header', () => {
       it('emits createMergeRequest when create merge request button is clicked', () => {
         const mergeRequestPath = '/group/project/merge_request/123';
         const spy = jest.spyOn(urlUtility, 'redirectTo');
-        mockAxios.onPost(defaultVulnerability.create_mr_url).reply(200, {
+        mockAxios.onPost(defaultVulnerability.createMrUrl).reply(200, {
           merge_request_path: mergeRequestPath,
         });
         findGlButton().vm.$emit('click');
         return waitForPromises().then(() => {
           expect(mockAxios.history.post).toHaveLength(1);
           const [postRequest] = mockAxios.history.post;
-          expect(postRequest.url).toBe(defaultVulnerability.create_mr_url);
+          expect(postRequest.url).toBe(defaultVulnerability.createMrUrl);
           expect(JSON.parse(postRequest.data)).toMatchObject({
             vulnerability_feedback: {
               feedback_type: FEEDBACK_TYPES.MERGE_REQUEST,
-              category: defaultVulnerability.report_type,
-              project_fingerprint: defaultVulnerability.project_fingerprint,
+              category: defaultVulnerability.reportType,
+              project_fingerprint: defaultVulnerability.projectFingerprint,
               vulnerability_data: {
-                ...getVulnerability({ shouldShowMergeRequestButton: true }),
-                hasMr: true,
-                category: defaultVulnerability.report_type,
+                ...convertObjectPropsToSnakeCase(
+                  getVulnerability({ shouldShowMergeRequestButton: true }),
+                ),
+                has_mr: true,
+                category: defaultVulnerability.reportType,
                 state: 'resolved',
               },
             },
@@ -237,7 +240,7 @@ describe('Vulnerability Header', () => {
       beforeEach(() => {
         createWrapper({
           ...getVulnerability({ shouldShowMergeRequestButton: true }),
-          create_mr_url: '',
+          createMrUrl: '',
         });
       });
 
@@ -280,7 +283,7 @@ describe('Vulnerability Header', () => {
       const vulnerability = {
         ...defaultVulnerability,
         state: 'confirmed',
-        confirmed_by_id: user.id,
+        confirmedById: user.id,
       };
 
       createWrapper(vulnerability);
@@ -303,8 +306,8 @@ describe('Vulnerability Header', () => {
 
     beforeEach(() => {
       createWrapper({
-        resolved_on_default_branch: true,
-        project_default_branch: branchName,
+        resolvedOnDefaultBranch: true,
+        projectDefaultBranch: branchName,
       });
     });
 
@@ -334,7 +337,7 @@ describe('Vulnerability Header', () => {
       `loads the correct user for the vulnerability state "%s"`,
       state => {
         const user = createRandomUser();
-        createWrapper({ state, [`${state}_by_id`]: user.id });
+        createWrapper({ state, [`${state}ById`]: user.id });
 
         return waitForPromises().then(() => {
           expect(mockAxios.history.get).toHaveLength(1);
@@ -353,7 +356,7 @@ describe('Vulnerability Header', () => {
     });
 
     it('will show an error when the user cannot be loaded', () => {
-      createWrapper({ state: 'confirmed', confirmed_by_id: 1 });
+      createWrapper({ state: 'confirmed', confirmedById: 1 });
 
       mockAxios.onGet().replyOnce(500);
 
@@ -365,7 +368,7 @@ describe('Vulnerability Header', () => {
 
     it('will set the isLoadingUser property correctly when the user is loading and finished loading', () => {
       const user = createRandomUser();
-      createWrapper({ state: 'confirmed', confirmed_by_id: user.id });
+      createWrapper({ state: 'confirmed', confirmedById: user.id });
 
       expect(findStatusDescription().props('isLoadingUser')).toBe(true);
 

ee/spec/frontend/vulnerabilities/history_entry_spec.js

@@ -9,8 +9,8 @@ describe('History Entry', () => {
     system: true,
     id: 1,
     note: 'changed vulnerability status to dismissed',
-    system_note_icon_name: 'cancel',
-    updated_at: new Date().toISOString(),
+    systemNoteIconName: 'cancel',
+    updatedAt: new Date().toISOString(),
     author: {
       name: 'author name',
       username: 'author username',
@@ -22,8 +22,8 @@ describe('History Entry', () => {
     id: 2,
     note: 'some note',
     author: {},
-    current_user: {
-      can_edit: true,
+    currentUser: {
+      canEdit: true,
     },
   };
 
@@ -53,8 +53,8 @@ describe('History Entry', () => {
     expect(eventItem().props()).toMatchObject({
       id: systemNote.id,
       author: systemNote.author,
-      createdAt: systemNote.updated_at,
-      iconName: systemNote.system_note_icon_name,
+      createdAt: systemNote.updatedAt,
+      iconName: systemNote.systemNoteIconName,
     });
   });
 

ee/spec/frontend/vulnerabilities/status_description_spec.js

@@ -37,9 +37,9 @@ describe('Vulnerability status description component', () => {
     // Automatically create the ${v.state}_at property if it doesn't exist. Otherwise, every test would need to create
     // it manually for the component to mount properly.
     if (vulnerability.state === 'detected') {
-      vulnerability.pipeline.created_at = vulnerability.pipeline.created_at || createDate();
+      vulnerability.pipeline.createdAt = vulnerability.pipeline.createdAt || createDate();
     } else {
-      const propertyName = `${vulnerability.state}_at`;
+      const propertyName = `${vulnerability.state}At`;
       vulnerability[propertyName] = vulnerability[propertyName] || createDate();
     }
 
@@ -59,7 +59,7 @@ describe('Vulnerability status description component', () => {
       ${'shows bolded state text'}         | ${true}
     `('$description if isStatusBolded is isStatusBolded', ({ isStatusBolded }) => {
       createWrapper({
-        vulnerability: { state: 'detected', pipeline: { created_at: createDate('2001') } },
+        vulnerability: { state: 'detected', pipeline: { createdAt: createDate('2001') } },
         isStatusBolded,
       });
 
@@ -71,7 +71,7 @@ describe('Vulnerability status description component', () => {
     it('uses the pipeline created date when the vulnerability state is "detected"', () => {
       const pipelineDateString = createDate('2001');
       createWrapper({
-        vulnerability: { state: 'detected', pipeline: { created_at: pipelineDateString } },
+        vulnerability: { state: 'detected', pipeline: { createdAt: pipelineDateString } },
       });
 
       expect(timeAgo().props('time')).toBe(pipelineDateString);
@@ -85,8 +85,8 @@ describe('Vulnerability status description component', () => {
         createWrapper({
           vulnerability: {
             state,
-            pipeline: { created_at: 'pipeline_created_at' },
-            [`${state}_at`]: expectedDate,
+            pipeline: { createdAt: 'pipeline_created_at' },
+            [`${state}At`]: expectedDate,
           },
         });