diff --git a/exporters/variables-scss/src/formatters/__fixtures__/unformattedExample.scss b/exporters/variables-scss/src/formatters/__fixtures__/unformattedExample.scss deleted file mode 100644 index 1fd84d1203..0000000000 --- a/exporters/variables-scss/src/formatters/__fixtures__/unformattedExample.scss +++ /dev/null @@ -1,5 +0,0 @@ -$my-var: ( -color: #000, -background: #fff, -border: 1px solid #000, -) !default; diff --git a/exporters/variables-scss/src/formatters/__tests__/cssFormatter.test.ts b/exporters/variables-scss/src/formatters/__tests__/cssFormatter.test.ts index dfa74e1014..6bdd3933af 100644 --- a/exporters/variables-scss/src/formatters/__tests__/cssFormatter.test.ts +++ b/exporters/variables-scss/src/formatters/__tests__/cssFormatter.test.ts @@ -2,9 +2,15 @@ import fs from 'fs'; import path from 'path'; import { formatCSS } from '../cssFormatter'; -const mockedUnformattedCSS = fs.readFileSync(path.join(__dirname, '../__fixtures__/unformattedExample.scss'), 'utf-8'); +const mockedUnformattedCSS = fs.readFileSync( + path.join(__dirname, '../../../tests/fixtures/unformattedExample.scss'), + 'utf-8', +); -const mockedFormattedCSS = fs.readFileSync(path.join(__dirname, '../__fixtures__/formattedExample.scss'), 'utf-8'); +const mockedFormattedCSS = fs.readFileSync( + path.join(__dirname, '../../../tests/fixtures/formattedExample.scss'), + 'utf-8', +); describe('formatCSS', () => { it('should correctly format CSS string', () => { diff --git a/exporters/variables-scss/src/generators/__tests__/contentGenerator.test.ts b/exporters/variables-scss/src/generators/__tests__/contentGenerator.test.ts index 8cdeeca495..90730a2472 100644 --- a/exporters/variables-scss/src/generators/__tests__/contentGenerator.test.ts +++ b/exporters/variables-scss/src/generators/__tests__/contentGenerator.test.ts @@ -2,11 +2,11 @@ import fs from 'fs'; import path from 'path'; import { Token, TokenGroup, TokenType } from '@supernovaio/sdk-exporters'; import { generateFileContent, addDisclaimer, filterTokensByTypeAndGroup } from '../contentGenerator'; -import { exampleMockedGroups, exampleMockedTokens } from '../../formatters/__fixtures__/mockedExampleTokens'; +import { exampleMockedGroups, exampleMockedTokens } from '../../../tests/fixtures/mockedExampleTokens'; import { FileData } from '../../config/fileConfig'; const mockedExpectedResult = fs.readFileSync( - path.join(__dirname, '../../formatters/__fixtures__/exampleFileContent.scss'), + path.join(__dirname, '../../../tests/fixtures/exampleFileContent.scss'), 'utf-8', ); const mappedTokens: Map = new Map([]); diff --git a/exporters/variables-scss/src/generators/__tests__/cssGenerator.test.ts b/exporters/variables-scss/src/generators/__tests__/cssGenerator.test.ts index fc60d106fb..36a688217b 100644 --- a/exporters/variables-scss/src/generators/__tests__/cssGenerator.test.ts +++ b/exporters/variables-scss/src/generators/__tests__/cssGenerator.test.ts @@ -1,6 +1,6 @@ import { DimensionToken, StringToken, Token, TokenGroup, TokenType } from '@supernovaio/sdk-exporters'; import { generateCssFromTokens, tokenToCSSByType } from '../cssGenerator'; -import { exampleMockedGroups, exampleMockedTokens } from '../../formatters/__fixtures__/mockedExampleTokens'; +import { exampleMockedGroups, exampleMockedTokens } from '../../../tests/fixtures/mockedExampleTokens'; const mappedTokens: Map = new Map([]); const tokenGroups: Array = exampleMockedGroups; diff --git a/exporters/variables-scss/src/generators/__tests__/cssObjectGenerator.test.ts b/exporters/variables-scss/src/generators/__tests__/cssObjectGenerator.test.ts index 02b032e1fa..047f6d8026 100644 --- a/exporters/variables-scss/src/generators/__tests__/cssObjectGenerator.test.ts +++ b/exporters/variables-scss/src/generators/__tests__/cssObjectGenerator.test.ts @@ -14,7 +14,7 @@ import { exampleMockedGroups, exampleMockedInvariantTokens, exampleMockedTokens, -} from '../../formatters/__fixtures__/mockedExampleTokens'; +} from '../../../tests/fixtures/mockedExampleTokens'; const mappedTokens: Map = new Map([]); const tokenGroups: Array = exampleMockedGroups; diff --git a/exporters/variables-scss/src/generators/__tests__/fileGenerator.test.ts b/exporters/variables-scss/src/generators/__tests__/fileGenerator.test.ts index a3928849a8..77c8d476d7 100644 --- a/exporters/variables-scss/src/generators/__tests__/fileGenerator.test.ts +++ b/exporters/variables-scss/src/generators/__tests__/fileGenerator.test.ts @@ -2,11 +2,11 @@ import fs from 'fs'; import path from 'path'; import { Supernova, Token, TokenGroup, TokenTheme } from '@supernovaio/sdk-exporters'; import { generateFiles, generateOutputFilesByThemes } from '../fileGenerator'; -import { exampleMockedGroups, exampleMockedTokens } from '../../formatters/__fixtures__/mockedExampleTokens'; +import { exampleMockedGroups, exampleMockedTokens } from '../../../tests/fixtures/mockedExampleTokens'; import { nonThemedFilesData } from '../../config/fileConfig'; const mockedExpectedResult = fs.readFileSync( - path.join(__dirname, '../../formatters/__fixtures__/exampleFileContent.scss'), + path.join(__dirname, '../../../tests/fixtures/exampleFileContent.scss'), 'utf-8', ); const mappedTokens: Map = new Map([]); diff --git a/exporters/variables-scss/src/helpers/__tests__/colorHelper.test.ts b/exporters/variables-scss/src/helpers/__tests__/colorHelper.test.ts index c3a1fb5760..83324926be 100644 --- a/exporters/variables-scss/src/helpers/__tests__/colorHelper.test.ts +++ b/exporters/variables-scss/src/helpers/__tests__/colorHelper.test.ts @@ -1,50 +1,20 @@ import { canHexBeShortened, normalizeColor, removeAlphaChannel, shortenHex } from '../colorHelper'; const dataProviderItems = [ - { - originalColor: 'ffffffff', - expectedColor: '#fff', - }, - { - originalColor: '123456', - expectedColor: '#123456', - }, - { - originalColor: '123', - expectedColor: '#123', - }, - { - originalColor: 'fff', - expectedColor: '#fff', - }, - { - originalColor: 'ffffff', - expectedColor: '#fff', - }, - { - originalColor: 'ffffff00', - expectedColor: '#fff0', - }, - { - originalColor: 'fffffff0', - expectedColor: '#fffffff0', - }, - { - originalColor: '96969', - expectedColor: '#96969', - }, - { - originalColor: '835ea1', - expectedColor: '#835ea1', - }, - { - originalColor: '00000040', - expectedColor: '#00000040', - }, + ['ffffffff', '#fff'], + ['123456', '#123456'], + ['123', '#123'], + ['fff', '#fff'], + ['ffffff', '#fff'], + ['ffffff00', '#fff0'], + ['fffffff0', '#fffffff0'], + ['96969', '#96969'], + ['835ea1', '#835ea1'], + ['00000040', '#00000040'], ]; describe('colorHelper', () => { - describe.each(dataProviderItems)('normalizeColor', ({ originalColor, expectedColor }) => { + describe.each(dataProviderItems)('normalizeColor', (originalColor, expectedColor) => { it('should normalize color', () => { expect(normalizeColor(originalColor)).toBe(expectedColor); }); diff --git a/exporters/variables-scss/src/helpers/__tests__/tokenHelper.test.ts b/exporters/variables-scss/src/helpers/__tests__/tokenHelper.test.ts index b97c646f57..783c1bfa6e 100644 --- a/exporters/variables-scss/src/helpers/__tests__/tokenHelper.test.ts +++ b/exporters/variables-scss/src/helpers/__tests__/tokenHelper.test.ts @@ -1,6 +1,6 @@ import { Token, TokenGroup } from '@supernovaio/sdk-exporters'; import { addEmptyLineBetweenTokenGroups, formatTokenName, sortTokens, tokenVariableName } from '../tokenHelper'; -import { exampleMockedGroups, exampleMockedTokens } from '../../formatters/__fixtures__/mockedExampleTokens'; +import { exampleMockedGroups, exampleMockedTokens } from '../../../tests/fixtures/mockedExampleTokens'; const dataProvider = [ { diff --git a/exporters/variables-scss/src/formatters/__fixtures__/exampleFileContent.scss b/exporters/variables-scss/tests/fixtures/exampleFileContent.scss similarity index 100% rename from exporters/variables-scss/src/formatters/__fixtures__/exampleFileContent.scss rename to exporters/variables-scss/tests/fixtures/exampleFileContent.scss diff --git a/exporters/variables-scss/src/formatters/__fixtures__/formattedExample.scss b/exporters/variables-scss/tests/fixtures/formattedExample.scss similarity index 100% rename from exporters/variables-scss/src/formatters/__fixtures__/formattedExample.scss rename to exporters/variables-scss/tests/fixtures/formattedExample.scss diff --git a/exporters/variables-scss/src/formatters/__fixtures__/mockedExampleTokens.ts b/exporters/variables-scss/tests/fixtures/mockedExampleTokens.ts similarity index 100% rename from exporters/variables-scss/src/formatters/__fixtures__/mockedExampleTokens.ts rename to exporters/variables-scss/tests/fixtures/mockedExampleTokens.ts diff --git a/exporters/variables-scss/tests/fixtures/unformattedExample.scss b/exporters/variables-scss/tests/fixtures/unformattedExample.scss new file mode 100644 index 0000000000..907f1969be --- /dev/null +++ b/exporters/variables-scss/tests/fixtures/unformattedExample.scss @@ -0,0 +1,5 @@ +$my-var: ( + color: #000, + background: #fff, + border: 1px solid #000, +) !default;