Skip to content

Commit 6887dbf

Browse files
authored
Merge pull request #7 from yoshiyoshifujii/feature/edit-readme
Edit README
2 parents 63bcad4 + 6da7cc1 commit 6887dbf

File tree

5 files changed

+26
-22
lines changed

5 files changed

+26
-22
lines changed

README.md

Lines changed: 22 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -6,28 +6,28 @@ This library is a ScalaTest extension library that supports embedded MySQL and F
66

77
## Installation
88

9-
Add the following to your sbt build (Scala 2.11.x, 2.12.x):
9+
Add the following to your sbt build (Scala 2.11.x, 2.12.x, 2.13.x):
1010

1111
### Release Version
1212

1313
```scala
1414
resolvers ++= Seq(
15-
"Seasar Repository" at "http://maven.seasar.org/maven2/",
16-
"Sonatype OSS Release Repository" at "https://oss.sonatype.org/content/repositories/releases/"
15+
"Seasar Repository" at "https://maven.seasar.org/maven2/",
16+
Resolver.sonatypeRepo("releases")
1717
)
1818

19-
libraryDependencies += "com.github.j5ik2o" %% "scalatestplus-db-core" % "1.0.9"
19+
libraryDependencies += "com.github.j5ik2o" %% "scalatestplus-db-core" % "<version>"
2020
```
2121

2222
### Snapshot Version
2323

2424
```scala
2525
resolvers ++= Seq(
26-
"Seasar Repository" at "http://maven.seasar.org/maven2/",
27-
"Sonatype OSS Snapshot Repository" at "https://oss.sonatype.org/content/repositories/snapshots/"
26+
"Seasar Repository" at "https://maven.seasar.org/maven2/",
27+
Resolver.sonatypeRepo("snapshots")
2828
)
2929

30-
libraryDependencies += "com.github.j5ik2o" %% "scalatestplus-db-core" % "1.0.10-SNAPSHOT"
30+
libraryDependencies += "com.github.j5ik2o" %% "scalatestplus-db-core" % "<version>-SNAPSHOT"
3131
```
3232

3333
## Usage
@@ -36,9 +36,10 @@ libraryDependencies += "com.github.j5ik2o" %% "scalatestplus-db-core" % "1.0.10-
3636

3737
```scala
3838
import com.wix.mysql.EmbeddedMysql
39-
import org.scalatest.{ FreeSpec, MustMatchers }
39+
import org.scalatest.freespec.AnyFreeSpec
40+
import org.scalatest.matchers.must.Matchers
4041

41-
class MySQLdOneInstancePerFreeSpec extends FreeSpec with MustMatchers with MySQLdOneInstancePerSuite {
42+
class MySQLdOneInstancePerFreeSpec extends AnyFreeSpec with Matchers with MySQLdOneInstancePerSuite {
4243

4344
override protected val schemaConfigs: Seq[SchemaConfig] = Seq(SchemaConfig(name = "test"))
4445

@@ -58,6 +59,7 @@ class MySQLdOneInstancePerFreeSpec extends FreeSpec with MustMatchers with MySQL
5859
mySQLdContext.embeddedMysql mustBe mysqld
5960
}
6061
}
62+
6163
}
6264
```
6365

@@ -66,9 +68,10 @@ class MySQLdOneInstancePerFreeSpec extends FreeSpec with MustMatchers with MySQL
6668

6769
```scala
6870
import com.wix.mysql.EmbeddedMysql
69-
import org.scalatest.{ fixture, MustMatchers }
71+
import org.scalatest.freespec.FixtureAnyFreeSpec
72+
import org.scalatest.matchers.must.Matchers
7073

71-
class MySQLdOneInstancePerTestOfFreeSpec extends fixture.FreeSpec with MustMatchers with MySQLdOneInstancePerTest {
74+
class MySQLdOneInstancePerTestOfFreeSpec extends FixtureAnyFreeSpec with Matchers with MySQLdOneInstancePerTest {
7275

7376
override protected val schemaConfigs: Seq[SchemaConfig] = Seq(SchemaConfig(name = "test"))
7477

@@ -95,11 +98,12 @@ class MySQLdOneInstancePerTestOfFreeSpec extends fixture.FreeSpec with MustMatch
9598

9699
```scala
97100
import com.wix.mysql.EmbeddedMysql
98-
import org.scalatest.{ FreeSpec, MustMatchers }
101+
import org.scalatest.freespec.AnyFreeSpec
102+
import org.scalatest.matchers.must.Matchers
99103

