From 18c6ba413110bbf74023bf82662c89118f93606b Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Mon, 13 Oct 2014 19:19:37 -0400
Subject: [PATCH] Fix GitBlitTest.testGitblitSettings()
---
src/test/java/com/gitblit/tests/GitBlitTest.java | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/src/test/java/com/gitblit/tests/GitBlitTest.java b/src/test/java/com/gitblit/tests/GitBlitTest.java
index 1f81b87..9eaae7f 100644
--- a/src/test/java/com/gitblit/tests/GitBlitTest.java
+++ b/src/test/java/com/gitblit/tests/GitBlitTest.java
@@ -15,6 +15,7 @@
*/
package com.gitblit.tests;
+import java.io.File;
import java.util.List;
import org.eclipse.jgit.lib.Repository;
@@ -24,6 +25,7 @@
import com.gitblit.FileSettings;
import com.gitblit.models.RepositoryModel;
import com.gitblit.models.UserModel;
+import com.gitblit.utils.FileUtils;
public class GitBlitTest extends GitblitUnitTest {
@@ -156,7 +158,9 @@
assertEquals(5, settings().getInteger("realm.userService", 5));
assertTrue(settings().getBoolean("git.enableGitServlet", false));
- assertEquals("src/test/config/test-users.conf", settings().getString("realm.userService", null));
+ File userDir = new File(System.getProperty("user.dir"));
+ File userService = new File(settings().getString("realm.userService", null));
+ assertEquals("src/test/config/test-users.conf", FileUtils.getRelativePath(userDir, userService));
assertEquals(5, settings().getInteger("realm.minPasswordLength", 0));
List<String> mdExtensions = settings().getStrings("web.markdownExtensions");
assertTrue(mdExtensions.size() > 0);
--
Gitblit v1.9.1