grim/convey

2c556d830e25
Parents 1119d9808a3f
Children b45750ddbe7c
Fix bad tests (was not prefixed with Test).
--- a/loaders/convey/extends_test.go Sun Sep 17 18:13:50 2017 -0500
+++ b/loaders/convey/extends_test.go Sun Sep 17 18:33:54 2017 -0500
@@ -136,9 +136,10 @@
Expect(cfg.Plans["plan1"].Stages[0].Tasks).To(BeEquivalentTo([]string{"foo", "baz"}))
}
-func (d *extendsSuite) ExtendDefault(t sweet.T) {
+func (d *extendsSuite) TestExtendDefault(t sweet.T) {
baseData := `
-default: plan1
+options:
+ default-plan: plan1
tasks:
foo:
image: imaginary1
@@ -150,7 +151,8 @@
extendedData := `
extends: base.yaml
-default: plan2
+options:
+ default-plan: plan2
tasks:
bar:
image: imaginary1
@@ -171,9 +173,10 @@
Expect(loader.defaultPlan).To(Equal("plan2"))
}
-func (d *extendsSuite) ExtendTasksOnly(t sweet.T) {
+func (d *extendsSuite) TestExtendTasksOnly(t sweet.T) {
baseData := `
-default: plan1
+options:
+ default-plan: plan1
tasks:
foo:
image: imaginary1
@@ -197,20 +200,9 @@
Expect(err).To(BeNil())
}
-func (d *extendsSuite) ExtendNoPlans(t sweet.T) {
- baseData := `
-default: plan1
-tasks:
- foo:
- image: imaginary1
-`
-
- extendedData := `
-extends: base.yaml
-tasks:
- bar:
- image: imaginary2
-`
+func (d *extendsSuite) TestExtendNoTasks(t sweet.T) {
+ baseData := ``
+ extendedData := `extends: base.yml`
loader := &Loader{
fileLoader: func(name string, c *Loader) (*cConfig.Config, error) {
@@ -222,6 +214,27 @@
Expect(err).To(Equal(ErrNoTasks))
}
+func (d *extendsSuite) TestExtendNoPlans(t sweet.T) {
+ baseData := `
+options:
+ default-plan: plan1
+tasks:
+ foo:
+ image: imaginary1
+`
+
+ extendedData := `extends: base.yaml`
+
+ loader := &Loader{
+ fileLoader: func(name string, c *Loader) (*cConfig.Config, error) {
+ return c.Load(".", name, []byte(baseData))
+ },
+ }
+
+ _, err := loader.Load(".", ".", []byte(extendedData))
+ Expect(err).To(Equal(ErrNoPlans))
+}
+
func (d *extendsSuite) TestLoop(t sweet.T) {
sameData := `
extends: convey.yaml