From 4874cc69ea09577ed61bce3a4945bb9bb407e76a Mon Sep 17 00:00:00 2001 From: Raffaello Bertini Date: Sat, 17 Jun 2017 03:43:32 +0100 Subject: [PATCH 1/4] adding code coverage --- .codecov.yml | 7 +++++++ .travis.yml | 11 ++++++++++- project/plugins.sbt | 2 ++ 3 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 .codecov.yml diff --git a/.codecov.yml b/.codecov.yml new file mode 100644 index 0000000..a59285f --- /dev/null +++ b/.codecov.yml @@ -0,0 +1,7 @@ +comment: + layout: "header, diff, tree, changes, sunburst, suggestions" + require_changes: false + branches: null + behavior: default + flags: null +paths: null diff --git a/.travis.yml b/.travis.yml index 95d7613..d074387 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,7 +3,7 @@ scala: - 2.11.11 #- 2.12.2 sudo: false -dist: trusty +#dist: trusty jdk: - oraclejdk8 - openjdk8 @@ -13,3 +13,12 @@ cache: directories: - '$HOME/.ivy2/cache' - '$HOME/.sbt/boot/' + +script: + - sbt clean coverage test coverageReport +# - sbt coverageReport + - sbt coverageAggregate + - sbt codacyCoverage + +after_success: +- bash <(curl -s https://codecov.io/bash) -t 7a8a8a42-bf1a-4dcd-b558-b571ee7b25a0 diff --git a/project/plugins.sbt b/project/plugins.sbt index aed302b..bf9635a 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -12,4 +12,6 @@ addSbtPlugin("com.vmunier" % "sbt-web-scalajs" % "1.0.4") addSbtPlugin("com.typesafe.sbt" % "sbt-digest" % "1.1.1") addSbtPlugin("com.typesafe.sbt" % "sbt-gzip" % "1.0.0") addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.14.3") +addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.5.0") +addSbtPlugin("com.codacy" % "sbt-codacy-coverage" % "1.3.8") From 25f8d504fadc4eb704f5f07824e7dca570dd6d0a Mon Sep 17 00:00:00 2001 From: Raffaello Bertini Date: Sat, 17 Jun 2017 03:47:58 +0100 Subject: [PATCH 2/4] restred trusty os in travis --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index d074387..a018b47 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,7 +3,7 @@ scala: - 2.11.11 #- 2.12.2 sudo: false -#dist: trusty +dist: trusty jdk: - oraclejdk8 - openjdk8 From 0407ae65fc731dd8461689d9fb07c87857adedec Mon Sep 17 00:00:00 2001 From: Raffaello Bertini Date: Sat, 17 Jun 2017 03:49:28 +0100 Subject: [PATCH 3/4] fix sbt in travis --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index a018b47..7286235 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,8 +15,8 @@ cache: - '$HOME/.sbt/boot/' script: - - sbt clean coverage test coverageReport -# - sbt coverageReport + - sbt clean coverage test + - sbt coverageReport - sbt coverageAggregate - sbt codacyCoverage From a7826276d4941f9e3713f22d9e083a390871bea1 Mon Sep 17 00:00:00 2001 From: Raffaello Bertini Date: Sat, 17 Jun 2017 04:33:43 +0100 Subject: [PATCH 4/4] added coveralls --- .travis.yml | 1 + project/plugins.sbt | 1 + server/test/controllers/HangPersonSpec.scala | 1 - 3 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 7286235..a11162e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,3 +22,4 @@ script: after_success: - bash <(curl -s https://codecov.io/bash) -t 7a8a8a42-bf1a-4dcd-b558-b571ee7b25a0 +- sbt coveralls diff --git a/project/plugins.sbt b/project/plugins.sbt index bf9635a..57f558a 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -14,4 +14,5 @@ addSbtPlugin("com.typesafe.sbt" % "sbt-gzip" % "1.0.0") addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.14.3") addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.5.0") addSbtPlugin("com.codacy" % "sbt-codacy-coverage" % "1.3.8") +addSbtPlugin("org.scoverage" % "sbt-coveralls" % "1.1.0") diff --git a/server/test/controllers/HangPersonSpec.scala b/server/test/controllers/HangPersonSpec.scala index cba2b4a..35d8183 100644 --- a/server/test/controllers/HangPersonSpec.scala +++ b/server/test/controllers/HangPersonSpec.scala @@ -4,7 +4,6 @@ import org.junit.runner._ import org.specs2.mutable._ import org.specs2.runner._ import play.api.mvc.Flash -import play.api.test.Helpers._ import play.api.test._ @RunWith(classOf[JUnitRunner])