fix(module:avatar): tolerate error src (#2008)

* fix(module:avatar): tolerate error src * fix lint
NG-ZORRO · Aug 19, 2018 · d55cdf2 · d55cdf2
1 parent fb3daa1
commit d55cdf2
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 2 deletions.
diff --git a/components/avatar/avatar.spec.ts b/components/avatar/avatar.spec.ts
@@ -27,8 +27,27 @@ describe('avatar', () => {
     fixture.detectChanges();
   });
 
-  it('#nzSrc', () => {
-    expect(context).not.toBeNull();
+  describe('#nzSrc', () => {
+    it('#nzSrc', () => {
+      expect(context).not.toBeNull();
+    });
+    it('should tolerate error src', fakeAsync(() => {
+      expect(getType(dl)).toBe('image');
+      expect(context.comp.hasSrc).toBe(true);
+      // Manually dispatch error.
+      context.nzSrc = '';
+      context.comp.imgError();
+      tick();
+      fixture.detectChanges();
+      expect(getType(dl)).toBe('icon');
+      expect(context.comp.hasSrc).toBe(false);
+      context.nzSrc = 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAADUlEQVR42mNk+P+/HgAFhAJ/wlseKgAAAABJRU5ErkJggg==';
+      tick();
+      fixture.detectChanges();
+      expect(context.comp.hasSrc).toBe(true);
+      expect(getType(dl)).toBe('image');
+      tick();
+    }));
   });
 
   it('#nzIcon', () => {

diff --git a/components/avatar/nz-avatar.component.ts b/components/avatar/nz-avatar.component.ts
@@ -103,6 +103,7 @@ export class NzAvatarComponent implements OnChanges {
   ngOnChanges(changes: SimpleChanges): void {
     this.hasText = !this.nzSrc && !!this.nzText;
     this.hasIcon = !this.nzSrc && !!this.nzIcon;
+    this.hasSrc = !!this.nzSrc;
 
     this.setClass().notifyCalc();
   }