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

Remove Specs2 dependency

Browse Source
This commit is contained in:
Naoki Takezoe
2016-02-06 22:27:23 +09:00
parent e72d808a3c
commit 419ea16ead
3 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
build.sbt
View File

@@ -10,7 +10,7 @@ sourcesInBase := false
organization := Organization organization := Organization
name := Name name := Name
version := GitBucketVersion version := GitBucketVersion
scalaVersion := "2.11.6" scalaVersion := "2.11.7"
// dependency settings // dependency settings
resolvers ++= Seq( resolvers ++= Seq(
@@ -44,8 +44,7 @@ libraryDependencies ++= Seq(
"javax.servlet" % "javax.servlet-api" % "3.1.0" % "provided", "javax.servlet" % "javax.servlet-api" % "3.1.0" % "provided",
"junit" % "junit" % "4.12" % "test", "junit" % "junit" % "4.12" % "test",
"org.scalatra" %% "scalatra-scalatest" % ScalatraVersion % "test", "org.scalatra" %% "scalatra-scalatest" % ScalatraVersion % "test",
"org.scalatra" %% "scalatra-specs2" % ScalatraVersion % "test", "org.scalaz" %% "scalaz-core" % "7.2.0" % "test"
"org.specs2" %% "specs2-junit" % "3.6.6" % "test"
) )
// Twirl settings // Twirl settings

5
src/test/scala/gitbucket/core/api/JsonFormatSpec.scala
View File

@@ -2,16 +2,13 @@ package gitbucket.core.api
import gitbucket.core.util.RepositoryName import gitbucket.core.util.RepositoryName
//import org.specs2.mutable.Specification import org.json4s.jackson.JsonMethods.parse
import org.json4s.jackson.JsonMethods.{pretty, parse}
import org.json4s._ import org.json4s._
//import org.specs2.matcher._
import org.scalatest.FunSuite import org.scalatest.FunSuite
import java.util.{Calendar, TimeZone, Date} import java.util.{Calendar, TimeZone, Date}
class JsonFormatSpec extends FunSuite { class JsonFormatSpec extends FunSuite {
val date1 = { val date1 = {
val d = Calendar.getInstance(TimeZone.getTimeZone("UTC")) val d = Calendar.getInstance(TimeZone.getTimeZone("UTC"))

6
src/test/scala/gitbucket/core/view/AvatarImageProviderSpec.scala
View File

@@ -5,15 +5,17 @@ import java.util.Date
import gitbucket.core.model.Account import gitbucket.core.model.Account
import gitbucket.core.service.{SystemSettingsService, RequestCache} import gitbucket.core.service.{SystemSettingsService, RequestCache}
import gitbucket.core.controller.Context import gitbucket.core.controller.Context
import org.mockito.Mockito._
import SystemSettingsService.SystemSettings import SystemSettingsService.SystemSettings
import javax.servlet.http.HttpServletRequest import javax.servlet.http.HttpServletRequest
import play.twirl.api.Html import play.twirl.api.Html
import org.scalatest.FunSpec import org.scalatest.FunSpec
import org.scalatest.mock.MockitoSugar._
import org.mockito.Mockito._
class AvatarImageProviderSpec extends FunSpec { class AvatarImageProviderSpec extends FunSpec {
val request = mock(classOf[HttpServletRequest]) val request = mock[HttpServletRequest]
when(request.getRequestURL).thenReturn(new StringBuffer("http://localhost:8080/path.html")) when(request.getRequestURL).thenReturn(new StringBuffer("http://localhost:8080/path.html"))
when(request.getRequestURI).thenReturn("/path.html") when(request.getRequestURI).thenReturn("/path.html")
when(request.getContextPath).thenReturn("") when(request.getContextPath).thenReturn("")