Skip to content

Commit 706807b

Browse files
authored
Fix spelling mistakes (mockito#502)
Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>
1 parent ccddcc1 commit 706807b

File tree

7 files changed

+14
-14
lines changed

7 files changed

+14
-14
lines changed

.scala-steward.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
# more information about the CRON expressions that are supported.
1919
#
2020
# Note that the date parts of the CRON expression are matched exactly
21-
# while the the time parts are only used to abide to the frequency of
21+
# while the time parts are only used to abide to the frequency of
2222
# the given expression.
2323
#
2424
# Default: @asap

README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ The library has independent developers, release cycle and versioning from core m
2828
* Repositories: [Maven Central](https://search.maven.org/search?q=mockito-scala)
2929

3030

31-
### Please ensure you don't declare `mockito-core` as a dependency. `mockito-scala` will pull the appropiate version automatically
31+
### Please ensure you don't declare `mockito-core` as a dependency. `mockito-scala` will pull the appropriate version automatically
3232

3333

3434
### Note: For more examples and use cases than the ones shown below, please refer to the library's specific tests
@@ -554,7 +554,7 @@ The workaround is quite easy though, just provide a value (or a matcher) for tha
554554

555555
## Numeric matchers
556556

557-
A new set of matchers to deal with number comparison were introduced (see [Scalactic tolerance](#tolerance) for aproximation),
557+
A new set of matchers to deal with number comparison were introduced (see [Scalactic tolerance](#tolerance) for approximation),
558558
the syntax is slightly different to make them more readable, so now we can write stuff like (notice the 'n')
559559
```scala
560560
aMock.method(5)
@@ -608,7 +608,7 @@ aMock.method(n =~ 5.0 +- 0.001) was called
608608
609609
An instance of `org.scalactic.Prettifier` is implicitly pulled by the `EqTo` matcher to provide a nicer (and customisable) printing of
610610
your types when an verification fails. `EqTo` is also used internally by `Mockito` to print the arguments of every invocation, so you'll
611-
get a consisten printing for both the expectation and the actual call.
611+
get a consistent printing for both the expectation and the actual call.
612612
613613
If you want to customise the print of any type you just need to declare your `Prettifier` in the implicit scope like
614614
@@ -747,7 +747,7 @@ val failingMock: Foo = mock[Foo].returnsMT[ErrorOr, MyClass](*) returns Left(Err
747747
748748
## Mocking Scala `object`
749749
750-
Since version 1.16.0 it is possible to mock `object` methods, given that such definitions are global, the way to mock them is sligtly different in order to ensure we restore the real implementation of the object after we are done
750+
Since version 1.16.0 it is possible to mock `object` methods, given that such definitions are global, the way to mock them is slightly different in order to ensure we restore the real implementation of the object after we are done
751751
752752
To enable `withObjectMocked` feature, it is mandatory to create the file `src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker` containing a single line:
753753

build.gradle

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -94,9 +94,9 @@ task writeActualVersion {
9494
def isSnapshot = version.endsWith("-SNAPSHOT")
9595

9696
if (isSnapshot) {
97-
println "Building a -SNAPSHOT version (Github release and Maven Central tasks are skipped)"
97+
println "Building a -SNAPSHOT version (GitHub release and Maven Central tasks are skipped)"
9898
tasks.named("githubRelease") {
99-
//snapshot versions do not produce changelog / Github releases
99+
//snapshot versions do not produce changelog / GitHub releases
100100
enabled = false
101101
}
102102
tasks.named("closeAndReleaseStagingRepository") {
@@ -111,11 +111,11 @@ tasks.register("releaseSummary") {
111111
println "RELEASE SUMMARY\n" +
112112
" SNAPSHOTS released to: https://s01.oss.sonatype.org/content/repositories/snapshots/org/mockito/\n" +
113113
" Release to Maven Central: SKIPPED FOR SNAPSHOTS\n" +
114-
" Github releases: SKIPPED FOR SNAPSHOTS"
114+
" GitHub releases: SKIPPED FOR SNAPSHOTS"
115115
} else {
116116
println "RELEASE SUMMARY\n" +
117117
" Release to Maven Central (available after delay): https://repo1.maven.org/maven2/org/mockito/\n" +
118-
" Github releases: https://github.com/mockito/mockito-scala/releases"
118+
" GitHub releases: https://github.com/mockito/mockito-scala/releases"
119119
}
120120
}
121121
}

common/src/main/scala/org/mockito/matchers/Transformed.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package org.mockito
22
package matchers
33

44
/**
5-
* Matcher tranformed from one type to another with a function to modify the input
5+
* Matcher transformed from one type to another with a function to modify the input
66
*
77
* Technically this is 'contramapped' but that seemed like an unnecessarily jargony name.
88
*/

common/src/test/scala/org/mockito/matchers/MatcherProps.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ class MatcherProps extends Properties("matchers") {
5252
val transformed = Transformed(ma)(f)
5353
val matches = transformed.matches(value)
5454
classify(matches, "matches", "doesn't match") {
55-
(matches ?= ma.matches(f(value))) :| "matches if underlying matches transfomed value" &&
55+
(matches ?= ma.matches(f(value))) :| "matches if underlying matches transformed value" &&
5656
(transformed.toString ?= s"transformed($ma: $f)") :| "renders to string correctly"
5757
}
5858
}

docs/release-notes.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
- 2020-11-07 - [2 commits](https://github.com/mockito/mockito-scala/compare/v1.16.0...v1.16.1) by [Rebeca Perez](https://github.com/cardie20) (1), [Scala Steward](https://github.com/scala-steward) (1) - published to [![Bintray](https://img.shields.io/badge/Bintray-1.16.1-green.svg)](https://bintray.com/mockito/maven/mockito-scala/1.16.1)
1414
- Fixes Issue #303 [(#308)](https://github.com/mockito/mockito-scala/pull/308)
1515
- Update mockito-core to 3.5.15 [(#304)](https://github.com/mockito/mockito-scala/pull/304)
16-
- How to mock scala obejct [(#303)](https://github.com/mockito/mockito-scala/issues/303)
16+
- How to mock scala object [(#303)](https://github.com/mockito/mockito-scala/issues/303)
1717

1818
#### 1.16.0
1919
- 2020-09-27 - [1 commit](https://github.com/mockito/mockito-scala/compare/v1.15.1...v1.16.0) by [Bruno Bonanno](https://github.com/bbonanno) - published to [![Bintray](https://img.shields.io/badge/Bintray-1.16.0-green.svg)](https://bintray.com/mockito/maven/mockito-scala/1.16.0)
@@ -36,7 +36,7 @@
3636
- NPE caused by mocking a generic method multiple times [(#256)](https://github.com/mockito/mockito-scala/issues/256)
3737
- Mocking method return Any as type throws Exception [(#254)](https://github.com/mockito/mockito-scala/issues/254)
3838
- IdiomaticMockitoSyntax appears not to handle thrown by without annotation [(#251)](https://github.com/mockito/mockito-scala/issues/251)
39-
- NPE when mocking a trait with a NonEmpyString argument [(#250)](https://github.com/mockito/mockito-scala/issues/250)
39+
- NPE when mocking a trait with a NonEmptyString argument [(#250)](https://github.com/mockito/mockito-scala/issues/250)
4040

4141
#### 1.14.8
4242
- 2020-06-23 - [1 commit](https://github.com/mockito/mockito-scala/compare/v1.14.7...v1.14.8) by [Ben Spencer](https://github.com/dangerousben) - published to [![Bintray](https://img.shields.io/badge/Bintray-1.14.8-green.svg)](https://bintray.com/mockito/maven/mockito-scala/1.14.8)

scalatest/src/test/scala/user/org/mockito/Issue254.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ class Issue254 extends AnyFlatSpec with MockitoSugar with Matchers {
1515

1616
// will explode with
1717
// java.lang.ClassNotFoundException: scala.Any
18-
// because it tries to instatiate Any at org/mockito/ReflectionUtils.scala:57
18+
// because it tries to instantiate Any at org/mockito/ReflectionUtils.scala:57
1919
when(myMock.methodReturningAny("test"))
2020
.thenReturn("some value")
2121

0 commit comments

Comments
 (0)