[utils/subscribeWithScope] rename

src/ui/public/config/config.js

@@ -21,7 +21,7 @@ import angular from 'angular';
 import chrome from '../chrome';
 import { isPlainObject } from 'lodash';
 import { uiModules } from '../modules';
-import { subscribe } from '../utils/subscribe';
+import { subscribeWithScope } from '../utils/subscribe_with_scope';
 
 const module = uiModules.get('kibana/config');
 
@@ -60,7 +60,7 @@ module.service(`config`, function ($rootScope, Promise) {
   //* angular specific methods *
   //////////////////////////////
 
-  const subscription = subscribe($rootScope, uiSettings.getUpdate$(), {
+  const subscription = subscribeWithScope($rootScope, uiSettings.getUpdate$(), {
     next: ({ key, newValue, oldValue }) => {
       $rootScope.$broadcast('change:config',        newValue, oldValue, key, this);
       $rootScope.$broadcast(`change:config.${key}`, newValue, oldValue, key, this);

src/ui/public/utils/subscribe.test.ts → src/ui/public/utils/subscribe_with_scope.test.ts

@@ -23,7 +23,7 @@ jest.mock('ui/notify/fatal_error', () => ({
 }));
 
 import * as Rx from 'rxjs';
-import { subscribe } from './subscribe';
+import { subscribeWithScope } from './subscribe_with_scope';
 
 let $rootScope: Scope;
 
@@ -46,7 +46,7 @@ it('subscribes to the passed observable, returns subscription', () => {
   const subSpy = jest.fn(() => unsubSpy);
   const observable = new Rx.Observable(subSpy);
 
-  const subscription = subscribe($scope as any, observable);
+  const subscription = subscribeWithScope($scope as any, observable);
   expect(subSpy).toHaveBeenCalledTimes(1);
   expect(unsubSpy).not.toHaveBeenCalled();
 
@@ -61,7 +61,7 @@ it('calls observer.next() if already in a digest cycle, wraps in $scope.$apply i
   const nextSpy = jest.fn();
   const $scope = new Scope();
 
-  subscribe($scope as any, subject, { next: nextSpy });
+  subscribeWithScope($scope as any, subject, { next: nextSpy });
 
   subject.next();
   expect($scope.$apply).toHaveBeenCalledTimes(1);
@@ -77,7 +77,7 @@ it('calls observer.next() if already in a digest cycle, wraps in $scope.$apply i
 
 it('reports fatalError if observer.next() throws', () => {
   const $scope = new Scope();
-  subscribe($scope as any, Rx.of(undefined), {
+  subscribeWithScope($scope as any, Rx.of(undefined), {
     next() {
       throw new Error('foo bar');
     },
@@ -96,12 +96,12 @@ it('reports fatal error if observer.error is not defined and observable errors',
   const $scope = new Scope();
   const error = new Error('foo');
   error.stack = `${error.message}\n---stack trace ---`;
-  subscribe($scope as any, Rx.throwError(error));
+  subscribeWithScope($scope as any, Rx.throwError(error));
 
   expect(mockFatalError.mock.calls).toMatchInlineSnapshot(`
 Array [
   Array [
-    [Error: Uncaught error in $scope.$subscribe: foo
+    [Error: Uncaught error in subscribeWithScope(): foo
 ---stack trace ---],
   ],
 ]
@@ -110,7 +110,7 @@ Array [
 
 it('reports fatal error if observer.error throws', () => {
   const $scope = new Scope();
-  subscribe($scope as any, Rx.throwError(new Error('foo')), {
+  subscribeWithScope($scope as any, Rx.throwError(new Error('foo')), {
     error: () => {
       throw new Error('foo');
     },
@@ -127,7 +127,7 @@ Array [
 
 it('does not report fatal error if observer.error handles the error', () => {
   const $scope = new Scope();
-  subscribe($scope as any, Rx.throwError(new Error('foo')), {
+  subscribeWithScope($scope as any, Rx.throwError(new Error('foo')), {
     error: () => {
       // noop, swallow error
     },
@@ -138,7 +138,7 @@ it('does not report fatal error if observer.error handles the error', () => {
 
 it('reports fatal error if observer.complete throws', () => {
   const $scope = new Scope();
-  subscribe($scope as any, Rx.EMPTY, {
+  subscribeWithScope($scope as any, Rx.EMPTY, {
     complete: () => {
       throw new Error('foo');
     },

src/ui/public/utils/subscribe.ts → src/ui/public/utils/subscribe_with_scope.ts

@@ -43,7 +43,7 @@ function callInDigest<T extends any[]>($scope: IScope, fn: (...args: T) => void,
  * Subscribe to an observable at a $scope, ensuring that the digest cycle
  * is run for subscriber hooks and routing errors to fatalError if not handled.
  */
-export function subscribe<T>(
+export function subscribeWithScope<T>(
   $scope: IScope,
   observable: Rx.Observable<T>,
   observer?: Rx.PartialObserver<T>
@@ -60,7 +60,9 @@ export function subscribe<T>(
           observer.error(error);
         } else {
           throw new Error(
-            `Uncaught error in $scope.$subscribe: ${error ? error.stack || error.message : error}`
+            `Uncaught error in subscribeWithScope(): ${
+              error ? error.stack || error.message : error
+            }`
           );
         }
       });