Integration tests (#4)

* AppTest - app starts
* DbUpraderTest
* AppTest returns js bundle
* AppTest returns status

Author: jendakol

.travis.sh

@@ -1,10 +1,10 @@
 #!/usr/bin/env bash
 
-function wait_for_service() {
+function wait_for_server() {
     n=0
     until [ $n -ge 30 ]
     do
-      echo -e "Waiting for rbackup"
+      echo -e "Waiting for RBackup"
 
       if [ "$(curl "http://$RBACKUP_IP:3369/status" 2>/dev/null | jq -r .status)" == "RBackup running" ]; then
         break
@@ -18,15 +18,16 @@ function wait_for_service() {
       exit 1
     fi
 
-    echo -e "rbackup ready"
+    echo -e "RBackup ready"
 }
 
 function client_test() {
     cd ci-tests  && \
      docker-compose up -d --build --force-recreate && \
      export RBACKUP_IP=$(docker inspect citests_tests_1 | jq -r '.[0] | .NetworkSettings.Ports."3369/tcp" | .[0].HostIp') && \
-     wait_for_service && \
+     wait_for_server && \
      cd .. && \
+     mkdir public && mkdir public/bundle && touch public/bundle/js.bundle.txt && touch public/bundle/style.bundle.txt && \
      sbt ";clean;test" && \
      cd ci-tests  && \
      docker-compose down

app/lib/Constants.scala

@@ -1,7 +1,7 @@
 package lib
 
 trait Constants {
-  final val versionStr: String = "0.1.0"
+  final val versionStr: String = "0.1.4"
 
   final val SentryDsn: Option[String] = None
 }

app/lib/db/DbScheme.scala

@@ -1,10 +1,14 @@
 package lib.db
 
+import com.typesafe.scalalogging.StrictLogging
+import lib.{App, AppVersion}
 import scalikejdbc._
 
 //noinspection SqlNoDataSourceInspection
-object DbScheme {
+object DbScheme extends StrictLogging {
   def create(implicit session: DBSession): Unit = {
+    val currentVersionStr = App.versionStr
+
     sql"""
          |CREATE TABLE IF NOT EXISTS FILES
          |(
@@ -40,16 +44,26 @@ object DbScheme {
          |);
          |
        """.stripMargin.executeUpdate().apply()
+
+    if (App.version > AppVersion(0, 1, 3)) {
+      if (sql"""select value from settings where key='db_version'""".map(_.string("value")).single().apply().isEmpty) {
+        logger.info(s"Didn't found db_version in DB, setting to $currentVersionStr")
+
+        sql"""
+             |insert ignore into settings values ('db_version', ${currentVersionStr});
+       """.stripMargin.executeUpdate().apply()
+      }
+    }
   }
 
-  def truncateAll(implicit session: DBSession): Unit = {
+  def dropAll(implicit session: DBSession): Unit = {
     sql"""
          |SET REFERENTIAL_INTEGRITY FALSE;
          |
-         |truncate table files;
-         |truncate table settings;
-         |truncate table backup_sets;
-         |truncate table backup_sets_files;
+         |drop table if exists files;
+         |drop table if exists settings;
+         |drop table if exists backup_sets;
+         |drop table if exists backup_sets_files;
          |
          |SET REFERENTIAL_INTEGRITY TRUE;
        """.stripMargin.executeUpdate().apply()

app/lib/db/DbUpgrader.scala

@@ -51,11 +51,7 @@ class DbUpgrader(dao: Dao)(implicit sch: Scheduler) extends StrictLogging {
           }
           .toList
           .sequentially
-          .flatMap { _ =>
-            dao
-              .setSetting("db_version", App.versionStr)
-              .map(_ => logger.debug(s"DB upgraded to version ${App.versionStr}"))
-          }
+          .map(_ => ())
       }
   }
 }

build.sbt

@@ -44,6 +44,8 @@ libraryDependencies ++= Seq(
   "io.sentry" % "sentry-logback" % "1.7.14",
   "com.typesafe.scala-logging" %% "scala-logging" % "3.9.0",
   "org.scalatest" %% "scalatest" % "3.0.5",
+  "org.scalaj" %% "scalaj-http" % "2.4.1" % "test",
+  "org.scalatestplus.play" %% "scalatestplus-play" % "3.1.2" % "test",
   "org.mockito" % "mockito-core" % "2.23.0" % "test"
 )
 
@@ -94,11 +96,12 @@ lazy val setVersionInSources = taskKey[Unit]("Sets build version into sources")
 
 setVersionInSources := {
   import java.io.PrintWriter
+
   import scala.io.Source
-  
+
   val version = sys.env.getOrElse("VERSION", throw new IllegalArgumentException("Missing VERSION env property"))
   println(s"Setting app version to $version")
-  
+
   val src = Source.fromFile(ConstantsPath).mkString
   val updated = src.replaceAll(
     """final val versionStr: String = "\d+.\d+.\d+"""",
@@ -132,8 +135,8 @@ setSentryDsnInSources := {
   }
 }
 
-sources in (Compile, doc) := Seq.empty
-publishArtifact in (Compile, packageDoc) := false
+sources in(Compile, doc) := Seq.empty
+publishArtifact in(Compile, packageDoc) := false
 
 PlayKeys.playDefaultPort := 3370
 PlayKeys.devSettings := Seq("play.server.http.port" -> "3370")

ci-tests/Dockerfile

@@ -3,4 +3,4 @@ FROM jendakol/rbackup:0.1
 WORKDIR /
 COPY . .
 
-ENTRYPOINT /wait-for-it.sh mysql:3306 -s -t 30 && /start-rbackup.sh
+ENTRYPOINT /wait-for-it.sh mysql:3306 -s -t 30 && /start-server.sh

ci-tests/start-rbackup.sh renamed to ci-tests/start-server.sh

@@ -11,6 +11,8 @@ cloudConnectorDefaults {
   chunkSize = 2048
 }
 
+cloudConnector {}
+
 fileHandler {
   parallelism = 2 // change the maxConnections accordingly!
   retries = 2

ci-tests/tests.sh

@@ -12,7 +12,7 @@ import utils.TestOps._
 
 class IntegrationTest extends FunSuite with StrictLogging {
   private val rbackupIp: String = {
-    val ip = System.getenv("RBACKUP_IP")
+    val ip = Option(System.getenv("RBACKUP_IP")).getOrElse("localhost")
 
     if (ip == "0.0.0.0") "localhost" else ip
   }