From d8603948c36de9718e39284e58d12665a53ca569 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jesper=20H=C3=A5kansson?= <jesper@jesperh.se>
Date: Tue, 12 Jul 2016 10:46:31 +0200
Subject: [PATCH 01/14] fix(MdInput): Input should not be treated as empty if
 it is a date field. Fixes #845

---
 src/components/input/input.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/input/input.html b/src/components/input/input.html
index 8c526675fec2..b4f1d7737f05 100644
--- a/src/components/input/input.html
+++ b/src/components/input/input.html
@@ -35,7 +35,7 @@
 
       <label class="md-input-placeholder"
              [attr.for]="inputId"
-             [class.md-empty]="empty"
+             [class.md-empty]="empty && type !== 'date'"
              [class.md-focused]="focused"
              [class.md-float]="floatingPlaceholder"
              [class.md-accent]="dividerColor == 'accent'"

From 17465c9cf36be7fd93b55abcdd0d63f16067c133 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jesper=20H=C3=A5kansson?= <jesper@jesperh.se>
Date: Tue, 12 Jul 2016 10:46:31 +0200
Subject: [PATCH 02/14] fix(MdInput): Input should not be treated as empty if
 it is a date field. Fixes #845

---
 src/components/input/input.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/input/input.html b/src/components/input/input.html
index 8c526675fec2..b4f1d7737f05 100644
--- a/src/components/input/input.html
+++ b/src/components/input/input.html
@@ -35,7 +35,7 @@
 
       <label class="md-input-placeholder"
              [attr.for]="inputId"
-             [class.md-empty]="empty"
+             [class.md-empty]="empty && type !== 'date'"
              [class.md-focused]="focused"
              [class.md-float]="floatingPlaceholder"
              [class.md-accent]="dividerColor == 'accent'"

From 5262e6be786435f5d0e5cd277fb0877f089acc2f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jesper=20H=C3=A5kansson?= <jesper@jesperh.se>
Date: Tue, 12 Jul 2016 14:02:32 +0200
Subject: [PATCH 03/14] fix(md-input): Check for type in empty getter instead

---
 src/components/input/input.html | 2 +-
 src/components/input/input.ts   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/input/input.html b/src/components/input/input.html
index b4f1d7737f05..8c526675fec2 100644
--- a/src/components/input/input.html
+++ b/src/components/input/input.html
@@ -35,7 +35,7 @@
 
       <label class="md-input-placeholder"
              [attr.for]="inputId"
-             [class.md-empty]="empty && type !== 'date'"
+             [class.md-empty]="empty"
              [class.md-focused]="focused"
              [class.md-float]="floatingPlaceholder"
              [class.md-accent]="dividerColor == 'accent'"
diff --git a/src/components/input/input.ts b/src/components/input/input.ts
index 5985f39b31c0..ca87fca62de2 100644
--- a/src/components/input/input.ts
+++ b/src/components/input/input.ts
@@ -129,7 +129,7 @@ export class MdInput implements ControlValueAccessor, AfterContentInit, OnChange
 
   /** Readonly properties. */
   get focused() { return this._focused; }
-  get empty() { return this._value == null || this._value === ''; }
+  get empty() { return (this._value == null || this._value === '') && this.type !== 'date'; }
   get characterCount(): number {
     return this.empty ? 0 : ('' + this._value).length;
   }

From 121486ad43e2d85197fcab4017cb8e1cfae38f4c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jesper=20H=C3=A5kansson?= <jesper@jesperh.se>
Date: Thu, 14 Jul 2016 23:06:07 +0200
Subject: [PATCH 04/14] test(MdInput): Add tests for empty check

---
 src/components/input/input.spec.ts | 92 ++++++++++++++++++++++++++++++
 1 file changed, 92 insertions(+)

diff --git a/src/components/input/input.spec.ts b/src/components/input/input.spec.ts
index 12ed39133310..d0f39ebe83ae 100644
--- a/src/components/input/input.spec.ts
+++ b/src/components/input/input.spec.ts
@@ -35,6 +35,62 @@ describe('MdInput', function () {
       });
   }));
 
