Fix tests

Author: marc0l92

DEVELOP.md

@@ -33,6 +33,7 @@ https://developer.atlassian.com/cloud/jira/platform/rest/v3/api-group-issue-sear
 
 ## Publish new release
 
+- Make sure test are running `npm run test`
 - Define the new version to use x.y.z
 - Run `npm run version x.y.z`
 - Commit and push the file modified

src/client/jiraClient.ts

@@ -86,7 +86,11 @@ function buildHeaders(account: IJiraIssueAccountSettings): Record<string, string
 }
 
 function isJsonResponse(response: RequestUrlResponse): boolean {
-    return response.headers['content-type'] && response.headers['content-type'].contains('json') && response.json
+    return response.headers && response.headers['content-type'] && response.headers['content-type'].includes('json') && response.json !== undefined
+}
+
+function isTextResponse(response: RequestUrlResponse): boolean {
+    return response.headers && response.headers['content-type'] && response.headers['content-type'].includes('text') && response.text !== undefined
 }
 
 async function sendRequest(requestOptions: RequestOptions): Promise<any> {
@@ -128,7 +132,7 @@ async function sendRequest(requestOptions: RequestOptions): Promise<any> {
             default:
                 if (isJsonResponse(response) && response.json.message) {
                     errorMsg = response.json.message
-                } else if (response.headers['content-type'] && response.headers['content-type'].contains('text') && response.text.contains('<title>Log in')) {
+                } else if (isTextResponse(response) && response.text.contains('<title>Log in')) {
                     errorMsg = 'Login required'
                 } else {
                     errorMsg = `HTTP ${response.status}`

test/jiraClinet.test.ts

@@ -4,6 +4,7 @@ import { TestAccountOpen } from './testData'
 
 const kIssueKey = 'AAA-123'
 const requestUrlMock = jest.spyOn(obsidian, 'requestUrl')
+const defaultHeaders = { 'content-type': 'application/json' }
 
 describe('JiraClient', () => {
     describe('Positive tests', () => {
@@ -19,11 +20,15 @@ describe('JiraClient', () => {
         // })
 
         test('testConnection', async () => {
-            requestUrlMock.mockReturnValue({ status: 200 } as any)
+            requestUrlMock.mockReturnValue({ status: 200, headers: defaultHeaders, json: { issues: [] } } as any)
             expect(await JiraClient.testConnection(TestAccountOpen)).toEqual(true)
             expect(requestUrlMock.mock.calls[0][0]).toEqual({
                 contentType: 'application/json',
-                headers: {},
+                headers: {
+                    "Accept": "application/json",
+                    "User-Agent": "obsidian-jira-issue-plugin",
+                    "X-Atlassian-Token": "no-check",
+                },
                 method: 'GET',
                 url: 'https://test-company.atlassian.net/rest/api/latest/project',
             })
@@ -33,14 +38,18 @@ describe('JiraClient', () => {
     describe('Negative tests', () => {
         test('testConnection', async () => {
             expect.assertions(2)
-            requestUrlMock.mockReturnValue({ status: 401 } as any)
+            requestUrlMock.mockReturnValue({ status: 401, headers: defaultHeaders } as any)
             try {
                 await JiraClient.testConnection(TestAccountOpen)
             } catch (e) {
-                expect(e).toEqual(new Error(`HTTP status 401`))
+                expect(e).toEqual(new Error(`Unauthorized: Please check your authentication credentials`))
                 expect(requestUrlMock.mock.calls[0][0]).toEqual({
                     contentType: 'application/json',
-                    headers: {},
+                    headers: {
+                        "Accept": "application/json",
+                        "User-Agent": "obsidian-jira-issue-plugin",
+                        "X-Atlassian-Token": "no-check",
+                    },
                     method: 'GET',
                     url: 'https://test-company.atlassian.net/rest/api/latest/project',
                 })

test/settings.test.ts

@@ -17,6 +17,7 @@ const StoredSettings = {
         color: 'colorVal',
         host: 'hostVal',
         bareToken: 'bareToken',
+        use2025Api: false,
     }],
     apiBasePath: 'apiBasePathVal',
     cache: {

test/testData.ts

@@ -18,7 +18,8 @@ export const TestAccountOpen = {
     authenticationType: EAuthenticationTypes.OPEN,
     priority: 1,
     color: '#123456',
-    cache: kEmptyAccountCache
+    use2025Api: false,
+    cache: kEmptyAccountCache,
 }
 
 export const TestAccountBasic = {
@@ -29,5 +30,6 @@ export const TestAccountBasic = {
     password: 'password2',
     priority: 2,
     color: '#789012',
-    cache: kEmptyAccountCache
+    use2025Api: false,
+    cache: kEmptyAccountCache,
 }