Pass errors swallow by promise to the observable

Author: Idan Levin

src/scalecube-services/services/ServiceCall.js

@@ -2,6 +2,9 @@
 
 import { Router, Message, utils } from 'src/scalecube-services/services';
 import { Observable } from 'rxjs/Observable';
+// $FlowFixMe
+import 'rxjs/add/operator/catch';
+
 
 const isObservable = (obj: any): boolean => {
   if (obj.constructor.name === 'Observable') {
@@ -60,12 +63,14 @@ export class ServiceCall {
         observer.error(new Error(`Service not found error: ${message.serviceName}.${message.method}`));
       } else if (utils.isLoader(inst)) {
         let unsubscribe;
-        const promise = inst.service.promise;
-        promise.then((service) => {
-          unsubscribe = createServiceObserver(message, service, observer);
+        const promise = new Promise(resolve=>{
+          inst.service.promise.then((service) => {
+            resolve(createServiceObserver(message, service, observer));
+          }).catch(e=>observer.error(e));
+
         });
         return () => {
-          promise.then(() => unsubscribe())
+          promise.then(unsubscribe => unsubscribe());
         };
       } else {
         return createServiceObserver(message, inst.service, observer);

test/scalecube-services/services/greeting.test.js

@@ -34,7 +34,7 @@ describe('Greeting suite', () => {
       .create();
 
     expect.assertions(1);
-    return expect().rejects.toEqual(new Error("please provide user to greet"));
+    return expect(greetingService.hello()).rejects.toEqual(new Error("please provide user to greet"));
 
   });
   it('Greeting.repeatToStream should return observable of greetings ', () => {
@@ -95,7 +95,7 @@ describe('Greeting suite', () => {
       .api(GreetingService)
       .create();
 
-    expect.assertions(1);
+      expect.assertions(1);
     greetingService.repeatToStream('hey', 'hello').subscribe().unsubscribe();
     expect(window['repeatToStreamUnsubscribe']).toBe(true);
   });