fix: multiple import statement on the same module

scolladon · Jan 3, 2024 · ed4e5f9 · ed4e5f9
1 parent 77190b9
commit ed4e5f9
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 14 deletions.
diff --git a/__tests__/integration/services.test.ts b/__tests__/integration/services.test.ts
@@ -1,7 +1,6 @@
 'use strict'
 import { expect, jest, describe, it } from '@jest/globals'
 import { getGlobalMetadata } from '../__utils__/globalTestHelper'
-import HandlerFactory from '../../src/service/typeHandlerFactory'
 import { ADDITION, DELETION, MODIFICATION } from '../../src/utils/gitConstants'
 import { readPathFromGit } from '../../src/utils/fsHelper'
 import { MetadataRepository } from '../../src/types/metadata'
@@ -447,7 +446,7 @@ beforeEach(() => {
     diffs: { package: new Map(), destructiveChanges: new Map() },
     warnings: [],
   }
-  handlerFactory = new HandlerFactory(work, globalMetadata)
+  handlerFactory = new TypeHandlerFactory(work, globalMetadata)
 })
 describe.each(testContext)(
   `integration test %s`,

diff --git a/__tests__/unit/lib/service/inFileHandler.test.ts b/__tests__/unit/lib/service/inFileHandler.test.ts
@@ -1,7 +1,6 @@
 'use strict'
 import { expect, jest, describe, it } from '@jest/globals'
 import { getGlobalMetadata, getWork } from '../../../__utils__/globalTestHelper'
-import InFile from '../../../../src/service/inFileHandler'
 import { writeFile } from '../../../../src/utils/fsHelper'
 import { Work } from '../../../../src/types/work'
 import { MetadataRepository } from '../../../../src/types/metadata'
@@ -34,7 +33,7 @@ describe.each([true, false])(`inFileHandler -d: %s`, generateDelta => {
     let sut: InFileHandler
     beforeEach(() => {
       // Arrange
-      sut = new InFile(
+      sut = new InFileHandler(
         'force-app/main/default/workflows/Test/Account.workflow-meta.xml',
         'workflows',
         work,
@@ -70,7 +69,7 @@ describe.each([true, false])(`inFileHandler -d: %s`, generateDelta => {
     describe('when metadata in file is not packable', () => {
       beforeEach(() => {
         // Arrange
-        sut = new InFile(
+        sut = new InFileHandler(
           'force-app/main/default/globalValueSetTranslations/Numbers-fr.globalValueSetTranslation-meta.xml',
           'globalValueSetTranslations',
           work,
@@ -111,7 +110,7 @@ describe.each([true, false])(`inFileHandler -d: %s`, generateDelta => {
     describe('when element are added and deleted', () => {
       beforeEach(() => {
         // Arrange
-        sut = new InFile(
+        sut = new InFileHandler(
           'force-app/main/default/workflows/Test/Account.workflow-meta.xml',
           'workflows',
           work,
@@ -150,7 +149,7 @@ describe.each([true, false])(`inFileHandler -d: %s`, generateDelta => {
     describe('when element are deleted and nothing is added', () => {
       beforeEach(() => {
         // Arrange
-        sut = new InFile(
+        sut = new InFileHandler(
           'force-app/main/default/workflows/Test/Account.workflow-meta.xml',
           'workflows',
           work,
@@ -186,7 +185,7 @@ describe.each([true, false])(`inFileHandler -d: %s`, generateDelta => {
       describe('when no metadata element are added/deleted and the file does not contains attributes', () => {
         beforeEach(() => {
           // Arrange
-          sut = new InFile(
+          sut = new InFileHandler(
             'force-app/main/default/labels/CustomLabel.label-meta.xml',
             'labels',
             work,
@@ -225,7 +224,7 @@ describe.each([true, false])(`inFileHandler -d: %s`, generateDelta => {
       describe('when no metadata element are added, some are deleted but the file contains attributes', () => {
         beforeEach(() => {
           // Arrange
-          sut = new InFile(
+          sut = new InFileHandler(
             'force-app/main/default/labels/CustomLabel.label-meta.xml',
             'labels',
             work,
@@ -266,7 +265,7 @@ describe.each([true, false])(`inFileHandler -d: %s`, generateDelta => {
     describe('when metadata in file is not packable', () => {
       beforeEach(() => {
         // Arrange
-        sut = new InFile(
+        sut = new InFileHandler(
           'force-app/main/default/globalValueSetTranslations/Numbers-fr.globalValueSetTranslation-meta.xml',
           'globalValueSetTranslations',
           work,
@@ -306,7 +305,7 @@ describe.each([true, false])(`inFileHandler -d: %s`, generateDelta => {
     let sut: InFileHandler
     beforeEach(() => {
       // Arrange
-      sut = new InFile(
+      sut = new InFileHandler(
         'force-app/main/default/workflows/Test/Account.workflow-meta.xml',
         'workflows',
         work,
@@ -336,7 +335,7 @@ describe.each([true, false])(`inFileHandler -d: %s`, generateDelta => {
     describe('when metadata in file is prune Only', () => {
       beforeEach(() => {
         // Arrange
-        sut = new InFile(
+        sut = new InFileHandler(
           'force-app/main/default/globalValueSetTranslations/Numbers-fr.globalValueSetTranslation-meta.xml',
           'globalValueSetTranslations',
           work,

diff --git a/src/service/inResourceHandler.ts b/src/service/inResourceHandler.ts
@@ -1,10 +1,9 @@
 'use strict'
 import StandardHandler from './standardHandler'
 import { join, parse, sep } from 'path'
-import { pathExists } from '../utils/fsHelper'
+import { pathExists, DOT } from '../utils/fsHelper'
 import { META_REGEX, METAFILE_SUFFIX } from '../utils/metadataConstants'
 import { cleanUpPackageMember } from '../utils/packageHelper'
-import { DOT } from '../utils/fsHelper'
 import { Work } from '../types/work'
 import { MetadataRepository } from '../types/metadata'