chore(init): use assets/.gitkeep (angular#1850)

filipesilva · web-flow · commit 7f70095b7219 · 2016-08-26T18:36:53.000+01:00
diff --git a/addon/ng2/blueprints/ng2/files/__path__/assets/.gitkeep b/addon/ng2/blueprints/ng2/files/__path__/assets/.gitkeep
diff --git a/addon/ng2/models/webpack-build-common.ts b/addon/ng2/models/webpack-build-common.ts
@@ -148,7 +148,7 @@ export function getWebpackCommonConfig(
       new CopyWebpackPlugin([{
         context: path.resolve(appRoot, appConfig.assets),
         from: { glob: '**/*', dot: true },
-        ignore: [ '.gitignore' ],
+        ignore: [ '.gitkeep' ],
         to: path.resolve(projectRoot, appConfig.outDir, appConfig.assets)
       }])
     ],
diff --git a/tests/e2e/e2e_workflow.spec.js b/tests/e2e/e2e_workflow.spec.js
@@ -322,12 +322,12 @@ describe('Basic end-to-end Workflow', function () {
     const testFile = path.join(process.cwd(), 'src', 'assets', 'test.abc');
     const distTestFile = path.join(process.cwd(), 'dist', 'assets', 'test.abc');
     fs.writeFileSync(testFile, 'hello world');
-    const distDotGitIgnore = path.join(process.cwd(), 'dist', 'assets', '.gitignore');
+    const distDotGitkeep = path.join(process.cwd(), 'dist', 'assets', '.gitkeep');
 
     sh.exec(`${ngBin} build`);
     expect(existsSync(distDotFile)).to.be.equal(true);
     expect(existsSync(distTestFile)).to.be.equal(true);
-    expect(existsSync(distDotGitIgnore)).to.be.equal(false);
+    expect(existsSync(distDotGitkeep)).to.be.equal(false);
   });
 
   // Mobile mode doesn't have styles
