Skip to content

Commit 227d682

Browse files
raphsuttiraphsutti
committed
Merge remote-tracking branch 'upstream/master' into master
2 parents f28b694 + c4eb24e commit 227d682

7 files changed

Lines changed: 186 additions & 82 deletions

File tree

‎.npmignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,4 @@ test/tools/trigger-appveyor-tests.sh
77
/appveyor.yml
88
jsconfig.json
99
travis_after_all.py
10+
/.nyc_output

‎README.md‎

Lines changed: 49 additions & 50 deletions
Large diffs are not rendered by default.

‎package-lock.json‎

Lines changed: 28 additions & 29 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/cli/strategies/git-cz.js‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ function gitCz (rawGitArgs, environment, adapterConfig) {
4141
let resolvedAdapterConfigPath = resolveAdapterPath(adapterConfig.path);
4242
let resolvedAdapterRootPath = findRoot(resolvedAdapterConfigPath);
4343
let prompter = getPrompter(adapterConfig.path);
44+
let shouldStageAllFiles = rawGitArgs.includes('-a') || rawGitArgs.includes('--all');
4445

4546
isClean(process.cwd(), function (error, stagingIsClean) {
4647
if (error) {
@@ -67,6 +68,6 @@ function gitCz (rawGitArgs, environment, adapterConfig) {
6768
throw error;
6869
}
6970
});
70-
});
71+
}, shouldStageAllFiles);
7172

7273
}

‎src/commitizen/staging.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ export { isClean };
55
/**
66
* Asynchrounously determines if the staging area is clean
77
*/
8-
function isClean (repoPath, done) {
9-
exec('git diff --no-ext-diff --name-only && git diff --no-ext-diff --cached --name-only', {
8+
function isClean (repoPath, done, stageAllFiles) {
9+
exec(`git diff --cached --no-ext-diff --name-only ${!!stageAllFiles ? '&& git diff --no-ext-diff --name-only' : ''}`, {
1010
maxBuffer: Infinity,
1111
cwd: repoPath
1212
}, function (error, stdout) {

‎test/tests/commit.js‎

Lines changed: 67 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -311,6 +311,73 @@ ${(os.platform === 'win32') ? '' : ' '}
311311
done();
312312
});
313313
});
314+
315+
it('should throw error if staging area is empty', function (done) {
316+
317+
this.timeout(config.maxTimeout); // this could take a while
318+
319+
// SETUP
320+
321+
let dummyCommitMessage = `one does not simply ignore the tests`;
322+
323+
// Describe a repo and some files to add and commit
324+
let repoConfig = {
325+
path: config.paths.endUserRepo,
326+
files: {
327+
dummyfile: {
328+
contents: `duck-duck-gray-duck`,
329+
filename: `mydummiestfile.txt`,
330+
},
331+
gitignore: {
332+
contents: `node_modules/`,
333+
filename: `.gitignore`,
334+
}
335+
}
336+
};
337+
338+
// Describe an adapter
339+
let adapterConfig = {
340+
path: path.join(repoConfig.path, '/node_modules/cz-jira-smart-commit'),
341+
npmName: 'cz-jira-smart-commit'
342+
};
343+
344+
// Quick setup the repos, adapter, and grab a simple prompter
345+
let prompter = quickPrompterSetup(repoConfig, adapterConfig, dummyCommitMessage);
346+
// TEST
347+
348+
// Make an initial commit
349+
commitizenCommit(inquirer, repoConfig.path, prompter, { disableAppendPaths: true, quiet: true, emitData: true }, function (error) {
350+
// Should pass, as the files are added to the staging area
351+
expect(error).to.be.null;
352+
353+
log(repoConfig.path, function (logOutput) {
354+
expect(logOutput).to.have.string(dummyCommitMessage);
355+
});
356+
whatChanged(repoConfig.path, function (whatChangedOutput) {
357+
expect(whatChangedOutput).to.have.string('A\t' + repoConfig.files.dummyfile.filename);
358+
359+
// Make changes and don't add them to the staging area
360+
writeFilesToPath({
361+
dummymodified: {
362+
contents: repoConfig.files.dummyfile.contents + '-modified',
363+
filename: repoConfig.files.dummyfile.filename,
364+
add: false,
365+
}
366+
}, repoConfig.path);
367+
// Define a dummy prompter
368+
let prompter = function (cz, commit) {
369+
commit(`${dummyCommitMessage} #2`, {});
370+
};
371+
372+
commitizenCommit(inquirer, repoConfig.path, prompter, { disableAppendPaths: true, quiet: true, emitData: true }, function (error) {
373+
// Should fail, as staging are is empty
374+
expect(error).to.be.instanceOf(Error);
375+
done();
376+
});
377+
});
378+
});
379+
380+
});
314381
});
315382

316383
afterEach(function () {

‎test/tests/staging.js‎

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,43 @@ describe('staging', function () {
7878
});
7979
});
8080

81+
it('should determine if --all flag adds files to staging area', function (done) {
82+
83+
this.timeout(config.maxTimeout); // this could take a while
84+
85+
// SETUP
86+
87+
// Describe a repo and some files to add and commit
88+
let repoConfig = {
89+
path: config.paths.endUserRepo,
90+
files: {
91+
dummyfile: {
92+
contents: `duck-duck-gray-duck`,
93+
filename: `mydummiestfile.txt`,
94+
},
95+
gitignore: {
96+
contents: `node_modules/`,
97+
filename: `.gitignore`
98+
}
99+
}
100+
};
101+
102+
gitInit(repoConfig.path);
103+
104+
staging.isClean(repoConfig.path, function (stagingIsCleanError, stagingIsClean) {
105+
expect(stagingIsCleanError).to.be.null;
106+
expect(stagingIsClean).to.be.true;
107+
108+
writeFilesToPath(repoConfig.files, repoConfig.path);
109+
110+
staging.isClean(repoConfig.path, function (afterWriteStagingIsCleanError, afterWriteStagingIsClean) {
111+
expect(afterWriteStagingIsCleanError).to.be.null;
112+
expect(afterWriteStagingIsClean).to.be.true;
113+
114+
done();
115+
});
116+
}, true);
117+
});
81118
});
82119

83120
afterEach(function () {

0 commit comments

Comments
 (0)