diff --git a/source/request.ts b/source/request.ts index 4ca7f45..d6755b7 100644 --- a/source/request.ts +++ b/source/request.ts @@ -11,6 +11,7 @@ let API_URL = 'https://en.wikipedia.org/w/api.php?', async function callAPI(url: string) { const options: AxiosRequestConfig = { headers: { + "User-Agent": USER_AGENT, "Api-User-Agent": USER_AGENT, }, }; diff --git a/test/pdf.test.ts b/test/pdf.test.ts index 530943e..cdec73f 100644 --- a/test/pdf.test.ts +++ b/test/pdf.test.ts @@ -1,6 +1,5 @@ import * as request from '../source/request'; import wiki from "../source/index"; -import { htmlString, notFoundJson } from './samples'; import { pdfError } from '../source/errors'; import Page, { pdf } from '../source/page'; import { pageJson } from './samples'; diff --git a/test/request.test.ts b/test/request.test.ts index 1d5b978..ced2d4e 100644 --- a/test/request.test.ts +++ b/test/request.test.ts @@ -4,9 +4,12 @@ import request, {makeRestRequest, setAPIUrl, returnRestUrl, setUserAgent} from ' import { wikiError } from '../source'; const fetchMock = jest.spyOn(axios, "get"); +const expectedDefaultUserAgent = "wikipedia (https://github.com/dopecodez/Wikipedia/)"; + const options: AxiosRequestConfig = { headers: { - 'Api-User-Agent': 'wikipedia (https://github.com/dopecodez/Wikipedia/)' + "User-Agent": expectedDefaultUserAgent, + 'Api-User-Agent': expectedDefaultUserAgent } } const baseConfig : AxiosResponse['config'] = { headers: new AxiosHeaders()}; @@ -86,11 +89,13 @@ test('Set language returns api url with language set', () => { test('Set user agent and use it to call the api', async () => { setUserAgent("testUser"); + const userAgentOverride = "testUser"; fetchMock.mockImplementation(async () => { return response1 } ); await request({}, true); const modifiedOptions : AxiosRequestConfig = { headers: { - 'Api-User-Agent': 'testUser' + "User-Agent": userAgentOverride, + 'Api-User-Agent': userAgentOverride } } expect(fetchMock).toHaveBeenCalledWith(