fix: allow integration tests to run from anywhere (#1593)

fixes #1384 - exposes DSL steps as public for use in other packages - modify the `integration test` just command to search for dirs containing the integration test tag
block · May 30, 2024 · 0381efa · 0381efa
1 parent f2597eb
commit 0381efa
Show file tree

Hide file tree

Showing 10 changed files with 354 additions and 333 deletions.
diff --git a/Justfile b/Justfile
@@ -114,7 +114,7 @@ integration-tests *test:
   #!/bin/bash
   set -euo pipefail
   testName=${1:-}
-  go test -fullpath -count 1 -v -tags integration -run "$testName" ./integration ./backend/controller/cronjobs
+  go test -fullpath -count 1 -v -tags integration -run "$testName" ./...
 
 # Run README doc tests
 test-readme *args:
@@ -138,4 +138,4 @@ lint-frontend: build-frontend
 
 # Lint the backend
 lint-backend:
-  @golangci-lint run ./...
+  @golangci-lint run ./...
diff --git a/backend/controller/ingress/ingress_integration_test.go b/backend/controller/ingress/ingress_integration_test.go
@@ -0,0 +1,116 @@
+//go:build integration
+
+package ingress_test
+
+import (
+	"net/http"
+	"testing"
+
+	"github.com/alecthomas/assert/v2"
+	"github.com/alecthomas/repr"
+
+	in "github.com/TBD54566975/ftl/integration"
+)
+
+func TestHttpIngress(t *testing.T) {
+	in.Run(t, "",
+		in.CopyModule("httpingress"),
+		in.Deploy("httpingress"),
+		in.HttpCall(http.MethodGet, "/users/123/posts/456", in.JsonData(t, in.Obj{}), func(t testing.TB, resp *in.HTTPResponse) {
+			assert.Equal(t, 200, resp.Status)
+			assert.Equal(t, []string{"Header from FTL"}, resp.Headers["Get"])
+			assert.Equal(t, []string{"application/json; charset=utf-8"}, resp.Headers["Content-Type"])
+
+			message, ok := resp.JsonBody["msg"].(string)
+			assert.True(t, ok, "msg is not a string: %s", repr.String(resp.JsonBody))
+			assert.Equal(t, "UserID: 123, PostID: 456", message)
+
+			nested, ok := resp.JsonBody["nested"].(map[string]any)
+			assert.True(t, ok, "nested is not a map: %s", repr.String(resp.JsonBody))
+			goodStuff, ok := nested["good_stuff"].(string)
+			assert.True(t, ok, "good_stuff is not a string: %s", repr.String(resp.JsonBody))
+			assert.Equal(t, "This is good stuff", goodStuff)
+		}),
+		in.HttpCall(http.MethodPost, "/users", in.JsonData(t, in.Obj{"userId": 123, "postId": 345}), func(t testing.TB, resp *in.HTTPResponse) {
+			assert.Equal(t, 201, resp.Status)
+			assert.Equal(t, []string{"Header from FTL"}, resp.Headers["Post"])
+			success, ok := resp.JsonBody["success"].(bool)
+			assert.True(t, ok, "success is not a bool: %s", repr.String(resp.JsonBody))
+			assert.True(t, success)
+		}),
+		// contains aliased field
+		in.HttpCall(http.MethodPost, "/users", in.JsonData(t, in.Obj{"user_id": 123, "postId": 345}), func(t testing.TB, resp *in.HTTPResponse) {
+			assert.Equal(t, 201, resp.Status)
+		}),
+		in.HttpCall(http.MethodPut, "/users/123", in.JsonData(t, in.Obj{"postId": "346"}), func(t testing.TB, resp *in.HTTPResponse) {
+			assert.Equal(t, 200, resp.Status)
+			assert.Equal(t, []string{"Header from FTL"}, resp.Headers["Put"])
+			assert.Equal(t, map[string]any{}, resp.JsonBody)
+		}),
+		in.HttpCall(http.MethodDelete, "/users/123", in.JsonData(t, in.Obj{}), func(t testing.TB, resp *in.HTTPResponse) {
+			assert.Equal(t, 200, resp.Status)
+			assert.Equal(t, []string{"Header from FTL"}, resp.Headers["Delete"])
+			assert.Equal(t, map[string]any{}, resp.JsonBody)
+		}),
+
+		in.HttpCall(http.MethodGet, "/html", in.JsonData(t, in.Obj{}), func(t testing.TB, resp *in.HTTPResponse) {
+			assert.Equal(t, 200, resp.Status)
+			assert.Equal(t, []string{"text/html; charset=utf-8"}, resp.Headers["Content-Type"])
+			assert.Equal(t, "<html><body><h1>HTML Page From FTL 🚀!</h1></body></html>", string(resp.BodyBytes))
+		}),
+
+		in.HttpCall(http.MethodPost, "/bytes", []byte("Hello, World!"), func(t testing.TB, resp *in.HTTPResponse) {
+			assert.Equal(t, 200, resp.Status)
+			assert.Equal(t, []string{"application/octet-stream"}, resp.Headers["Content-Type"])
+			assert.Equal(t, []byte("Hello, World!"), resp.BodyBytes)
+		}),
+
+		in.HttpCall(http.MethodGet, "/empty", nil, func(t testing.TB, resp *in.HTTPResponse) {
+			assert.Equal(t, 200, resp.Status)
+			assert.Equal(t, nil, resp.Headers["Content-Type"])
+			assert.Equal(t, nil, resp.BodyBytes)
+		}),
+
+		in.HttpCall(http.MethodGet, "/string", []byte("Hello, World!"), func(t testing.TB, resp *in.HTTPResponse) {
+			assert.Equal(t, 200, resp.Status)
+			assert.Equal(t, []string{"text/plain; charset=utf-8"}, resp.Headers["Content-Type"])
+			assert.Equal(t, []byte("Hello, World!"), resp.BodyBytes)
+		}),
+
+		in.HttpCall(http.MethodGet, "/int", []byte("1234"), func(t testing.TB, resp *in.HTTPResponse) {
+			assert.Equal(t, 200, resp.Status)
+			assert.Equal(t, []string{"text/plain; charset=utf-8"}, resp.Headers["Content-Type"])
+			assert.Equal(t, []byte("1234"), resp.BodyBytes)
+		}),
+		in.HttpCall(http.MethodGet, "/float", []byte("1234.56789"), func(t testing.TB, resp *in.HTTPResponse) {
+			assert.Equal(t, 200, resp.Status)
+			assert.Equal(t, []string{"text/plain; charset=utf-8"}, resp.Headers["Content-Type"])
+			assert.Equal(t, []byte("1234.56789"), resp.BodyBytes)
+		}),
+		in.HttpCall(http.MethodGet, "/bool", []byte("true"), func(t testing.TB, resp *in.HTTPResponse) {
+			assert.Equal(t, 200, resp.Status)
+			assert.Equal(t, []string{"text/plain; charset=utf-8"}, resp.Headers["Content-Type"])
+			assert.Equal(t, []byte("true"), resp.BodyBytes)
+		}),
+		in.HttpCall(http.MethodGet, "/error", nil, func(t testing.TB, resp *in.HTTPResponse) {
+			assert.Equal(t, 500, resp.Status)
+			assert.Equal(t, []string{"text/plain; charset=utf-8"}, resp.Headers["Content-Type"])
+			assert.Equal(t, []byte("Error from FTL"), resp.BodyBytes)
+		}),
+		in.HttpCall(http.MethodGet, "/array/string", in.JsonData(t, []string{"hello", "world"}), func(t testing.TB, resp *in.HTTPResponse) {
+			assert.Equal(t, 200, resp.Status)
+			assert.Equal(t, []string{"application/json; charset=utf-8"}, resp.Headers["Content-Type"])
+			assert.Equal(t, in.JsonData(t, []string{"hello", "world"}), resp.BodyBytes)
+		}),
+		in.HttpCall(http.MethodPost, "/array/data", in.JsonData(t, []in.Obj{{"item": "a"}, {"item": "b"}}), func(t testing.TB, resp *in.HTTPResponse) {
+			assert.Equal(t, 200, resp.Status)
+			assert.Equal(t, []string{"application/json; charset=utf-8"}, resp.Headers["Content-Type"])
+			assert.Equal(t, in.JsonData(t, []in.Obj{{"item": "a"}, {"item": "b"}}), resp.BodyBytes)
+		}),
+		in.HttpCall(http.MethodGet, "/typeenum", in.JsonData(t, in.Obj{"name": "A", "value": "hello"}), func(t testing.TB, resp *in.HTTPResponse) {
+			assert.Equal(t, 200, resp.Status)
+			assert.Equal(t, []string{"application/json; charset=utf-8"}, resp.Headers["Content-Type"])
+			assert.Equal(t, in.JsonData(t, in.Obj{"name": "A", "value": "hello"}), resp.BodyBytes)
+		}),
+	)
+}
diff --git a/integration/testdata/go/httpingress/ftl.toml → .../ingress/testdata/go/httpingress/ftl.toml b/integration/testdata/go/httpingress/ftl.toml → .../ingress/testdata/go/httpingress/ftl.toml
diff --git a/integration/testdata/go/httpingress/go.mod → ...er/ingress/testdata/go/httpingress/go.mod b/integration/testdata/go/httpingress/go.mod → ...er/ingress/testdata/go/httpingress/go.mod
diff --git a/integration/testdata/go/httpingress/go.sum → ...er/ingress/testdata/go/httpingress/go.sum b/integration/testdata/go/httpingress/go.sum → ...er/ingress/testdata/go/httpingress/go.sum
diff --git a/...on/testdata/go/httpingress/httpingress.go → ...ss/testdata/go/httpingress/httpingress.go b/...on/testdata/go/httpingress/httpingress.go → ...ss/testdata/go/httpingress/httpingress.go