From 85fa74cd870e8009838ae207ebc5f5d166c37a65 Mon Sep 17 00:00:00 2001
From: Younes JAAIDI <yjaaidi@gmail.com>
Date: Mon, 4 Feb 2019 21:14:43 +0100
Subject: [PATCH] fix(@schematics/angular): use `scss` instead of `sass`
 extension in build and test architects

---
 packages/schematics/angular/application/index.ts     |  4 ++--
 .../schematics/angular/application/index_spec.ts     | 12 ++++++++++++
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/packages/schematics/angular/application/index.ts b/packages/schematics/angular/application/index.ts
index 946a43970c7e..f639b14005f1 100644
--- a/packages/schematics/angular/application/index.ts
+++ b/packages/schematics/angular/application/index.ts
@@ -205,7 +205,7 @@ function addAppToWorkspaceFile(options: ApplicationOptions, workspace: Workspace
             join(normalize(projectRoot), 'src', 'assets'),
           ],
           styles: [
-            `${projectRoot}src/styles.${options.style}`,
+            `${projectRoot}src/styles.${styleToFileExtention(options.style)}`,
           ],
           scripts: [],
           es5BrowserSupport: true,
@@ -258,7 +258,7 @@ function addAppToWorkspaceFile(options: ApplicationOptions, workspace: Workspace
           tsConfig: `${rootFilesRoot}tsconfig.spec.json`,
           karmaConfig: `${rootFilesRoot}karma.conf.js`,
           styles: [
-            `${projectRoot}src/styles.${options.style}`,
+            `${projectRoot}src/styles.${styleToFileExtention(options.style)}`,
           ],
           scripts: [],
           assets: [
diff --git a/packages/schematics/angular/application/index_spec.ts b/packages/schematics/angular/application/index_spec.ts
index 290f7978e26e..0c92fd644610 100644
--- a/packages/schematics/angular/application/index_spec.ts
+++ b/packages/schematics/angular/application/index_spec.ts
@@ -295,5 +295,17 @@ describe('Application Schematic', () => {
       expect(content.rules['directive-selector'][2]).toMatch('app');
       expect(content.rules['component-selector'][2]).toMatch('app');
     });
+
+    it('should use `scss` file extension instead of `sass` for `styles.scss`', () => {
+      const options = { ...defaultOptions, style: 'sass' };
+
+      const tree = schematicRunner.runSchematic('application', options, workspaceTree);
+      const config = JSON.parse(tree.readContent('/angular.json'));
+      const project = config.projects.foo;
+      const projectArchitect = config.projects.foo.architect;
+      expect(projectArchitect.build.options.styles).toEqual(['projects/foo/src/styles.scss']);
+      expect(projectArchitect.test.options.styles).toEqual(['projects/foo/src/styles.scss']);
+    });
+
   });
 });