+  it('should not be treated as empty if type is date', () => {
+    return builder.createAsync(MdInputDateTestController)
+      .then(fixture => {
+        fakeAsync(() => {
+          fixture.componentInstance.placeholder = 'Placeholder';
+          fixture.detectChanges();
+
+          let el = fixture.debugElement.query(By.css('label')).nativeElement;
+          expect(el).not.toBeNull();
+          expect(el.className.includes('md-empty')).toBe(false);
+        })();
+      });
+  });
+
+  it('should treat text input type as empty at init', () => {
+    return builder.createAsync(MdInputTextTestController)
+      .then(fixture => {
+        fakeAsync(() => {
+          fixture.componentInstance.placeholder = 'Placeholder';
+          fixture.detectChanges();
+
+          let el = fixture.debugElement.query(By.css('label')).nativeElement;
+          expect(el).not.toBeNull();
+          expect(el.className.includes('md-empty')).toBe(true);
+        })();
+      });
+  });
+
+  it('should treat password input type as empty at init', () => {
+    return builder.createAsync(MdInputPasswordTestController)
+      .then(fixture => {
+        fakeAsync(() => {
+          fixture.componentInstance.placeholder = 'Placeholder';
+          fixture.detectChanges();
+
+          let el = fixture.debugElement.query(By.css('label')).nativeElement;
+          expect(el).not.toBeNull();
+          expect(el.className.includes('md-empty')).toBe(true);
+        })();
+      });
+  });
+
+  it('should treat number input type as empty at init', () => {
+    return builder.createAsync(MdInputNumberTestController)
+      .then(fixture => {
+        fakeAsync(() => {
+          fixture.componentInstance.placeholder = 'Placeholder';
+          fixture.detectChanges();
+
+          let el = fixture.debugElement.query(By.css('label')).nativeElement;
+          expect(el).not.toBeNull();
+          expect(el.className.includes('md-empty')).toBe(true);
+        })();
+      });
+  });
+
   it('support ngModel', async(() => {
     builder.createAsync(MdInputBaseTestController)
       .then(fixture => {
@@ -777,3 +833,39 @@ class MdInputOptionalAttributeController {}
   directives: [MdInput]
 })
 class MdInputWithNameTestController {}
+
+@Component({
+  selector: 'test-input-controller',
+  template: `
+    <md-input type="date" [placeholder]="placeholder"></md-input>
+  `,
+  directives: [MdInput]
+})
+class MdInputDateTestController {}
+
+@Component({
+  selector: 'test-input-controller',
+  template: `
+    <md-input type="text" [placeholder]="placeholder"></md-input>
+  `,
+  directives: [MdInput]
+})
+class MdInputTextTestController {}
+
+@Component({
+  selector: 'test-input-controller',
+  template: `
+    <md-input type="password" [placeholder]="placeholder"></md-input>
+  `,
+  directives: [MdInput]
+})
+class MdInputPasswordTestController {}
+
+@Component({
+  selector: 'test-input-controller',
+  template: `
+    <md-input type="number" [placeholder]="placeholder"></md-input>
+  `,
+  directives: [MdInput]
+})
+class MdInputNumberTestController {}
\ No newline at end of file

From 22b05763e9e45b075796d6f79af094b1905d172b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jesper=20H=C3=A5kansson?= <jesper@jesperh.se>
Date: Thu, 14 Jul 2016 23:23:38 +0200
Subject: [PATCH 05/14] test(MdInput): Update empty check tests to match the
 other tests new syntax

---
 src/components/input/input.spec.ts | 72 +++++++++++++-----------------
 1 file changed, 32 insertions(+), 40 deletions(-)

diff --git a/src/components/input/input.spec.ts b/src/components/input/input.spec.ts
index d0f39ebe83ae..0f6de1b5ae3e 100644
--- a/src/components/input/input.spec.ts
+++ b/src/components/input/input.spec.ts
@@ -35,61 +35,53 @@ describe('MdInput', function () {
       });
   }));
 
