Add latest changes from gitlab-org/gitlab@master

2 files changed, 53 insertions, 0 deletions

diff --git a/spec/frontend/diffs/mock_data/diff_with_commit.js b/spec/frontend/diffs/mock_data/diff_with_commit.js
new file mode 100644
index 00000000000..d646294ee84
--- /dev/null
+++ b/spec/frontend/diffs/mock_data/diff_with_commit.js
@@ -0,0 +1,7 @@
+const FIXTURE = 'merge_request_diffs/with_commit.json';
+
+preloadFixtures(FIXTURE);
+
+export default function getDiffWithCommit() {
+  return getJSONFixture(FIXTURE);
+}
diff --git a/spec/frontend/diffs/mock_data/merge_request_diffs.js b/spec/frontend/diffs/mock_data/merge_request_diffs.js
new file mode 100644
index 00000000000..4bbef146336
--- /dev/null
+++ b/spec/frontend/diffs/mock_data/merge_request_diffs.js
@@ -0,0 +1,46 @@
+export default [
+  {
+    base_version_path: '/gnuwget/wget2/merge_requests/6/diffs?diff_id=37',
+    version_index: 4,
+    created_at: '2018-10-23T11:49:16.611Z',
+    commits_count: 4,
+    latest: true,
+    short_commit_sha: 'de7a8f7f',
+    version_path: '/gnuwget/wget2/merge_requests/6/diffs?diff_id=37',
+    compare_path:
+      '/gnuwget/wget2/merge_requests/6/diffs?diff_id=37&start_sha=de7a8f7f20c3ea2e0bef3ba01cfd41c21f6b4995',
+  },
+  {
+    base_version_path: '/gnuwget/wget2/merge_requests/6/diffs?diff_id=36',
+    version_index: 3,
+    created_at: '2018-10-23T11:46:40.617Z',
+    commits_count: 3,
+    latest: false,
+    short_commit_sha: 'e78fc18f',
+    version_path: '/gnuwget/wget2/merge_requests/6/diffs?diff_id=36',
+    compare_path:
+      '/gnuwget/wget2/merge_requests/6/diffs?diff_id=37&start_sha=e78fc18fa37acb2185c59ca94d4a964464feb50e',
+  },
+  {
+    base_version_path: '/gnuwget/wget2/merge_requests/6/diffs?diff_id=35',
+    version_index: 2,
+    created_at: '2018-10-04T09:57:39.648Z',
+    commits_count: 2,
+    latest: false,
+    short_commit_sha: '48da7e7e',
+    version_path: '/gnuwget/wget2/merge_requests/6/diffs?diff_id=35',
+    compare_path:
+      '/gnuwget/wget2/merge_requests/6/diffs?diff_id=37&start_sha=48da7e7e9a99d41c852578bd9cb541ca4d864b3e',
+  },
+  {
+    base_version_path: '/gnuwget/wget2/merge_requests/6/diffs?diff_id=20',
+    version_index: 1,
+    created_at: '2018-09-25T20:30:39.493Z',
+    commits_count: 1,
+    latest: false,
+    short_commit_sha: '47bac2ed',
+    version_path: '/gnuwget/wget2/merge_requests/6/diffs?diff_id=20',
+    compare_path:
+      '/gnuwget/wget2/merge_requests/6/diffs?diff_id=37&start_sha=47bac2ed972c5bee344c1cea159a22cd7f711dc0',
+  },
+];