Merge branch 'main' into react-classname-optional-data-skelton

carbon-design-system · Aug 2, 2023 · 961e09e · 961e09e
2 parents 0bb71c7 + b4a65d6
commit 961e09e
Show file tree

Hide file tree

Showing 8 changed files with 132 additions and 45 deletions.
diff --git a/e2e/components/Link/Link-test.avt.e2e.js b/e2e/components/Link/Link-test.avt.e2e.js
@@ -0,0 +1,48 @@
+/**
+ * Copyright IBM Corp. 2016, 2023
+ *
+ * This source code is licensed under the Apache-2.0 license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+'use strict';
+
+const { expect, test } = require('@playwright/test');
+const { visitStory } = require('../../test-utils/storybook');
+
+test.describe('Link @avt', () => {
+  test('accessibility-checker default', async ({ page }) => {
+    await visitStory(page, {
+      component: 'Link',
+      id: 'components-link--default',
+      globals: {
+        theme: 'white',
+      },
+    });
+    await expect(page).toHaveNoACViolations('components-link--default');
+  });
+
+  test('accessibility-checker inline', async ({ page }) => {
+    await visitStory(page, {
+      component: 'Link',
+      id: 'components-link--inline',
+      globals: {
+        theme: 'white',
+      },
+    });
+    await expect(page).toHaveNoACViolations('components-link--inline');
+  });
+
+  test('accessibility-checker paired with icon', async ({ page }) => {
+    await visitStory(page, {
+      component: 'Link',
+      id: 'components-link--paired-with-icon',
+      globals: {
+        theme: 'white',
+      },
+    });
+    await expect(page).toHaveNoACViolations(
+      'components-link--paired-with-icon'
+    );
+  });
+});
diff --git a/e2e/components/Link/Link-test.e2e.js b/e2e/components/Link/Link-test.e2e.js
@@ -7,9 +7,9 @@
 
 'use strict';
 
-const { expect, test } = require('@playwright/test');
+const { test } = require('@playwright/test');
 const { themes } = require('../../test-utils/env');
-const { snapshotStory, visitStory } = require('../../test-utils/storybook');
+const { snapshotStory } = require('../../test-utils/storybook');
 
 test.describe('Link', () => {
   themes.forEach((theme) => {
@@ -31,15 +31,4 @@ test.describe('Link', () => {
       });
     });
   });
-
-  test('accessibility-checker @avt', async ({ page }) => {
-    await visitStory(page, {
-      component: 'Link',
-      id: 'components-link--default',
-      globals: {
-        theme: 'white',
-      },
-    });
-    await expect(page).toHaveNoACViolations('Link');
-  });
 });
diff --git a/e2e/components/OrderedList/OrderedList-test.avt.e2e.js b/e2e/components/OrderedList/OrderedList-test.avt.e2e.js
@@ -0,0 +1,35 @@
+/**
+ * Copyright IBM Corp. 2016, 2023
+ *
+ * This source code is licensed under the Apache-2.0 license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+'use strict';
+
+const { expect, test } = require('@playwright/test');
+const { visitStory } = require('../../test-utils/storybook');
+
+test.describe('OrderedList @avt', () => {
+  test('accessibility-checker default', async ({ page }) => {
+    await visitStory(page, {
+      component: 'OrderedList',
+      id: 'components-orderedlist--default',
+      globals: {
+        theme: 'white',
+      },
+    });
+    await expect(page).toHaveNoACViolations('components-orderedlist--default');
+  });
+
+  test('accessibility-checker nested', async ({ page }) => {
+    await visitStory(page, {
+      component: 'OrderedList',
+      id: 'components-orderedlist--nested',
+      globals: {
+        theme: 'white',
+      },
+    });
+    await expect(page).toHaveNoACViolations('components-orderedlist--nested');
+  });
+});
diff --git a/e2e/components/OrderedList/OrderedList-test.e2e.js b/e2e/components/OrderedList/OrderedList-test.e2e.js
@@ -7,9 +7,9 @@
 
 'use strict';
 
-const { expect, test } = require('@playwright/test');
+const { test } = require('@playwright/test');
 const { themes } = require('../../test-utils/env');
-const { snapshotStory, visitStory } = require('../../test-utils/storybook');
+const { snapshotStory } = require('../../test-utils/storybook');
 
 test.describe('OrderedList', () => {
   themes.forEach((theme) => {
@@ -39,15 +39,4 @@ test.describe('OrderedList', () => {
       });
     });
   });
-
-  test('accessibility-checker @avt', async ({ page }) => {
-    await visitStory(page, {
-      component: 'OrderedList',
-      id: 'components-orderedlist--default',
-      globals: {
-        theme: 'white',
-      },
-    });
-    await expect(page).toHaveNoACViolations('OrderedList');
-  });
 });
diff --git a/e2e/components/UnorderedList/UnorderedList-test.avt.e2e.js b/e2e/components/UnorderedList/UnorderedList-test.avt.e2e.js
@@ -0,0 +1,37 @@
+/**
+ * Copyright IBM Corp. 2016, 2023
+ *
+ * This source code is licensed under the Apache-2.0 license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+'use strict';
+
+const { expect, test } = require('@playwright/test');
+const { visitStory } = require('../../test-utils/storybook');
+
+test.describe('UnorderedList @avt', () => {
+  test('accessibility-checker default', async ({ page }) => {
+    await visitStory(page, {
+      component: 'UnorderedList',
+      id: 'components-unorderedlist--default',
+      globals: {
+        theme: 'white',
+      },
+    });
+    await expect(page).toHaveNoACViolations(
+      'components-unorderedlist--default'
+    );
+  });
+
+  test('accessibility-checker nested', async ({ page }) => {
+    await visitStory(page, {
+      component: 'UnorderedList',
+      id: 'components-unorderedlist--nested',
+      globals: {
+        theme: 'white',
+      },
+    });
+    await expect(page).toHaveNoACViolations('components-unorderedlist--nested');
+  });
+});
diff --git a/e2e/components/UnorderedList/UnorderedList-test.e2e.js b/e2e/components/UnorderedList/UnorderedList-test.e2e.js
@@ -7,9 +7,9 @@
 
 'use strict';
 
-const { expect, test } = require('@playwright/test');
+const { test } = require('@playwright/test');
 const { themes } = require('../../test-utils/env');
-const { snapshotStory, visitStory } = require('../../test-utils/storybook');
+const { snapshotStory } = require('../../test-utils/storybook');
 
 test.describe('UnorderedList', () => {
   themes.forEach((theme) => {
@@ -31,15 +31,4 @@ test.describe('UnorderedList', () => {
       });
     });
   });
-
-  test('accessibility-checker @avt', async ({ page }) => {
-    await visitStory(page, {
-      component: 'UnorderedList',
-      id: 'components-unorderedlist--default',
-      globals: {
-        theme: 'white',
-      },
-    });
-    await expect(page).toHaveNoACViolations('UnorderedList');
-  });
 });
diff --git a/packages/styles/scss/__tests__/__snapshots__/type-test.js.snap b/packages/styles/scss/__tests__/__snapshots__/type-test.js.snap
@@ -933,7 +933,7 @@ Object {
         Object {
           "position": Position {
             "end": Object {
-              "column": 72,
+              "column": 59,
               "line": 96,
             },
             "source": undefined,
@@ -944,12 +944,12 @@ Object {
           },
           "property": "font-size",
           "type": "declaration",
-          "value": "var(--cds-helper-text-02-font-size, carbon--type-scale(2))",
+          "value": "var(--cds-helper-text-02-font-size, 0.875rem)",
         },
         Object {
           "position": Position {
             "end": Object {
-              "column": 85,
+              "column": 58,
               "line": 97,
             },
             "source": undefined,
@@ -960,7 +960,7 @@ Object {
           },
           "property": "font-weight",
           "type": "declaration",
-          "value": "var(--cds-helper-text-02-font-weight, carbon--font-weight(\\"regular\\"))",
+          "value": "var(--cds-helper-text-02-font-weight, 400)",
         },
         Object {
           "position": Position {

diff --git a/packages/type/scss/_styles.scss b/packages/type/scss/_styles.scss
@@ -92,8 +92,8 @@ $helper-text-01: (
 /// @deprecated
 /// @group @carbon/type
 $helper-text-02: (
-  font-size: carbon--type-scale(2),
-  font-weight: carbon--font-weight('regular'),
+  font-size: scale.type-scale(2),
+  font-weight: font-family.font-weight('regular'),
   line-height: 1.28572,
   letter-spacing: 0.16px,
 ) !default;