From 8cbf2a2b5d09296c10ab710c7f63676ea2369fa2 Mon Sep 17 00:00:00 2001 From: Erik Engervall Date: Tue, 20 Apr 2021 21:56:01 +0200 Subject: [PATCH] Refactor helper Signed-off-by: Erik Engervall --- .../github-release-manager/src/api/PluginApiClient.ts | 2 +- .../src/cards/createRc/CreateRc.test.tsx | 2 +- .../src/cards/createRc/CreateRc.tsx | 2 +- .../src/cards/createRc/hooks/useCreateRc.ts | 2 +- .../createRc => }/helpers/getRcGitHubInfo.test.ts | 2 +- .../{cards/createRc => }/helpers/getRcGitHubInfo.ts | 10 +++++----- .../src/test-helpers/test-helpers.ts | 2 +- 7 files changed, 11 insertions(+), 11 deletions(-) rename plugins/github-release-manager/src/{cards/createRc => }/helpers/getRcGitHubInfo.test.ts (98%) rename plugins/github-release-manager/src/{cards/createRc => }/helpers/getRcGitHubInfo.ts (82%) diff --git a/plugins/github-release-manager/src/api/PluginApiClient.ts b/plugins/github-release-manager/src/api/PluginApiClient.ts index 276951b598..8efaacb4b8 100644 --- a/plugins/github-release-manager/src/api/PluginApiClient.ts +++ b/plugins/github-release-manager/src/api/PluginApiClient.ts @@ -20,7 +20,7 @@ import { readGitHubIntegrationConfigs } from '@backstage/integration'; import { CalverTagParts } from '../helpers/tagParts/getCalverTagParts'; import { DISABLE_CACHE } from '../constants/constants'; -import { getRcGitHubInfo } from '../cards/CreateRc/helpers/getRcGitHubInfo'; +import { getRcGitHubInfo } from '../helpers/getRcGitHubInfo'; import { Project } from '../contexts/ProjectContext'; import { SemverTagParts } from '../helpers/tagParts/getSemverTagParts'; diff --git a/plugins/github-release-manager/src/cards/createRc/CreateRc.test.tsx b/plugins/github-release-manager/src/cards/createRc/CreateRc.test.tsx index f4aaaa29ee..461f04a65d 100644 --- a/plugins/github-release-manager/src/cards/createRc/CreateRc.test.tsx +++ b/plugins/github-release-manager/src/cards/createRc/CreateRc.test.tsx @@ -35,7 +35,7 @@ jest.mock('../../contexts/PluginApiClientContext', () => ({ jest.mock('../../contexts/ProjectContext', () => ({ useProjectContext: jest.fn(() => mockCalverProject), })); -jest.mock('./helpers/getRcGitHubInfo', () => ({ +jest.mock('../../helpers/getRcGitHubInfo', () => ({ getRcGitHubInfo: () => mockNextGitHubInfo, })); jest.mock('./hooks/useCreateRc', () => ({ diff --git a/plugins/github-release-manager/src/cards/createRc/CreateRc.tsx b/plugins/github-release-manager/src/cards/createRc/CreateRc.tsx index f2ca2d7e5f..63715d236d 100644 --- a/plugins/github-release-manager/src/cards/createRc/CreateRc.tsx +++ b/plugins/github-release-manager/src/cards/createRc/CreateRc.tsx @@ -32,7 +32,7 @@ import { } from '../../api/PluginApiClient'; import { ComponentConfigCreateRc } from '../../types/types'; import { Differ } from '../../components/Differ'; -import { getRcGitHubInfo } from './helpers/getRcGitHubInfo'; +import { getRcGitHubInfo } from '../../helpers/getRcGitHubInfo'; import { InfoCardPlus } from '../../components/InfoCardPlus'; import { ResponseStepDialog } from '../../components/ResponseStepDialog/ResponseStepDialog'; import { SEMVER_PARTS } from '../../constants/constants'; diff --git a/plugins/github-release-manager/src/cards/createRc/hooks/useCreateRc.ts b/plugins/github-release-manager/src/cards/createRc/hooks/useCreateRc.ts index 2cd18cb4ab..b0b0c98dca 100644 --- a/plugins/github-release-manager/src/cards/createRc/hooks/useCreateRc.ts +++ b/plugins/github-release-manager/src/cards/createRc/hooks/useCreateRc.ts @@ -23,7 +23,7 @@ import { IPluginApiClient, } from '../../../api/PluginApiClient'; import { CardHook, ComponentConfigCreateRc } from '../../../types/types'; -import { getRcGitHubInfo } from '../helpers/getRcGitHubInfo'; +import { getRcGitHubInfo } from '../../../helpers/getRcGitHubInfo'; import { GitHubReleaseManagerError } from '../../../errors/GitHubReleaseManagerError'; import { Project } from '../../../contexts/ProjectContext'; import { useResponseSteps } from '../../../hooks/useResponseSteps'; diff --git a/plugins/github-release-manager/src/cards/createRc/helpers/getRcGitHubInfo.test.ts b/plugins/github-release-manager/src/helpers/getRcGitHubInfo.test.ts similarity index 98% rename from plugins/github-release-manager/src/cards/createRc/helpers/getRcGitHubInfo.test.ts rename to plugins/github-release-manager/src/helpers/getRcGitHubInfo.test.ts index 1e41ea0d38..51ad5fc122 100644 --- a/plugins/github-release-manager/src/cards/createRc/helpers/getRcGitHubInfo.test.ts +++ b/plugins/github-release-manager/src/helpers/getRcGitHubInfo.test.ts @@ -21,7 +21,7 @@ import { mockReleaseVersionCalver, mockReleaseVersionSemver, mockSemverProject, -} from '../../../test-helpers/test-helpers'; +} from '../test-helpers/test-helpers'; import { getRcGitHubInfo } from './getRcGitHubInfo'; describe('getRcGitHubInfo', () => { diff --git a/plugins/github-release-manager/src/cards/createRc/helpers/getRcGitHubInfo.ts b/plugins/github-release-manager/src/helpers/getRcGitHubInfo.ts similarity index 82% rename from plugins/github-release-manager/src/cards/createRc/helpers/getRcGitHubInfo.ts rename to plugins/github-release-manager/src/helpers/getRcGitHubInfo.ts index 74407fb749..18043033c9 100644 --- a/plugins/github-release-manager/src/cards/createRc/helpers/getRcGitHubInfo.ts +++ b/plugins/github-release-manager/src/helpers/getRcGitHubInfo.ts @@ -16,11 +16,11 @@ import { DateTime } from 'luxon'; -import { getBumpedSemverTagParts } from '../../../helpers/getBumpedTag'; -import { GetLatestReleaseResult } from '../../../api/PluginApiClient'; -import { getSemverTagParts } from '../../../helpers/tagParts/getSemverTagParts'; -import { Project } from '../../../contexts/ProjectContext'; -import { SEMVER_PARTS } from '../../../constants/constants'; +import { getBumpedSemverTagParts } from './getBumpedTag'; +import { GetLatestReleaseResult } from '../api/PluginApiClient'; +import { getSemverTagParts } from './tagParts/getSemverTagParts'; +import { Project } from '../contexts/ProjectContext'; +import { SEMVER_PARTS } from '../constants/constants'; export const getRcGitHubInfo = ({ project, diff --git a/plugins/github-release-manager/src/test-helpers/test-helpers.ts b/plugins/github-release-manager/src/test-helpers/test-helpers.ts index e138512971..3daa449376 100644 --- a/plugins/github-release-manager/src/test-helpers/test-helpers.ts +++ b/plugins/github-release-manager/src/test-helpers/test-helpers.ts @@ -21,8 +21,8 @@ import { IPluginApiClient, } from '../api/PluginApiClient'; import { CalverTagParts } from '../helpers/tagParts/getCalverTagParts'; -import { getRcGitHubInfo } from '../cards/CreateRc/helpers/getRcGitHubInfo'; import { Project } from '../contexts/ProjectContext'; +import { getRcGitHubInfo } from '../helpers/getRcGitHubInfo'; const mockOwner = 'mock_owner'; const mockRepo = 'mock_repo';