Skip to content

Commit

Permalink
Fix merge conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
pascalwilbrink committed Jun 10, 2024
1 parent 8ef6cda commit 015e493
Show file tree
Hide file tree
Showing 16 changed files with 915 additions and 55 deletions.
3 changes: 2 additions & 1 deletion packages/components/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,8 @@
"scripts": {
"clean": "rimraf dist",
"build": "tsc",
"test": "web-test-runner --coverage"
"test": "web-test-runner --coverage",
"test:watch": "web-test-runner --watch"
},
"eslintConfig": {
"extends": [
Expand Down
38 changes: 38 additions & 0 deletions packages/components/test/__snapshots__/action-icon.test.snap.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
/* @web/test-runner snapshot v1 */
export const snapshots = {};

snapshots["Basic component action-icon with icon property set looks like the latest snapshot"] =
`<header>
</header>
<section>
<span>
<slot name="icon">
</slot>
</span>
<slot name="action">
</slot>
</section>
<footer>
</footer>
`;
/* end snapshot Basic component action-icon with icon property set looks like the latest snapshot */

snapshots["Basic component action-icon with unset icon property looks like the latest snapshot"] =
`<header>
</header>
<section>
<span>
<slot name="icon">
<mwc-icon>
edit
</mwc-icon>
</slot>
</span>
<slot name="action">
</slot>
</section>
<footer>
</footer>
`;
/* end snapshot Basic component action-icon with unset icon property looks like the latest snapshot */

24 changes: 24 additions & 0 deletions packages/components/test/__snapshots__/action-pane.test.snap.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
/* @web/test-runner snapshot v1 */
export const snapshots = {};

snapshots["action-pane looks like the latest snapshot"] =
`<section>
<h1 title="test label">
<span>
<slot name="icon">
</slot>
</span>
test label
<nav>
<slot name="action">
</slot>
</nav>
</h1>
<div>
<slot>
</slot>
</div>
</section>
`;
/* end snapshot action-pane looks like the latest snapshot */

28 changes: 28 additions & 0 deletions packages/components/test/__snapshots__/filtered-list.test.snap.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
/* @web/test-runner snapshot v1 */
export const snapshots = {};

snapshots["filtered-list looks like its latest snapshot"] =
`<div id="tfcontainer">
<abbr title="[filter]">
<mwc-textfield
icontrailing="search"
label=""
outlined=""
>
</mwc-textfield>
</abbr>
<mwc-formfield class="checkall">
<mwc-checkbox>
</mwc-checkbox>
</mwc-formfield>
</div>
<ul
class="mdc-deprecated-list"
tabindex="-1"
>
<slot>
</slot>
</ul>
`;
/* end snapshot filtered-list looks like its latest snapshot */

Loading

0 comments on commit 015e493

Please sign in to comment.