Skip to content

Commit 4a79ef7

Browse files
Fix dead variables-dark import in dormant SCSS mixin tests (#42746)
1 parent 0847f3a commit 4a79ef7

5 files changed

Lines changed: 79 additions & 78 deletions

File tree

scss/tests/jasmine.cjs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ module.exports = {
88
spec_dir: 'scss',
99
// Make Jasmine look for `.test.scss` files
1010
// spec_files: ['**/*.{test,spec}.scss'],
11-
spec_files: ['**/_utilities.test.scss', '**/utilities/_api.test.scss', '**/modules/_configuration.test.scss', '**/modules/_root-tokens.test.scss', '**/forms/_validation.test.scss'],
11+
spec_files: ['**/_utilities.test.scss', '**/utilities/_api.test.scss', '**/modules/_configuration.test.scss', '**/modules/_root-tokens.test.scss', '**/forms/_validation.test.scss', '**/mixins/_color-mode-*.test.scss'],
1212
// Compile them into JS scripts running `sass-true`
1313
requires: [path.join(__dirname, 'sass-true/register.cjs')],
1414
// Ensure we use `require` so that the require.extensions works

scss/tests/mixins/_color-contrast.test.scss

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
1-
@import "../../functions";
2-
@import "../../config";
3-
@import "../../variables-dark";
4-
@import "../../maps";
5-
@import "../../mixins";
1+
@use "../../colors" as *;
2+
@use "../../config" as *;
3+
@use "../../functions" as *;
64

75
@include describe("color-contrast function") {
86
@include it("should return a color when contrast ratio equals minimum requirement (WCAG 2.1 compliance)") {
Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
// check-unused-imports-disable — test infrastructure imports.
2+
// stylelint-disable selector-attribute-quotes
3+
4+
@use "sass:color";
5+
// Configure the shared config module once, for this compilation, before it's
6+
// loaded by mixins/color-mode. Dart Sass forbids reassigning another module's
7+
// variable (`ns.$var: value !global` errors), so overriding via `with (...)`
8+
// at first load is the only supported way to flip `$color-mode-type` for a test.
9+
@use "../../config" with ($color-mode-type: "data");
10+
@use "../../colors" as *;
11+
@use "../../mixins/color-mode" as *;
12+
13+
@include describe("global $color-mode-type: data") {
14+
@include it("generates data attribute selectors for dark mode") {
15+
@include assert() {
16+
@include output() {
17+
@include color-mode(dark) {
18+
.element {
19+
color: var(--bs-primary-fg-emphasis);
20+
background-color: var(--bs-primary-bg-subtle);
21+
}
22+
}
23+
@include color-mode(dark, true) {
24+
--custom-color: #{color.mix($indigo, $blue, 50%, oklch)};
25+
}
26+
}
27+
@include expect() {
28+
[data-bs-theme=dark] .element {
29+
color: var(--bs-primary-fg-emphasis);
30+
background-color: var(--bs-primary-bg-subtle);
31+
}
32+
[data-bs-theme=dark] {
33+
--custom-color: #{color.mix($indigo, $blue, 50%, oklch)};
34+
}
35+
}
36+
}
37+
}
38+
}
Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
// check-unused-imports-disable — test infrastructure imports.
2+
3+
@use "sass:color";
4+
@use "../../colors" as *;
5+
@use "../../mixins/color-mode" as *;
6+
7+
// Exercises the default `$color-mode-type: "media-query"` (see scss/_config.scss).
8+
@include describe("global $color-mode-type: media-query (default)") {
9+
@include it("generates media queries for dark mode") {
10+
@include assert() {
11+
@include output() {
12+
@include color-mode(dark) {
13+
.element {
14+
color: var(--bs-primary-fg-emphasis);
15+
background-color: var(--bs-primary-bg-subtle);
16+
}
17+
}
18+
@include color-mode(dark, true) {
19+
--custom-color: #{color.mix($indigo, $blue, 50%, oklch)};
20+
}
21+
}
22+
@include expect() {
23+
@media (prefers-color-scheme: dark) {
24+
.element {
25+
color: var(--bs-primary-fg-emphasis);
26+
background-color: var(--bs-primary-bg-subtle);
27+
}
28+
}
29+
@media (prefers-color-scheme: dark) {
30+
:root {
31+
--custom-color: #{color.mix($indigo, $blue, 50%, oklch)};
32+
}
33+
}
34+
}
35+
}
36+
}
37+
}

scss/tests/mixins/_color-modes.test.scss

Lines changed: 0 additions & 72 deletions
This file was deleted.

0 commit comments

Comments
 (0)