Merge branch 'master' into alpha38

This commit is contained in:
Adam Bradley
2015-10-06 16:28:40 -05:00
3 changed files with 14 additions and 1 deletions

View File

@ -45,6 +45,15 @@ Ionic 2 is based on the new [2.x version of AngularJS](https://angular.io/), and
3. Go to [http://localhost:8000/e2e/](http://localhost:8000/e2e/) 3. Go to [http://localhost:8000/e2e/](http://localhost:8000/e2e/)
4. Stay cool 4. Stay cool
### Running Snapshot
1. Install [Protractor](https://angular.github.io/protractor/#/): `npm install -g protractor`
2. Export `IONIC_SNAPSHOT_KEY` (get from someone)
3. Run `gulp snapshot`
### Running Tests
1. `gulp karma`
### Distribution ### Distribution

View File

@ -0,0 +1,4 @@
it('should animate focus', function() {
element(by.css('.e2eFloatingSearchBar input')).sendKeys("Should animate");
});

View File

@ -6,7 +6,7 @@
<ion-content> <ion-content>
<form [ng-form-model]="form"> <form [ng-form-model]="form">
<label> Default Search </label> <label> Default Search </label>
<ion-search-bar ng-control="searchQuery"></ion-search-bar> <ion-search-bar ng-control="searchQuery" class="e2eFloatingSearchBar"></ion-search-bar>
<label> Placeholder Search </label> <label> Placeholder Search </label>
<ion-search-bar ng-control="searchQuery" placeholder="Filter"></ion-search-bar> <ion-search-bar ng-control="searchQuery" placeholder="Filter"></ion-search-bar>
</form> </form>