Skip to content

Commit

Permalink
Roll out yesterday's demo for #108
Browse files Browse the repository at this point in the history
  • Loading branch information
lathonez committed Jul 3, 2016
1 parent 5d89589 commit a754659
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 5 deletions.
2 changes: 1 addition & 1 deletion app/components/clickerForm/clickerForm.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<ion-row>
<ion-col width-80>
<ion-item>
<ion-input block [ngFormControl]="clickerNameInput" [(ngModel)]="clickerName" type="text" placeholder="New Clicker"></ion-input>
<ion-input block [ngFormControl]="clickerNameInput" type="text" placeholder="New Clicker"></ion-input>
</ion-item>
</ion-col>
<ion-col>
Expand Down
2 changes: 0 additions & 2 deletions app/components/clickerForm/clickerForm.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ export class ClickerForm {
private clickerService: Clickers;
private form: ControlGroup;
private clickerNameInput: AbstractControl;
private clickerName: string;

constructor(clickerService: Clickers, fb: FormBuilder) {
this.clickerService = clickerService;
Expand All @@ -26,7 +25,6 @@ export class ClickerForm {
});

this.clickerNameInput = this.form.controls['clickerNameInput'];
this.clickerName = 'Clicker Issue #108';
}

public newClicker(formValue: Object): boolean {
Expand Down
4 changes: 2 additions & 2 deletions app/pages/clickerList/clickerList.e2e.ts
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,13 @@ describe('ClickerList', () => {
'test clicker one'.split('').forEach((c) => clickerField.sendKeys(c));
clickerButton.click();
browser.driver.sleep(1000);
expect(firstClicker.getText()).toEqual('CLICKER ISSUE #108TEST CLICKER ONE (0)');
expect(firstClicker.getText()).toEqual('TEST CLICKER ONE (0)');
});

it('should click a Clicker', () => {
firstClicker.click();
browser.driver.sleep(1000);
expect(firstClicker.getText()).toEqual('CLICKER ISSUE #108TEST CLICKER ONE (1)');
expect(firstClicker.getText()).toEqual('TEST CLICKER ONE (1)');
});

it('should delete a Clicker', () => {
Expand Down

0 comments on commit a754659

Please sign in to comment.