100104
class FlywayWithMySQLdOneInstancePerFreeSpec
101-
extends FreeSpec
102-
with MustMatchers
105+
extends AnyFreeSpec
106+
with Matchers
103107
with FlywayWithMySQLdOneInstancePerSuite {
104108

105109
override protected val schemaConfigs: Seq[SchemaConfig] = Seq(SchemaConfig(name = "test"))
@@ -128,14 +132,14 @@ class FlywayWithMySQLdOneInstancePerFreeSpec
128132

129133
### When starting MySQLd with Flyway for each test case
130134

131-
132135
```scala
133136
import com.wix.mysql.EmbeddedMysql
134-
import org.scalatest.{ fixture, MustMatchers }
137+
import org.scalatest.freespec.FixtureAnyFreeSpec
138+
import org.scalatest.matchers.must.Matchers
135139

136140
class FlywayWithMySQLdOneInstancePerTestOfFreeSpec
137-
extends fixture.FreeSpec
138-
with MustMatchers
141+
extends FixtureAnyFreeSpec
142+
with Matchers
139143
with FlywayWithMySQLdOneInstancePerTest {
140144

141145
override protected val schemaConfigs: Seq[SchemaConfig] = Seq(SchemaConfig(name = "test"))

src/test/scala/com/github/j5ik2o/scalatestplus/db/FlywayWithMySQLdOneInstancePerFreeSpec.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ class FlywayWithMySQLdOneInstancePerFreeSpec
1515

1616
var mysqld: EmbeddedMysql = _
1717

18-
"FlywayWithMySQLdOnInstancePerFreeSpec" - {
18+
"FlywayWithMySQLdOneInstancePerFreeSpec" - {
1919
"should start & stop mysqld1" in {
2020
println(s"context = $mySQLdContext")
2121
mySQLdContext mustNot be(null)

src/test/scala/com/github/j5ik2o/scalatestplus/db/FlywayWithMySQLdOneInstancePerTestOfFreeSpec.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ class FlywayWithMySQLdOneInstancePerTestOfFreeSpec
1515

1616
var mysqld: EmbeddedMysql = _
1717

18-
"FlywayWithMySQLdOnInstancePerTestOfFreeSpec" - {
18+
"FlywayWithMySQLdOneInstancePerTestOfFreeSpec" - {
1919
"should start & stop mysqld1" in { context =>
2020
println(s"context = $context")
2121
context.mySQLdContext mustNot be(null)

src/test/scala/com/github/j5ik2o/scalatestplus/db/MySQLdOneInstancePerFreeSpec.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ class MySQLdOneInstancePerFreeSpec extends AnyFreeSpec with Matchers with MySQLd
1010

1111
var mysqld: EmbeddedMysql = _
1212

13-
"MySQLdOnInstancePerFreeSpec" - {
13+
"MySQLdOneInstancePerFreeSpec" - {
1414
"should start & stop mysqld1" in {
1515
println(s"context = $mySQLdContext")
1616
mySQLdContext mustNot be(null)

src/test/scala/com/github/j5ik2o/scalatestplus/db/MySQLdOneInstancePerTestOfFreeSpec.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ class MySQLdOneInstancePerTestOfFreeSpec extends FixtureAnyFreeSpec with Matcher
1010

1111
var mysqld: EmbeddedMysql = _
1212

13-
"MySQLdOnInstancePerTestOfFreeSpec" - {
13+
"MySQLdOneInstancePerTestOfFreeSpec" - {
1414
"should start & stop mysqld1" in { context =>
1515
println(s"context = $context")
1616
context mustNot be(null)

0 commit comments

Comments
 (0)