Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2026-02-12 09:36:54 +01:00
Code Issues Packages Projects Releases Activity

merge with branch 1.x

Browse Source
This commit is contained in:
Sebastian Sdorra
2017-01-12 19:50:39 +01:00
parent 5332ac2466 b5aaf1ca4e
commit bad99919f4
250 changed files with 16399 additions and 1573 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
scm-webapp/src/test/java/sonia/scm/it/IntegrationTestUtil.java
View File

@@ -77,11 +77,12 @@ public final class IntegrationTestUtil
/** Field description */
public static final String ADMIN_USERNAME = "scmadmin";
public static final String URL = "http://localhost:8081/scm";
/** Field description */
public static final String BASE_URL = "http://localhost:8081/scm/api/rest/";
/** scm-manager base url */
public static final String BASE_URL = "http://localhost:8081/scm/";
/** scm-manager base url for the rest api */
public static final String REST_BASE_URL = BASE_URL.concat("api/rest/");
/** Field description */
public static final String EXTENSION = ".xml";
@@ -256,7 +257,7 @@ public final class IntegrationTestUtil
*/
public static String createResourceUrl(String url)
{
return BASE_URL.concat(url).concat(EXTENSION);
return REST_BASE_URL.concat(url).concat(EXTENSION);
}
/**