grim/convey

Missed a bunch of updates on unit tests for the options update

2018-01-21, Gary Kramlich
2909e17deafe
Parents 821100c43641
Children 49fa7c253ba3
Missed a bunch of updates on unit tests for the options update
6 files changed, 38 insertions(+), 38 deletions(-)
  • +1 -1
    config/override_test.go
  • +2 -2
    loaders/convey/convey_test.go
  • +2 -2
    loaders/convey/default_plan_test.go
  • +4 -4
    loaders/convey/environment_test.go
  • +14 -14
    loaders/convey/extend_test.go
  • +15 -15
    loaders/convey/extends_test.go
    • --- a/config/override_test.go Mon Jan 15 22:15:08 2018 -0600
    +++ b/config/override_test.go Sun Jan 21 00:24:21 2018 -0600
    @@ -25,7 +25,7 @@
    type testLoader struct{}
    -func (l *testLoader) Load(path, base string, data []byte, disableDeprecated bool) (*Config, error) {
    +func (l *testLoader) Load(path, base string, data []byte, options []string, disableDeprecated bool) (*Config, error) {
    return nil, nil
    }
    --- a/loaders/convey/convey_test.go Mon Jan 15 22:15:08 2018 -0600
    +++ b/loaders/convey/convey_test.go Sun Jan 21 00:24:21 2018 -0600
    @@ -76,7 +76,7 @@
    l := Loader{}
    - _, err := l.Load(".", ".", []byte(data), true)
    + _, err := l.Load(".", ".", []byte(data), []string{}, true)
    Expect(err).To(MatchError(ErrNoTasks))
    }
    @@ -89,6 +89,6 @@
    l := Loader{}
    - _, err := l.Load(".", ".", []byte(data), true)
    + _, err := l.Load(".", ".", []byte(data), []string{}, true)
    Expect(err).To(MatchError(ErrNoPlans))
    }
    --- a/loaders/convey/default_plan_test.go Mon Jan 15 22:15:08 2018 -0600
    +++ b/loaders/convey/default_plan_test.go Sun Jan 21 00:24:21 2018 -0600
    @@ -54,7 +54,7 @@
    `
    l := Loader{}
    - cfg, err := l.Load(".", ".", []byte(data), true)
    + cfg, err := l.Load(".", ".", []byte(data), []string{}, true)
    Expect(err).To(BeNil())
    Expect(l.defaultPlan).To(Equal("overridden-plan"))
    @@ -74,7 +74,7 @@
    `
    l := Loader{}
    - cfg, err := l.Load(".", ".", []byte(data), true)
    + cfg, err := l.Load(".", ".", []byte(data), []string{}, true)
    Expect(err).To(BeNil())
    Expect(l.defaultPlan).To(Equal(""))
    --- a/loaders/convey/environment_test.go Mon Jan 15 22:15:08 2018 -0600
    +++ b/loaders/convey/environment_test.go Sun Jan 21 00:24:21 2018 -0600
    @@ -45,7 +45,7 @@
    ` + baseData
    loader := Loader{}
    - cfg, err := loader.Load(".", ".", []byte(data), true)
    + cfg, err := loader.Load(".", ".", []byte(data), []string{}, true)
    Expect(err).To(BeNil())
    Expect(cfg.Environment).To(ConsistOf([]string{"foo=bar", "baz"}))
    @@ -56,7 +56,7 @@
    ` + baseData
    loader := Loader{}
    - cfg, err := loader.Load(".", ".", []byte(data), true)
    + cfg, err := loader.Load(".", ".", []byte(data), []string{}, true)
    Expect(err).To(BeNil())
    Expect(cfg.Environment).To(Equal([]string{"foo=bar"}))
    @@ -64,7 +64,7 @@
    func (e *environmentSuite) TestEnvironmentUnmarshalGlobalOverrideSlice(t sweet.T) {
    loader := Loader{}
    - cfg, err := loader.Load(".", ".", []byte(baseData), true)
    + cfg, err := loader.Load(".", ".", []byte(baseData), []string{}, true)
    Expect(err).To(BeNil())
    Expect(cfg.Environment).To(BeEmpty())
    @@ -81,7 +81,7 @@
    func (e *environmentSuite) TestEnvironmentUnmarshalGlobalOverrideString(t sweet.T) {
    loader := Loader{}
    - cfg, err := loader.Load(".", ".", []byte(baseData), true)
    + cfg, err := loader.Load(".", ".", []byte(baseData), []string{}, true)
    Expect(err).To(BeNil())
    Expect(cfg.Environment).To(BeEmpty())
    --- a/loaders/convey/extend_test.go Mon Jan 15 22:15:08 2018 -0600
    +++ b/loaders/convey/extend_test.go Sun Jan 21 00:24:21 2018 -0600
    @@ -49,7 +49,7 @@
    `
    loader := &Loader{}
    - cfg, err := loader.Load(".", ".", []byte(data), true)
    + cfg, err := loader.Load(".", ".", []byte(data), []string{}, true)
    Expect(err).To(BeNil())
    Expect(cfg.Tasks).To(HaveLen(2))
    @@ -85,7 +85,7 @@
    `
    loader := &Loader{}
    - cfg, err := loader.Load(".", ".", []byte(data), true)
    + cfg, err := loader.Load(".", ".", []byte(data), []string{}, true)
    Expect(err).To(BeNil())
    Expect(cfg.Tasks).To(HaveLen(3))
    @@ -116,7 +116,7 @@
    `
    loader := &Loader{}
    - _, err := loader.Load(".", ".", []byte(data), true)
    + _, err := loader.Load(".", ".", []byte(data), []string{}, true)
    Expect(err).To(MatchError("The following tasks are part of a dependency cycle: a, b"))
    }
    @@ -133,7 +133,7 @@
    `
    loader := &Loader{}
    - _, err := loader.Load(".", ".", []byte(data), true)
    + _, err := loader.Load(".", ".", []byte(data), []string{}, true)
    Expect(err).To(MatchError("b: Extending undeclared task 'a'"))
    }
    @@ -167,11 +167,11 @@
    loader := &Loader{
    fileLoader: func(name string, c *Loader) (*cConfig.Config, error) {
    - return c.Load(".", name, []byte(baseData), true)
    + return c.Load(".", name, []byte(baseData), []string{}, true)
    },
    }
    - cfg, err := loader.Load(".", ".", []byte(extendedData), true)
    + cfg, err := loader.Load(".", ".", []byte(extendedData), []string{}, true)
    Expect(err).To(BeNil())
    Expect(cfg.Tasks).To(HaveLen(2))
    @@ -257,11 +257,11 @@
    "base2.yaml": data2,
    }
    - return c.Load(".", name, []byte(m[name]), true)
    + return c.Load(".", name, []byte(m[name]), []string{}, true)
    },
    }
    - cfg, err := loader.Load(".", ".", []byte(data3), true)
    + cfg, err := loader.Load(".", ".", []byte(data3), []string{}, true)
    Expect(err).To(BeNil())
    Expect(cfg.Plans).To(HaveLen(2))
    Expect(cfg.Plans).To(HaveKey("plan1"))
    @@ -310,11 +310,11 @@
    loader := &Loader{
    fileLoader: func(name string, c *Loader) (*cConfig.Config, error) {
    - return c.Load(".", name, []byte(data1), true)
    + return c.Load(".", name, []byte(data1), []string{}, true)
    },
    }
    - _, err := loader.Load(".", ".", []byte(data2), true)
    + _, err := loader.Load(".", ".", []byte(data2), []string{}, true)
    Expect(err).To(MatchError("cannot merge with unknown plan 'plan2'"))
    }
    @@ -349,11 +349,11 @@
    loader := &Loader{
    fileLoader: func(name string, c *Loader) (*cConfig.Config, error) {
    - return c.Load(".", name, []byte(data1), true)
    + return c.Load(".", name, []byte(data1), []string{}, true)
    },
    }
    - _, err := loader.Load(".", ".", []byte(data2), true)
    + _, err := loader.Load(".", ".", []byte(data2), []string{}, true)
    Expect(err).To(MatchError("cannot overwrite stage 'missing' in plan 'plan1' (no such stage in parent)"))
    }
    @@ -385,11 +385,11 @@
    loader := &Loader{
    fileLoader: func(name string, c *Loader) (*cConfig.Config, error) {
    - return c.Load(".", name, []byte(data1), true)
    + return c.Load(".", name, []byte(data1), []string{}, true)
    },
    }
    - cfg, err := loader.Load(".", ".", []byte(data2), true)
    + cfg, err := loader.Load(".", ".", []byte(data2), []string{}, true)
    Expect(err).To(BeNil())
    Expect(cfg.Plans["plan1"].Stages[0].Tasks).To(ConsistOf("foo"))
    Expect(cfg.Plans["plan1"].Environment).To(ConsistOf("FOO=BAR", "BAR=BONK"))
    --- a/loaders/convey/extends_test.go Mon Jan 15 22:15:08 2018 -0600
    +++ b/loaders/convey/extends_test.go Sun Jan 21 00:24:21 2018 -0600
    @@ -68,11 +68,11 @@
    loader := &Loader{
    fileLoader: func(name string, c *Loader) (*cConfig.Config, error) {
    - return c.Load(".", name, []byte(baseData), true)
    + return c.Load(".", name, []byte(baseData), []string{}, true)
    },
    }
    - cfg, err := loader.Load(".", ".", []byte(extendedData), true)
    + cfg, err := loader.Load(".", ".", []byte(extendedData), []string{}, true)
    Expect(err).To(BeNil())
    Expect(cfg.Environment).To(ConsistOf([]string{"x=1", "y=2", "z=3", "w=4"}))
    @@ -124,11 +124,11 @@
    loader := &Loader{
    fileLoader: func(name string, c *Loader) (*cConfig.Config, error) {
    - return c.Load(".", name, []byte(baseData), true)
    + return c.Load(".", name, []byte(baseData), []string{}, true)
    },
    }
    - cfg, err := loader.Load(".", ".", []byte(extendedData), true)
    + cfg, err := loader.Load(".", ".", []byte(extendedData), []string{}, true)
    Expect(err).To(BeNil())
    Expect(cfg.Environment).To(ConsistOf([]string{"x=1", "y=2", "z=4"}))
    @@ -173,11 +173,11 @@
    loader := &Loader{
    fileLoader: func(name string, c *Loader) (*cConfig.Config, error) {
    - return c.Load(".", name, []byte(baseData), true)
    + return c.Load(".", name, []byte(baseData), []string{}, true)
    },
    }
    - _, err := loader.Load(".", ".", []byte(extendedData), true)
    + _, err := loader.Load(".", ".", []byte(extendedData), []string{}, true)
    Expect(err).To(BeNil())
    Expect(loader.defaultPlan).To(Equal("plan2"))
    }
    @@ -202,11 +202,11 @@
    loader := &Loader{
    fileLoader: func(name string, c *Loader) (*cConfig.Config, error) {
    - return c.Load(".", name, []byte(baseData), true)
    + return c.Load(".", name, []byte(baseData), []string{}, true)
    },
    }
    - cfg, err := loader.Load(".", ".", []byte(extendedData), true)
    + cfg, err := loader.Load(".", ".", []byte(extendedData), []string{}, true)
    Expect(err).To(BeNil())
    Expect(cfg.Tasks).To(HaveLen(1))
    Expect(cfg.Tasks).To(HaveKey("foo"))
    @@ -220,11 +220,11 @@
    loader := &Loader{
    fileLoader: func(name string, c *Loader) (*cConfig.Config, error) {
    - return c.Load(".", name, []byte(baseData), true)
    + return c.Load(".", name, []byte(baseData), []string{}, true)
    },
    }
    - _, err := loader.Load(".", ".", []byte(extendedData), true)
    + _, err := loader.Load(".", ".", []byte(extendedData), []string{}, true)
    Expect(err).To(Equal(ErrNoTasks))
    }
    @@ -242,11 +242,11 @@
    loader := &Loader{
    fileLoader: func(name string, c *Loader) (*cConfig.Config, error) {
    - return c.Load(".", name, []byte(baseData), true)
    + return c.Load(".", name, []byte(baseData), []string{}, true)
    },
    }
    - cfg, err := loader.Load(".", ".", []byte(extendedData), true)
    + cfg, err := loader.Load(".", ".", []byte(extendedData), []string{}, true)
    Expect(err).To(Equal(ErrNoPlans))
    Expect(cfg.Tasks).To(HaveLen(1))
    Expect(cfg.Tasks).To(HaveKey("foo"))
    @@ -259,11 +259,11 @@
    loader := &Loader{
    fileLoader: func(name string, c *Loader) (*cConfig.Config, error) {
    - return c.Load(".", name, []byte(sameData), true)
    + return c.Load(".", name, []byte(sameData), []string{}, true)
    },
    }
    - _, err := loader.Load(".", ".", []byte(sameData), true)
    + _, err := loader.Load(".", ".", []byte(sameData), []string{}, true)
    Expect(err).To(Equal(ErrMaxExtendsDepth))
    }
    @@ -281,6 +281,6 @@
    },
    }
    - loader.Load(".", ".", []byte(data), true)
    + loader.Load(".", ".", []byte(data), []string{}, true)
    Expect(calledWith).To(Equal("../base.yaml"))
    }