Merge pull request #12 from ReactiveX/minko/fix-frompromise

fix(rules): proper migration of fromPromise and _throw
ReactiveX · Apr 19, 2018 · 5c54550 · 5c54550
2 parents 651b5b1 + a744151
commit 5c54550
Show file tree

Hide file tree

Showing 2 changed files with 84 additions and 0 deletions.
diff --git a/src/updateRxjsImportsRule.ts b/src/updateRxjsImportsRule.ts
@@ -163,6 +163,18 @@ const ImportReplacements = [
     newPath: 'rxjs',
     newSymbol: 'NEVER'
   },
+  {
+    path: 'rxjs/observable/fromPromise',
+    symbol: 'fromPromise',
+    newPath: 'rxjs',
+    newSymbol: 'from'
+  },
+  {
+    path: 'rxjs/observable/throw',
+    symbol: '_throw',
+    newPath: 'rxjs',
+    newSymbol: 'throwError'
+  },
   {
     path: 'rxjs/Subscription',
     symbol: 'AnonymousSubscription',

diff --git a/test/updateRxjsImportsRule.spec.ts b/test/updateRxjsImportsRule.spec.ts
@@ -293,5 +293,77 @@ describe('update-rxjs-imports', () => {
 
       assertReplacements(err as RuleFailure[], source, after);
     });
+
+    it('should migrate fromPromise to from', () => {
+      const source = `
+        import { fromPromise } from 'rxjs/observable/fromPromise';
+      `;
+      const after = `
+        import { from as fromPromise } from 'rxjs';
+      `;
+
+      const err = assertFailures('update-rxjs-imports', source, [
+        {
+          startPosition: {
+            line: 1,
+            character: 17
+          },
+          endPosition: {
+            line: 1,
+            character: 28
+          },
+          message: 'imported symbol no longer exists'
+        },
+        {
+          startPosition: {
+            line: 1,
+            character: 37
+          },
+          endPosition: {
+            line: 1,
+            character: 64
+          },
+          message: 'outdated import path'
+        }
+      ]);
+
+      assertReplacements(err as RuleFailure[], source, after);
+    });
+
+    it('should migrate fromPromise to from', () => {
+      const source = `
+        import { _throw } from 'rxjs/observable/throw';
+      `;
+      const after = `
+        import { throwError as _throw } from 'rxjs';
+      `;
+
+      const err = assertFailures('update-rxjs-imports', source, [
+        {
+          startPosition: {
+            line: 1,
+            character: 17
+          },
+          endPosition: {
+            line: 1,
+            character: 23
+          },
+          message: 'imported symbol no longer exists'
+        },
+        {
+          startPosition: {
+            line: 1,
+            character: 32
+          },
+          endPosition: {
+            line: 1,
+            character: 53
+          },
+          message: 'outdated import path'
+        }
+      ]);
+
+      assertReplacements(err as RuleFailure[], source, after);
+    });
   });
 });