added test to verify issue 169 is also fixed

geofffranks · Jul 7, 2017 · 84c949d · 84c949d
1 parent 34a3cc1
commit 84c949d
Show file tree

Hide file tree

Showing 2 changed files with 43 additions and 0 deletions.
diff --git a/assets/cartesian-product/can-be-grabbed.yml b/assets/cartesian-product/can-be-grabbed.yml
@@ -0,0 +1,17 @@
+meta:
+  fast-tests:
+    - isolation
+  slow-tests:
+    - integration
+  master-fast-tests:
+    (( cartesian-product "master-" meta.fast-tests "-tests" ))
+  master-slow-tests:
+    - (( concat "master-" meta.slow-tests.0 "-tests" ))
+
+groups:
+- name: master
+  jobs: (( grab
+             meta.master-fast-tests
+             meta.master-slow-tests
+             "master-dependencies-test"
+             "master-docker-build" ))
diff --git a/cmd/spruce/main_test.go b/cmd/spruce/main_test.go
@@ -1606,6 +1606,32 @@ ips_with_port:
 - 2.2.3.4:80
 join_ips_with_port: 1.2.3.4:80,2.2.3.4:80
 
+`)
+		})
+
+		Convey("Issue #169 - Cartesian Product should produce a []interface{}", func() {
+			os.Args = []string{"spruce", "merge", "../../assets/cartesian-product/can-be-grabbed.yml"}
+			stdout = ""
+			stderr = ""
+			main()
+			So(stderr, ShouldEqual, "")
+			So(stdout, ShouldEqual, `groups:
+- jobs:
+  - master-isolation-tests
+  - master-integration-tests
+  - master-dependencies-test
+  - master-docker-build
+  name: master
+meta:
+  fast-tests:
+  - isolation
+  master-fast-tests:
+  - master-isolation-tests
+  master-slow-tests:
+  - master-integration-tests
+  slow-tests:
+  - integration
+
 `)
 		})
 	})