From 2ed4e3e307f03b7a7a0dd626cfcf7e9b000e2ebe Mon Sep 17 00:00:00 2001 From: DAI Mingchen Date: Thu, 25 Jul 2024 11:48:00 +0000 Subject: [PATCH] resolved WARN NoEmptyContinuation (grammar mistakes), and removed trivial unit test for hCAPTCHA --- Dockerfile.rootless | 2 +- modules/hcaptcha/hcaptcha_test.go | 106 ------------------------------ 2 files changed, 1 insertion(+), 107 deletions(-) delete mode 100644 modules/hcaptcha/hcaptcha_test.go diff --git a/Dockerfile.rootless b/Dockerfile.rootless index 7101c27aad..95ba43937a 100644 --- a/Dockerfile.rootless +++ b/Dockerfile.rootless @@ -41,7 +41,7 @@ RUN if [ -n "${GITEA_VERSION}" ]; then \ && make clean-all build \ && echo "-------------------" \ && echo " BUILD SUCCESS" \ - && echo "-------------------" \ + && echo "-------------------" # Begin env-to-ini build RUN go build contrib/environment-to-ini/environment-to-ini.go diff --git a/modules/hcaptcha/hcaptcha_test.go b/modules/hcaptcha/hcaptcha_test.go deleted file mode 100644 index 55e01ec535..0000000000 --- a/modules/hcaptcha/hcaptcha_test.go +++ /dev/null @@ -1,106 +0,0 @@ -// Copyright 2023 The Gitea Authors. All rights reserved. -// SPDX-License-Identifier: MIT - -package hcaptcha - -import ( - "net/http" - "os" - "strings" - "testing" - "time" -) - -const ( - dummySiteKey = "10000000-ffff-ffff-ffff-000000000001" - dummySecret = "0x0000000000000000000000000000000000000000" - dummyToken = "10000000-aaaa-bbbb-cccc-000000000001" -) - -func TestMain(m *testing.M) { - os.Exit(m.Run()) -} - -func TestCaptcha(t *testing.T) { - tt := []struct { - Name string - Secret string - Token string - Error ErrorCode - }{ - { - Name: "Success", - Secret: dummySecret, - Token: dummyToken, - }, - { - Name: "Missing Secret", - Token: dummyToken, - Error: ErrMissingInputSecret, - }, - { - Name: "Missing Token", - Secret: dummySecret, - Error: ErrMissingInputResponse, - }, - { - Name: "Invalid Token", - Secret: dummySecret, - Token: "test", - Error: ErrInvalidInputResponse, - }, - } - - for _, tc := range tt { - t.Run(tc.Name, func(t *testing.T) { - client, err := New(tc.Secret, WithHTTP(&http.Client{ - Timeout: time.Second * 5, - })) - if err != nil { - // The only error that can be returned from creating a client - if tc.Error == ErrMissingInputSecret && err == ErrMissingInputSecret { - return - } - t.Log(err) - t.FailNow() - } - - resp, err := client.Verify(tc.Token, PostOptions{ - Sitekey: dummySiteKey, - }) - if err != nil { - // The only error that can be returned prior to the request - if tc.Error == ErrMissingInputResponse && err == ErrMissingInputResponse { - return - } - t.Log(err) - t.FailNow() - } - - if tc.Error.String() != "" { - if resp.Success { - t.Log("Verification should fail.") - t.Fail() - } - if len(resp.ErrorCodes) == 0 { - t.Log("hCaptcha should have returned an error.") - t.Fail() - } - var hasErr bool - for _, err := range resp.ErrorCodes { - if strings.EqualFold(err.String(), tc.Error.String()) { - hasErr = true - break - } - } - if !hasErr { - t.Log("hCaptcha did not return the error being tested") - t.Fail() - } - } else if !resp.Success { - t.Log("Verification should succeed.") - t.Fail() - } - }) - } -}