SONAR-12632 Rework QG related types

3 files changed, 10 insertions, 6 deletions

diff --git a/server/sonar-web/src/main/js/store/__tests__/branches-test.ts b/server/sonar-web/src/main/js/store/__tests__/branches-test.ts
index e74645fafaa..dd2ffe3c8d7 100644
--- a/server/sonar-web/src/main/js/store/__tests__/branches-test.ts
+++ b/server/sonar-web/src/main/js/store/__tests__/branches-test.ts
@@ -19,15 +19,16 @@
  */
 import { getBranchLikeKey } from '../../helpers/branch-like';
 import { mockBranch, mockPullRequest } from '../../helpers/mocks/branch-like';
-import { mockQualityGateStatusCondition } from '../../helpers/testMocks';
+import { mockQualityGateStatusCondition } from '../../helpers/mocks/quality-gates';
 import { BranchLike } from '../../types/branch-like';
+import { QualityGateStatusCondition } from '../../types/quality-gates';
 import reducer, {
   getBranchStatusByBranchLike,
   registerBranchStatusAction,
   State
 } from '../branches';
 
-type TestArgs = [BranchLike, string, T.Status, T.QualityGateStatusCondition[], boolean?];
+type TestArgs = [BranchLike, string, T.Status, QualityGateStatusCondition[], boolean?];
 
 const FAILING_CONDITION = mockQualityGateStatusCondition();
 const COMPONENT = 'foo';
diff --git a/server/sonar-web/src/main/js/store/__tests__/rootActions-test.tsx b/server/sonar-web/src/main/js/store/__tests__/rootActions-test.tsx
index 4c4add7250c..50fae18e874 100644
--- a/server/sonar-web/src/main/js/store/__tests__/rootActions-test.tsx
+++ b/server/sonar-web/src/main/js/store/__tests__/rootActions-test.tsx
@@ -18,7 +18,7 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  */
 import { mockBranch } from '../../helpers/mocks/branch-like';
-import { mockQualityGateStatusCondition } from '../../helpers/testMocks';
+import { mockQualityGateStatusCondition } from '../../helpers/mocks/quality-gates';
 import { registerBranchStatusAction } from '../branches';
 import { fetchBranchStatus, registerBranchStatus } from '../rootActions';
 
@@ -28,7 +28,9 @@ jest.mock('../branches', () => ({
 }));
 
 jest.mock('../../api/quality-gates', () => {
-  const { mockQualityGateProjectStatus } = require.requireActual('../../helpers/testMocks');
+  const { mockQualityGateProjectStatus } = require.requireActual(
+    '../../helpers/mocks/quality-gates'
+  );
   return {
     getQualityGateProjectStatus: jest.fn().mockResolvedValue(
       mockQualityGateProjectStatus({
diff --git a/server/sonar-web/src/main/js/store/branches.ts b/server/sonar-web/src/main/js/store/branches.ts
index 67928e2f86d..f05a531af98 100644
--- a/server/sonar-web/src/main/js/store/branches.ts
+++ b/server/sonar-web/src/main/js/store/branches.ts
@@ -19,10 +19,11 @@
  */
 import { getBranchLikeKey } from '../helpers/branch-like';
 import { BranchLike } from '../types/branch-like';
+import { QualityGateStatusCondition } from '../types/quality-gates';
 import { ActionType } from './utils/actions';
 
 export interface BranchStatusData {
-  conditions?: T.QualityGateStatusCondition[];
+  conditions?: QualityGateStatusCondition[];
   ignoredConditions?: boolean;
   status?: T.Status;
 }
@@ -41,7 +42,7 @@ export function registerBranchStatusAction(
   branchLike: BranchLike,
   component: string,
   status: T.Status,
-  conditions?: T.QualityGateStatusCondition[],
+  conditions?: QualityGateStatusCondition[],
   ignoredConditions?: boolean
 ) {
   return {