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

Specs2 support #85

Merged
merged 51 commits into from
Apr 12, 2019
Merged

Specs2 support #85

merged 51 commits into from
Apr 12, 2019

Conversation

ultrasecreth
Copy link
Member

  • Adds support for specs2
  • Extract Scalatest specific code to it's own module
  • Adds support for Scalatest AsyncSpec (ScalaTest AsyncWordSpec and wasCalled #57)
  • Code improvements
  • Minor bug fixes
  • Minor features added

etorreborre
etorreborre reviewed Mar 24, 2019
View reviewed changes
core/src/main/scala/org/mockito/MockitoScalaSession.scala Outdated Show resolved Hide resolved
core/src/main/scala/org/mockito/integrations/scalatest/IdiomaticMockitoFixture.scala Outdated Show resolved Hide resolved
core/src/main/scala/org/mockito/matchers/DefaultMatcher.scala Outdated Show resolved Hide resolved
specs2/src/main/scala/org/mockito/specs2/HamcrestMatcherAdapter.scala Outdated Show resolved Hide resolved
specs2/src/main/scala/org/mockito/specs2/Specs2Mockito.scala Outdated Show resolved Hide resolved
specs2/src/test/scala/org/mockito/specs2/MockitoScalaSpec.scala Outdated Show resolved Hide resolved
specs2/src/test/scala/org/mockito/specs2/MockitoScalaSpec.scala Outdated Show resolved Hide resolved
specs2/src/test/scala/org/mockito/specs2/MockitoScalaSpec.scala Outdated Show resolved Hide resolved
specs2/src/test/scala/org/mockito/specs2/MockitoScalaSpec.scala Outdated Show resolved Hide resolved
specs2/src/test/scala/org/mockito/specs2/MockitoScalaSpec.scala Outdated Show resolved Hide resolved
@ultrasecreth ultrasecreth force-pushed the specs2-support branch 4 times, most recently from d63e835 to c91a740 Compare April 4, 2019 18:10
@ultrasecreth
Copy link
Member Author

@mockitoguy this PR adds 2 new artefacts (mockito-scala-scalatest & mockito-scala-specs2), similar idea to mockito-junit-jupiter, would this be a problem with how the current publishing works? or just merging the PR and letting shipkit works its magic would be enough? - Thanks!

ultrasecreth and others added 23 commits April 7, 2019 16:01
@ultrasecreth
Add DefaultAnswer for a single, hardcoded value
0a0f1c0
@ultrasecreth
Fix issue with inline mixins
c5265ad
@ultrasecreth
methods with byName params are looked up on the whole class hierarchy…
a3a546a 
… rather than just the mocked class only
@ultrasecreth
Create scalatest module and move everything scalatest specific in the…
d6ad99f 
…re (even the current tests)
@ultrasecreth
Add integration with Scalatest so verifications return org.scalatest.…
66b42ba 
…compatible.Assertion rather than Unit, this allows a verify line to be the last one in an Async test
@ultrasecreth
Replace IdiomaticMockitoFixture by ScalatestMockito and ScalatestAsyn…
ef92123 
…cMockito
@ultrasecreth
Prettify EqTo expected value
745b5f4
@ultrasecreth
Add DefaultAnswer constructor based on a InvocationOnMock Function
9c1ada5
@ultrasecreth
Simplify macro that identifies argument matchers
68df79c
@ultrasecreth
Fix issue when extracting byName arguments on a spy self call (etorre…
0af90d3 
…borre/specs2#428)
@ultrasecreth
Macro that identifies argument matchers is also aware of Specs2 match…
26b8822 
…er conversions
@ultrasecreth
Add feature to specify a verification that may happen in the future
76618b6
@ultrasecreth
Add missing toString to the ScalaInvocation
fa1bb04
@ultrasecreth
Add another test for the bug-fix on spies calling mocks internally
966428e
@ultrasecreth
Macro will wrap any not-known matcher in a defaultMatcher rather than…
eea6eb1 
… eqTo directly

defaultMatcher relies on the DefaultMatcher[T] type class, so the actual matcher to be used can be overridden by the user or any framework extension
@ultrasecreth
Add ignoreStubs to the idiomaticAPI
c397a55
@ultrasecreth
Fix InOrder definition
2927b33
@ultrasecreth
Add missing lenient print in build.sbt
6541176
@ultrasecreth
Add specs2 module
bcc6dbe
@ultrasecreth
Fix MockitoSessionAsyncFixture
9a2a1b4
@ultrasecreth
Increase test timeout to cope with slow travis slaves
201cd59
@ultrasecreth
Improve handling of VarArgs
9e0e391
@ultrasecreth
Replace Traversable by Iterable as the former was deprecated in Scala…
ffceb91 
… 2.13
ultrasecreth and others added 20 commits April 7, 2019 16:04
@ultrasecreth
Add support for existent specs2 stubbing syntax
96fb258
@ultrasecreth
Rename framework specific traits
bd21a83
@ultrasecreth
fixed the compilation error for executing fragments in the Mockito spec
2fb68ec
@ultrasecreth
migrated the mockito spec to a more idiomatic specs2 style
efbb731
@ultrasecreth
Adds support for most of the existent specs2 syntax
a740c7e
@ultrasecreth
Add -Ypartial-unification for scala versions < 2.13
ff5fe91
@ultrasecreth
Add support for specs2 inOrder syntax
8c9b707
@ultrasecreth
Fail if a non-mock is passed to verifyNoMoreInteractions
52c7fbb
@ultrasecreth
Mark mockito-scala-specs2 as beta
dfe91dc
@ultrasecreth
Add idiomatic timeout example to README
9b9da12
@ultrasecreth
Add type definition to default implicit matcher
2172b63
@ultrasecreth
Add notes for v1.3.0
f81f688
@ultrasecreth
Rebase on current release/1.x and force formatting
d531287
@ultrasecreth
Ensure AsyncMockito can work with Futures, update README
5e18da6
@ultrasecreth
Add ability to create a mock and stub one of its methods in a single …
b196345 
…line
@ultrasecreth
Fix bug for doAnswer where if a non-function was provided then the la…
13cd3f1 
…zy arg was evaluated twice
@ultrasecreth
Increase timeout to cope with slow CI
2b8444a
@ultrasecreth
Add Scalatest traits for old syntax
48a86ed
@ultrasecreth
Update README
144448c
@ultrasecreth
Necessary changes to support 2.13.0-RC1
34971a4
@mockitoguy
Copy link
Member

No problem pushing multiple artifacts. Shipkit handles this (Mockito does it).

Are you sure you want to ship different versions? It is non standard and may increase entropy. Why don't we ship beta version for all artifacts? I realize that it would not be 100% correct but you get simplicity in return :)

If you are really keen on different versions, changes in Shipkit may be needed (there's only one way to find out...)

@ultrasecreth
Copy link
Member Author

@mockitoguy Cool, I'll try and see what happens :) worst case scenario the beta one will not be released at all!

@ultrasecreth ultrasecreth merged commit f69ec7d into release/1.x Apr 12, 2019
@ultrasecreth ultrasecreth deleted the specs2-support branch June 2, 2019 19:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@etorreborre etorreborre etorreborre left review comments

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@ultrasecreth @mockitoguy @etorreborre