From 0c8149455967e868bee22112bd8710fc481cf518 Mon Sep 17 00:00:00 2001 From: ErickSkrauch Date: Wed, 15 Apr 2020 17:52:13 +0300 Subject: [PATCH] Fix tests for worker --- http/uuids_worker.go | 3 +-- http/uuids_worker_test.go | 10 ++++++++-- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/http/uuids_worker.go b/http/uuids_worker.go index 3a705a0..b161827 100644 --- a/http/uuids_worker.go +++ b/http/uuids_worker.go @@ -20,7 +20,7 @@ type UUIDsWorker struct { } func (ctx *UUIDsWorker) CreateHandler() *mux.Router { - requestEventsMiddleware := CreateRequestEventsMiddleware(ctx.Emitter, "skinsystem") + requestEventsMiddleware := CreateRequestEventsMiddleware(ctx.Emitter, "skinsystem") // This prefix should be unified router := mux.NewRouter().StrictSlash(true) router.Use(requestEventsMiddleware) @@ -39,7 +39,6 @@ func (ctx *UUIDsWorker) GetUUID(response http.ResponseWriter, request *http.Requ username := parseUsername(mux.Vars(request)["username"]) profile, err := ctx.UUIDsProvider.GetUuid(username) if err != nil { - ctx.Emit("uuids_provider:error", err) // TODO: do I need emitter here? if _, ok := err.(*mojang.TooManyRequestsError); ok { response.WriteHeader(http.StatusTooManyRequests) return diff --git a/http/uuids_worker_test.go b/http/uuids_worker_test.go index 0271dd8..b48b53e 100644 --- a/http/uuids_worker_test.go +++ b/http/uuids_worker_test.go @@ -87,6 +87,8 @@ var getUuidTestsCases = []*uuidsWorkerTestCase{ { Name: "Success provider response", BeforeTest: func(suite *uuidsWorkerTestSuite) { + suite.Emitter.On("Emit", "skinsystem:before_request", mock.Anything) + suite.Emitter.On("Emit", "skinsystem:after_request", mock.Anything, 200) suite.UuidsProvider.On("GetUuid", "mock_username").Return(&mojang.ProfileInfo{ Id: "0fcc38620f1845f3a54e1b523c1bd1c7", Name: "mock_username", @@ -105,6 +107,8 @@ var getUuidTestsCases = []*uuidsWorkerTestCase{ { Name: "Receive empty response from UUIDs provider", BeforeTest: func(suite *uuidsWorkerTestSuite) { + suite.Emitter.On("Emit", "skinsystem:before_request", mock.Anything) + suite.Emitter.On("Emit", "skinsystem:after_request", mock.Anything, 204) suite.UuidsProvider.On("GetUuid", "mock_username").Return(nil, nil) }, AfterTest: func(suite *uuidsWorkerTestSuite, response *http.Response) { @@ -116,9 +120,10 @@ var getUuidTestsCases = []*uuidsWorkerTestCase{ { Name: "Receive error from UUIDs provider", BeforeTest: func(suite *uuidsWorkerTestSuite) { + suite.Emitter.On("Emit", "skinsystem:before_request", mock.Anything) + suite.Emitter.On("Emit", "skinsystem:after_request", mock.Anything, 500) err := errors.New("this is an error") suite.UuidsProvider.On("GetUuid", "mock_username").Return(nil, err) - suite.Emitter.On("Emit", "uuids_provider:error", err).Times(1) }, AfterTest: func(suite *uuidsWorkerTestSuite, response *http.Response) { suite.Equal(500, response.StatusCode) @@ -132,9 +137,10 @@ var getUuidTestsCases = []*uuidsWorkerTestCase{ { Name: "Receive Too Many Requests from UUIDs provider", BeforeTest: func(suite *uuidsWorkerTestSuite) { + suite.Emitter.On("Emit", "skinsystem:before_request", mock.Anything) + suite.Emitter.On("Emit", "skinsystem:after_request", mock.Anything, 429) err := &mojang.TooManyRequestsError{} suite.UuidsProvider.On("GetUuid", "mock_username").Return(nil, err) - suite.Emitter.On("Emit", "uuids_provider:error", err).Times(1) }, AfterTest: func(suite *uuidsWorkerTestSuite, response *http.Response) { suite.Equal(429, response.StatusCode)