From 7b87e065dba127616d361e93d326d1d7c3431eee Mon Sep 17 00:00:00 2001 From: Paul Gschwendtner Date: Tue, 14 Nov 2017 19:40:37 +0100 Subject: [PATCH 1/2] build: fix travis required tests not running * Fixes that the `travis_required` CI mode isn't running. This mode is important for Firefox and Chrome testing. --- .travis.yml | 2 +- src/lib/input/input.spec.ts | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index ccfabb5dd866..068c2197309c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -30,7 +30,7 @@ jobs: - env: "MODE=saucelabs_required" - env: "MODE=browserstack_required" - env: "MODE=travis_required" - env: "DEPLOY_MODE=build-artifacts" + - env: "DEPLOY_MODE=build-artifacts" - env: "DEPLOY_MODE=docs-content" - env: "DEPLOY_MODE=screenshot-tool" - env: "DEPLOY_MODE=dashboard" diff --git a/src/lib/input/input.spec.ts b/src/lib/input/input.spec.ts index f1b84b2675ad..2e981ae513ee 100644 --- a/src/lib/input/input.spec.ts +++ b/src/lib/input/input.spec.ts @@ -110,7 +110,7 @@ describe('MatInput without forms', function () { it('should not be treated as empty if type is date', inject([Platform], (platform: Platform) => { - if (!(platform.TRIDENT || platform.FIREFOX || (platform.SAFARI && !platform.IOS))) { + if (!(platform.TRIDENT || (platform.SAFARI && !platform.IOS))) { let fixture = TestBed.createComponent(MatInputDateTestController); fixture.detectChanges(); @@ -123,7 +123,7 @@ describe('MatInput without forms', function () { // Firefox, Safari Desktop and IE don't support type="date" and fallback to type="text". it('should be treated as empty if type is date on Firefox and IE', inject([Platform], (platform: Platform) => { - if (platform.TRIDENT || platform.FIREFOX || (platform.SAFARI && !platform.IOS)) { + if (platform.TRIDENT || (platform.SAFARI && !platform.IOS)) { let fixture = TestBed.createComponent(MatInputDateTestController); fixture.detectChanges(); From d79d800a4646d624f1295eada205f08881c764c0 Mon Sep 17 00:00:00 2001 From: Paul Gschwendtner Date: Tue, 14 Nov 2017 21:30:08 +0100 Subject: [PATCH 2/2] Update test name --- src/lib/input/input.spec.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lib/input/input.spec.ts b/src/lib/input/input.spec.ts index 2e981ae513ee..033a9292b375 100644 --- a/src/lib/input/input.spec.ts +++ b/src/lib/input/input.spec.ts @@ -120,8 +120,8 @@ describe('MatInput without forms', function () { } })); - // Firefox, Safari Desktop and IE don't support type="date" and fallback to type="text". - it('should be treated as empty if type is date on Firefox and IE', + // Safari Desktop and IE don't support type="date" and fallback to type="text". + it('should be treated as empty if type is date in Safari Desktop or IE', inject([Platform], (platform: Platform) => { if (platform.TRIDENT || (platform.SAFARI && !platform.IOS)) { let fixture = TestBed.createComponent(MatInputDateTestController);