From 6be15a1cac2f98585174f501879c3685ef2a54b6 Mon Sep 17 00:00:00 2001
From: mrbytes <eguervos@msn.com>
Date: Sat, 08 Mar 2014 12:10:58 -0500
Subject: [PATCH] Merge branch 'master' of https://github.com/gitblit/gitblit
---
src/test/java/de/akquinet/devops/GitBlitServer4UITests.java | 15 +++++++--------
1 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/src/test/java/de/akquinet/devops/GitBlitServer4UITests.java b/src/test/java/de/akquinet/devops/GitBlitServer4UITests.java
index 2d54be2..5e361b9 100644
--- a/src/test/java/de/akquinet/devops/GitBlitServer4UITests.java
+++ b/src/test/java/de/akquinet/devops/GitBlitServer4UITests.java
@@ -1,12 +1,15 @@
package de.akquinet.devops;
+import java.io.File;
import java.util.ArrayList;
import java.util.List;
import com.beust.jcommander.JCommander;
import com.beust.jcommander.ParameterException;
-import com.gitblit.GitBlit;
import com.gitblit.GitBlitServer;
+import com.gitblit.IStoredSettings;
+import com.gitblit.Keys;
+import com.gitblit.servlet.GitblitContext;
public class GitBlitServer4UITests extends GitBlitServer {
@@ -50,13 +53,9 @@
}
}
- private GitBlit4UITests instance;
-
@Override
- protected GitBlit getGitBlitInstance() {
- if (instance == null) {
- instance = new GitBlit4UITests(false);
- }
- return instance;
+ protected GitblitContext newGitblit(IStoredSettings settings, File baseFolder) {
+ settings.overrideSetting(Keys.web.allowLuceneIndexing, false);
+ return new GitblitContext(settings, baseFolder);
}
}
--
Gitblit v1.9.1