Merge pull request #189 from dogmatiq/127-message-expectation

Change "message assertions" to be "expectations".
dogmatiq · Nov 25, 2020 · ac6c3ce · ac6c3ce
2 parents ba50231 + 02c1418
commit ac6c3ce
Show file tree

Hide file tree

Showing 28 changed files with 1,479 additions and 1,455 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -43,6 +43,8 @@ migrate tests from prior versions.
 - **[BC]** Move `assert.Should()`, to `testkit.ToSatisfy()`
 - **[BC]** Move `assert.CommandTypeExecuted()`, to `testkit.ToExecuteCommandOfType()`
 - **[BC]** Move `assert.EventTypeExecuted()`, to `testkit.ToRecordEventOfType()`
+- **[BC]** Move `assert.CommandExecuted()`, to `testkit.ToExecuteCommand()`
+- **[BC]** Move `assert.EventExecuted()`, to `testkit.ToRecordEvent()`
 
 ### Removed
 

diff --git a/action.call_test.go b/action.call_test.go
@@ -10,7 +10,6 @@ import (
 	"github.com/dogmatiq/dogma"
 	. "github.com/dogmatiq/dogma/fixtures"
 	. "github.com/dogmatiq/testkit"
-	"github.com/dogmatiq/testkit/assert"
 	"github.com/dogmatiq/testkit/engine"
 	"github.com/dogmatiq/testkit/engine/envelope"
 	"github.com/dogmatiq/testkit/engine/fact"
@@ -154,7 +153,7 @@ var _ = Describe("func Call()", func() {
 					MessageC1,
 				)
 			}),
-			assert.CommandExecuted(MessageC1),
+			ToExecuteCommand(MessageC1),
 		)
 	})
 
@@ -168,7 +167,7 @@ var _ = Describe("func Call()", func() {
 					MessageE1,
 				)
 			}),
-			assert.EventRecorded(MessageE1),
+			ToRecordEvent(MessageE1),
 		)
 	})
 

diff --git a/action.dispatch.command_test.go b/action.dispatch.command_test.go
@@ -9,7 +9,6 @@ import (
 	"github.com/dogmatiq/dogma"
 	. "github.com/dogmatiq/dogma/fixtures"
 	. "github.com/dogmatiq/testkit"
-	"github.com/dogmatiq/testkit/assert"
 	"github.com/dogmatiq/testkit/engine"
 	"github.com/dogmatiq/testkit/engine/envelope"
 	"github.com/dogmatiq/testkit/engine/fact"
@@ -119,7 +118,7 @@ var _ = Describe("func ExecuteCommand()", func() {
 
 		test.Expect(
 			ExecuteCommand(MessageC1),
-			assert.CommandExecuted(MessageC1),
+			ToExecuteCommand(MessageC1),
 		)
 
 		Expect(t.Failed()).To(BeTrue())

diff --git a/action.dispatch.event_test.go b/action.dispatch.event_test.go
@@ -10,7 +10,6 @@ import (
 	"github.com/dogmatiq/dogma"
 	. "github.com/dogmatiq/dogma/fixtures"
 	. "github.com/dogmatiq/testkit"
-	"github.com/dogmatiq/testkit/assert"
 	"github.com/dogmatiq/testkit/engine"
 	"github.com/dogmatiq/testkit/engine/envelope"
 	"github.com/dogmatiq/testkit/engine/fact"
@@ -121,7 +120,7 @@ var _ = Describe("func RecordEvent()", func() {
 
 		test.Expect(
 			RecordEvent(MessageE1),
-			assert.EventRecorded(MessageE1),
+			ToRecordEvent(MessageE1),
 		)
 
 		Expect(t.Failed()).To(BeTrue())

diff --git a/assert/assertion.go b/assert/assertion.go
diff --git a/assert/common_test.go b/assert/common_test.go
diff --git a/assert/doc.go b/assert/doc.go
diff --git a/assert/ginkgo_test.go b/assert/ginkgo_test.go