Skip to content
This repository has been archived by the owner on Mar 23, 2024. It is now read-only.

Commit

Permalink
Revert "Preset: JSCS"
Browse files Browse the repository at this point in the history
This reverts commit b336c65.
Patch backed outso that a patch release could be made.

Refs ch-1015
  • Loading branch information
mikesherov committed Feb 9, 2015
1 parent 585fdbd commit 6a9ad23
Show file tree
Hide file tree
Showing 6 changed files with 17 additions and 26 deletions.
16 changes: 14 additions & 2 deletions .jscsrc
Original file line number Diff line number Diff line change
@@ -1,7 +1,19 @@
{
"preset": "jscs",
"preset": "google",
"fileExtensions": [ ".js", "jscs" ],

"requireParenthesesAroundIIFE": true,
"maximumLineLength": 120,
"validateLineBreaks": "LF",
"validateIndentation": 4,

"disallowKeywords": ["with"],
"disallowSpacesInsideObjectBrackets": null,
"disallowImplicitTypeConversion": ["string"],

"safeContextKeyword": "_this",

"excludeFiles": [
"test/data/**"
]
}
}
1 change: 0 additions & 1 deletion OVERVIEW.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
* [MDCS](https://github.com/jscs-dev/node-jscs/blob/master/presets/mdcs.json)[https://github.com/mrdoob/three.js/wiki/Mr.doob's-Code-Style™](https://github.com/mrdoob/three.js/wiki/Mr.doob's-Code-Style%E2%84%A2)
* [Wikimedia](https://github.com/jscs-dev/node-jscs/blob/master/presets/wikimedia.json)https://www.mediawiki.org/wiki/Manual:Coding_conventions/JavaScript
* [Yandex](https://github.com/jscs-dev/node-jscs/blob/master/presets/yandex.json)https://github.com/yandex/codestyle/blob/master/javascript.md
* [JSCS](https://github.com/jscs-dev/node-jscs/blob/master/presets/jscs.json)

## Friendly packages

Expand Down
2 changes: 0 additions & 2 deletions lib/config/configuration.js
Original file line number Diff line number Diff line change
Expand Up @@ -678,8 +678,6 @@ Configuration.prototype.registerDefaultPresets = function() {

// https://github.com/yandex/codestyle/blob/master/javascript.md
this.registerPreset('yandex', require('../../presets/yandex.json'));

this.registerPreset('jscs', require('../../presets/jscs.json'));
};

module.exports = Configuration;
Expand Down
14 changes: 0 additions & 14 deletions presets/jscs.json

This file was deleted.

1 change: 0 additions & 1 deletion test/config/configuration.js
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,6 @@ describe('modules/config/configuration', function() {
assert(configuration.hasPreset('wikimedia'));
assert(configuration.hasPreset('yandex'));
assert(configuration.hasPreset('grunt'));
assert(configuration.hasPreset('jscs'));
});
});

Expand Down
9 changes: 3 additions & 6 deletions test/string-checker.js
Original file line number Diff line number Diff line change
Expand Up @@ -331,7 +331,6 @@ describe('modules/string-checker', function() {
testPreset('mdcs');
testPreset('wikimedia');
testPreset('yandex');
testPreset('jscs', __filename);

/**
* Helper to test a given preset's configuration against its test file
Expand All @@ -341,19 +340,17 @@ describe('modules/string-checker', function() {
*
* @example testPreset('google')
* @param {String} presetName
* @param {String} [fixturePath]
*/
function testPreset(presetName, fixturePath) {
function testPreset(presetName) {
it('preset ' + presetName + ' should not report any errors from the sample file', function() {
fixturePath = fixturePath || './test/data/options/preset/' + presetName + '.js';

var checker = new Checker();

checker.registerDefaultRules();
checker.configure({
preset: presetName
});

return checker.checkFile(fixturePath).then(function(errors) {
return checker.checkFile('./test/data/options/preset/' + presetName + '.js').then(function(errors) {
assert(errors.isEmpty());
});
});
Expand Down

0 comments on commit 6a9ad23

Please sign in to comment.