New files since last release: additional test cases

sindresorhus · Aug 2, 2020 · 2fa3cf5 · 2fa3cf5
1 parent fba3ab4
commit 2fa3cf5
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 4 deletions.
diff --git a/integration-test b/integration-test
diff --git a/source/npm/util.js b/source/npm/util.js
@@ -150,7 +150,7 @@ function getFilesNotIncludedInFilesProperty(pkg, fileList) {
 		} catch (_) {}
 	}
 
-	let result = fileList.filter(minimatch.filter(getIgnoredFilesGlob(globArrayForFilesAndDirectories, pkg.directories), {matchBase: true}));
+	const result = fileList.filter(minimatch.filter(getIgnoredFilesGlob(globArrayForFilesAndDirectories, pkg.directories), {matchBase: true}));
 	return result.filter(minimatch.filter(getDefaultIncludedFilesGlob(pkg.main), {nocase: true, matchBase: true}));
 }
 
@@ -170,6 +170,7 @@ function getDefaultIncludedFilesGlob(mainFile) {
 	if (mainFile) {
 		filesAlwaysIncluded.push(mainFile);
 	}
+
 	return `!{${filesAlwaysIncluded}}`;
 }
 
@@ -193,7 +194,8 @@ function getIgnoredFilesGlob(globArrayFromFilesProperty, packageDirectories) {
 		'node_modules/**/*',
 		'npm-debug.log',
 		'package-lock.json',
-		'.git/**/*'
+		'.git/**/*',
+		'.git'
 	];
 
 	// Test files are assumed not to be part of the package

diff --git a/test/fixtures/npmignore/README.txt b/test/fixtures/npmignore/README.txt
@@ -0,0 +1 @@
+File is always included in package.
diff --git a/test/fixtures/npmignore/readme.md b/test/fixtures/npmignore/readme.md
@@ -0,0 +1 @@
+File is always included in package.
diff --git a/test/integration.js b/test/integration.js
@@ -1,6 +1,11 @@
 const test = require('ava');
 const execa = require('execa');
 
+test.before(async () => {
+	await execa('git', ['submodule', 'update', '--remote']);
+	await execa('npm', ['i'], {cwd: 'integration-test'});
+});
+
 test('Integration tests', async t => {
 	await execa('ava', {cwd: 'integration-test'});
 	t.pass();

diff --git a/test/npmignore.js b/test/npmignore.js
@@ -6,7 +6,9 @@ const newFiles = [
 	'source/ignore.txt',
 	'source/pay_attention.txt',
 	'.hg',
-	'test/file.txt'
+	'test/file.txt',
+	'readme.md',
+	'README.txt'
 ];
 
 test('ignored files using file-attribute in package.json with one file', async t => {