diff --git a/resources/assets/src/views/user/Closet/ModalApply.tsx b/resources/assets/src/views/user/Closet/ModalApply.tsx index f3f30651..01e0795b 100644 --- a/resources/assets/src/views/user/Closet/ModalApply.tsx +++ b/resources/assets/src/views/user/Closet/ModalApply.tsx @@ -42,7 +42,7 @@ const ModalApply: React.FC = (props) => { } const handleSelect = async (player: Player) => { - const { code, message } = await fetch.post( + const { code, message } = await fetch.put( urls.user.player.set(player.pid), { skin: props.skin, diff --git a/resources/assets/src/views/user/Players/index.tsx b/resources/assets/src/views/user/Players/index.tsx index 909dc76b..d46ad6d1 100644 --- a/resources/assets/src/views/user/Players/index.tsx +++ b/resources/assets/src/views/user/Players/index.tsx @@ -67,7 +67,7 @@ const Players: React.FC = () => { return } - const { code, message } = await fetch.post( + const { code, message } = await fetch.put( urls.user.player.rename(player.pid), { name }, ) @@ -88,7 +88,7 @@ const Players: React.FC = () => { return } - const { code, message } = await fetch.post( + const { code, message } = await fetch.del( urls.user.player.clear(selected), { type: [skin && 'skin', cape && 'cape'].filter(Boolean) }, ) @@ -128,7 +128,7 @@ const Players: React.FC = () => { return } - const { code, message } = await fetch.post( + const { code, message } = await fetch.del( urls.user.player.delete(player.pid), ) if (code === 0) { diff --git a/resources/assets/tests/views/user/Closet.test.tsx b/resources/assets/tests/views/user/Closet.test.tsx index 73491d69..f393b4f3 100644 --- a/resources/assets/tests/views/user/Closet.test.tsx +++ b/resources/assets/tests/views/user/Closet.test.tsx @@ -391,7 +391,7 @@ describe('apply textures to player', () => { fetch.get .mockResolvedValueOnce(createPaginator([fixtureSkin])) .mockResolvedValueOnce([fixturePlayer]) - fetch.post.mockResolvedValue({ code: 0, message: 'success' }) + fetch.put.mockResolvedValue({ code: 0, message: 'success' }) const { getByText, @@ -407,7 +407,7 @@ describe('apply textures to player', () => { await waitFor(() => expect(fetch.get).toBeCalled()) fireEvent.click(getByTitle(fixturePlayer.name)) await waitFor(() => - expect(fetch.post).toBeCalledWith( + expect(fetch.put).toBeCalledWith( urls.user.player.set(fixturePlayer.pid), { skin: fixtureSkin.tid }, ), @@ -420,7 +420,7 @@ describe('apply textures to player', () => { fetch.get .mockResolvedValueOnce(createPaginator([fixtureSkin])) .mockResolvedValueOnce([fixturePlayer]) - fetch.post.mockResolvedValue({ code: 1, message: 'failed' }) + fetch.put.mockResolvedValue({ code: 1, message: 'failed' }) const { getByText, @@ -436,7 +436,7 @@ describe('apply textures to player', () => { await waitFor(() => expect(fetch.get).toBeCalled()) fireEvent.click(getByTitle(fixturePlayer.name)) await waitFor(() => - expect(fetch.post).toBeCalledWith( + expect(fetch.put).toBeCalledWith( urls.user.player.set(fixturePlayer.pid), { skin: fixtureSkin.tid }, ), @@ -459,6 +459,6 @@ describe('apply textures to player', () => { $('#modal-apply').modal('hide').trigger('hidden.bs.modal') - expect(fetch.post).not.toBeCalled() + expect(fetch.put).not.toBeCalled() }) }) diff --git a/resources/assets/tests/views/user/Players.test.tsx b/resources/assets/tests/views/user/Players.test.tsx index dd9f7a04..7e1eda9e 100644 --- a/resources/assets/tests/views/user/Players.test.tsx +++ b/resources/assets/tests/views/user/Players.test.tsx @@ -270,7 +270,7 @@ describe('edit player name', () => { }) it('succeeded', async () => { - fetch.post.mockResolvedValue({ code: 0, message: 'success' }) + fetch.put.mockResolvedValue({ code: 0, message: 'success' }) const { getByText, @@ -287,7 +287,7 @@ describe('edit player name', () => { }) fireEvent.click(getByText(t('general.confirm'))) await waitFor(() => - expect(fetch.post).toBeCalledWith(urls.user.player.rename(fixture.pid), { + expect(fetch.put).toBeCalledWith(urls.user.player.rename(fixture.pid), { name: 'reina', }), ) @@ -307,14 +307,15 @@ describe('edit player name', () => { target: { value: '' }, }) fireEvent.click(getByText(t('general.confirm'))) - await waitFor(() => expect(fetch.post).not.toBeCalled()) + await waitFor(() => expect(fetch.put).not.toBeCalled()) expect(queryByText(t('user.emptyPlayerName'))).toBeInTheDocument() fireEvent.click(getByText(t('general.cancel'))) + expect(queryByText(fixture.name)).toBeInTheDocument() }) it('failed', async () => { - fetch.post.mockResolvedValue({ code: 1, message: 'failed' }) + fetch.put.mockResolvedValue({ code: 1, message: 'failed' }) const { getByText, @@ -331,7 +332,7 @@ describe('edit player name', () => { }) fireEvent.click(getByText(t('general.confirm'))) await waitFor(() => - expect(fetch.post).toBeCalledWith(urls.user.player.rename(fixture.pid), { + expect(fetch.put).toBeCalledWith(urls.user.player.rename(fixture.pid), { name: 'reina', }), ) @@ -339,21 +340,6 @@ describe('edit player name', () => { expect(getByRole('alert')).toHaveClass('alert-danger') expect(queryByText(fixture.name)).toBeInTheDocument() }) - - it('cancelled', async () => { - const { getByText, getByTitle, getByDisplayValue, queryByText } = render( - , - ) - await waitFor(() => expect(fetch.get).toBeCalledTimes(1)) - - fireEvent.click(getByTitle(t('user.player.edit-pname'))) - fireEvent.input(getByDisplayValue(fixture.name), { - target: { value: 'reina' }, - }) - fireEvent.click(getByText(t('general.cancel'))) - await waitFor(() => expect(fetch.post).not.toBeCalled()) - expect(queryByText(fixture.name)).toBeInTheDocument() - }) }) describe('reset texture', () => { @@ -365,7 +351,7 @@ describe('reset texture', () => { }) it('clear skin and cape', async () => { - fetch.post.mockResolvedValue({ code: 0, message: 'success' }) + fetch.del.mockResolvedValue({ code: 0, message: 'success' }) const { getByText, getByRole, getByLabelText, queryByText } = render( , @@ -377,7 +363,7 @@ describe('reset texture', () => { fireEvent.click(getByLabelText(t('general.cape'))) fireEvent.click(getByText(t('general.confirm'))) await waitFor(() => - expect(fetch.post).toBeCalledWith(urls.user.player.clear(fixture.pid), { + expect(fetch.del).toBeCalledWith(urls.user.player.clear(fixture.pid), { type: ['skin', 'cape'], }), ) @@ -386,7 +372,7 @@ describe('reset texture', () => { }) it('clear skin', async () => { - fetch.post.mockResolvedValue({ code: 0, message: 'success' }) + fetch.del.mockResolvedValue({ code: 0, message: 'success' }) const { getByText, getByRole, getByLabelText, queryByText } = render( , @@ -397,7 +383,7 @@ describe('reset texture', () => { fireEvent.click(getByLabelText(t('general.skin'))) fireEvent.click(getByText(t('general.confirm'))) await waitFor(() => - expect(fetch.post).toBeCalledWith(urls.user.player.clear(fixture.pid), { + expect(fetch.del).toBeCalledWith(urls.user.player.clear(fixture.pid), { type: ['skin'], }), ) @@ -406,7 +392,7 @@ describe('reset texture', () => { }) it('clear cape', async () => { - fetch.post.mockResolvedValue({ code: 0, message: 'success' }) + fetch.del.mockResolvedValue({ code: 0, message: 'success' }) const { getByText, getByRole, getByLabelText, queryByText } = render( , @@ -417,7 +403,7 @@ describe('reset texture', () => { fireEvent.click(getByLabelText(t('general.cape'))) fireEvent.click(getByText(t('general.confirm'))) await waitFor(() => - expect(fetch.post).toBeCalledWith(urls.user.player.clear(fixture.pid), { + expect(fetch.del).toBeCalledWith(urls.user.player.clear(fixture.pid), { type: ['cape'], }), ) @@ -431,13 +417,13 @@ describe('reset texture', () => { fireEvent.click(getByText(t('user.player.delete-texture'))) fireEvent.click(getByText(t('general.confirm'))) - await waitFor(() => expect(fetch.post).not.toBeCalled()) + await waitFor(() => expect(fetch.del).not.toBeCalled()) expect(queryByText(t('user.noClearChoice'))).toBeInTheDocument() expect(getByRole('alert')).toHaveClass('alert-warning') }) it('failed', async () => { - fetch.post.mockResolvedValue({ code: 1, message: 'failed' }) + fetch.del.mockResolvedValue({ code: 1, message: 'failed' }) const { getByText, getByRole, getByLabelText, queryByText } = render( , @@ -448,7 +434,7 @@ describe('reset texture', () => { fireEvent.click(getByLabelText(t('general.skin'))) fireEvent.click(getByText(t('general.confirm'))) await waitFor(() => - expect(fetch.post).toBeCalledWith(urls.user.player.clear(fixture.pid), { + expect(fetch.del).toBeCalledWith(urls.user.player.clear(fixture.pid), { type: ['skin'], }), ) @@ -463,7 +449,7 @@ describe('reset texture', () => { fireEvent.click(getByText(t('user.player.delete-texture'))) fireEvent.click(getByLabelText(t('general.skin'))) fireEvent.click(getByText(t('general.cancel'))) - await waitFor(() => expect(fetch.post).not.toBeCalled()) + await waitFor(() => expect(fetch.del).not.toBeCalled()) }) }) @@ -476,7 +462,7 @@ describe('delete player', () => { }) it('succeeded', async () => { - fetch.post.mockResolvedValue({ code: 0, message: 'success' }) + fetch.del.mockResolvedValue({ code: 0, message: 'success' }) const { getByText, getByRole, queryByText } = render() await waitFor(() => expect(fetch.get).toBeCalledTimes(1)) @@ -484,7 +470,7 @@ describe('delete player', () => { fireEvent.click(getByText(t('user.player.delete-player'))) fireEvent.click(getByText(t('general.confirm'))) await waitFor(() => - expect(fetch.post).toBeCalledWith(urls.user.player.delete(fixture.pid)), + expect(fetch.del).toBeCalledWith(urls.user.player.delete(fixture.pid)), ) expect(getByText('success')).toBeInTheDocument() expect(getByRole('status')).toHaveClass('alert-success') @@ -492,7 +478,7 @@ describe('delete player', () => { }) it('failed', async () => { - fetch.post.mockResolvedValue({ code: 1, message: 'failed' }) + fetch.del.mockResolvedValue({ code: 1, message: 'failed' }) const { getByText, getByRole, queryByText } = render() await waitFor(() => expect(fetch.get).toBeCalledTimes(1)) @@ -500,7 +486,7 @@ describe('delete player', () => { fireEvent.click(getByText(t('user.player.delete-player'))) fireEvent.click(getByText(t('general.confirm'))) await waitFor(() => - expect(fetch.post).toBeCalledWith(urls.user.player.delete(fixture.pid)), + expect(fetch.del).toBeCalledWith(urls.user.player.delete(fixture.pid)), ) expect(getByText('failed')).toBeInTheDocument() expect(getByRole('alert')).toHaveClass('alert-danger') @@ -513,7 +499,7 @@ describe('delete player', () => { fireEvent.click(getByText(t('user.player.delete-player'))) fireEvent.click(getByText(t('general.cancel'))) - await waitFor(() => expect(fetch.post).not.toBeCalled()) + await waitFor(() => expect(fetch.del).not.toBeCalled()) expect(queryByText(fixture.name)).toBeInTheDocument() }) })