Merge pull request #434 from mezis/blur-specify

Also process FSpecify and FWhen when unfocusing
onsi · Feb 16, 2018 · 9008c7b · 9008c7b
2 parents ae6829d + ee65bdb
commit 9008c7b
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 4 deletions.
diff --git a/ginkgo/unfocus_command.go b/ginkgo/unfocus_command.go
@@ -26,6 +26,8 @@ func unfocusSpecs([]string, []string) {
 	unfocus("Measure")
 	unfocus("DescribeTable")
 	unfocus("Entry")
+	unfocus("Specify")
+	unfocus("When")
 }
 
 func unfocus(component string) {

diff --git a/integration/_fixtures/focused_fixture/focused_fixture_test.go b/integration/_fixtures/focused_fixture/focused_fixture_test.go
@@ -18,10 +18,20 @@ var _ = Describe("FocusedFixture", func() {
 		})
 	})
 
+	FWhen("focused", func() {
+		It("focused", func() {
+
+		})
+	})
+
 	FIt("focused", func() {
 
 	})
 
+	FSpecify("focused", func() {
+
+	})
+
 	FMeasure("focused", func(b Benchmarker) {
 
 	}, 2)

diff --git a/integration/subcommand_test.go b/integration/subcommand_test.go
@@ -354,17 +354,17 @@ var _ = Describe("Subcommand", func() {
 			Eventually(session).Should(gexec.Exit(types.GINKGO_FOCUS_EXIT_CODE))
 			output := session.Out.Contents()
 
-			Ω(output).Should(ContainSubstring("6 Passed"))
-			Ω(output).Should(ContainSubstring("5 Skipped"))
+			Ω(string(output)).Should(ContainSubstring("8 Passed"))
+			Ω(string(output)).Should(ContainSubstring("5 Skipped"))
 
 			session = startGinkgo(pathToTest, "blur")
 			Eventually(session).Should(gexec.Exit(0))
 
 			session = startGinkgo(pathToTest, "--noColor")
 			Eventually(session).Should(gexec.Exit(0))
 			output = session.Out.Contents()
-			Ω(output).Should(ContainSubstring("11 Passed"))
-			Ω(output).Should(ContainSubstring("0 Skipped"))
+			Ω(string(output)).Should(ContainSubstring("13 Passed"))
+			Ω(string(output)).Should(ContainSubstring("0 Skipped"))
 		})
 	})