search

scalatest / scalatestplus-mockito

ScalaTest + JMock provides integration support between ScalaTest and Mockito.
Apache License 2.0
16 stars 11 forks source link

Support Mockito 3.4.x #21

Closed diversit closed 4 years ago

diversit commented 4 years ago

Updating Mockito dependency to 3.4.6. Ignore .idea folder.

Note: I recon a new mockito-3.4/3.2.0.x branch is needed. I have this in my fork, but cannot add this to the main repo.

cla-bot[bot] commented 4 years ago

Hi @diversit, we require contributors to sign our Contributor License Agreement, and we don't have yours on file. In order for us to review and merge your code, please access https://www.artima.com/cla/choose-type to sign our Contributor License Agreement. Your effort is highly appreciated. Thank you.

artimasites commented 4 years ago

@cla-bot[bot] check

cla-bot[bot] commented 4 years ago

The cla-bot has been summoned, and re-checked this pull request!

cheeseng commented 4 years ago

@diversit This is now merged in branch mockito-3.4/3.2.1.x .

diversit commented 4 years ago

Closing since has been merged in mockito-3.4/3.2.1.x .