From 99744de5c47f5c256d1c5fef8b8a8132eca2f87c Mon Sep 17 00:00:00 2001
From: Mike Brocchi <mbrocchi@gmail.com>
Date: Thu, 12 Apr 2018 12:17:43 -0400
Subject: [PATCH] test: Remove refs to service schematic module option

---
 tests/e2e/tests/generate/lint-fix.ts          |  2 +-
 .../tests/generate/service/service-basic.ts   |  5 ++---
 .../tests/generate/service/service-dry-run.ts | 13 ------------
 .../generate/service/service-module-fail.ts   |  9 --------
 .../tests/generate/service/service-module.ts  | 21 -------------------
 5 files changed, 3 insertions(+), 47 deletions(-)
 delete mode 100644 tests/e2e/tests/generate/service/service-dry-run.ts
 delete mode 100644 tests/e2e/tests/generate/service/service-module-fail.ts
 delete mode 100644 tests/e2e/tests/generate/service/service-module.ts

diff --git a/tests/e2e/tests/generate/lint-fix.ts b/tests/e2e/tests/generate/lint-fix.ts
index 23e17a07f0..f7925489c8 100644
--- a/tests/e2e/tests/generate/lint-fix.ts
+++ b/tests/e2e/tests/generate/lint-fix.ts
@@ -34,7 +34,7 @@ export default function () {
     // Enable default option and generate all other module related blueprints
     .then(() => ng('config', 'defaults.lintFix', 'true'))
     .then(() => ng('generate', 'directive', 'test-directive'))
-    .then(() => ng('generate', 'service', 'test-service', '--module', 'app.module.ts'))
+    .then(() => ng('generate', 'service', 'test-service'))
     .then(() => ng('generate', 'pipe', 'test-pipe'))
     .then(() => ng('generate', 'guard', 'test-guard', '--module', 'app.module.ts'))
     .then(() => ng('lint'));
diff --git a/tests/e2e/tests/generate/service/service-basic.ts b/tests/e2e/tests/generate/service/service-basic.ts
index fcecfb13f1..3ebd58fc97 100644
--- a/tests/e2e/tests/generate/service/service-basic.ts
+++ b/tests/e2e/tests/generate/service/service-basic.ts
@@ -10,9 +10,8 @@ export default function() {
   return ng('generate', 'service', 'test-service')
     .then(() => expectFileToExist(serviceDir))
     .then(() => expectFileToExist(join(serviceDir, 'test-service.service.ts')))
-    .then(() => expectFileToExist(join(serviceDir, 'test-service.service.spec.ts')));
+    .then(() => expectFileToExist(join(serviceDir, 'test-service.service.spec.ts')))
 
     // Try to run the unit tests.
-    // TODO: re-enable when updated to Angular v6
-    // .then(() => ng('test', '--watch=false'));
+    .then(() => ng('test', '--watch=false'));
 }
diff --git a/tests/e2e/tests/generate/service/service-dry-run.ts b/tests/e2e/tests/generate/service/service-dry-run.ts
deleted file mode 100644
index 43b17ffa96..0000000000
--- a/tests/e2e/tests/generate/service/service-dry-run.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-import {ng} from '../../../utils/process';
-import {expectGitToBeClean} from '../../../utils/git';
-
-
-export default function() {
-  return ng('generate', 'service', 'test-service', '--module', 'app.module.ts', '--dry-run')
-    .then(({stdout}) => {
-      if (!/NOTE: Run with "dry run" no changes were made/.test(stdout)) {
-        throw 'Dry run warning not shown.';
-      }
-    })
-    .then(() => expectGitToBeClean());
-}
diff --git a/tests/e2e/tests/generate/service/service-module-fail.ts b/tests/e2e/tests/generate/service/service-module-fail.ts
deleted file mode 100644
index 18f16e100e..0000000000
--- a/tests/e2e/tests/generate/service/service-module-fail.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-import {ng} from '../../../utils/process';
-import {expectToFail} from '../../../utils/utils';
-
-
-export default function() {
-  return Promise.resolve()
-    .then(() => expectToFail(() =>
-      ng('generate', 'service', 'test-service', '--module', 'app.moduleXXX.ts')));
-}
diff --git a/tests/e2e/tests/generate/service/service-module.ts b/tests/e2e/tests/generate/service/service-module.ts
deleted file mode 100644
index 7d71e7fc60..0000000000
--- a/tests/e2e/tests/generate/service/service-module.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-import {join} from 'path';
-import {ng} from '../../../utils/process';
-import {expectFileToMatch} from '../../../utils/fs';
-
-
-// tslint:disable:max-line-length
-export default function() {
-  const servicePath = join('src', 'app', 'test-service.service.ts');
-  const service2Path = join('src', 'app', 'test-service2.service.ts');
-
-  return ng('generate', 'service', 'test-service', '--module', 'app.module.ts')
-    .then(() => expectFileToMatch(servicePath, /import { AppModule } from '.\/app.module'/))
-    .then(() => expectFileToMatch(servicePath, /providedIn: AppModule/))
-
-    .then(() => process.chdir(join('src', 'app')))
-    .then(() => ng('generate', 'service', 'test-service2', '--module', 'app.module.ts'))
-    .then(() => process.chdir('../..'))
-    .then(() => expectFileToMatch(service2Path, /import { AppModule } from '.\/app.module'/))
-    .then(() => expectFileToMatch(service2Path, /providedIn: AppModule/))
-    .then(() => ng('build'));
-}