Skip to content

Commit

Permalink
Merge branch 'main' into icons-new-july-august-2021
Browse files Browse the repository at this point in the history
  • Loading branch information
kodiakhq[bot] authored Aug 17, 2021
2 parents 350fa3d + c521e05 commit 0ac3660
Show file tree
Hide file tree
Showing 7 changed files with 133 additions and 14 deletions.
9 changes: 9 additions & 0 deletions .all-contributorsrc
Original file line number Diff line number Diff line change
Expand Up @@ -783,6 +783,15 @@
"contributions": [
"doc"
]
},
{
"login": "Kiittyka",
"name": "Krithika S Udupa",
"avatar_url": "https://avatars.githubusercontent.com/u/41021851?v=4",
"profile": "https://github.com/Kiittyka",
"contributions": [
"doc"
]
}
],
"commitConvention": "none"
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/stale.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ jobs:
This issue has been closed because it has received no activity for
14 days
stale-issue-label: 'status: stale 🍞'
stale-pr-label: 'status: stale 🍞'
days-before-stale: 7
days-before-close: 7
debug-only: true
6 changes: 4 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,8 @@ we support!
## :books: Documentation

- See our documentation site
[here](https://www.carbondesignsystem.com/get-started/develop/react) for full
how-to docs and guidelines
[here](https://www.carbondesignsystem.com/developing/frameworks/react/) for
full how-to docs and guidelines
- [Contributing](/.github/CONTRIBUTING.md): Guidelines for making contributions
to this repo.
- 🏃‍♀️ Migration Guides
Expand Down Expand Up @@ -184,6 +184,8 @@ check out our [Contributing Guide](/.github/CONTRIBUTING.md) and our
</tr>
<tr>
<td align="center"><a href="https://github.com/szymonbrandys"><img src="https://avatars.githubusercontent.com/u/79149899?v=4?s=100" width="100px;" alt=""/><br /><sub><b>szymonbrandys</b></sub></a><br /><a href="https://github.com/carbon-design-system/carbon/commits?author=szymonbrandys" title="Code">💻</a></td>
<td align="center"><a href="https://github.com/adamalston"><img src="https://avatars.githubusercontent.com/u/18297826?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Adam Alston</b></sub></a><br /><a href="https://github.com/carbon-design-system/carbon/commits?author=adamalston" title="Documentation">📖</a></td>
<td align="center"><a href="https://github.com/Kiittyka"><img src="https://avatars.githubusercontent.com/u/41021851?v=4?s=100" width="100px;" alt=""/><br /><sub><b>Krithika S Udupa</b></sub></a><br /><a href="https://github.com/carbon-design-system/carbon/commits?author=Kiittyka" title="Documentation">📖</a></td>
</tr>
</table>

Expand Down
6 changes: 0 additions & 6 deletions packages/carbon-react/__tests__/index-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -195,12 +195,6 @@ Array [
"TooltipDefinition",
"TooltipIcon",
"UnorderedList",
"unstable_ContextMenu",
"unstable_ContextMenuDivider",
"unstable_ContextMenuGroup",
"unstable_ContextMenuItem",
"unstable_ContextMenuRadioGroup",
"unstable_ContextMenuSelectableItem",
"unstable_Heading",
"unstable_PageSelector",
"unstable_Pagination",
Expand Down
6 changes: 0 additions & 6 deletions packages/carbon-react/src/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -191,12 +191,6 @@ export {
unstable_Pagination,
unstable_TreeView,
unstable_TreeNode,
unstable_ContextMenu,
unstable_ContextMenuDivider,
unstable_ContextMenuGroup,
unstable_ContextMenuItem,
unstable_ContextMenuRadioGroup,
unstable_ContextMenuSelectableItem,
unstable_useContextMenu,
unstable_Heading,
unstable_Section,
Expand Down
66 changes: 66 additions & 0 deletions packages/react/src/components/Tabs/tabs-test.e2e.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
/**
* Copyright IBM Corp. 2016, 2018
*
* This source code is licensed under the Apache-2.0 license found in the
* LICENSE file in the root directory of this source tree.
*/

import 'carbon-components/scss/components/tabs/_tabs.scss';

import React from 'react';
import { mount } from '@cypress/react';
import Tabs from './Tabs';
import Tab from '../Tab/Tab';
import TabsSkeleton from './Tabs.Skeleton';

describe('Tabs', () => {
beforeEach(() => {
mount(
<>
<Tabs>
<Tab label="Tab label 1">
<p>Content for first tab goes here.</p>
</Tab>
<Tab label="Tab label 2">
<p>Content for second tab goes here.</p>
</Tab>
<Tab label="Tab label 3" disabled>
<p>Content for third tab goes here.</p>
</Tab>
<Tab
label="Tab label 4 shows truncation"
title="Tab label 4 shows truncation">
<p>Content for fourth tab goes here.</p>
</Tab>
</Tabs>
<Tabs type="container">
<Tab label="Tab label 1">
<p>Yellow</p>
</Tab>
<Tab label="Tab label 2">
<p>Content for second tab goes here.</p>
</Tab>
<Tab
label="Tab label 3 shows truncation"
title="Tab label 3 shows truncation">
<p>Content for third tab goes here.</p>
</Tab>
<Tab label="Tab label 4" disabled>
<p>Content for fourth container tab goes here.</p>
</Tab>
</Tabs>
<TabsSkeleton type="default" />
<TabsSkeleton type="container" />
</>
);
});

it('should render', () => {
cy.findByText('Yellow').should('be.visible');

// snapshots should always be taken _after_ an assertion that
// a element/component should be visible. This is to ensure
// the DOM has settled and the element has fully loaded.
cy.percySnapshot();
});
});
53 changes: 53 additions & 0 deletions packages/react/src/components/Tag/Tag-test.e2e.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
/**
* Copyright IBM Corp. 2016, 2018
*
* This source code is licensed under the Apache-2.0 license found in the
* LICENSE file in the root directory of this source tree.
*/

import 'carbon-components/scss/components/tag/_tag.scss';

import React from 'react';
import { mount } from '@cypress/react';
import Tag from './Tag';
import TagSkeleton from './Tag.Skeleton';
import { Tag16 } from '@carbon/icons-react';

describe('Tag', () => {
beforeEach(() => {
mount(
<>
<Tag>This is a tag</Tag>
<Tag onClick={() => {}}>This is an interactive tag</Tag>
<Tag size="sm">This is a small tag</Tag>
<Tag filter>This is a filter tag</Tag>
<Tag renderIcon={Tag16}>Custom icon</Tag>
<Tag filter disabled>
Disabled filter tag
</Tag>
<Tag type="magenta">magenta</Tag>
<Tag type="red">red</Tag>
<Tag type="purple">purple</Tag>
<Tag type="blue">blue</Tag>
<Tag type="cyan">cyan</Tag>
<Tag type="teal">teal</Tag>
<Tag type="green">green</Tag>
<Tag type="gray">gray</Tag>
<Tag type="cool-gray">cool-gray</Tag>
<Tag type="warm-gray">warm-gray</Tag>
<Tag type="high-contrast">high-contrast</Tag>
<TagSkeleton />
<TagSkeleton size="sm" />
</>
);
});

it('should render', () => {
cy.findByText(/warm-gray/).should('be.visible');

// snapshots should always be taken _after_ an assertion that
// a element/component should be visible. This is to ensure
// the DOM has settled and the element has fully loaded.
cy.percySnapshot();
});
});

0 comments on commit 0ac3660

Please sign in to comment.