mirror of
https://github.com/scm-manager/scm-manager.git
synced 2025-11-08 22:45:45 +01:00
With this pull request, diffs for Git are loaded in chunks. This means, that for diffs with a lot of files only a part of them are loaded. In the UI a button will be displayed to load more. In the REST API, the number of files can be specified. This only works for diffs, that are delivered as "parsed" diffs. Currently, this is only available for Git. Co-authored-by: Sebastian Sdorra <sebastian.sdorra@cloudogu.com>
226 lines
6.4 KiB
TypeScript
226 lines
6.4 KiB
TypeScript
/*
|
|
* MIT License
|
|
*
|
|
* Copyright (c) 2020-present Cloudogu GmbH and Contributors
|
|
*
|
|
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
* of this software and associated documentation files (the "Software"), to deal
|
|
* in the Software without restriction, including without limitation the rights
|
|
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
* copies of the Software, and to permit persons to whom the Software is
|
|
* furnished to do so, subject to the following conditions:
|
|
*
|
|
* The above copyright notice and this permission notice shall be included in all
|
|
* copies or substantial portions of the Software.
|
|
*
|
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
|
* SOFTWARE.
|
|
*/
|
|
|
|
import fetchMock from "fetch-mock-jest";
|
|
import { Diff } from "@scm-manager/ui-types";
|
|
import { act, renderHook } from "@testing-library/react-hooks";
|
|
import { useDiff } from "./diff";
|
|
import createWrapper from "./tests/createWrapper";
|
|
|
|
describe("Test diff", () => {
|
|
const simpleDiff: Diff = {
|
|
files: [
|
|
{
|
|
oldPath: "/dev/null",
|
|
newPath: "0.txt",
|
|
oldEndingNewLine: true,
|
|
newEndingNewLine: true,
|
|
oldRevision: "0000000000000000000000000000000000000000",
|
|
newRevision: "573541ac9702dd3969c9bc859d2b91ec1f7e6e56",
|
|
type: "add",
|
|
language: "text",
|
|
hunks: [
|
|
{
|
|
content: "@@ -0,0 +1 @@",
|
|
newStart: 1,
|
|
newLines: 1,
|
|
changes: [
|
|
{
|
|
content: "0",
|
|
type: "insert",
|
|
lineNumber: 1,
|
|
isInsert: true
|
|
}
|
|
]
|
|
}
|
|
],
|
|
_links: {
|
|
lines: {
|
|
href:
|
|
"/api/v2/repositories/scmadmin/HeartOfGold-git/content/one_to_onehundred/0.txt?start={start}&end={end}",
|
|
templated: true
|
|
}
|
|
}
|
|
}
|
|
],
|
|
partial: false,
|
|
_links: {
|
|
self: {
|
|
href: "/api/v2/diff"
|
|
}
|
|
}
|
|
};
|
|
|
|
const partialDiff1: Diff = {
|
|
files: [
|
|
{
|
|
oldPath: "/dev/null",
|
|
newPath: "0.txt",
|
|
oldEndingNewLine: true,
|
|
newEndingNewLine: true,
|
|
oldRevision: "0000000000000000000000000000000000000000",
|
|
newRevision: "573541ac9702dd3969c9bc859d2b91ec1f7e6e56",
|
|
type: "add",
|
|
language: "text",
|
|
hunks: [
|
|
{
|
|
content: "@@ -0,0 +1 @@",
|
|
newStart: 1,
|
|
newLines: 1,
|
|
changes: [
|
|
{
|
|
content: "0",
|
|
type: "insert",
|
|
lineNumber: 1,
|
|
isInsert: true
|
|
}
|
|
]
|
|
}
|
|
],
|
|
_links: {
|
|
lines: {
|
|
href:
|
|
"/api/v2/repositories/scmadmin/HeartOfGold-git/content/one_to_onehundred/0.txt?start={start}&end={end}",
|
|
templated: true
|
|
}
|
|
}
|
|
}
|
|
],
|
|
partial: true,
|
|
_links: {
|
|
self: {
|
|
href: "/diff"
|
|
},
|
|
next: {
|
|
href: "/diff?offset=1&limit=1"
|
|
}
|
|
}
|
|
};
|
|
|
|
const partialDiff2: Diff = {
|
|
files: [
|
|
{
|
|
oldPath: "/dev/null",
|
|
newPath: "1.txt",
|
|
oldEndingNewLine: true,
|
|
newEndingNewLine: true,
|
|
oldRevision: "0000000000000000000000000000000000000000",
|
|
newRevision: "573541ac9702dd3969c9bc859d2b91ec1f7e6e56",
|
|
type: "add",
|
|
language: "text",
|
|
hunks: [
|
|
{
|
|
content: "@@ -0,0 +1 @@",
|
|
newStart: 1,
|
|
newLines: 1,
|
|
changes: [
|
|
{
|
|
content: "1",
|
|
type: "insert",
|
|
lineNumber: 1,
|
|
isInsert: true
|
|
}
|
|
]
|
|
}
|
|
],
|
|
_links: {
|
|
lines: {
|
|
href:
|
|
"/api/v2/repositories/scmadmin/HeartOfGold-git/content/one_to_onehundred/1.txt?start={start}&end={end}",
|
|
templated: true
|
|
}
|
|
}
|
|
}
|
|
],
|
|
partial: false,
|
|
_links: {
|
|
self: {
|
|
href: "/diff"
|
|
}
|
|
}
|
|
};
|
|
|
|
beforeEach(() => {
|
|
fetchMock.reset();
|
|
});
|
|
|
|
it("should return simple parsed diff", async () => {
|
|
fetchMock.getOnce("/api/v2/diff", {
|
|
body: simpleDiff,
|
|
headers: { "Content-Type": "application/vnd.scmm-diffparsed+json;v=2" }
|
|
});
|
|
const { result, waitFor } = renderHook(() => useDiff("/diff"), {
|
|
wrapper: createWrapper()
|
|
});
|
|
await waitFor(() => !!result.current.data);
|
|
expect(result.current.data).toEqual(simpleDiff);
|
|
});
|
|
|
|
it("should parse and return textual diff", async () => {
|
|
fetchMock.getOnce("/api/v2/diff", {
|
|
body: `diff --git a/new.txt b/new.txt
|
|
--- a/new.txt
|
|
+++ b/new.txt
|
|
@@ -1,1 +1,1 @@
|
|
-i am old!
|
|
\\ No newline at end of file
|
|
+i am new!
|
|
\\ No newline at end of file
|
|
`,
|
|
headers: { "Content-Type": "text/plain" }
|
|
});
|
|
const { result, waitFor } = renderHook(() => useDiff("/diff"), {
|
|
wrapper: createWrapper()
|
|
});
|
|
await waitFor(() => !!result.current.data);
|
|
expect(result.current.data?.files).toHaveLength(1);
|
|
});
|
|
|
|
it("should return parsed diff in multiple chunks", async () => {
|
|
fetchMock.getOnce("/api/v2/diff?limit=1", {
|
|
body: partialDiff1,
|
|
headers: { "Content-Type": "application/vnd.scmm-diffparsed+json;v=2" }
|
|
});
|
|
fetchMock.getOnce("/api/v2/diff?offset=1&limit=1", {
|
|
body: partialDiff2,
|
|
headers: { "Content-Type": "application/vnd.scmm-diffparsed+json;v=2" }
|
|
});
|
|
const { result, waitFor, waitForNextUpdate } = renderHook(() => useDiff("/diff?limit=1"), {
|
|
wrapper: createWrapper()
|
|
});
|
|
await waitFor(() => !!result.current.data);
|
|
expect(result.current.data).toEqual(partialDiff1);
|
|
|
|
await act(() => {
|
|
const { fetchNextPage } = result.current;
|
|
fetchNextPage();
|
|
return waitForNextUpdate();
|
|
});
|
|
|
|
await waitFor(() => !result.current.isFetchingNextPage);
|
|
|
|
expect(result.current.data).toEqual({ ...partialDiff2, files: [partialDiff1.files[0], partialDiff2.files[0]] });
|
|
});
|
|
});
|