diff --git a/roles/home/aichat.nix b/roles/home/aichat.nix index 495e662..39d6939 100644 --- a/roles/home/aichat.nix +++ b/roles/home/aichat.nix @@ -111,21 +111,118 @@ roles = '' ### INPUT: - diff --git a/ci/entrypoint.sh b/ci/entrypoint.sh - index 03a7870..50bc7f0 100755 - --- a/ci/entrypoint.sh - +++ b/ci/entrypoint.sh - @@ -181,7 +181,7 @@ ts_build_directory() { + diff --git a/structs/routing_test.go b/structs/routing_test.go + index 2e19254..04191cc 100644 + --- a/structs/routing_test.go + +++ b/structs/routing_test.go + @@ -3,7 +3,7 @@ package structs_test + import ( + "testing" + + - "github.com/stretchr/testify/assert" + + "github.com/stretchr/testify/require" + "github.pie.apple.com/kerosene/Core/structs" + "gorm.io/datatypes" + ) + @@ -15,18 +15,18 @@ func TestNewRoutingBuilder(t *testing.T) { + scheme := "http" + + builder, err := structs.NewRoutingBuilder(name, proxy, port, scheme) + - assert.NoError(t, err) + + require.NoError(t, err) + + routing, err := builder.Build() + - assert.NoError(t, err) + - + - assert.Equal(t, name, routing.Name) + - assert.Equal(t, proxy, routing.Proxy) + - assert.Equal(t, port, routing.Port) + - assert.Equal(t, scheme, routing.Scheme) + - assert.Equal(t, datatypes.JSON(`[]`), routing.NameServers) + - assert.Nil(t, routing.Providers) + - assert.Nil(t, routing.Assets) + + require.NoError(t, err) + + + + require.Equal(t, name, routing.Name) + + require.Equal(t, proxy, routing.Proxy) + + require.Equal(t, port, routing.Port) + + require.Equal(t, scheme, routing.Scheme) + + require.Equal(t, datatypes.JSON(`[]`), routing.NameServers) + + require.Nil(t, routing.Providers) + + require.Nil(t, routing.Assets) } - - prep_go() { - - go download && go mod tidy - + go mod download && go mod tidy + + func TestRoutingBuilderMethods(t *testing.T) { + @@ -39,7 +39,7 @@ func TestRoutingBuilderMethods(t *testing.T) { + assets := []structs.Asset{} + + builder, err := structs.NewRoutingBuilder(name, proxy, port, scheme) + - assert.NoError(t, err) + + require.NoError(t, err) + + routing, err := builder. + WithProviders(providers). + @@ -47,38 +47,24 @@ func TestRoutingBuilderMethods(t *testing.T) { + WithAssets(assets). + Build() + + - assert.NoError(t, err) + - assert.Equal(t, providers, routing.Providers) + - assert.Equal(t, nameServers, routing.NameServers) + - assert.Equal(t, assets, routing.Assets) + + require.NoError(t, err) + + require.Equal(t, providers, routing.Providers) + + require.Equal(t, nameServers, routing.NameServers) + + require.Equal(t, assets, routing.Assets) + } + + -// func TestRoutingBuilderValidation(t *testing.T) { + -// builder, err := structs.NewRoutingBuilder("exampleName", "exampleProxy", 8080, "http") + -// assert.NoError(t, err) + - + -// // Test successful build + -// routing, err := builder.Build() + -// assert.NoError(t, err) + -// assert.NotNil(t, routing) + - + -// // Test invalid build with missing required fields + -// builder.routing.Name = "" + -// routing, err = builder.Build() + -// assert.Error(t, err) + -// assert.Nil(t, routing) + -// } + - + func TestRoutingBuilderSanityChecks(t *testing.T) { + + t.Parallel() + + + _, err := structs.NewRoutingBuilder("", "exampleProxy", 8080, "http") + - assert.Error(t, err) + - assert.Equal(t, structs.ErrInvalidName, err) + + require.Error(t, err) + + require.Equal(t, structs.ErrInvalidName, err) + + _, err = structs.NewRoutingBuilder("exampleName", "", 8080, "http") + - assert.Error(t, err) + - assert.Equal(t, structs.ErrInvalidProxy, err) + + require.Error(t, err) + + require.Equal(t, structs.ErrInvalidProxy, err) + + _, err = structs.NewRoutingBuilder("exampleName", "exampleProxy", 8080, "") + - assert.Error(t, err) + - assert.Equal(t, structs.ErrInvalidScheme, err) + + require.Error(t, err) + + require.Equal(t, structs.ErrInvalidScheme, err) } ### OUTPUT: - fix (cicd): Modified `prep_go()` to use `go mod download` instead of `go download` + refactor(structs_tests): update test assertion library to 'require' and refactor tests for better readability + + - Replaced the 'assert' library with 'require' in routing_test.go + - Refined code formatting and added comments + - Removed commented out test functions + - Added `t.Parallel()` + - name: createpr prompt: |-