Nemcio/GitBucket
1
0
Fork 0
mirror of https://github.com/gitbucket/gitbucket.git synced 2025-11-06 21:45:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix TestCase

Browse Source
This commit is contained in:
takezoe
2014-04-29 17:02:16 +09:00
parent ecfaa0247a
commit 2fe6b8c1e7
2 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/scala/app/ControllerBase.scala
View File

@@ -138,7 +138,7 @@ abstract class ControllerBase extends ScalatraFilter
*/ */
case class Context(settings: SystemSettingsService.SystemSettings, loginAccount: Option[Account], request: HttpServletRequest){ case class Context(settings: SystemSettingsService.SystemSettings, loginAccount: Option[Account], request: HttpServletRequest){
val path = settings.baseUrl.getOrElse(request.getServletContext.getContextPath) val path = settings.baseUrl.getOrElse(request.getContextPath)
val currentPath = request.getRequestURI.substring(request.getContextPath.length) val currentPath = request.getRequestURI.substring(request.getContextPath.length)
val baseUrl = settings.baseUrl(request) val baseUrl = settings.baseUrl(request)
val host = new java.net.URL(baseUrl).getHost val host = new java.net.URL(baseUrl).getHost

25
src/test/scala/view/AvatarImageProviderSpec.scala
View File

@@ -3,16 +3,23 @@ package view
import java.util.Date import java.util.Date
import org.specs2.mutable._ import org.specs2.mutable._
import org.specs2.mock.Mockito
import service.RequestCache import service.RequestCache
import model.Account import model.Account
import service.SystemSettingsService.SystemSettings import service.SystemSettingsService.SystemSettings
import twirl.api.Html import twirl.api.Html
import javax.servlet.http.HttpServletRequest
class AvatarImageProviderSpec extends Specification { class AvatarImageProviderSpec extends Specification with Mockito {
val request = mock[HttpServletRequest]
request.getRequestURL returns new StringBuffer("http://localhost:8080/path.html")
request.getRequestURI returns "/path.html"
request.getContextPath returns ""
"getAvatarImageHtml" should { "getAvatarImageHtml" should {
"show Gravatar image for no image account if gravatar integration is enabled" in { "show Gravatar image for no image account if gravatar integration is enabled" in {
implicit val context = app.Context(createSystemSettings(true), None, null) implicit val context = app.Context(createSystemSettings(true), None, request)
val provider = new AvatarImageProviderImpl(Some(createAccount(None))) val provider = new AvatarImageProviderImpl(Some(createAccount(None)))
provider.toHtml("user", 32).toString mustEqual provider.toHtml("user", 32).toString mustEqual
@@ -20,7 +27,7 @@ class AvatarImageProviderSpec extends Specification {
} }
"show uploaded image even if gravatar integration is enabled" in { "show uploaded image even if gravatar integration is enabled" in {
implicit val context = app.Context(createSystemSettings(true), None, null) implicit val context = app.Context(createSystemSettings(true), None, request)
val provider = new AvatarImageProviderImpl(Some(createAccount(Some("icon.png")))) val provider = new AvatarImageProviderImpl(Some(createAccount(Some("icon.png"))))
provider.toHtml("user", 32).toString mustEqual provider.toHtml("user", 32).toString mustEqual
@@ -28,7 +35,7 @@ class AvatarImageProviderSpec extends Specification {
} }
"show local image for no image account if gravatar integration is disabled" in { "show local image for no image account if gravatar integration is disabled" in {
implicit val context = app.Context(createSystemSettings(false), None, null) implicit val context = app.Context(createSystemSettings(false), None, request)
val provider = new AvatarImageProviderImpl(Some(createAccount(None))) val provider = new AvatarImageProviderImpl(Some(createAccount(None)))
provider.toHtml("user", 32).toString mustEqual provider.toHtml("user", 32).toString mustEqual
@@ -36,7 +43,7 @@ class AvatarImageProviderSpec extends Specification {
} }
"show Gravatar image for specified mail address if gravatar integration is enabled" in { "show Gravatar image for specified mail address if gravatar integration is enabled" in {
implicit val context = app.Context(createSystemSettings(true), None, null) implicit val context = app.Context(createSystemSettings(true), None, request)
val provider = new AvatarImageProviderImpl(None) val provider = new AvatarImageProviderImpl(None)
provider.toHtml("user", 20, "hoge@hoge.com").toString mustEqual provider.toHtml("user", 20, "hoge@hoge.com").toString mustEqual
@@ -44,7 +51,7 @@ class AvatarImageProviderSpec extends Specification {
} }
"show unknown image for unknown user if gravatar integration is enabled" in { "show unknown image for unknown user if gravatar integration is enabled" in {
implicit val context = app.Context(createSystemSettings(true), None, null) implicit val context = app.Context(createSystemSettings(true), None, request)
val provider = new AvatarImageProviderImpl(None) val provider = new AvatarImageProviderImpl(None)
provider.toHtml("user", 20).toString mustEqual provider.toHtml("user", 20).toString mustEqual
@@ -52,7 +59,7 @@ class AvatarImageProviderSpec extends Specification {
} }
"show unknown image for specified mail address if gravatar integration is disabled" in { "show unknown image for specified mail address if gravatar integration is disabled" in {
implicit val context = app.Context(createSystemSettings(false), None, null) implicit val context = app.Context(createSystemSettings(false), None, request)
val provider = new AvatarImageProviderImpl(None) val provider = new AvatarImageProviderImpl(None)
provider.toHtml("user", 20, "hoge@hoge.com").toString mustEqual provider.toHtml("user", 20, "hoge@hoge.com").toString mustEqual
@@ -60,7 +67,7 @@ class AvatarImageProviderSpec extends Specification {
} }
"add tooltip if it's enabled" in { "add tooltip if it's enabled" in {
implicit val context = app.Context(createSystemSettings(false), None, null) implicit val context = app.Context(createSystemSettings(false), None, request)
val provider = new AvatarImageProviderImpl(None) val provider = new AvatarImageProviderImpl(None)
provider.toHtml("user", 20, "hoge@hoge.com", true).toString mustEqual provider.toHtml("user", 20, "hoge@hoge.com", true).toString mustEqual
@@ -85,7 +92,7 @@ class AvatarImageProviderSpec extends Specification {
private def createSystemSettings(useGravatar: Boolean) = private def createSystemSettings(useGravatar: Boolean) =
SystemSettings( SystemSettings(
baseUrl = Some(""), baseUrl = None,
allowAccountRegistration = false, allowAccountRegistration = false,
gravatar = useGravatar, gravatar = useGravatar,
notification = false, notification = false,