Skip to content

Commit b7ff3db

Browse files
Rachel RoppoloRachel Roppolo
authored andcommitted
Merge branch 'release/1.27.0' into main
2 parents 3c22d6a + e410f00 commit b7ff3db

File tree

92 files changed

+12801
-11964
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

92 files changed

+12801
-11964
lines changed

.storybook/preview.js

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,11 @@ import React from 'react';
22
import { addDecorator } from "@storybook/react";
33

44
addDecorator(story => <div style={{ padding: '1rem' }}>{story()}</div>);
5+
6+
export const parameters = {
7+
options: {
8+
storySort: {
9+
order: ['Foundations', 'Components'],
10+
},
11+
},
12+
};

LICENSE.txt

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
MIT License
2+
3+
Copyright (c) 2019-2022 User Interviews
4+
5+
Permission is hereby granted, free of charge, to any person obtaining a copy
6+
of this software and associated documentation files (the "Software"), to deal
7+
in the Software without restriction, including without limitation the rights
8+
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
9+
copies of the Software, and to permit persons to whom the Software is
10+
furnished to do so, subject to the following conditions:
11+
12+
The above copyright notice and this permission notice shall be included in all
13+
copies or substantial portions of the Software.
14+
15+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
16+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
17+
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
18+
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
19+
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
20+
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
21+
SOFTWARE.

cypress/integration/alert_spec.js

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,38 @@
11
const alerts = [
22
{
33
name: 'Success',
4-
path: 'design-system-alert--success',
4+
path: 'components-alert--success',
55
class: '.Alert__title',
66
},
77
{
88
name: 'Info',
9-
path: 'design-system-alert--info',
9+
path: 'components-alert--info',
1010
class: '.Alert__title',
1111
},
1212
{
1313
name: 'Announcement',
14-
path: 'design-system-alert--announcement',
14+
path: 'components-alert--announcement',
1515
class: '.Alert__title',
1616
},
1717
{
1818
name: 'Error',
19-
path: 'design-system-alert--error',
19+
path: 'components-alert--error',
2020
class: '.Alert__title',
2121
},
2222
{
2323
name: 'Warning',
24-
path: 'design-system-alert--warning',
24+
path: 'components-alert--warning',
2525
class: '.Alert__title',
2626
},
2727
{
2828
name: 'With Dismiss',
29-
path: 'design-system-alert--with-dismiss',
29+
path: 'components-alert--with-dismiss',
3030
class: '.Alert__title',
3131
match: 'Default title',
3232
},
3333
{
3434
name: 'With Call To Action',
35-
path: 'design-system-alert--with-call-to-action',
35+
path: 'components-alert--with-call-to-action',
3636
class: '.Alert__title',
3737
match: 'Success title',
3838
},
@@ -44,7 +44,7 @@ describe('Alert', () => {
4444
cy.visit(test.path);
4545
const match = test.match ? test.match : test.name;
4646
cy.get('#storybook-preview-iframe').iframe().find(test.class).should('contain', match);
47-
cy.percySnapshot(test.path);
47+
cy.takePercySnapshot(test.path);
4848
});
4949
});
5050
});

cypress/integration/avatar_spec.js

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
const avatars = [
22
{
33
name: 'Small',
4-
path: 'design-system-avatar--small',
4+
path: 'components-avatar--small',
55
class: '.Avatar__circle__initials',
66
match: 'RR',
77
},
88
{
99
name: 'Large',
10-
path: 'design-system-avatar--large',
10+
path: 'components-avatar--large',
1111
class: '.Avatar__circle__initials',
1212
match: 'RR',
1313
},
1414
{
1515
name: 'With Alert',
16-
path: 'design-system-avatar--with-alert',
16+
path: 'components-avatar--with-alert',
1717
class: '.Avatar__circle__initials',
1818
match: 'RR',
1919
},
@@ -24,16 +24,15 @@ describe('Avatar', () => {
2424
it(test.name, () => {
2525
cy.visit(test.path);
2626
cy.get('#storybook-preview-iframe').iframe().find(test.class).should('contain', test.match);
27-
cy.wait(1000);
28-
cy.percySnapshot(test.path);
27+
cy.takePercySnapshot(test.path);
2928
});
3029
});
3130

3231
it('With Image', () => {
33-
cy.visit('design-system-avatar--with-image');
32+
cy.visit('components-avatar--with-image');
3433
cy.get('#storybook-preview-iframe').iframe().find('.Avatar__circle')
3534
.find('img')
3635
.should('be.visible');
37-
cy.percySnapshot('design-system-alert--with-image');
36+
cy.takePercySnapshot('components-alert--with-image');
3837
});
3938
});

