1 files changed, 15 insertions, 11 deletions

diff --git a/config/config_test.go b/config/config_test.go
index f6b6c1e..98e91a7 100644
--- a/config/config_test.go
+++ b/config/config_test.go
@@ -8,7 +8,7 @@ import (
 	"phabricator.wikimedia.org/source/blubber/config"
 )
 
-func TestConfig(t *testing.T) {
+func TestConfigYAML(t *testing.T) {
 	cfg, err := config.ReadConfig([]byte(`---
     version: v1
     variants:
@@ -24,21 +24,25 @@ func TestConfig(t *testing.T) {
 func TestConfigValidation(t *testing.T) {
 	t.Run("variants", func(t *testing.T) {
 		t.Run("ok", func(t *testing.T) {
-			_, err := config.ReadConfig([]byte(`---
-        version: v1
-        variants:
-          build: {}
-          foo: {}`))
+			err := config.Validate(config.Config{
+				VersionConfig: config.VersionConfig{Version: "v1"},
+				Variants: map[string]config.VariantConfig{
+					"build": config.VariantConfig{},
+					"foo":   config.VariantConfig{},
+				},
+			})
 
 			assert.False(t, config.IsValidationError(err))
 		})
 
 		t.Run("bad", func(t *testing.T) {
-			_, err := config.ReadConfig([]byte(`---
-        version: v1
-        variants:
-          build foo: {}
-          foo bar: {}`))
+			err := config.Validate(config.Config{
+				VersionConfig: config.VersionConfig{Version: "v1"},
+				Variants: map[string]config.VariantConfig{
+					"build foo": config.VariantConfig{},
+					"foo bar":   config.VariantConfig{},
+				},
+			})
 
 			if assert.True(t, config.IsValidationError(err)) {
 				msg := config.HumanizeValidationError(err)