incremental fixes

Author: MrRefactoring

tests/integration/agile/sprint.test.ts

@@ -21,7 +21,7 @@ afterAll(async () => {
   await deleteAgileProject();
 });
 
-test.sequential.skip('should create new sprint', async ({ expect }) => {
+test.sequential('should create new sprint', async ({ expect }) => {
   const boards = await client.board.getAllBoards({ name: Constants.testAgileProjectKey });
 
   expect(boards.total).toBe(1);
@@ -40,7 +40,7 @@ test.sequential.skip('should create new sprint', async ({ expect }) => {
   expect(sprint.state).toBe('future');
 });
 
-test.sequential.skip('should create and move task to sprint', async ({ expect }) => {
+test.sequential('should create and move task to sprint', async ({ expect }) => {
   const issue = await getVersion3Client().issues.createIssue({
     fields: {
       summary: 'Test task',
@@ -65,7 +65,7 @@ test.sequential.skip('should create and move task to sprint', async ({ expect })
   expect(!!issue).toBeTruthy();
 });
 
-test.sequential.skip('should return issues for sprint', async ({ expect }) => {
+test.sequential('should return issues for sprint', async ({ expect }) => {
   const { issues } = await client.sprint.getIssuesForSprint({
     sprintId: sprint.id,
   });
@@ -74,7 +74,7 @@ test.sequential.skip('should return issues for sprint', async ({ expect }) => {
   expect(issues[0].fields?.summary).toBe('Test task');
 });
 
-test.sequential.skip('should partially update sprint', async ({ expect }) => {
+test.sequential('should partially update sprint', async ({ expect }) => {
   const newSprint = await client.sprint.partiallyUpdateSprint({
     sprintId: sprint.id,
     state: 'active',
@@ -85,6 +85,6 @@ test.sequential.skip('should partially update sprint', async ({ expect }) => {
   expect(newSprint.state).toBe('active');
 });
 
-test.sequential.skip('should remove sprint', async () => {
+test.sequential('should remove sprint', async () => {
   await client.sprint.deleteSprint({ sprintId: sprint.id });
 });

tests/unit/clients/baseClient.test.ts

@@ -1,87 +1,20 @@
-import * as sinon from 'sinon';
-import { test } from 'vitest';
+import { describe, test } from 'vitest';
 import { BaseClient } from '@jirajs';
 
-const XAtlassianToken = 'X-Atlassian-Token';
+describe('BaseClient', () => {
+  test('shouldn\'t display error message for correct host urls', () => {
+    new BaseClient({
+      host: 'http://localhost',
+    });
 
-test('should create X-Atlassian-Token: no-check header in requests', async ({ expect }) => {
-  const client = new BaseClient({
-    host: 'http://localhost',
-    noCheckAtlassianToken: true,
+    new BaseClient({ host: 'https://localhost/' });
   });
 
-  // @ts-expect-error Wrong typings
-  const defaultHeaders: Record<string, string> = client.instance.defaults.headers;
+  test('should display error message for incorrect host url', ({ expect }) => {
+    const errorMessage = 'Couldn\'t parse the host URL. Perhaps you forgot to add \'http://\' or \'https://\' at the beginning of the URL?';
 
-  expect(defaultHeaders[XAtlassianToken]).toBe('no-check');
-
-  const sendRequestStub = sinon.stub(client, 'sendRequest');
-
-  // @ts-expect-error Wrong typings
-  await client.sendRequest({}, undefined); // TODO problem with never type
-
-  expect(sendRequestStub.calledOnce).toBeTruthy();
-
-  const callArgument = sendRequestStub.getCall(0).args[0];
-
-  expect(callArgument.headers?.[XAtlassianToken]).toBe(undefined);
-});
-
-test('should not create X-Atlassian-Token: no-check header in requests case 1', async ({ expect }) => {
-  const client = new BaseClient({
-    host: 'http://localhost',
-    noCheckAtlassianToken: false,
-  });
-  // @ts-expect-error Wrong typings
-  const defaultHeaders: Record<string, string> = client.instance.defaults.headers;
-
-  expect(defaultHeaders[XAtlassianToken]).toBe(undefined);
-
-  const sendRequestStub = sinon.stub(client, 'sendRequest');
-
-  // @ts-expect-error Wrong typings
-  await client.sendRequest({}, undefined); // TODO problem with never type
-  expect(sendRequestStub.calledOnce).toBeTruthy();
-
-  const callArgument = sendRequestStub.getCall(0).args[0];
-
-  expect(callArgument.headers?.[XAtlassianToken]).toBe(undefined);
-});
-
-test('should create X-Atlassian-Token: no-check header in requests case 2', async ({ expect }) => {
-  const client = new BaseClient({
-    host: 'http://localhost',
+    expect(() => new BaseClient({ host: '' })).toThrowError(errorMessage);
+    expect(() => new BaseClient({ host: 'localhost' })).toThrowError(errorMessage);
+    expect(() => new BaseClient({ host: 'example.com' })).toThrowError(errorMessage);
   });
-
-  // @ts-expect-error Wrong typings
-  const defaultHeaders: Record<string, string> = client.instance.defaults.headers;
-
-  expect(defaultHeaders[XAtlassianToken]).toBe(undefined);
-
-  const sendRequestStub = sinon.stub(client, 'sendRequest');
-
-  // @ts-expect-error Wrong typings
-  await client.sendRequest({}, undefined); // TODO problem with never type
-
-  expect(sendRequestStub.calledOnce).toBeTruthy();
-
-  const callArgument = sendRequestStub.getCall(0).args[0];
-
-  expect(callArgument.headers?.[XAtlassianToken]).toBe(undefined);
-});
-
-test('shouldn\'t display error message for correct host urls', () => {
-  new BaseClient({
-    host: 'http://localhost',
-  });
-
-  new BaseClient({ host: 'https://localhost/' });
-});
-
-test('should display error message for incorrect host url', ({ expect }) => {
-  const errorMessage = 'Couldn\'t parse the host URL. Perhaps you forgot to add \'http://\' or \'https://\' at the beginning of the URL?';
-
-  expect(() => new BaseClient({ host: '' })).toThrowError(errorMessage);
-  expect(() => new BaseClient({ host: 'localhost' })).toThrowError(errorMessage);
-  expect(() => new BaseClient({ host: 'example.com' })).toThrowError(errorMessage);
 });