Merge remote-tracking branch 'origin/master' into api-support

Conflicts: src/main/scala/ScalatraBootstrap.scala src/main/scala/gitbucket/core/controller/AccountController.scala src/main/scala/gitbucket/core/controller/ControllerBase.scala src/main/scala/gitbucket/core/controller/IssuesController.scala src/main/scala/gitbucket/core/controller/PullRequestsController.scala src/main/scala/gitbucket/core/controller/RepositorySettingsController.scala src/main/scala/gitbucket/core/controller/RepositoryViewerController.scala src/main/scala/gitbucket/core/model/Profile.scala src/main/scala/gitbucket/core/service/PullRequestService.scala src/main/scala/gitbucket/core/service/WebHookService.scala src/main/scala/gitbucket/core/servlet/InitializeListener.scala src/main/scala/gitbucket/core/view/helpers.scala src/main/twirl/gitbucket/core/pulls/conversation.scala.html src/main/twirl/gitbucket/core/pulls/mergeguide.scala.html src/main/twirl/issues/listparts.scala.html
2025-11-09 15:05:50 +01:00 · 2015-03-16 22:49:47 +09:00
parent 73b7aef4a9 d9c1293985
commit 6acbd5b2cf
215 changed files with 1127 additions and 916 deletions
--- a/src/test/scala/gitbucket/core/service/AccountServiceSpec.scala
+++ b/src/test/scala/gitbucket/core/service/AccountServiceSpec.scala
@@ -0,0 +1,79 @@
+package gitbucket.core.service
+
+import gitbucket.core.model.{Account, GroupMember}
+import org.specs2.mutable.Specification
+import java.util.Date
+
+class AccountServiceSpec extends Specification with ServiceSpecBase {
+
+  "AccountService" should {
+    val RootMailAddress = "root@localhost"
+
+    "getAllUsers" in { withTestDB { implicit session =>
+      AccountService.getAllUsers() must be like{
+        case List(Account("root", "root", RootMailAddress, _, true, _, _, _, None, None, false, false)) => ok
+      }
+    }}
+
+    "getAccountByUserName" in { withTestDB { implicit session =>
+      AccountService.getAccountByUserName("root") must beSome.like {
+        case user => user.userName must_== "root"
+      }
+
+      AccountService.getAccountByUserName("invalid user name") must beNone
+    }}
+
+    "getAccountByMailAddress" in { withTestDB { implicit session =>
+      AccountService.getAccountByMailAddress(RootMailAddress) must beSome
+    }}
+
+    "updateLastLoginDate" in { withTestDB { implicit session =>
+      val root = "root"
+      def user() =
+        AccountService.getAccountByUserName(root).getOrElse(sys.error(s"user $root does not exists"))
+
+      user().lastLoginDate must beNone
+      val date1 = new Date
+      AccountService.updateLastLoginDate(root)
+      user().lastLoginDate must beSome.like{ case date =>
+        date must be_>(date1)
+      }
+      val date2 = new Date
+      Thread.sleep(1000)
+      AccountService.updateLastLoginDate(root)
+      user().lastLoginDate must beSome.like{ case date =>
+        date must be_>(date2)
+      }
+    }}
+
+    "updateAccount" in { withTestDB { implicit session =>
+      val root = "root"
+      def user() =
+        AccountService.getAccountByUserName(root).getOrElse(sys.error(s"user $root does not exists"))
+
+      val newAddress = "new mail address"
+      AccountService.updateAccount(user().copy(mailAddress = newAddress))
+      user().mailAddress must_== newAddress
+    }}
+
+    "group" in { withTestDB { implicit session =>
+      val group1 = "group1"
+      val user1 = "root"
+      AccountService.createGroup(group1, None)
+
+      AccountService.getGroupMembers(group1) must_== Nil
+      AccountService.getGroupsByUserName(user1) must_== Nil
+
+      AccountService.updateGroupMembers(group1, List((user1, true)))
+
+      AccountService.getGroupMembers(group1) must_== List(GroupMember(group1, user1, true))
+      AccountService.getGroupsByUserName(user1) must_== List(group1)
+
+      AccountService.updateGroupMembers(group1, Nil)
+
+      AccountService.getGroupMembers(group1) must_== Nil
+      AccountService.getGroupsByUserName(user1) must_== Nil
+    }}
+  }
+}
+
--- a/src/test/scala/gitbucket/core/service/ServiceSpecBase.scala
+++ b/src/test/scala/gitbucket/core/service/ServiceSpecBase.scala
@@ -0,0 +1,71 @@
+package gitbucket.core.service
+
+import gitbucket.core.servlet.AutoUpdate
+import gitbucket.core.util.{ControlUtil, DatabaseConfig, FileUtil}
+import gitbucket.core.model.Profile._
+import profile.simple._
+import ControlUtil._
+import java.sql.DriverManager
+import org.apache.commons.io.FileUtils
+import scala.util.Random
+import java.io.File
+import model._
+
+trait ServiceSpecBase {
+
+  def withTestDB[A](action: (Session) => A): A = {
+    FileUtil.withTmpDir(new File(FileUtils.getTempDirectory(), Random.alphanumeric.take(10).mkString)){ dir =>
+      val (url, user, pass) = (DatabaseConfig.url(Some(dir.toString)), DatabaseConfig.user, DatabaseConfig.password)
+      org.h2.Driver.load()
+      using(DriverManager.getConnection(url, user, pass)){ conn =>
+        AutoUpdate.versions.reverse.foreach(_.update(conn, Thread.currentThread.getContextClassLoader))
+      }
+      Database.forURL(url, user, pass).withSession { session =>
+        action(session)
+      }
+    }
+  }
+
+  def generateNewAccount(name:String)(implicit s:Session):Account = {
+    AccountService.createAccount(name, name, name, s"${name}@example.com", false, None)
+    AccountService.getAccountByUserName(name).get
+  }
+
+  lazy val dummyService = new RepositoryService with AccountService with IssuesService with PullRequestService
+    with CommitStatusService (){}
+
+  def generateNewUserWithDBRepository(userName:String, repositoryName:String)(implicit s:Session):Account = {
+    val ac = generateNewAccount(userName)
+    dummyService.createRepository(repositoryName, userName, None, false)
+    ac
+  }
+
+  def generateNewIssue(userName:String, repositoryName:String, requestUserName:String="root")(implicit s:Session): Int = {
+    dummyService.createIssue(
+      owner            = userName,
+      repository       = repositoryName,
+      loginUser        = requestUserName,
+      title            = "issue title",
+      content          = None,
+      assignedUserName = None,
+      milestoneId      = None,
+      isPullRequest    = true)
+  }
+
+  def generateNewPullRequest(base:String, request:String)(implicit s:Session):(Issue, PullRequest) = {
+    val Array(baseUserName, baseRepositoryName, baesBranch)=base.split("/")
+    val Array(requestUserName, requestRepositoryName, requestBranch)=request.split("/")
+    val issueId = generateNewIssue(baseUserName, baseRepositoryName, requestUserName)
+    dummyService.createPullRequest(
+      originUserName        = baseUserName,
+      originRepositoryName  = baseRepositoryName,
+      issueId               = issueId,
+      originBranch          = baesBranch,
+      requestUserName       = requestUserName,
+      requestRepositoryName = requestRepositoryName,
+      requestBranch         = requestBranch,
+      commitIdFrom          = baesBranch,
+      commitIdTo            = requestBranch)
+    dummyService.getPullRequest(baseUserName, baseRepositoryName, issueId).get
+  }
+}