diff --git a/packages/@angular/cli/tasks/lint.ts b/packages/@angular/cli/tasks/lint.ts index 12cf4c4c9725..23412e3b92b7 100644 --- a/packages/@angular/cli/tasks/lint.ts +++ b/packages/@angular/cli/tasks/lint.ts @@ -5,7 +5,6 @@ import * as ts from 'typescript'; import { requireProjectModule } from '../utilities/require-project-module'; import { CliConfig } from '../models/config'; import { LintCommandOptions } from '../commands/lint'; -import { oneLine } from 'common-tags'; interface CliLintConfig { files?: (string | string[]); @@ -21,11 +20,7 @@ export default Task.extend({ const lintConfigs: CliLintConfig[] = CliConfig.fromProject().config.lint || []; if (lintConfigs.length === 0) { - ui.writeLine(chalk.yellow(oneLine` - No lint config(s) found. - If this is not intended, run "ng update". - `)); - + ui.writeLine(chalk.yellow('No lint configuration(s) found.')); return Promise.resolve(0); } diff --git a/tests/e2e/tests/lint/lint-no-config-section.ts b/tests/e2e/tests/lint/lint-no-config-section.ts index 07d67aef518c..d2bfc1e4992d 100644 --- a/tests/e2e/tests/lint/lint-no-config-section.ts +++ b/tests/e2e/tests/lint/lint-no-config-section.ts @@ -6,23 +6,13 @@ export default function () { .then(() => ng('set', 'lint', '[]')) .then(() => ng('lint')) .then(({ stdout }) => { - if (!stdout.match(/No lint config\(s\) found\./)) { + if (!stdout.match(/No lint configuration\(s\) found\./)) { throw new Error(oneLine` - Expected to match "No lint configs found." + Expected to match "No lint configuration(s) found." in ${stdout}. `); } return stdout; - }) - .then((output) => { - if (!output.match(/If this is not intended, run "ng update"\./)) { - throw new Error(oneLine` - Expected to match "If this is not intended, run "ng update"." - in ${output}. - `); - } - - return output; }); }