consolidated some integration tests (redhat-developer#3835)

* consolidated some integration tests

* used better spec titles

* added cmpName in the push

* Added other spec

* reverted the consolidation

tests/integration/devfile/cmd_devfile_test_test.go

@@ -44,15 +44,22 @@ var _ = Describe("odo devfile test command tests", func() {
 
 	Context("Should show proper errors", func() {
 
-		It("should show error if component is not pushed", func() {
+		// used ";" as consolidating symbol as this spec covers multiple scenerios
+		It("should show error if component is not pushed; should error out if a non-existent command or a command from wrong group is specified", func() {
 			helper.CmdShouldPass("odo", "create", "nodejs", "--project", namespace, cmpName)
 
 			helper.CopyExample(filepath.Join("source", "devfiles", "nodejs", "project"), context)
 			helper.CopyExampleDevFile(filepath.Join("source", "devfiles", "nodejs", "devfile-with-testgroup.yaml"), filepath.Join(context, "devfile.yaml"))
 
 			output := helper.CmdShouldFail("odo", "test", "--context", context)
-
 			Expect(output).To(ContainSubstring("error occurred while getting the pod: pod not found for the selector"))
+
+			helper.CmdShouldPass("odo", "push", "--context", context)
+			output = helper.CmdShouldFail("odo", "test", "--test-command", "invalidcmd", "--context", context)
+			Expect(output).To(ContainSubstring("not found in the devfile"))
+
+			output = helper.CmdShouldFail("odo", "test", "--test-command", "devrun", "--context", context)
+			Expect(output).To(ContainSubstring("command devrun is of group run in devfile.yaml"))
 		})
 
 		It("should show error if no test group is defined", func() {
@@ -66,28 +73,6 @@ var _ = Describe("odo devfile test command tests", func() {
 			Expect(output).To(ContainSubstring("the command group of kind \"test\" is not found in the devfile"))
 		})
 
-		It("should show error if specify non-exist command", func() {
-			helper.CmdShouldPass("odo", "create", "nodejs", "--context", context, cmpName)
-
-			helper.CopyExample(filepath.Join("source", "devfiles", "nodejs", "project"), context)
-			helper.CopyExampleDevFile(filepath.Join("source", "devfiles", "nodejs", "devfile-with-testgroup.yaml"), filepath.Join(context, "devfile.yaml"))
-			helper.CmdShouldPass("odo", "push", "--context", context)
-			output := helper.CmdShouldFail("odo", "test", "--test-command", "invalidcmd", "--context", context)
-
-			Expect(output).To(ContainSubstring("not found in the devfile"))
-		})
-
-		It("should show error if command from another group", func() {
-			helper.CmdShouldPass("odo", "create", "nodejs", "--context", context, cmpName)
-
-			helper.CopyExample(filepath.Join("source", "devfiles", "nodejs", "project"), context)
-			helper.CopyExampleDevFile(filepath.Join("source", "devfiles", "nodejs", "devfile-with-testgroup.yaml"), filepath.Join(context, "devfile.yaml"))
-			helper.CmdShouldPass("odo", "push", "--context", context)
-			output := helper.CmdShouldFail("odo", "test", "--test-command", "devrun", "--context", context)
-
-			Expect(output).To(ContainSubstring("command devrun is of group run in devfile.yaml"))
-		})
-
 		It("should show error if devfile has no default test command", func() {
 			helper.CmdShouldPass("odo", "create", "nodejs", "--context", context, cmpName)
 			helper.CopyExample(filepath.Join("source", "devfiles", "nodejs", "project"), context)