Use new When() synonym

onsi · Jan 12, 2020 · acbca72 · acbca72
1 parent a31eda7
commit acbca72
Show file tree

Hide file tree

Showing 41 changed files with 175 additions and 175 deletions.
diff --git a/format/format_test.go b/format/format_test.go
@@ -338,13 +338,13 @@ var _ = Describe("Format", func() {
 		})
 
 		Describe("formatting []byte slices", func() {
-			Context("when the slice is made of printable bytes", func() {
+			When("the slice is made of printable bytes", func() {
 				It("should present it as string", func() {
 					b := []byte("a b c")
 					Expect(Object(b, 1)).Should(matchRegexp(`\[\]uint8 \| len:5, cap:\d+`, `a b c`))
 				})
 			})
-			Context("when the slice contains non-printable bytes", func() {
+			When("the slice contains non-printable bytes", func() {
 				It("should present it as slice", func() {
 					b := []byte("a b c\n\x01\x02\x03\xff\x1bH")
 					Expect(Object(b, 1)).Should(matchRegexp(`\[\]uint8 \| len:12, cap:\d+`, `\[97, 32, 98, 32, 99, 10, 1, 2, 3, 255, 27, 72\]`))
@@ -367,7 +367,7 @@ var _ = Describe("Format", func() {
 				Expect(Object(&a, 1)).Should(match(fmt.Sprintf("*int | %p", &a), "3"))
 			})
 
-			Context("when there are pointers to pointers...", func() {
+			When("there are pointers to pointers...", func() {
 				It("should recursively deference the pointer until it gets to a value", func() {
 					a := 3
 					var b *int
@@ -381,7 +381,7 @@ var _ = Describe("Format", func() {
 				})
 			})
 
-			Context("when the pointer points to nil", func() {
+			When("the pointer points to nil", func() {
 				It("should say nil and not explode", func() {
 					var a *AStruct
 					Expect(Object(a, 1)).Should(match("*format_test.AStruct | 0x0", "nil"))
@@ -409,7 +409,7 @@ var _ = Describe("Format", func() {
 				Expect(Object(s, 1)).Should(match("[]bool | len:3, cap:4", "[false, false, false]"))
 			})
 
-			Context("when the slice contains long entries", func() {
+			When("the slice contains long entries", func() {
 				It("should format the entries with newlines", func() {
 					w := []string{"Josiah Edward Bartlet", "Toby Ziegler", "CJ Cregg"}
 					expected := `[
@@ -430,7 +430,7 @@ var _ = Describe("Format", func() {
 				Expect(Object(m, 1)).Should(matchRegexp(`map\[int\]bool \| len:2`, hashMatchingRegexp("3: true", "4: false")))
 			})
 
-			Context("when the slice contains long entries", func() {
+			When("the slice contains long entries", func() {
 				It("should format the entries with newlines", func() {
 					m := map[string][]byte{}
 					m["Josiah Edward Bartlet"] = []byte("Martin Sheen")
@@ -459,7 +459,7 @@ var _ = Describe("Format", func() {
 				Expect(Object(s, 1)).Should(match("format_test.SimpleStruct", `{Name: "Oswald", Enumeration: 17, Veritas: true, Data: "datum", secret: 1983}`))
 			})
 
-			Context("when the struct contains long entries", func() {
+			When("the struct contains long entries", func() {
 				It("should format the entries with new lines", func() {
 					s := &SimpleStruct{
 						Name:        "Mithrandir Gandalf Greyhame",
@@ -635,13 +635,13 @@ var _ = Describe("Format", func() {
 			UseStringerRepresentation = false
 		})
 
-		Context("when passed a GoStringer", func() {
+		When("passed a GoStringer", func() {
 			It("should use what GoString() returns", func() {
 				Expect(Object(GoStringer{}, 1)).Should(ContainSubstring("<format_test.GoStringer>: go-string"))
 			})
 		})
 
-		Context("when passed a stringer", func() {
+		When("passed a stringer", func() {
 			It("should use what String() returns", func() {
 				Expect(Object(Stringer{}, 1)).Should(ContainSubstring("<format_test.Stringer>: string"))
 			})

diff --git a/gbytes/io_wrappers_test.go b/gbytes/io_wrappers_test.go
@@ -62,7 +62,7 @@ var _ = Describe("Io Wrappers", func() {
 			timeoutCloser = TimeoutCloser(innerCloser, 20*time.Millisecond)
 		})
 
-		Context("when the underlying Closer closes with no error", func() {
+		When("the underlying Closer closes with no error", func() {
 			BeforeEach(func() {
 				innerCloser = FakeCloser{}
 			})
@@ -72,7 +72,7 @@ var _ = Describe("Io Wrappers", func() {
 			})
 		})
 
-		Context("when the underlying Closer closes with an error", func() {
+		When("the underlying Closer closes with an error", func() {
 			BeforeEach(func() {
 				innerCloser = FakeCloser{err: fmt.Errorf("boom")}
 			})
@@ -82,7 +82,7 @@ var _ = Describe("Io Wrappers", func() {
 			})
 		})
 
-		Context("when the underlying Closer hangs", func() {
+		When("the underlying Closer hangs", func() {
 			BeforeEach(func() {
 				innerCloser = FakeCloser{
 					err:      fmt.Errorf("boom"),
@@ -104,7 +104,7 @@ var _ = Describe("Io Wrappers", func() {
 			timeoutReader = TimeoutReader(innerReader, 20*time.Millisecond)
 		})
 
-		Context("when the underlying Reader returns no error", func() {
+		When("the underlying Reader returns no error", func() {
 			BeforeEach(func() {
 				innerReader = FakeReader{}
 			})
@@ -118,7 +118,7 @@ var _ = Describe("Io Wrappers", func() {
 			})
 		})
 
-		Context("when the underlying Reader returns an error", func() {
+		When("the underlying Reader returns an error", func() {
 			BeforeEach(func() {
 				innerReader = FakeReader{err: fmt.Errorf("boom")}
 			})
@@ -130,7 +130,7 @@ var _ = Describe("Io Wrappers", func() {
 			})
 		})
 
-		Context("when the underlying Reader hangs", func() {
+		When("the underlying Reader hangs", func() {
 			BeforeEach(func() {
 				innerReader = FakeReader{err: fmt.Errorf("boom"), duration: time.Hour}
 			})
@@ -151,7 +151,7 @@ var _ = Describe("Io Wrappers", func() {
 			timeoutWriter = TimeoutWriter(innerWriter, 20*time.Millisecond)
 		})
 
-		Context("when the underlying Writer returns no error", func() {
+		When("the underlying Writer returns no error", func() {
 			BeforeEach(func() {
 				innerWriter = FakeWriter{}
 			})
@@ -163,7 +163,7 @@ var _ = Describe("Io Wrappers", func() {
 			})
 		})
 
-		Context("when the underlying Writer returns an error", func() {
+		When("the underlying Writer returns an error", func() {
 			BeforeEach(func() {
 				innerWriter = FakeWriter{err: fmt.Errorf("boom")}
 			})
@@ -174,7 +174,7 @@ var _ = Describe("Io Wrappers", func() {
 			})
 		})
 
-		Context("when the underlying Writer hangs", func() {
+		When("the underlying Writer hangs", func() {
 			BeforeEach(func() {
 				innerWriter = FakeWriter{err: fmt.Errorf("boom"), duration: time.Hour}
 			})

diff --git a/gbytes/say_matcher_test.go b/gbytes/say_matcher_test.go
@@ -25,7 +25,7 @@ var _ = Describe("SayMatcher", func() {
 		buffer.Write([]byte("abc"))
 	})
 
-	Context("when actual is not a gexec Buffer, or a BufferProvider", func() {
+	When("actual is not a gexec Buffer, or a BufferProvider", func() {
 		It("should error", func() {
 			failures := InterceptGomegaFailures(func() {
 				Expect("foo").Should(Say("foo"))
@@ -34,7 +34,7 @@ var _ = Describe("SayMatcher", func() {
 		})
 	})
 
-	Context("when a match is found", func() {
+	When("a match is found", func() {
 		It("should succeed", func() {
 			Expect(buffer).Should(Say("abc"))
 		})
@@ -60,12 +60,12 @@ var _ = Describe("SayMatcher", func() {
 		})
 	})
 
-	Context("when no match is found", func() {
+	When("no match is found", func() {
 		It("should not error", func() {
 			Expect(buffer).ShouldNot(Say("def"))
 		})
 
-		Context("when the buffer is closed", func() {
+		When("the buffer is closed", func() {
 			BeforeEach(func() {
 				buffer.Close()
 			})
@@ -97,7 +97,7 @@ var _ = Describe("SayMatcher", func() {
 		})
 	})
 
-	Context("when a positive match fails", func() {
+	When("a positive match fails", func() {
 		It("should report where it got stuck", func() {
 			Expect(buffer).Should(Say("abc"))
 			buffer.Write([]byte("def"))
@@ -109,7 +109,7 @@ var _ = Describe("SayMatcher", func() {
 		})
 	})
 
-	Context("when a negative match fails", func() {
+	When("a negative match fails", func() {
 		It("should report where it got stuck", func() {
 			failures := InterceptGomegaFailures(func() {
 				Expect(buffer).ShouldNot(Say("abc"))
@@ -120,7 +120,7 @@ var _ = Describe("SayMatcher", func() {
 		})
 	})
 
-	Context("when a match is not found", func() {
+	When("a match is not found", func() {
 		It("should not fastforward the buffer", func() {
 			Expect(buffer).ShouldNot(Say("def"))
 			Expect(buffer).Should(Say("abc"))
@@ -139,7 +139,7 @@ var _ = Describe("SayMatcher", func() {
 		})
 	})
 
-	Context("when actual is a BufferProvider", func() {
+	When("actual is a BufferProvider", func() {
 		It("should use actual's buffer", func() {
 			s := &speaker{
 				buffer: NewBuffer(),

diff --git a/gexec/build_test.go b/gexec/build_test.go
@@ -14,7 +14,7 @@ import (
 var packagePath = "./_fixture/firefly"
 
 var _ = Describe(".Build", func() {
-	Context("when there have been previous calls to Build", func() {
+	When("there have been previous calls to Build", func() {
 		BeforeEach(func() {
 			_, err := gexec.Build(packagePath)
 			Expect(err).ShouldNot(HaveOccurred())

diff --git a/gexec/session_test.go b/gexec/session_test.go
@@ -270,7 +270,7 @@ var _ = Describe("Session", func() {
 		})
 	})
 
-	Context("when the command exits", func() {
+	When("the command exits", func() {
 		It("should close the buffers", func() {
 			Eventually(session).Should(Exit())
 
@@ -292,7 +292,7 @@ var _ = Describe("Session", func() {
 		})
 	})
 
-	Context("when wrapping out and err", func() {
+	When("wrapping out and err", func() {
 		var (
 			outWriterBuffer, errWriterBuffer *Buffer
 		)
@@ -317,7 +317,7 @@ var _ = Describe("Session", func() {
 			Expect(errWriterBuffer.Contents()).Should(Equal(session.Err.Contents()))
 		})
 
-		Context("when discarding the output of the command", func() {
+		When("discarding the output of the command", func() {
 			BeforeEach(func() {
 				outWriter = ioutil.Discard
 				errWriter = ioutil.Discard

diff --git a/ghttp/test_server.go b/ghttp/test_server.go
@@ -37,8 +37,8 @@ A more comprehensive example is available at https://onsi.github.io/gomega/#_tes
 				))
 			})
 
-			Context("when requesting all sprockets", func() {
-				Context("when the response is successful", func() {
+			When("requesting all sprockets", func() {
+				When("the response is successful", func() {
 					BeforeEach(func() {
 						sprockets = []Sprocket{
 							NewSprocket("Alfalfa"),
@@ -51,7 +51,7 @@ A more comprehensive example is available at https://onsi.github.io/gomega/#_tes
 					})
 				})
 
-				Context("when the response is missing", func() {
+				When("the response is missing", func() {
 					BeforeEach(func() {
 						statusCode = http.StatusNotFound
 					})
@@ -61,7 +61,7 @@ A more comprehensive example is available at https://onsi.github.io/gomega/#_tes
 					})
 				})
 
-				Context("when the response fails to authenticate", func() {
+				When("the response fails to authenticate", func() {
 					BeforeEach(func() {
 						statusCode = http.StatusUnauthorized
 					})
@@ -73,7 +73,7 @@ A more comprehensive example is available at https://onsi.github.io/gomega/#_tes
 					})
 				})
 
-				Context("when the response is a server failure", func() {
+				When("the response is a server failure", func() {
 					BeforeEach(func() {
 						statusCode = http.StatusInternalServerError
 					})
@@ -86,7 +86,7 @@ A more comprehensive example is available at https://onsi.github.io/gomega/#_tes
 				})
 			})
 
-			Context("when requesting some sprockets", func() {
+			When("requesting some sprockets", func() {
 				BeforeEach(func() {
 					sprockets = []Sprocket{
 						NewSprocket("Alfalfa"),