Skip to content

Release 0.11.0 #148

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Dec 9, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
docker-it-scala
=============

[![CI](https://github.com/whisklabs/docker-it-scala/actions/workflows/ci.yaml/badge.svg)](https://github.com/whisklabs/docker-it-scala/actions/workflows/ci.yaml)
[![Maven Central](https://maven-badges.herokuapp.com/maven-central/com.whisk/docker-testkit-core_2.12/badge.svg)](https://maven-badges.herokuapp.com/maven-central/com.whisk/docker-testkit-core_2.12)
[![Join the chat at https://gitter.im/whisklabs/docker-it-scala](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/whisklabs/docker-it-scala?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)

Expand All @@ -22,16 +23,16 @@ There are separate artifacts available for these libraries:

```scala
libraryDependencies ++= Seq(
"com.whisk" %% "docker-testkit-scalatest" % "0.9.9" % "test",
"com.whisk" %% "docker-testkit-impl-spotify" % "0.9.9" % "test")
"com.whisk" %% "docker-testkit-scalatest" % "0.11.0" % "test",
"com.whisk" %% "docker-testkit-impl-spotify" % "0.11.0" % "test")
```

**docker-java**

```scala
libraryDependencies ++= Seq(
"com.whisk" %% "docker-testkit-scalatest" % "0.9.9" % "test",
"com.whisk" %% "docker-testkit-impl-docker-java" % "0.9.9" % "test")
"com.whisk" %% "docker-testkit-scalatest" % "0.11.0" % "test",
"com.whisk" %% "docker-testkit-impl-docker-java" % "0.11.0" % "test")
```

You don't necessarily have to use `scalatest` dependency as demonstrated above.
Expand Down
6 changes: 3 additions & 3 deletions build.sbt
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
lazy val commonSettings = Seq(
organization := "com.whisk",
version := "0.10.0-RC",
version := "0.11.0",
scalaVersion := "2.13.6",
crossScalaVersions := Seq("2.13.6", "2.12.15", "2.11.12"),
crossScalaVersions := Seq("2.13.6", "2.12.15", "2.11.12", "3.0.2"),
scalacOptions ++= Seq("-feature", "-deprecation"),
Test / fork := true,
licenses += ("MIT", url("http://opensource.org/licenses/MIT")),
Expand Down Expand Up @@ -56,7 +56,7 @@ lazy val scalatest =
.settings(
name := "docker-testkit-scalatest",
libraryDependencies ++= Seq(
"org.scalatest" %% "scalatest" % "3.1.2",
"org.scalatest" %% "scalatest" % "3.2.9",
"ch.qos.logback" % "logback-classic" % "1.2.3" % "test"
)
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,5 @@ case class DockerTestTimeouts(

object DockerTestTimeouts {

val Default = DockerTestTimeouts()
val Default: DockerTestTimeouts = DockerTestTimeouts()
}
9 changes: 9 additions & 0 deletions notes/0.11.0.markdown
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
#scala #docker #integration-testing

## Highlights

* add cross-compilation for scala [3](https://github.com/whisklabs/docker-it-scala/pull/146)
* proper [timeouts handling](https://github.com/whisklabs/docker-it-scala/pull/133)
* updated [sbt with plugins](https://github.com/whisklabs/docker-it-scala/pull/147)
* create Github Action [CI](https://github.com/whisklabs/docker-it-scala/pull/147)
* docs and small code improvements
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,14 @@ class MultiContainerTest
with DockerElasticsearchService
with DockerMongodbService {

override val managedContainers = ContainerGroup.of(elasticsearchContainer, mongodbContainer)
override val managedContainers: ContainerGroup =
ContainerGroup.of(elasticsearchContainer, mongodbContainer)

test("both containers should be ready") {
assert(elasticsearchContainer.state().isInstanceOf[ContainerState.Ready],
"elasticsearch container is ready")
assert(
elasticsearchContainer.state().isInstanceOf[ContainerState.Ready],
"elasticsearch container is ready"
)
assert(elasticsearchContainer.mappedPortOpt(9200).nonEmpty, "elasticsearch port is exposed")

assert(mongodbContainer.state().isInstanceOf[ContainerState.Ready], "mongodb is ready")
Expand Down