From 3f0db4038fdd4af1328f0be24550ecfd137ebf1a Mon Sep 17 00:00:00 2001
From: Will Abson <will.abson@alfresco.com>
Date: Tue, 29 Nov 2016 18:53:23 +0000
Subject: [PATCH] Fix failing processlist tests

---
 .../activiti-processlist.component.spec.ts       | 16 ++++++++--------
 .../components/activiti-processlist.component.ts |  4 +++-
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/ng2-components/ng2-activiti-processlist/src/components/activiti-processlist.component.spec.ts b/ng2-components/ng2-activiti-processlist/src/components/activiti-processlist.component.spec.ts
index def2d37107..fbb5806afa 100644
--- a/ng2-components/ng2-activiti-processlist/src/components/activiti-processlist.component.spec.ts
+++ b/ng2-components/ng2-activiti-processlist/src/components/activiti-processlist.component.spec.ts
@@ -154,16 +154,16 @@ describe('ActivitiProcessInstanceListComponent', () => {
         expect(component.getCurrentId()).toBeNull();
     });
 
-    it('should throw an exception when the response is wrong', (done) => {
-        spyOn(service, 'getProcessInstances').and.returnValue(Observable.throw('Fake server error'));
+    it('should throw an exception when the response is wrong', fakeAsync(() => {
+        let emitSpy: jasmine.Spy = spyOn(component.onError, 'emit');
+        let fakeError = 'Fake server error';
+        spyOn(service, 'getProcessInstances').and.returnValue(Observable.throw(fakeError));
+        component.appId = '1';
         component.state = 'open';
-        component.onError.subscribe( (err) => {
-            expect(err).toBeDefined();
-            expect(err).toBe('Fake server error');
-            done();
-        });
         fixture.detectChanges();
-    });
+        tick();
+        expect(emitSpy).toHaveBeenCalledWith(fakeError);
+    }));
 
     it('should emit onSuccess event when reload() called', fakeAsync(() => {
         spyOn(service, 'getProcessInstances').and.returnValue(Observable.of(fakeGlobalProcesses));
diff --git a/ng2-components/ng2-activiti-processlist/src/components/activiti-processlist.component.ts b/ng2-components/ng2-activiti-processlist/src/components/activiti-processlist.component.ts
index d211501383..902e87424b 100644
--- a/ng2-components/ng2-activiti-processlist/src/components/activiti-processlist.component.ts
+++ b/ng2-components/ng2-activiti-processlist/src/components/activiti-processlist.component.ts
@@ -79,7 +79,9 @@ export class ActivitiProcessInstanceListComponent implements OnInit, OnChanges {
         if (!this.data) {
             this.data = this.initDefaultSchemaColumns();
         }
-        this.reload();
+        if (this.appId) {
+            this.reload();
+        }
     }
 
     ngOnChanges(changes: SimpleChanges) {