From 4730b7074f073258e31cbe0c9e2ff2bdd0ff3f5c Mon Sep 17 00:00:00 2001 From: Maxim Lebedev Date: Sat, 17 Feb 2024 00:30:24 +0600 Subject: [PATCH] :art: Used special domains in test objects See https://datatracker.ietf.org/doc/html/rfc6761#section-6.2 --- internal/domain/site.go | 8 ++++---- internal/server/usecase/server_ucase_test.go | 12 +++++++----- .../http/testdata/TestHandler_ServeHTTP.golden | 2 +- 3 files changed, 12 insertions(+), 10 deletions(-) diff --git a/internal/domain/site.go b/internal/domain/site.go index aa19880..d57ce19 100644 --- a/internal/domain/site.go +++ b/internal/domain/site.go @@ -43,7 +43,7 @@ func TestSite(tb testing.TB) *Site { DefaultLanguage: en, Language: ru, Languages: []Language{en, ru}, - BaseURL: &url.URL{Scheme: "https", Host: "example.com", Path: "/"}, + BaseURL: &url.URL{Scheme: "https", Host: "test.web.site", Path: "/"}, TimeZone: time.UTC, File: NewPath(filepath.Join("content", "index.en.md")), Title: "Testing", @@ -76,8 +76,8 @@ func TestSite(tb testing.TB) *Site { "headers": []any{map[string]any{ "path": "/**", "values": map[string]any{ - "Link": `; rel="indieauth-metadata", ` + - `; rel="micropub"`, + "Link": `; rel="indieauth-metadata", ` + + `; rel="micropub"`, "X-Koroko": "Ya-ha-ha!", }, }, map[string]any{ @@ -92,7 +92,7 @@ func TestSite(tb testing.TB) *Site { "status": 302, }, map[string]any{ "from": "/foo", - "to": "https://example.com/", + "to": "https://test.redirect.site/", "status": 301, "force": true, }}, diff --git a/internal/server/usecase/server_ucase_test.go b/internal/server/usecase/server_ucase_test.go index f8a0e09..e81ad8c 100644 --- a/internal/server/usecase/server_ucase_test.go +++ b/internal/server/usecase/server_ucase_test.go @@ -8,14 +8,16 @@ import ( "source.toby3d.me/toby3d/home/internal/domain" "source.toby3d.me/toby3d/home/internal/server/usecase" + "source.toby3d.me/toby3d/home/internal/site/repository/stub" ) func TestDo(t *testing.T) { t.Parallel() - site := domain.TestSite(t) + testSite := domain.TestSite(t) - actual, err := usecase.NewServerUseCase().Do(context.Background(), site) + actual, err := usecase.NewServerUseCase(stub.NewStubSiteRepository(testSite, nil)). + Do(context.Background(), testSite.Language) if err != nil { t.Fatal(err) } @@ -24,8 +26,8 @@ func TestDo(t *testing.T) { Headers: []domain.Header{{ Path: "/**", Values: map[string]string{ - "Link": `; rel="indieauth-metadata", ` + - `; rel="micropub"`, + "Link": `; rel="indieauth-metadata", ` + + `; rel="micropub"`, "X-Koroko": "Ya-ha-ha!", }, }, { @@ -41,7 +43,7 @@ func TestDo(t *testing.T) { Force: false, }, { From: "/foo", - To: "https://example.com/", + To: "https://test.redirect.site/", Status: 301, Force: true, }}, diff --git a/internal/webfinger/delivery/http/testdata/TestHandler_ServeHTTP.golden b/internal/webfinger/delivery/http/testdata/TestHandler_ServeHTTP.golden index 368f2aa..58fa407 100755 --- a/internal/webfinger/delivery/http/testdata/TestHandler_ServeHTTP.golden +++ b/internal/webfinger/delivery/http/testdata/TestHandler_ServeHTTP.golden @@ -1 +1 @@ -{"subject":"acct:user@example.com","links":[{"rel":"self","type":"application/activity+json","href":"https://example.com/"},{"rel":"http://webfinger.net/rel/profile-page","type":"text/html","href":"https://example.com/"},{"rel":"http://webfinger.net/rel/avatar","type":"image/jpeg","href":"https://example.com/logo.jpg"}]} +{"subject":"acct:user@test.web.site","links":[{"rel":"self","type":"application/activity+json","href":"https://test.web.site/"},{"rel":"http://webfinger.net/rel/profile-page","type":"text/html","href":"https://test.web.site/"},{"rel":"http://webfinger.net/rel/avatar","type":"image/jpeg","href":"https://test.web.site/"}]}