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.

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

Saturday morning cartoon version of "conjunction" #202

Merged
merged 2 commits into from
Sep 21, 2015
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions Source/Mock.Generic.xdoc
Original file line number Diff line number Diff line change
Expand Up @@ -285,7 +285,7 @@
<doc for="Mock{T}.Verify(expression)">
<summary>
Verifies that a specific invocation matching the given expression was performed on the mock. Use
in conjuntion with the default <see cref="MockBehavior.Loose"/>.
in conjunction with the default <see cref="MockBehavior.Loose"/>.
</summary>
<example group="verification">
This example assumes that the mock has been used, and later we want to verify that a given
Expand All @@ -304,7 +304,7 @@
<doc for="Mock{T}.Verify(expression,times)">
<summary>
Verifies that a specific invocation matching the given expression was performed on the mock. Use
in conjuntion with the default <see cref="MockBehavior.Loose"/>.
in conjunction with the default <see cref="MockBehavior.Loose"/>.
</summary>
<exception cref="MockException">
The invocation was not call the times specified by
Expand All @@ -316,7 +316,7 @@
<doc for="Mock{T}.Verify(expression,failMessage)">
<summary>
Verifies that a specific invocation matching the given expression was performed on the mock,
specifying a failure error message. Use in conjuntion with the default
specifying a failure error message. Use in conjunction with the default
<see cref="MockBehavior.Loose"/>.
</summary>
<example group="verification">
Expand All @@ -337,7 +337,7 @@
<doc for="Mock{T}.Verify(expression,times,failMessage)">
<summary>
Verifies that a specific invocation matching the given expression was performed on the mock,
specifying a failure error message. Use in conjuntion with the default
specifying a failure error message. Use in conjunction with the default
<see cref="MockBehavior.Loose"/>.
</summary>
<exception cref="MockException">
Expand All @@ -351,7 +351,7 @@
<doc for="Mock{T}.Verify{TResult}(expression)">
<summary>
Verifies that a specific invocation matching the given expression was performed on the mock. Use
in conjuntion with the default <see cref="MockBehavior.Loose"/>.
in conjunction with the default <see cref="MockBehavior.Loose"/>.
</summary>
<example group="verification">
This example assumes that the mock has been used, and later we want to verify that a given
Expand All @@ -371,7 +371,7 @@
<doc for="Mock{T}.Verify{TResult}(expression,times)">
<summary>
Verifies that a specific invocation matching the given
expression was performed on the mock. Use in conjuntion
expression was performed on the mock. Use in conjunction
with the default <see cref="MockBehavior.Loose"/>.
</summary>
<exception cref="MockException">
Expand Down Expand Up @@ -622,4 +622,4 @@
</code>
</example>
</doc>
</docs>
</docs>
4 changes: 2 additions & 2 deletions Source/Protected/IProtectedMock.cs
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ public interface IProtectedMock<TMock> : IHideObjectMembers

/// <summary>
/// Specifies a verify for a void method with the given <paramref name="methodName"/>,
/// optionally specifying arguments for the method call. Use in conjuntion with the default
/// optionally specifying arguments for the method call. Use in conjunction with the default
/// <see cref="MockBehavior.Loose"/>.
/// </summary>
/// <exception cref="MockException">The invocation was not call the times specified by
Expand Down Expand Up @@ -151,4 +151,4 @@ public interface IProtectedMock<TMock> : IHideObjectMembers

#endregion
}
}
}