Skip to content
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.

Sign up for GitHub

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

Jump to bottom

upgrade ScalaTest to 3.2.0 #333

Merged
merged 1 commit into from Jul 8, 2020
Merged

upgrade ScalaTest to 3.2.0 #333

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Expand Up @@ -69,7 +69,7 @@ For ScalaTest, to use ScalaMock in your Tests, add the following to your `build.

```scala
libraryDependencies += Seq("org.scalamock" %% "scalamock" % "4.4.0" % Test,
"org.scalatest" %% "scalatest" % "3.0.8" % Test)
"org.scalatest" %% "scalatest" % "3.2.0" % Test)
```

## Documentation
Expand Down
2 changes: 1 addition & 1 deletion build.sbt
View file
Open in desktop
Expand Up @@ -4,7 +4,7 @@ scalaVersion in ThisBuild := "2.11.12"
crossScalaVersions in ThisBuild := Seq("2.11.12", "2.12.8", "2.13.0")
//scalaJSUseRhino in ThisBuild := true

lazy val scalatest = "org.scalatest" %% "scalatest" % "3.1.2"
lazy val scalatest = "org.scalatest" %% "scalatest" % "3.2.0"
lazy val specs2 = "org.specs2" %% "specs2-core" % "4.9.4"
lazy val scalameta = "org.scalameta" %% "scalameta" % "4.3.15"

Expand Down
2 changes: 1 addition & 1 deletion project/build.properties
View file
Open in desktop
@@ -1 +1 @@
sbt.version=1.3.12
sbt.version=1.3.13
2 changes: 1 addition & 1 deletion shared/src/test/scala/org/scalamock/test/scalatest/FixtureContextTest.scala
View file
Open in desktop
Expand Up @@ -54,7 +54,7 @@ class FixtureContextTest extends AnyFlatSpec with Matchers with MockFactory {
mockedTrait.oneParamMethod(2) shouldBe "two"
}

it should "allow to use mock defined in fixture-context with expecations predefined" in new TestSetupWithExpectationsPredefined {
it should "allow to use mock defined in fixture-context with expectations predefined" in new TestSetupWithExpectationsPredefined {
(mockedTrait.oneParamMethod _).expects(2).returning("two")

mockedTrait.oneParamMethod(input) shouldBe output
Expand Down
1 change: 0 additions & 1 deletion shared/src/test/scala/org/scalamock/test/scalatest/PathSpecTest.scala
View file
Open in desktop
Expand Up @@ -22,7 +22,6 @@ package org.scalamock.test.scalatest

import org.scalamock.scalatest.PathMockFactory
import org.scalatest.exceptions.TestFailedException
import org.scalatest.path
import org.scalatest.funspec
import org.scalatest.matchers.should.Matchers

Expand Down
2 changes: 1 addition & 1 deletion shared/src/test/scala/org/scalamock/test/specs2/FixtureContextTest.scala
View file
Open in desktop
Expand Up @@ -54,7 +54,7 @@ class FixtureContextTest extends Specification {
mockedTrait.oneParamMethod(2) must_== "two"
}

"allow to use mock defined in fixture-context with expecations predefined" in new TestSetupWithExpectationsPredefined {
"allow to use mock defined in fixture-context with expectations predefined" in new TestSetupWithExpectationsPredefined {
(mockedTrait.oneParamMethod _).expects(2).returning("two")

mockedTrait.oneParamMethod(input) must_== output
Expand Down