-  it('should not be treated as empty if type is date', () => {
-    return builder.createAsync(MdInputDateTestController)
+  it('should not be treated as empty if type is date', async(() => {
+    builder.createAsync(MdInputDateTestController)
       .then(fixture => {
-        fakeAsync(() => {
-          fixture.componentInstance.placeholder = 'Placeholder';
-          fixture.detectChanges();
+        fixture.componentInstance.placeholder = 'Placeholder';
+        fixture.detectChanges();
 
-          let el = fixture.debugElement.query(By.css('label')).nativeElement;
-          expect(el).not.toBeNull();
-          expect(el.className.includes('md-empty')).toBe(false);
-        })();
+        let el = fixture.debugElement.query(By.css('label')).nativeElement;
+        expect(el).not.toBeNull();
+        expect(el.className.includes('md-empty')).toBe(false);
       });
-  });
+  }));
 
-  it('should treat text input type as empty at init', () => {
-    return builder.createAsync(MdInputTextTestController)
+  it('should treat text input type as empty at init', async(() => {
+    builder.createAsync(MdInputTextTestController)
       .then(fixture => {
-        fakeAsync(() => {
-          fixture.componentInstance.placeholder = 'Placeholder';
-          fixture.detectChanges();
+        fixture.componentInstance.placeholder = 'Placeholder';
+        fixture.detectChanges();
 
-          let el = fixture.debugElement.query(By.css('label')).nativeElement;
-          expect(el).not.toBeNull();
-          expect(el.className.includes('md-empty')).toBe(true);
-        })();
+        let el = fixture.debugElement.query(By.css('label')).nativeElement;
+        expect(el).not.toBeNull();
+        expect(el.className.includes('md-empty')).toBe(true);
       });
-  });
+  }));
 
-  it('should treat password input type as empty at init', () => {
-    return builder.createAsync(MdInputPasswordTestController)
+  it('should treat password input type as empty at init', async(() => {
+    builder.createAsync(MdInputPasswordTestController)
       .then(fixture => {
-        fakeAsync(() => {
-          fixture.componentInstance.placeholder = 'Placeholder';
-          fixture.detectChanges();
+        fixture.componentInstance.placeholder = 'Placeholder';
+        fixture.detectChanges();
 
-          let el = fixture.debugElement.query(By.css('label')).nativeElement;
-          expect(el).not.toBeNull();
-          expect(el.className.includes('md-empty')).toBe(true);
-        })();
+        let el = fixture.debugElement.query(By.css('label')).nativeElement;
+        expect(el).not.toBeNull();
+        expect(el.className.includes('md-empty')).toBe(true);
       });
-  });
+  }));
 