cypress/integration/button_spec.js

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
const buttons = [
22
{
33
name: 'Primary',
4-
path: 'design-system-button--primary',
4+
path: 'components-button--primary',
55
class: '.Button',
66
match: 'Confirm',
77
},
88
{
99
name: 'Danger',
10-
path: 'design-system-button--danger',
10+
path: 'components-button--danger',
1111
class: '.Button',
1212
match: 'Delete',
1313
},
1414
{
1515
name: 'Warning',
16-
path: 'design-system-button--warning',
16+
path: 'components-button--warning',
1717
class: '.Button',
1818
match: 'Edit',
1919
},
@@ -24,8 +24,7 @@ describe('Button', () => {
2424
it(test.name, () => {
2525
cy.visit(test.path);
2626
cy.get('#storybook-preview-iframe').iframe().find(test.class).should('contain', test.match);
27-
cy.wait(1000);
28-
cy.percySnapshot(test.path);
27+
cy.takePercySnapshot(test.path);
2928
});
3029
});
3130
});

cypress/integration/card_spec.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
describe('Card', () => {
22
it('Default', () => {
3-
cy.visit('design-system-card--default');
3+
cy.visit('components-card--default');
44
cy.get('#storybook-preview-iframe').iframe().find('.Card__title')
55
.should('contain', 'Large card with title');
6-
cy.percySnapshot('design-system-card--default');
6+
cy.takePercySnapshot('components-card--default');
77
});
88
});
Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,20 @@
11
describe('CheckboxButton', () => {
22
it('Default', () => {
3-
cy.visit('design-system-checkboxbutton--default');
3+
cy.visit('components-checkboxbutton--default');
44
cy.get('#storybook-preview-iframe').iframe().find('.checkbox').should('exist');
5-
cy.wait(1000);
6-
cy.percySnapshot('design-system-checkboxbutton--default');
5+
cy.takePercySnapshot('components-checkboxbutton--default');
76
});
87

98
it('Indeterminate', () => {
10-
cy.visit('design-system-checkboxbutton--indeterminate');
9+
cy.visit('components-checkboxbutton--indeterminate');
1110
cy.get('#storybook-preview-iframe').iframe().find('#select-all').should('exist');
12-
cy.wait(1000);
13-
cy.percySnapshot('design-system-checkboxbutton--indeterminate');
11+
cy.takePercySnapshot('components-checkboxbutton--indeterminate');
1412
});
1513

1614
it('With Description', () => {
17-
cy.visit('design-system-checkboxbutton--with-description');
15+
cy.visit('components-checkboxbutton--with-description');
1816
cy.get('#storybook-preview-iframe').iframe().find('.FormControlLabel__label')
1917
.should('contain', 'Label 2');
20-
cy.wait(1000);
21-
cy.percySnapshot('design-system-checkboxbutton--with-description');
18+
cy.takePercySnapshot('components-checkboxbutton--with-description');
2219
});
2320
});
Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
describe('Copy to Clipboard Button', () => {
22
it('Default', () => {
3-
cy.visit('design-system-copy-to-clipboard-button--default');
3+
cy.visit('components-copy-to-clipboard-button--default');
44
cy.get('#storybook-preview-iframe').iframe().find('.CopyToClipboardButton').should('exist');
5-
cy.percySnapshot('design-system-copy-to-clipboard-button--default');
5+
cy.takePercySnapshot('components-copy-to-clipboard-button--default');
66
});
77

88
it('Secondary', () => {
9-
cy.visit('design-system-copy-to-clipboard-button--secondary');
9+
cy.visit('components-copy-to-clipboard-button--secondary');
1010
cy.get('#storybook-preview-iframe').iframe().find('.CopyToClipboardButton').should('exist');
11-
cy.percySnapshot('design-system-copy-to-clipboard-button--secondary');
11+
cy.takePercySnapshot('components-copy-to-clipboard-button--secondary');
1212
});
1313
});
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
describe('Copy to Clipboard', () => {
22
it('Default', () => {
3-
cy.visit('design-system-copy-to-clipboard--default');
3+
cy.visit('components-copy-to-clipboard--default');
44
cy.get('#storybook-preview-iframe').iframe().find('.CopyToClipboard').should('exist');
5-
cy.percySnapshot('design-system-copy-to-clipboard--default');
5+
cy.takePercySnapshot('components-copy-to-clipboard--default');
66
});
77
});
Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
const dropdowns = [
22
{
33
name: 'Default',
4-
path: 'design-system-dropdown--default',
4+
path: 'components-dropdown--default',
55
class: '.Dropdown',
66
},
77
{
88
name: 'Sizes',
9-
path: 'design-system-dropdown--sizes',
9+
path: 'components-dropdown--sizes',
1010
class: '.Dropdown',
1111
},
1212
{
1313
name: 'Icon',
14-
path: 'design-system-dropdown--icon',
14+
path: 'components-dropdown--icon',
1515
class: '.Dropdown',
1616
},
1717
];
@@ -21,8 +21,7 @@ describe('Dropdown', () => {
2121
it(test.name, () => {
2222
cy.visit(test.path);
2323
cy.get('#storybook-preview-iframe').iframe().find(test.class).should('exist');
24-
cy.wait(1000);
25-
cy.percySnapshot(test.path);
24+
cy.takePercySnapshot(test.path);
2625
});
2726
});
2827
});

0 commit comments

Comments
 (0)