javascript/ionic-framework
1
0
Fork 0
mirror of https://github.com/ionic-team/ionic-framework.git synced 2025-08-18 03:00:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into update-pwa-check

Browse Source
This commit is contained in:
Liam DeBeasi
2019-02-01 14:10:35 -05:00
committed by GitHub
parent a584f6e6da bdcf1686d8
commit 536254e430
3 changed files with 29 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/components/modal/readme.md
View File

@ -36,7 +36,7 @@ instance.prop2 = value2;
This way, your component can access the passed params, check the "Usage" section for further code example for each frameworks. This way, your component can access the passed params, check the "Usage" section for further code example for each frameworks.
### Retuning data ### Returning data
Modals can also return data back to the controller when they are dismissed. Modals can also return data back to the controller when they are dismissed.

27
core/src/components/searchbar/test/basic/e2e.ts
View File

@ -7,10 +7,29 @@ test('searchbar: basic', async () => {
await page.waitFor(250); await page.waitFor(250);
const compare = await page.compareScreenshot(); const compares = [];
expect(compare).toMatchScreenshot(); compares.push(await page.compareScreenshot());
const searchbar = await page.find('ion-searchbar'); let searchbar = await page.find('#basic');
await searchbar.callMethod('setFocus'); await searchbar.callMethod('setFocus');
expect(await page.compareScreenshot('focused')).toMatchScreenshot();
await page.waitFor(250);
searchbar = await page.find('#basic');
expect(searchbar).toHaveClass('searchbar-has-focus');
compares.push(await page.compareScreenshot('focused'));
// No Cancel Button Searchbar
searchbar = await page.find('#noCancel');
await searchbar.callMethod('setFocus');
await page.waitFor(250);
searchbar = await page.find('#noCancel');
expect(searchbar).toHaveClass('searchbar-has-focus');
compares.push(await page.compareScreenshot('no cancel button, focused'));
for (const compare of compares) {
expect(compare).toMatchScreenshot();
}
}); });

10
core/src/components/searchbar/test/basic/index.html
View File

@ -22,7 +22,11 @@
<ion-content id="content"> <ion-content id="content">
<h5 padding-start padding-top> Search - Default </h5> <h5 padding-start padding-top> Search - Default </h5>
<ion-searchbar value="test" type="tel" show-cancel-button debounce="500"> <ion-searchbar id="basic" value="test" type="tel" show-cancel-button debounce="500">
</ion-searchbar>
<h5 padding-start padding-top> Search - No Cancel Button </h5>
<ion-searchbar id="noCancel" value="after view" autocorrect="off" autocomplete="off" spellcheck="true" type="text" show-cancel-button="false">
</ion-searchbar> </ion-searchbar>
<h5 padding-start padding-top> Search - Danger </h5> <h5 padding-start padding-top> Search - Danger </h5>
@ -42,10 +46,6 @@
type="number" placeholder="Filter Schedules"> type="number" placeholder="Filter Schedules">
</ion-searchbar> </ion-searchbar>
<h5 padding-start padding-top> Search - No Cancel Button </h5>
<ion-searchbar value="after view" autocorrect="off" autocomplete="off" spellcheck="true" type="text" show-cancel-button="false">
</ion-searchbar>
<h5 padding-start padding-top> Search - Custom Cancel Button Danger </h5> <h5 padding-start padding-top> Search - Custom Cancel Button Danger </h5>
<ion-searchbar show-cancel-button cancel-button-text="Really Long Cancel" color="danger"> <ion-searchbar show-cancel-button cancel-button-text="Really Long Cancel" color="danger">
</ion-searchbar> </ion-searchbar>