diff options
| author | James Moger <james.moger@gitblit.com> | 2013-11-24 21:28:27 -0500 |
|---|---|---|
| committer | James Moger <james.moger@gitblit.com> | 2013-11-29 11:05:51 -0500 |
| commit | f8f6aa4d07cdfaaf23e24bf9eaf0a5fb9b437dda (patch) | |
| tree | 6b3d2edcfdaf17853e9946bf0db510d4d24d35ae /src/test/config | |
| parent | 8d88096236fe70b850a29f548432299a866886e6 (diff) | |
| download | gitblit-f8f6aa4d07cdfaaf23e24bf9eaf0a5fb9b437dda.tar.gz gitblit-f8f6aa4d07cdfaaf23e24bf9eaf0a5fb9b437dda.zip | |
Update unit tests for refactored architecture
Change-Id: I04639db977c515e5e1090ef8f0e1ce858820cb03
Diffstat (limited to 'src/test/config')
| -rw-r--r-- | src/test/config/test-gitblit.properties | 3 | ||||
| -rw-r--r-- | src/test/config/test-ui-users.conf | 6 | ||||
| -rw-r--r-- | src/test/config/test-users.conf | 4 |
3 files changed, 9 insertions, 4 deletions
diff --git a/src/test/config/test-gitblit.properties b/src/test/config/test-gitblit.properties index 0d797b40..e636469e 100644 --- a/src/test/config/test-gitblit.properties +++ b/src/test/config/test-gitblit.properties @@ -6,13 +6,14 @@ git.defaultAccessRestriction = NONE git.repositoriesFolder = ${baseFolder}/git git.searchRepositoriesSubfolders = true git.enableGitServlet = true +git.daemonPort = 8300 groovy.scriptsFolder = src/main/distrib/data/groovy groovy.preReceiveScripts = blockpush groovy.postReceiveScripts = sendmail web.authenticateViewPages = false web.authenticateAdminPages = true web.allowCookieAuthentication = true -realm.userService = ${baseFolder}/src/test/config/test-users.conf +realm.userService = src/test/config/test-users.conf realm.passwordStorage = md5 realm.minPasswordLength = 5 web.siteName = Test Gitblit diff --git a/src/test/config/test-ui-users.conf b/src/test/config/test-ui-users.conf index 5bf35f3b..fb23f25d 100644 --- a/src/test/config/test-ui-users.conf +++ b/src/test/config/test-ui-users.conf @@ -4,19 +4,19 @@ role = "#admin" role = "#notfederated" [user "userthree"] - password = StoredInLDAP + password = "#externalAccount" cookie = d7d3894fc517612aa6c595555b6e1ab8e147e597 displayName = User Three emailAddress = userthree@gitblit.com role = "#admin" [user "userone"] - password = StoredInLDAP + password = "#externalAccount" cookie = c97cd38e50858cd0b389ec61b18fb9a89b4da54c displayName = User One emailAddress = User.One@gitblit.com role = "#admin" [user "usertwo"] - password = StoredInLDAP + password = "#externalAccount" cookie = 498ca9bd2841d39050fa45d1d737b9f9f767858d displayName = User Two emailAddress = usertwo@gitblit.com diff --git a/src/test/config/test-users.conf b/src/test/config/test-users.conf index 4f947872..b665fd5b 100644 --- a/src/test/config/test-users.conf +++ b/src/test/config/test-users.conf @@ -3,6 +3,10 @@ cookie = dd94709528bb1c83d08f3088d4043f4742891f4f role = "#admin" role = "#notfederated" +[user "sampleuser"] + password = sampleuser + cookie = 6e07ed42149fc166206319faffdfba2e2ec82e43 + role = "#none" [team "admins"] role = "#none" user = admin |