summaryrefslogtreecommitdiffstats
path: root/src/test
diff options
context:
space:
mode:
authorPaul Martin <paul@paulsputer.com>2015-12-25 22:35:11 +0000
committerPaul Martin <paul@paulsputer.com>2015-12-25 22:35:11 +0000
commit46f33f87750573713509fbdbd0fc2ae51dc12044 (patch)
treeaa227353d88fa97da0b40c02c46d45862c7013d3 /src/test
parent2539ceea0d47467d54cedd340afa6ede2909b2bd (diff)
downloadgitblit-46f33f87750573713509fbdbd0fc2ae51dc12044.tar.gz
gitblit-46f33f87750573713509fbdbd0fc2ae51dc12044.zip
Fix for #976 - Filestore links via browser
+ GitLFS client support + FilestoreModel now parses meta file + Read meta heading from cache if available + Authentication based on accept headers for browser view filestore login + PathModel & PathChangeModel now understands filestore items + Zip & Rar downloads contain include filestore items + Filestore servlet returns LFS JSON error only if accepted by client + DiffStat now knows repository to allow identification of filestore items + Filestore items identified and returned via view, raw & blob links on blame, commitDiff, commit and Tree pages
Diffstat (limited to 'src/test')
-rw-r--r--src/test/java/com/gitblit/tests/JGitUtilsTest.java6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/test/java/com/gitblit/tests/JGitUtilsTest.java b/src/test/java/com/gitblit/tests/JGitUtilsTest.java
index 2cf4a5a1..c273e860 100644
--- a/src/test/java/com/gitblit/tests/JGitUtilsTest.java
+++ b/src/test/java/com/gitblit/tests/JGitUtilsTest.java
@@ -585,16 +585,16 @@ public class JGitUtilsTest extends GitblitUnitTest {
@Test
public void testZip() throws Exception {
- assertFalse(CompressionUtils.zip(null, null, null, null));
+ assertFalse(CompressionUtils.zip(null, null, null, null, null));
Repository repository = GitBlitSuite.getHelloworldRepository();
File zipFileA = new File(GitBlitSuite.REPOSITORIES, "helloworld.zip");
FileOutputStream fosA = new FileOutputStream(zipFileA);
- boolean successA = CompressionUtils.zip(repository, null, Constants.HEAD, fosA);
+ boolean successA = CompressionUtils.zip(repository, null, null, Constants.HEAD, fosA);
fosA.close();
File zipFileB = new File(GitBlitSuite.REPOSITORIES, "helloworld-java.zip");
FileOutputStream fosB = new FileOutputStream(zipFileB);
- boolean successB = CompressionUtils.zip(repository, "java.java", Constants.HEAD, fosB);
+ boolean successB = CompressionUtils.zip(repository, null, "java.java", Constants.HEAD, fosB);
fosB.close();
repository.close();