Add latest changes from gitlab-org/gitlab@master

2 files changed, 59 insertions, 0 deletions

diff --git a/spec/frontend/diffs/mock_data/diff_file.js b/spec/frontend/diffs/mock_data/diff_file.js
index 27428197c1c..e4b2fdf6ede 100644
--- a/spec/frontend/diffs/mock_data/diff_file.js
+++ b/spec/frontend/diffs/mock_data/diff_file.js
@@ -13,6 +13,7 @@ export default {
   blob_name: 'CHANGELOG',
   blob_icon: '<i aria-hidden="true" data-hidden="true" class="fa fa-file-text-o fa-fw"></i>',
   file_hash: '1c497fbb3a46b78edf04cc2a2fa33f67e3ffbe2a',
+  file_identifier_hash: '928f8286952bda02d674b692addcbe077084663a',
   file_path: 'CHANGELOG',
   new_file: false,
   deleted_file: false,
diff --git a/spec/frontend/diffs/mock_data/diff_metadata.js b/spec/frontend/diffs/mock_data/diff_metadata.js
new file mode 100644
index 00000000000..b73b29e4bc8
--- /dev/null
+++ b/spec/frontend/diffs/mock_data/diff_metadata.js
@@ -0,0 +1,58 @@
+/* eslint-disable import/prefer-default-export */
+/* https://gitlab.com/gitlab-org/frontend/rfcs/-/issues/20 */
+
+export const diffMetadata = {
+  real_size: '1',
+  size: 1,
+  branch_name: 'update-changelog',
+  source_branch_exists: true,
+  target_branch_name: 'master',
+  commit: null,
+  context_commits: null,
+  merge_request_diff: {
+    version_index: null,
+    created_at: '2019-11-07T06:48:35.202Z',
+    commits_count: 1,
+    latest: true,
+    short_commit_sha: 'eb227b3e',
+    base_version_path: '/gitlab-org/gitlab-test/-/merge_requests/4/diffs?diff_id=4',
+    head_version_path: '/gitlab-org/gitlab-test/-/merge_requests/4/diffs?diff_head=true',
+    version_path: '/gitlab-org/gitlab-test/-/merge_requests/4/diffs?diff_id=4',
+    compare_path:
+      '/gitlab-org/gitlab-test/-/merge_requests/4/diffs?diff_id=4\u0026start_sha=eb227b3e214624708c474bdab7bde7afc17cefcc',
+  },
+  start_version: null,
+  latest_diff: true,
+  latest_version_path: '/gitlab-org/gitlab-test/-/merge_requests/4/diffs',
+  added_lines: 2,
+  removed_lines: 0,
+  render_overflow_warning: false,
+  email_patch_path: '/gitlab-org/gitlab-test/-/merge_requests/4.patch',
+  plain_diff_path: '/gitlab-org/gitlab-test/-/merge_requests/4.diff',
+  merge_request_diffs: [
+    {
+      version_index: null,
+      created_at: '2019-11-07T06:48:35.202Z',
+      commits_count: 1,
+      latest: true,
+      short_commit_sha: 'eb227b3e',
+      base_version_path: '/gitlab-org/gitlab-test/-/merge_requests/4/diffs?diff_id=4',
+      head_version_path: '/gitlab-org/gitlab-test/-/merge_requests/4/diffs?diff_head=true',
+      version_path: '/gitlab-org/gitlab-test/-/merge_requests/4/diffs?diff_id=4',
+      compare_path:
+        '/gitlab-org/gitlab-test/-/merge_requests/4/diffs?diff_id=4\u0026start_sha=eb227b3e214624708c474bdab7bde7afc17cefcc',
+    },
+  ],
+  diff_files: [
+    {
+      added_lines: 2,
+      removed_lines: 0,
+      new_path: 'CHANGELOG',
+      old_path: 'CHANGELOG',
+      new_file: false,
+      deleted_file: false,
+      file_identifier_hash: '928f8286952bda02d674b692addcbe077084663a',
+      file_hash: '1c497fbb3a46b78edf04cc2a2fa33f67e3ffbe2a',
+    },
+  ],
+};