fix tests

saadeghi · Jun 7, 2023 · 8d3260d · 8d3260d
1 parent 611d3c7
commit 8d3260d
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 28 deletions.
diff --git a/src/tests/a11y.test.js b/src/tests/a11y.test.js
@@ -4,7 +4,7 @@ import * as themes from "../theming/themes"
 import {
   trimThemeName,
   trimCssVariable,
-  lchValuesToHex,
+  hslValuesToHex,
   ContrastRatioWarningThreshold,
   ContrastRatioErrorThreshold,
   isColorContrastOkay,
@@ -35,13 +35,13 @@ describe.each(
   ])(`${trimThemeName(themeKey)} color pairs`, (pair1, pair2) => {
     if (
       isColorContrastOkay(
-        lchValuesToHex(colorFunctions.convertToLch(themes[themeKey])[pair1]),
-        lchValuesToHex(colorFunctions.convertToLch(themes[themeKey])[pair2]),
+        hslValuesToHex(colorFunctions.convertColorFormat(themes[themeKey])[pair1]),
+        hslValuesToHex(colorFunctions.convertColorFormat(themes[themeKey])[pair2]),
         ContrastRatioWarningThreshold
       ) === false &&
       isColorContrastOkay(
-        lchValuesToHex(colorFunctions.convertToLch(themes[themeKey])[pair1]),
-        lchValuesToHex(colorFunctions.convertToLch(themes[themeKey])[pair2]),
+        hslValuesToHex(colorFunctions.convertColorFormat(themes[themeKey])[pair1]),
+        hslValuesToHex(colorFunctions.convertColorFormat(themes[themeKey])[pair2]),
         ContrastRatioErrorThreshold
       ) === true
     ) {
@@ -54,8 +54,8 @@ describe.each(
 
     if (
       isColorContrastOkay(
-        lchValuesToHex(colorFunctions.convertToLch(themes[themeKey])[pair1]),
-        lchValuesToHex(colorFunctions.convertToLch(themes[themeKey])[pair2]),
+        hslValuesToHex(colorFunctions.convertColorFormat(themes[themeKey])[pair1]),
+        hslValuesToHex(colorFunctions.convertColorFormat(themes[themeKey])[pair2]),
         ContrastRatioErrorThreshold
       ) === false
     ) {
@@ -68,8 +68,8 @@ describe.each(
 
     expect(
       isColorContrastOkay(
-        lchValuesToHex(colorFunctions.convertToLch(themes[themeKey])[pair1]),
-        lchValuesToHex(colorFunctions.convertToLch(themes[themeKey])[pair2]),
+        hslValuesToHex(colorFunctions.convertColorFormat(themes[themeKey])[pair1]),
+        hslValuesToHex(colorFunctions.convertColorFormat(themes[themeKey])[pair2]),
         ContrastRatioErrorThreshold
       )
     ).toBe(true)

diff --git a/src/tests/colors.test.js b/src/tests/colors.test.js
@@ -2,14 +2,10 @@ import { expect, test } from "vitest"
 import * as colorFunctions from "../theming/functions"
 
 test("Foreground color generator function", () => {
-  expect(colorFunctions.generateForegroundColorFrom("lch(100% 0 0)")).toBe("20 0 0")
-  expect(colorFunctions.generateForegroundColorFrom("lch(0% 0 0)")).toBe("80 0 0")
-  expect(colorFunctions.generateForegroundColorFrom("lch(100% 0 0)", 1)).toBe("0 0 0")
-  expect(colorFunctions.generateForegroundColorFrom("lch(0% 0 0)", 1)).toBe("100 0 0")
-  expect(colorFunctions.generateForegroundColorFrom("lch(60.83% 53.53 259.57)")).toBe(
-    "92.17 10.71 259.57"
-  )
-  expect(colorFunctions.generateForegroundColorFrom("lch(45.82% 76.92 31.84)")).toBe(
-    "89.16 15.38 31.84"
-  )
+  expect(colorFunctions.generateForegroundColorFrom("#fff")).toBe("146 0% 19%")
+  expect(colorFunctions.generateForegroundColorFrom("#000")).toBe("145 0% 78%")
+  expect(colorFunctions.generateForegroundColorFrom("#fff", 1)).toBe("0 0% 0%")
+  expect(colorFunctions.generateForegroundColorFrom("#000", 1)).toBe("161 100% 100%")
+  expect(colorFunctions.generateForegroundColorFrom("#1D9BF0")).toBe("215 87% 93%")
+  expect(colorFunctions.generateForegroundColorFrom("#CF212E")).toBe("8 93% 91%")
 })
diff --git a/src/tests/themes.test.js b/src/tests/themes.test.js
@@ -16,7 +16,9 @@ describe.each(
       return colorName !== "default"
     })
   )(`${trimThemeName(themeKey)} has colors`, (colorName) => {
-    expect(colorFunctions.convertToLch(themes[themeKey])).toHaveProperty(colorNames[colorName])
+    expect(colorFunctions.convertColorFormat(themes[themeKey])).toHaveProperty(
+      colorNames[colorName]
+    )
   })
 })
 
@@ -41,6 +43,6 @@ describe.each(
       "--tab-radius",
     ]
   )(`${trimThemeName(themeKey)} has CSS variables`, (variableName) => {
-    expect(colorFunctions.convertToLch(themes[themeKey])).toHaveProperty(variableName)
+    expect(colorFunctions.convertColorFormat(themes[themeKey])).toHaveProperty(variableName)
   })
 })
diff --git a/src/tests/utils.js b/src/tests/utils.js
@@ -25,16 +25,16 @@ export const isColorContrastOkay = (input1, input2, ratio) => {
   return false
 }
 
-function changeLchValuesToObject(input) {
-  const [l, c, h] = input.match(/\d+(\.\d+)?%|\d+(\.\d+)?/g).map(parseFloat)
-  return { l, c, h, a: 1 }
+function changeHslValuesToObject(input) {
+  const [h, s, l] = input.match(/\d+(\.\d+)?%|\d+(\.\d+)?/g).map(parseFloat)
+  return { h, s, l, a: 1 }
 }
 
-export const lchValuesToHex = (input) => {
+export const hslValuesToHex = (input) => {
   return colord(
-    `lch(${changeLchValuesToObject(input).l}% ${changeLchValuesToObject(input).c} ${
-      changeLchValuesToObject(input).h
-    })`
+    `hsl(${changeHslValuesToObject(input).h} ${changeHslValuesToObject(input).s}% ${
+      changeHslValuesToObject(input).l
+    }%)`
   ).toHex()
 }