-  it('should treat number input type as empty at init', () => {
-    return builder.createAsync(MdInputNumberTestController)
+  it('should treat number input type as empty at init', async(() => {
+    builder.createAsync(MdInputNumberTestController)
       .then(fixture => {
-        fakeAsync(() => {
-          fixture.componentInstance.placeholder = 'Placeholder';
-          fixture.detectChanges();
+        fixture.componentInstance.placeholder = 'Placeholder';
+        fixture.detectChanges();
 
-          let el = fixture.debugElement.query(By.css('label')).nativeElement;
-          expect(el).not.toBeNull();
-          expect(el.className.includes('md-empty')).toBe(true);
-        })();
+        let el = fixture.debugElement.query(By.css('label')).nativeElement;
+        expect(el).not.toBeNull();
+        expect(el.className.includes('md-empty')).toBe(true);
       });
-  });
+  }));
 
   it('support ngModel', async(() => {
     builder.createAsync(MdInputBaseTestController)

From 07885d079e48c40335b8c4c997314c22e84d13c7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jesper=20H=C3=A5kansson?= <jesper@jesperh.se>
Date: Fri, 15 Jul 2016 13:02:42 +0200
Subject: [PATCH 06/14] test(MdInput): Fix linting issue

---
 src/components/input/input.spec.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/input/input.spec.ts b/src/components/input/input.spec.ts
index 0f6de1b5ae3e..4d2da2982892 100644
--- a/src/components/input/input.spec.ts
+++ b/src/components/input/input.spec.ts
@@ -860,4 +860,4 @@ class MdInputPasswordTestController {}
   `,
   directives: [MdInput]
 })
-class MdInputNumberTestController {}
\ No newline at end of file
+class MdInputNumberTestController {}

From e4dc755d7c84e9bfef7fe61f62d56ae7da46c8df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jesper=20H=C3=A5kansson?= <jesper@jesperh.se>
Date: Tue, 12 Jul 2016 14:02:32 +0200
Subject: [PATCH 07/14] fix(md-input): Check for type in empty getter instead

---
 src/components/input/input.html | 2 +-
 src/components/input/input.ts   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/input/input.html b/src/components/input/input.html
index 09ce5cf9ffda..33bd44808055 100644
--- a/src/components/input/input.html
+++ b/src/components/input/input.html
@@ -37,7 +37,7 @@
 
       <label class="md-input-placeholder"
              [attr.for]="inputId"
-             [class.md-empty]="empty && type !== 'date'"
+             [class.md-empty]="empty"
              [class.md-focused]="focused"
              [class.md-float]="floatingPlaceholder"
              [class.md-accent]="dividerColor == 'accent'"
diff --git a/src/components/input/input.ts b/src/components/input/input.ts
index f8b6b91409ec..3783712a14ab 100644
--- a/src/components/input/input.ts
+++ b/src/components/input/input.ts
@@ -129,7 +129,7 @@ export class MdInput implements ControlValueAccessor, AfterContentInit, OnChange
 
   /** Readonly properties. */
   get focused() { return this._focused; }
-  get empty() { return this._value == null || this._value === ''; }
+  get empty() { return (this._value == null || this._value === '') && this.type !== 'date'; }
   get characterCount(): number {
     return this.empty ? 0 : ('' + this._value).length;
   }

From 9dabcc0fa3dd0ca7fbb73fba6d6d5b8554c91f10 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jesper=20H=C3=A5kansson?= <jesper@jesperh.se>
Date: Tue, 12 Jul 2016 10:46:31 +0200
Subject: [PATCH 08/14] fix(MdInput): Input should not be treated as empty if
 it is a date field. Fixes #845

---
 src/components/input/input.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/input/input.html b/src/components/input/input.html
index 33bd44808055..09ce5cf9ffda 100644
--- a/src/components/input/input.html
+++ b/src/components/input/input.html
@@ -37,7 +37,7 @@
 
       <label class="md-input-placeholder"
              [attr.for]="inputId"
-             [class.md-empty]="empty"
+             [class.md-empty]="empty && type !== 'date'"
              [class.md-focused]="focused"
              [class.md-float]="floatingPlaceholder"
              [class.md-accent]="dividerColor == 'accent'"

From 5bc3f615a2e3250a4425d5a399e88005ddac0ac5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jesper=20H=C3=A5kansson?= <jesper@jesperh.se>
Date: Tue, 12 Jul 2016 14:02:32 +0200
Subject: [PATCH 09/14] fix(md-input): Check for type in empty getter instead

---
 src/components/input/input.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/input/input.html b/src/components/input/input.html
index 09ce5cf9ffda..33bd44808055 100644
--- a/src/components/input/input.html
+++ b/src/components/input/input.html
@@ -37,7 +37,7 @@
 
       <label class="md-input-placeholder"
              [attr.for]="inputId"
-             [class.md-empty]="empty && type !== 'date'"
+             [class.md-empty]="empty"
              [class.md-focused]="focused"
              [class.md-float]="floatingPlaceholder"
              [class.md-accent]="dividerColor == 'accent'"

From ece42321cccf0cd937139cc860326da62d214989 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jesper=20H=C3=A5kansson?= <jesper@jesperh.se>
Date: Thu, 14 Jul 2016 23:06:07 +0200
Subject: [PATCH 10/14] test(MdInput): Add tests for empty check

---
 src/components/input/input.spec.ts | 92 ++++++++++++++++++++++++++++++
 1 file changed, 92 insertions(+)

diff --git a/src/components/input/input.spec.ts b/src/components/input/input.spec.ts
index ccfbf1d67041..3e079ad0a38f 100644
--- a/src/components/input/input.spec.ts
+++ b/src/components/input/input.spec.ts
@@ -35,6 +35,62 @@ describe('MdInput', function () {
       });
   }));
 
+  it('should not be treated as empty if type is date', () => {
+    return builder.createAsync(MdInputDateTestController)
+      .then(fixture => {
+        fakeAsync(() => {
+          fixture.componentInstance.placeholder = 'Placeholder';
+          fixture.detectChanges();
+
+          let el = fixture.debugElement.query(By.css('label')).nativeElement;
+          expect(el).not.toBeNull();
+          expect(el.className.includes('md-empty')).toBe(false);
+        })();
+      });
+  });
+
+  it('should treat text input type as empty at init', () => {
+    return builder.createAsync(MdInputTextTestController)
+      .then(fixture => {
+        fakeAsync(() => {
+          fixture.componentInstance.placeholder = 'Placeholder';
+          fixture.detectChanges();
+
+          let el = fixture.debugElement.query(By.css('label')).nativeElement;
+          expect(el).not.toBeNull();
+          expect(el.className.includes('md-empty')).toBe(true);
+        })();
+      });
+  });
+
+  it('should treat password input type as empty at init', () => {
+    return builder.createAsync(MdInputPasswordTestController)
+      .then(fixture => {
+        fakeAsync(() => {
+          fixture.componentInstance.placeholder = 'Placeholder';
+          fixture.detectChanges();
+
+          let el = fixture.debugElement.query(By.css('label')).nativeElement;
+          expect(el).not.toBeNull();
+          expect(el.className.includes('md-empty')).toBe(true);
+        })();
+      });
+  });
+
+  it('should treat number input type as empty at init', () => {
+    return builder.createAsync(MdInputNumberTestController)
+      .then(fixture => {
+        fakeAsync(() => {
+          fixture.componentInstance.placeholder = 'Placeholder';
+          fixture.detectChanges();
+
+          let el = fixture.debugElement.query(By.css('label')).nativeElement;
+          expect(el).not.toBeNull();
+          expect(el.className.includes('md-empty')).toBe(true);
+        })();
+      });
+  });
+
   it('support ngModel', async(() => {
     builder.createAsync(MdInputBaseTestController)
       .then(fixture => {
@@ -817,3 +873,39 @@ class MdInputOptionalAttributeController {}
   directives: [MdInput]
 })
 class MdInputWithNameTestController {}
+
+@Component({
+  selector: 'test-input-controller',
+  template: `
+    <md-input type="date" [placeholder]="placeholder"></md-input>
+  `,
+  directives: [MdInput]
+})
+class MdInputDateTestController {}
+
+@Component({
+  selector: 'test-input-controller',
+  template: `
+    <md-input type="text" [placeholder]="placeholder"></md-input>
+  `,
+  directives: [MdInput]
+})
+class MdInputTextTestController {}
+
+@Component({
+  selector: 'test-input-controller',
+  template: `
+    <md-input type="password" [placeholder]="placeholder"></md-input>
+  `,
+  directives: [MdInput]
+})
+class MdInputPasswordTestController {}
+
+@Component({
+  selector: 'test-input-controller',
+  template: `
+    <md-input type="number" [placeholder]="placeholder"></md-input>
+  `,
+  directives: [MdInput]
+})
+class MdInputNumberTestController {}
\ No newline at end of file

From 920da03f8f7aa050dbdb8eff55dc93d0e8338272 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jesper=20H=C3=A5kansson?= <jesper@jesperh.se>
Date: Thu, 14 Jul 2016 23:23:38 +0200
Subject: [PATCH 11/14] test(MdInput): Update empty check tests to match the
 other tests new syntax

---
 src/components/input/input.spec.ts | 72 +++++++++++++-----------------
 1 file changed, 32 insertions(+), 40 deletions(-)

diff --git a/src/components/input/input.spec.ts b/src/components/input/input.spec.ts
index 3e079ad0a38f..3cbbf4d054e1 100644
--- a/src/components/input/input.spec.ts
+++ b/src/components/input/input.spec.ts
@@ -35,61 +35,53 @@ describe('MdInput', function () {
       });
   }));
 
-  it('should not be treated as empty if type is date', () => {
-    return builder.createAsync(MdInputDateTestController)
+  it('should not be treated as empty if type is date', async(() => {
+    builder.createAsync(MdInputDateTestController)
       .then(fixture => {
-        fakeAsync(() => {
-          fixture.componentInstance.placeholder = 'Placeholder';
-          fixture.detectChanges();
+        fixture.componentInstance.placeholder = 'Placeholder';
+        fixture.detectChanges();
 
-          let el = fixture.debugElement.query(By.css('label')).nativeElement;
-          expect(el).not.toBeNull();
-          expect(el.className.includes('md-empty')).toBe(false);
-        })();
+        let el = fixture.debugElement.query(By.css('label')).nativeElement;
+        expect(el).not.toBeNull();
+        expect(el.className.includes('md-empty')).toBe(false);
       });
-  });
+  }));
 
-  it('should treat text input type as empty at init', () => {
-    return builder.createAsync(MdInputTextTestController)
+  it('should treat text input type as empty at init', async(() => {
+    builder.createAsync(MdInputTextTestController)
       .then(fixture => {
-        fakeAsync(() => {
-          fixture.componentInstance.placeholder = 'Placeholder';
-          fixture.detectChanges();
+        fixture.componentInstance.placeholder = 'Placeholder';
+        fixture.detectChanges();
 
-          let el = fixture.debugElement.query(By.css('label')).nativeElement;
-          expect(el).not.toBeNull();
-          expect(el.className.includes('md-empty')).toBe(true);
-        })();
+        let el = fixture.debugElement.query(By.css('label')).nativeElement;
+        expect(el).not.toBeNull();
+        expect(el.className.includes('md-empty')).toBe(true);
       });
-  });
+  }));
 
-  it('should treat password input type as empty at init', () => {
-    return builder.createAsync(MdInputPasswordTestController)
+  it('should treat password input type as empty at init', async(() => {
+    builder.createAsync(MdInputPasswordTestController)
       .then(fixture => {
-        fakeAsync(() => {
-          fixture.componentInstance.placeholder = 'Placeholder';
-          fixture.detectChanges();
+        fixture.componentInstance.placeholder = 'Placeholder';
+        fixture.detectChanges();
 
-          let el = fixture.debugElement.query(By.css('label')).nativeElement;
-          expect(el).not.toBeNull();
-          expect(el.className.includes('md-empty')).toBe(true);
-        })();
+        let el = fixture.debugElement.query(By.css('label')).nativeElement;
+        expect(el).not.toBeNull();
+        expect(el.className.includes('md-empty')).toBe(true);
       });
-  });
+  }));
 
-  it('should treat number input type as empty at init', () => {
-    return builder.createAsync(MdInputNumberTestController)
+  it('should treat number input type as empty at init', async(() => {
+    builder.createAsync(MdInputNumberTestController)
       .then(fixture => {
-        fakeAsync(() => {
-          fixture.componentInstance.placeholder = 'Placeholder';
-          fixture.detectChanges();
+        fixture.componentInstance.placeholder = 'Placeholder';
+        fixture.detectChanges();
 
-          let el = fixture.debugElement.query(By.css('label')).nativeElement;
-          expect(el).not.toBeNull();
-          expect(el.className.includes('md-empty')).toBe(true);
-        })();
+        let el = fixture.debugElement.query(By.css('label')).nativeElement;
+        expect(el).not.toBeNull();
+        expect(el.className.includes('md-empty')).toBe(true);
       });
-  });
+  }));
 
   it('support ngModel', async(() => {
     builder.createAsync(MdInputBaseTestController)

From 8987153c1b17d7477b5764549dcd75d25805aa29 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jesper=20H=C3=A5kansson?= <jesper@jesperh.se>
Date: Wed, 27 Jul 2016 08:38:06 +0200
Subject: [PATCH 12/14] test(MdInput): Skip empty check tests for IE11

---
 src/components/input/input.spec.ts | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/src/components/input/input.spec.ts b/src/components/input/input.spec.ts
index ef2555b42c35..9dbfbc43b4a0 100644
--- a/src/components/input/input.spec.ts
+++ b/src/components/input/input.spec.ts
@@ -12,6 +12,10 @@ import {
   MD_INPUT_DIRECTIVES,
 } from './input';
 
+function isInternetExplorer11() {
+    return !(window.ActiveXObject) && "ActiveXObject" in window
+}
+
 
 describe('MdInput', function () {
   var builder: TestComponentBuilder;
@@ -36,6 +40,9 @@ describe('MdInput', function () {
   }));
 
   it('should not be treated as empty if type is date', async(() => {
+    if (isInternetExplorer11()) {
+        return;
+    }
     builder.createAsync(MdInputDateTestController)
       .then(fixture => {
         fixture.componentInstance.placeholder = 'Placeholder';
@@ -48,6 +55,9 @@ describe('MdInput', function () {
   }));
 
   it('should treat text input type as empty at init', async(() => {
+    if (isInternetExplorer11()) {
+        return;
+    }
     builder.createAsync(MdInputTextTestController)
       .then(fixture => {
         fixture.componentInstance.placeholder = 'Placeholder';
@@ -60,6 +70,9 @@ describe('MdInput', function () {
   }));
 
   it('should treat password input type as empty at init', async(() => {
+    if (isInternetExplorer11()) {
+        return;
+    }
     builder.createAsync(MdInputPasswordTestController)
       .then(fixture => {
         fixture.componentInstance.placeholder = 'Placeholder';
@@ -72,6 +85,9 @@ describe('MdInput', function () {
   }));
 
   it('should treat number input type as empty at init', async(() => {
+    if (isInternetExplorer11()) {
+        return;
+    }
     builder.createAsync(MdInputNumberTestController)
       .then(fixture => {
         fixture.componentInstance.placeholder = 'Placeholder';

From a0b2e26cc8ca60b1c861f2b8a97642398def7bec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jesper=20H=C3=A5kansson?= <jesper@jesperh.se>
Date: Wed, 27 Jul 2016 08:45:02 +0200
Subject: [PATCH 13/14] test(MdInput): Resolve linting issues

---
 src/components/input/input.spec.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/input/input.spec.ts b/src/components/input/input.spec.ts
index 53eef3babd2c..78e9d4f105f6 100644
--- a/src/components/input/input.spec.ts
+++ b/src/components/input/input.spec.ts
@@ -13,7 +13,7 @@ import {
 } from './input';
 
 function isInternetExplorer11() {
-    return !(window.ActiveXObject) && "ActiveXObject" in window
+    return 'ActiveXObject' in window;
 }
 
 describe('MdInput', function () {

From ba124233b660029e1f893634337471f5a248c4d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jesper=20H=C3=A5kansson?= <jesper@jesperh.se>
Date: Tue, 6 Sep 2016 20:52:51 +0200
Subject: [PATCH 14/14] test(MdInput): Update empty() check tests to match new
 test syntax

---
 src/lib/input/input.spec.ts | 116 +++++++++++++++---------------------
 1 file changed, 48 insertions(+), 68 deletions(-)

diff --git a/src/lib/input/input.spec.ts b/src/lib/input/input.spec.ts
index 7b2283e80542..97ef4808c3cc 100644
--- a/src/lib/input/input.spec.ts
+++ b/src/lib/input/input.spec.ts
@@ -53,6 +53,10 @@ describe('MdInput', function () {
         MdInputWithMin,
         MdInputWithStep,
         MdInputWithTabindex,
+        MdInputDateTestController,
+        MdInputTextTestController,
+        MdInputPasswordTestController,
+        MdInputNumberTestController,
       ],
     });
 
@@ -70,60 +74,52 @@ describe('MdInput', function () {
     if (isInternetExplorer11()) {
       return;
     }
-    builder.createAsync(MdInputDateTestController)
-      .then(fixture => {
-        fixture.componentInstance.placeholder = 'Placeholder';
-        fixture.detectChanges();
-
-        let el = fixture.debugElement.query(By.css('label')).nativeElement;
-        expect(el).not.toBeNull();
-        expect(el.className.includes('md-empty')).toBe(false);
-      });
+    let fixture = TestBed.createComponent(MdInputDateTestController);
+    fixture.componentInstance.placeholder = 'Placeholder';
+    fixture.detectChanges();
+
+    let el = fixture.debugElement.query(By.css('label')).nativeElement;
+    expect(el).not.toBeNull();
+    expect(el.className.includes('md-empty')).toBe(false);
   }));
 
   it('should treat text input type as empty at init', async(() => {
     if (isInternetExplorer11()) {
       return;
     }
-    builder.createAsync(MdInputTextTestController)
-      .then(fixture => {
-        fixture.componentInstance.placeholder = 'Placeholder';
-        fixture.detectChanges();
-
-        let el = fixture.debugElement.query(By.css('label')).nativeElement;
-        expect(el).not.toBeNull();
-        expect(el.className.includes('md-empty')).toBe(true);
-      });
+    let fixture = TestBed.createComponent(MdInputTextTestController);
+    fixture.componentInstance.placeholder = 'Placeholder';
+    fixture.detectChanges();
+
+    let el = fixture.debugElement.query(By.css('label')).nativeElement;
+    expect(el).not.toBeNull();
+    expect(el.className.includes('md-empty')).toBe(true);
   }));
 
   it('should treat password input type as empty at init', async(() => {
     if (isInternetExplorer11()) {
       return;
     }
-    builder.createAsync(MdInputPasswordTestController)
-      .then(fixture => {
-        fixture.componentInstance.placeholder = 'Placeholder';
-        fixture.detectChanges();
-
-        let el = fixture.debugElement.query(By.css('label')).nativeElement;
-        expect(el).not.toBeNull();
-        expect(el.className.includes('md-empty')).toBe(true);
-      });
+    let fixture = TestBed.createComponent(MdInputPasswordTestController);
+    fixture.componentInstance.placeholder = 'Placeholder';
+    fixture.detectChanges();
+
+    let el = fixture.debugElement.query(By.css('label')).nativeElement;
+    expect(el).not.toBeNull();
+    expect(el.className.includes('md-empty')).toBe(true);
   }));
 
   it('should treat number input type as empty at init', async(() => {
     if (isInternetExplorer11()) {
       return;
     }
-    builder.createAsync(MdInputNumberTestController)
-      .then(fixture => {
-        fixture.componentInstance.placeholder = 'Placeholder';
-        fixture.detectChanges();
-
-        let el = fixture.debugElement.query(By.css('label')).nativeElement;
-        expect(el).not.toBeNull();
-        expect(el.className.includes('md-empty')).toBe(true);
-      });
+    let fixture = TestBed.createComponent(MdInputNumberTestController);
+    fixture.componentInstance.placeholder = 'Placeholder';
+    fixture.detectChanges();
+
+    let el = fixture.debugElement.query(By.css('label')).nativeElement;
+    expect(el).not.toBeNull();
+    expect(el.className.includes('md-empty')).toBe(true);
   }));
 
   // TODO(kara): update when core/testing adds fix
@@ -765,38 +761,22 @@ class MdInputWithStep { }
 @Component({template: `<md-input [tabindex]="tabIndex"></md-input>`})
 class MdInputWithTabindex { }
 
-@Component({
-  selector: 'test-input-controller',
-  template: `
-    <md-input type="date" [placeholder]="placeholder"></md-input>
-  `,
-  directives: [MdInput]
-})
-class MdInputDateTestController {}
+@Component({template: `<md-input type="date" [placeholder]="placeholder"></md-input>`})
+class MdInputDateTestController {
+  placeholder: string = '';
+}
 
-@Component({
-  selector: 'test-input-controller',
-  template: `
-    <md-input type="text" [placeholder]="placeholder"></md-input>
-  `,
-  directives: [MdInput]
-})
-class MdInputTextTestController {}
+@Component({template: `<md-input type="text" [placeholder]="placeholder"></md-input>`})
+class MdInputTextTestController {
+  placeholder: string = '';
+}
 
-@Component({
-  selector: 'test-input-controller',
-  template: `
-    <md-input type="password" [placeholder]="placeholder"></md-input>
-  `,
-  directives: [MdInput]
-})
-class MdInputPasswordTestController {}
+@Component({template: `<md-input type="password" [placeholder]="placeholder"></md-input>`})
+class MdInputPasswordTestController {
+  placeholder: string = '';
+}
 
-@Component({
-  selector: 'test-input-controller',
-  template: `
-    <md-input type="number" [placeholder]="placeholder"></md-input>
-  `,
-  directives: [MdInput]
-})
-class MdInputNumberTestController {}
+@Component({template: `<md-input type="number" [placeholder]="placeholder"></md-input>`})
+class MdInputNumberTestController {
+  placeholder: string = '';
+}