Skip to content

C
Challonge
Commit 91559004 authored by Aaron Tidwell's avatar Aaron Tidwell
Browse files
Options

Add jsformat and jshint. Add additional npm script tasks. Fix formatting errors

parent 14167248
Hide whitespace changes
Inline Side-by-side
Showing with 561 additions and 50 deletions
.jsfmtrc 0 → 100644
View file @ 91559004
{
"esformatter": {
"allowShebang": true
},
"indent": {
"value": "\t",
"alignComments": true,
"ArrayExpression": 1,
"ArrayPattern": 1,
"ArrowFunctionExpression": 1,
"AssignmentExpression": 1,
"AssignmentExpression.BinaryExpression": 1,
"AssignmentExpression.LogicalExpression": 1,
"AssignmentExpression.UnaryExpression": 1,
"CallExpression": 1,
"CallExpression.BinaryExpression": 1,
"CallExpression.LogicalExpression": 1,
"CallExpression.UnaryExpression": 1,
"CatchClause": 1,
"ConditionalExpression": 1,
"CommentInsideEmptyBlock": 1,
"ClassDeclaration": 1,
"DoWhileStatement": 1,
"ForInStatement": 1,
"ForOfStatement": 1,
"ForStatement": 1,
"FunctionDeclaration": 1,
"FunctionExpression": 1,
"IfStatement": 1,
"MemberExpression": 1,
"MultipleVariableDeclaration": 1,
"NewExpression": 1,
"ObjectExpression": 1,
"ObjectExpression.BinaryExpression": 1,
"ObjectExpression.LogicalExpression": 1,
"ObjectExpression.UnaryExpression": 1,
"ObjectPattern": 1,
"ParameterList": 1,
"ReturnStatement": 1,
"SingleVariableDeclaration": 0,
"SwitchCase": 1,
"SwitchStatement": 1,
"TopLevelFunctionBlock": 1,
"TryStatement": 1,
"VariableDeclaration.BinaryExpression": 1,
"VariableDeclaration.LogicalExpression": 1,
"VariableDeclaration.UnaryExpression": 1,
"WhileStatement": 1
},
"lineBreak": {
"value": "\n",
"before": {
"AssignmentExpression": ">=1",
"AssignmentOperator": 0,
"AssignmentPattern": 0,
"ArrayPatternOpening": 0,
"ArrayPatternClosing": 0,
"ArrayPatternComma": 0,
"ArrowFunctionExpressionArrow": 0,
"ArrowFunctionExpressionOpeningBrace": 0,
"ArrowFunctionExpressionClosingBrace": ">=1",
"BlockStatement": 0,
"BreakKeyword": ">=1",
"CallExpression": -1,
"CallExpressionOpeningParentheses": 0,
"CallExpressionClosingParentheses": -1,
"ClassDeclaration": ">=1",
"ClassDeclarationOpeningBrace": 0,
"ClassDeclarationClosingBrace": ">=1",
"ConditionalExpression": ">=1",
"CatchOpeningBrace": 0,
"CatchClosingBrace": ">=1",
"CatchKeyword": 0,
"DeleteOperator": ">=1",
"DoWhileStatement": ">=1",
"DoWhileStatementOpeningBrace": 0,
"DoWhileStatementClosingBrace": ">=1",
"EndOfFile": -1,
"EmptyStatement": -1,
"FinallyKeyword": -1,
"FinallyOpeningBrace": 0,
"FinallyClosingBrace": ">=1",
"ForInStatement": ">=1",
"ForInStatementExpressionOpening": 0,
"ForInStatementExpressionClosing": 0,
"ForInStatementOpeningBrace": 0,
"ForInStatementClosingBrace": ">=1",
"ForOfStatement": ">=1",
"ForOfStatementExpressionOpening": 0,
"ForOfStatementExpressionClosing": 0,
"ForOfStatementOpeningBrace": 0,
"ForOfStatementClosingBrace": ">=1",
"ForStatement": ">=1",
"ForStatementExpressionOpening": 0,
"ForStatementExpressionClosing": "<2",
"ForStatementOpeningBrace": 0,
"ForStatementClosingBrace": ">=1",
"FunctionExpression": -1,
"FunctionExpressionOpeningBrace": 0,
"FunctionExpressionClosingBrace": ">=1",
"FunctionDeclaration": ">=1",
"FunctionDeclarationOpeningBrace": 0,
"FunctionDeclarationClosingBrace": ">=1",
"IIFEClosingParentheses": 0,
"IfStatement": ">=1",
"IfStatementOpeningBrace": 0,
"IfStatementClosingBrace": ">=1",
"ElseIfStatement": 0,
"ElseIfStatementOpeningBrace": 0,
"ElseIfStatementClosingBrace": ">=1",
"ElseStatement": 0,
"ElseStatementOpeningBrace": 0,
"ElseStatementClosingBrace": ">=1",
"LogicalExpression": -1,
"MethodDefinition": ">=1",
"MemberExpressionOpening": 0,
"MemberExpressionClosing": 0,
"MemberExpressionPeriod": -1,
"ObjectExpressionClosingBrace": ">=1",
"ObjectPatternOpeningBrace": 0,
"ObjectPatternClosingBrace": 0,
"ObjectPatternComma": 0,
"Property": ">=1",
"PropertyValue": 0,
"ReturnStatement": -1,
"SwitchOpeningBrace": 0,
"SwitchClosingBrace": ">=1",
"ThisExpression": -1,
"ThrowStatement": ">=1",
"TryKeyword": -1,
"TryOpeningBrace": 0,
"TryClosingBrace": ">=1",
"VariableName": ">=1",
"VariableValue": 0,
"VariableDeclaration": ">=1",
"VariableDeclarationSemiColon": 0,
"VariableDeclarationWithoutInit": ">=1",
"WhileStatement": ">=1",
"WhileStatementOpeningBrace": 0,
"WhileStatementClosingBrace": ">=1"
},
"after": {
"AssignmentExpression": ">=1",
"AssignmentOperator": 0,
"AssignmentPattern": 0,
"ArrayPatternOpening": 0,
"ArrayPatternClosing": 0,
"ArrayPatternComma": 0,
"ArrowFunctionExpressionArrow": 0,
"ArrowFunctionExpressionOpeningBrace": ">=1",
"ArrowFunctionExpressionClosingBrace": -1,
"BlockStatement": 0,
"BreakKeyword": -1,
"CallExpression": -1,
"CallExpressionOpeningParentheses": -1,
"CallExpressionClosingParentheses": -1,
"ClassDeclaration": ">=1",
"ClassDeclarationOpeningBrace": ">=1",
"ClassDeclarationClosingBrace": ">=1",
"CatchOpeningBrace": ">=1",
"CatchClosingBrace": ">=0",
"CatchKeyword": 0,
"ConditionalExpression": ">=1",
"DeleteOperator": ">=1",
"DoWhileStatement": ">=1",
"DoWhileStatementOpeningBrace": ">=1",
"DoWhileStatementClosingBrace": 0,
"EmptyStatement": -1,
"FinallyKeyword": -1,
"FinallyOpeningBrace": ">=1",
"FinallyClosingBrace": ">=1",
"ForInStatement": ">=1",
"ForInStatementExpressionOpening": "<2",
"ForInStatementExpressionClosing": -1,
"ForInStatementOpeningBrace": ">=1",
"ForInStatementClosingBrace": ">=1",
"ForOfStatement": ">=1",
"ForOfStatementExpressionOpening": "<2",
"ForOfStatementExpressionClosing": -1,
"ForOfStatementOpeningBrace": ">=1",
"ForOfStatementClosingBrace": ">=1",
"ForStatement": ">=1",
"ForStatementExpressionOpening": "<2",
"ForStatementExpressionClosing": -1,
"ForStatementOpeningBrace": ">=1",
"ForStatementClosingBrace": ">=1",
"FunctionExpression": ">=1",
"FunctionExpressionOpeningBrace": ">=1",
"FunctionExpressionClosingBrace": -1,
"FunctionDeclaration": ">=1",
"FunctionDeclarationOpeningBrace": ">=1",
"FunctionDeclarationClosingBrace": ">=1",
"IIFEOpeningParentheses": 0,
"IfStatement": ">=1",
"IfStatementOpeningBrace": ">=1",
"IfStatementClosingBrace": ">=1",
"ElseIfStatement": ">=1",
"ElseIfStatementOpeningBrace": ">=1",
"ElseIfStatementClosingBrace": ">=1",
"ElseStatement": ">=1",
"ElseStatementOpeningBrace": ">=1",
"ElseStatementClosingBrace": ">=1",
"LogicalExpression": -1,
"MethodDefinition": ">=1",
"MemberExpressionOpening": 0,
"MemberExpressionClosing": 0,
"MemberExpressionPeriod": 0,
"ObjectExpressionOpeningBrace": ">=1",
"ObjectPatternOpeningBrace": 0,
"ObjectPatternClosingBrace": 0,
"ObjectPatternComma": 0,
"Property": 0,
"PropertyName": 0,
"ReturnStatement": -1,
"SwitchOpeningBrace": ">=1",
"SwitchClosingBrace": ">=1",
"SwitchCaseColon": ">=1",
"ThisExpression": 0,
"ThrowStatement": ">=1",
"TryKeyword": -1,
"TryOpeningBrace": ">=1",
"TryClosingBrace": 0,
"VariableValue": -1,
"VariableDeclaration": ">=1",
"VariableDeclarationSemiColon": ">=1",
"WhileStatement": ">=1",
"WhileStatementOpeningBrace": ">=1",
"WhileStatementClosingBrace": ">=1"
}
},
"whiteSpace": {
"value": " ",
"removeTrailing": 1,
"before": {
"AssignmentPattern": 1,
"ArrayExpressionOpening": 0,
"ArrayExpressionClosing": 0,
"ArrayExpressionComma": 0,
"ArrayPatternOpening": 1,
"ArrayPatternClosing": 0,
"ArrayPatternComma": 0,
"ArrowFunctionExpressionArrow": 1,
"ArrowFunctionExpressionOpeningBrace": 1,
"ArrowFunctionExpressionClosingBrace": 0,
"ArgumentComma": 0,
"ArgumentList": 0,
"AssignmentOperator": 1,
"BinaryExpression": 0,
"BinaryExpressionOperator": 1,
"BlockComment": 1,
"CallExpression": -1,
"CallExpressionOpeningParentheses": 0,
"CallExpressionClosingParentheses": -1,
"CatchParameterList": 0,
"CatchOpeningBrace": 1,
"CatchClosingBrace": 1,
"CatchKeyword": 1,
"CommaOperator": 0,
"ClassDeclarationOpeningBrace": 1,
"ClassDeclarationClosingBrace": 1,
"ConditionalExpressionConsequent": 1,
"ConditionalExpressionAlternate": 1,
"DoWhileStatementOpeningBrace": 1,
"DoWhileStatementClosingBrace": 1,
"DoWhileStatementConditional": 1,
"EmptyStatement": 0,
"ExpressionClosingParentheses": 0,
"FinallyKeyword": -1,
"FinallyOpeningBrace": 1,
"FinallyClosingBrace": 1,
"ForInStatement": 1,
"ForInStatementExpressionOpening": 1,
"ForInStatementExpressionClosing": 0,
"ForInStatementOpeningBrace": 1,
"ForInStatementClosingBrace": 1,
"ForOfStatement": 1,
"ForOfStatementExpressionOpening": 1,
"ForOfStatementExpressionClosing": 0,
"ForOfStatementOpeningBrace": 1,
"ForOfStatementClosingBrace": 1,
"ForStatement": 1,
"ForStatementExpressionOpening": 1,
"ForStatementExpressionClosing": 0,
"ForStatementOpeningBrace": 1,
"ForStatementClosingBrace": 1,
"ForStatementSemicolon": 0,
"FunctionDeclarationOpeningBrace": 1,
"FunctionDeclarationClosingBrace": 1,
"FunctionExpressionOpeningBrace": 1,
"FunctionExpressionClosingBrace": 1,
"FunctionGeneratorAsterisk": 0,
"FunctionName": 1,
"IIFEClosingParentheses": 0,
"IfStatementConditionalOpening": 1,
"IfStatementConditionalClosing": 0,
"IfStatementOpeningBrace": 1,
"IfStatementClosingBrace": 1,
"ModuleSpecifierClosingBrace": 1,
"ElseStatementOpeningBrace": 1,
"ElseStatementClosingBrace": 1,
"ElseIfStatementOpeningBrace": 1,
"ElseIfStatementClosingBrace": 1,
"LineComment": 1,
"LogicalExpressionOperator": 1,
"MemberExpressionOpening": 0,
"MemberExpressionClosing": 0,
"MemberExpressionPeriod": 0,
"ObjectExpressionOpeningBrace": -1,
"ObjectExpressionClosingBrace": 0,
"ObjectPatternOpeningBrace": 1,
"ObjectPatternClosingBrace": 0,
"ObjectPatternComma": 0,
"Property": 1,
"PropertyValue": 1,
"ParameterComma": 0,
"ParameterList": 0,
"SwitchDiscriminantOpening": 1,
"SwitchDiscriminantClosing": 0,
"SwitchCaseColon": 0,
"ThrowKeyword": 1,
"TryKeyword": -1,
"TryOpeningBrace": 1,
"TryClosingBrace": 1,
"UnaryExpressionOperator": 0,
"VariableName": 1,
"VariableValue": 1,
"VariableDeclarationSemiColon": 0,
"WhileStatementConditionalOpening": 1,
"WhileStatementConditionalClosing": 0,
"WhileStatementOpeningBrace": 1,
"WhileStatementClosingBrace": 1
},
"after": {
"AssignmentPattern": 1,
"ArrayExpressionOpening": 0,
"ArrayExpressionClosing": 0,
"ArrayExpressionComma": 1,
"ArrayPatternOpening": 0,
"ArrayPatternClosing": 1,
"ArrayPatternComma": 1,
"ArrowFunctionExpressionArrow": 1,
"ArrowFunctionExpressionOpeningBrace": 0,
"ArrowFunctionExpressionClosingBrace": 0,
"ArgumentComma": 1,
"ArgumentList": 0,
"AssignmentOperator": 1,
"BinaryExpression": 0,
"BinaryExpressionOperator": 1,
"BlockComment": 1,
"CallExpression": -1,
"CallExpressionOpeningParentheses": -1,
"CallExpressionClosingParentheses": -1,
"CatchParameterList": 0,
"CatchOpeningBrace": 1,
"CatchClosingBrace": 1,
"CatchKeyword": 1,
"ClassDeclarationOpeningBrace": 1,
"ClassDeclarationClosingBrace": 1,
"CommaOperator": 1,
"ConditionalExpressionConsequent": 1,
"ConditionalExpressionTest": 1,
"DoWhileStatementOpeningBrace": 1,
"DoWhileStatementClosingBrace": 1,
"DoWhileStatementBody": 1,
"EmptyStatement": 0,
"ExpressionOpeningParentheses": 0,
"FinallyKeyword": -1,
"FinallyOpeningBrace": 1,
"FinallyClosingBrace": 1,
"ForInStatement": 1,
"ForInStatementExpressionOpening": 0,
"ForInStatementExpressionClosing": 1,
"ForInStatementOpeningBrace": 1,
"ForInStatementClosingBrace": 1,
"ForOfStatement": 1,
"ForOfStatementExpressionOpening": 0,
"ForOfStatementExpressionClosing": 1,
"ForOfStatementOpeningBrace": 1,
"ForOfStatementClosingBrace": 1,
"ForStatement": 1,
"ForStatementExpressionOpening": 0,
"ForStatementExpressionClosing": 1,
"ForStatementClosingBrace": 1,
"ForStatementOpeningBrace": 1,
"ForStatementSemicolon": 1,
"FunctionReservedWord": 0,
"FunctionName": 0,
"FunctionExpressionOpeningBrace": 1,
"FunctionExpressionClosingBrace": 0,
"FunctionDeclarationOpeningBrace": 1,
"FunctionDeclarationClosingBrace": 1,
"IIFEOpeningParentheses": 0,
"IfStatementConditionalOpening": 0,
"IfStatementConditionalClosing": 1,
"IfStatementOpeningBrace": 1,
"IfStatementClosingBrace": 1,
"ModuleSpecifierOpeningBrace": 1,
"ElseStatementOpeningBrace": 1,
"ElseStatementClosingBrace": 1,
"ElseIfStatementOpeningBrace": 1,
"ElseIfStatementClosingBrace": 1,
"MemberExpressionOpening": 0,
"MemberExpressionClosing": 0,
"MemberExpressionPeriod": 0,
"LogicalExpressionOperator": 1,
"ObjectExpressionOpeningBrace": 0,
"ObjectExpressionClosingBrace": 0,
"ObjectPatternOpeningBrace": 0,
"ObjectPatternClosingBrace": 1,
"ObjectPatternComma": 1,
"PropertyName": 0,
"PropertyValue": 0,
"ParameterComma": 1,
"ParameterList": 0,
"SwitchDiscriminantOpening": 0,
"SwitchDiscriminantClosing": 1,
"ThrowKeyword": 1,
"TryKeyword": -1,
"TryOpeningBrace": 1,
"TryClosingBrace": 1,
"UnaryExpressionOperator": 0,
"VariableName": 1,
"VariableValue": 0,
"VariableDeclarationSemiColon": 0,
"WhileStatementConditionalOpening": 0,
"WhileStatementConditionalClosing": 1,
"WhileStatementOpeningBrace": 1,
"WhileStatementClosingBrace": 1
}
}
}
.jshintrc 0 → 100644
View file @ 91559004
{
"asi": false,
"bitwise": true,
"browser": true,
"camelcase": false,
"curly": true,
"forin": false,
"immed": true,
"latedef": "nofunc",
"maxlen": false,
"newcap": false,
"noarg": true,
"node": true,
"noempty": true,
"nonew": true,
"predef": [
"jasmine",
"spyOn",
"beforeEach",
"afterEach",
"fdescribe",
"xdescribe",
"describe",
"expect",
"it",
"fit",
"xit"
],
"quotmark": true,
"trailing": true,
"undef": true,
"unused": false,
"esversion": 6
}
.travis.yml
View file @ 91559004
language: node_js language: node_js
node_js: node_js:
- "6.0.0" - "6.0.0"
script: npm run-script integrate
README.md
View file @ 91559004
...@@ -101,6 +101,22 @@ tournament: { tournament_type: 'single elimination' } ...@@ -101,6 +101,22 @@ tournament: { tournament_type: 'single elimination' }
$ npm test $ npm test
``` ```
### Run JsFmt/JsHint
```bash
$ npm run-script format
```
```bash
$ npm run-script lint
```
### All (travis integration tests)
```bash
$ npm run-script integrate
```
### Issue Tracking ### Issue Tracking
Issues are tracked on github: https://github.com/Tidwell/node-challonge/issues Issues are tracked on github: https://github.com/Tidwell/node-challonge/issues
......
lib/api/client.js
View file @ 91559004
...@@ -39,7 +39,7 @@ function serializeProperties(obj) { ...@@ -39,7 +39,7 @@ function serializeProperties(obj) {
var serializedProperties = []; var serializedProperties = [];
for (var prop in obj) { for (var prop in obj) {
if (obj.hasOwnProperty(prop)) { if (obj.hasOwnProperty(prop)) {
if (typeof(obj[prop]) === 'object' && obj[prop] !== null) { if (typeof (obj[prop]) === 'object' && obj[prop] !== null) {
for (var attr in obj[prop]) { for (var attr in obj[prop]) {
compiledParams += '&'; compiledParams += '&';
compiledParams += prop + '[' + attr + ']=' + encodeURIComponent(obj[prop][attr]); compiledParams += prop + '[' + attr + ']=' + encodeURIComponent(obj[prop][attr]);
...@@ -82,7 +82,7 @@ function convertProperties(obj, converionFunction) { ...@@ -82,7 +82,7 @@ function convertProperties(obj, converionFunction) {
delete obj[prop]; delete obj[prop];
} }
//otherwise leave it alone //otherwise leave it alone
} }
} }
return obj; return obj;
...@@ -112,8 +112,8 @@ Client.prototype.makeRequest = function(obj) { ...@@ -112,8 +112,8 @@ Client.prototype.makeRequest = function(obj) {
// Add on the api key // Add on the api key
obj.api_key = this.options.get('apiKey'); //convert for url obj.api_key = this.options.get('apiKey'); //convert for url
obj.cache_bust = Math.random() obj.cache_bust = Math.random();
//serialize the properties //serialize the properties
var serialized = serializeProperties(obj); var serialized = serializeProperties(obj);
var compiledParams = serialized.serialized; var compiledParams = serialized.serialized;
//merge the stuff to remove //merge the stuff to remove
......
lib/api/client.spec.js
View file @ 91559004
...@@ -152,7 +152,7 @@ describe('Client Class', () => { ...@@ -152,7 +152,7 @@ describe('Client Class', () => {
const opts = parseOpts(); const opts = parseOpts();
expect(opts['some_property[another_property]']).toBe('anotherthing'); expect(opts['some_property[another_property]']).toBe('anotherthing');
expect(opts['something']).not.toBeDefined(); expect(opts.something).not.toBeDefined();
}); });
it('should add the api key to request', () => { it('should add the api key to request', () => {
...@@ -303,6 +303,6 @@ describe('Client Class', () => { ...@@ -303,6 +303,6 @@ describe('Client Class', () => {
httpsMock.listeners.data[0]('<bla>'); httpsMock.listeners.data[0]('<bla>');
httpsMock.listeners.end[0](); httpsMock.listeners.end[0]();
expect(spy).toHaveBeenCalledWith(null, '<bla>'); expect(spy).toHaveBeenCalledWith(null, '<bla>');
}) });
}); });
}); });
lib/api/error-handler.js
View file @ 91559004
...@@ -58,4 +58,4 @@ exports.handle = function(res, resData, callback, format) { ...@@ -58,4 +58,4 @@ exports.handle = function(res, resData, callback, format) {
// ship the response object back as the data // ship the response object back as the data
callback(err, res); callback(err, res);
return; return;
} };
lib/api/matches.spec.js
View file @ 91559004
...@@ -32,7 +32,7 @@ describe('matches endpoints', () => { ...@@ -32,7 +32,7 @@ describe('matches endpoints', () => {
expect(obj).toEqual({ expect(obj).toEqual({
path: '/somedomain-25/matches', path: '/somedomain-25/matches',
method: 'GET' method: 'GET'
}) });
}; };
matchesInstance.index({ matchesInstance.index({
id: 25 id: 25
......
lib/api/participants.js
View file @ 91559004
...@@ -58,4 +58,4 @@ Participants.prototype.randomize = function(obj) { ...@@ -58,4 +58,4 @@ Participants.prototype.randomize = function(obj) {
delete obj.id; delete obj.id;
obj.method = 'POST'; obj.method = 'POST';
this.makeRequest(obj); this.makeRequest(obj);
} };
lib/api/participants.spec.js
View file @ 91559004
...@@ -20,7 +20,7 @@ describe('participants endpoints', () => { ...@@ -20,7 +20,7 @@ describe('participants endpoints', () => {
expect(obj).toEqual({ expect(obj).toEqual({
path: '/25/participants', path: '/25/participants',
method: 'GET' method: 'GET'
}) });
}; };
participantsInstance.index({ participantsInstance.index({
id: 25 id: 25
...@@ -32,7 +32,7 @@ describe('participants endpoints', () => { ...@@ -32,7 +32,7 @@ describe('participants endpoints', () => {
expect(obj).toEqual({ expect(obj).toEqual({
path: '/somedomain-25/participants', path: '/somedomain-25/participants',
method: 'GET' method: 'GET'
}) });
}; };
participantsInstance.index({ participantsInstance.index({
id: 25 id: 25
...@@ -47,7 +47,7 @@ describe('participants endpoints', () => { ...@@ -47,7 +47,7 @@ describe('participants endpoints', () => {
expect(obj).toEqual({ expect(obj).toEqual({
path: '/25/participants', path: '/25/participants',
method: 'POST' method: 'POST'
}) });
}; };
participantsInstance.create({ participantsInstance.create({
id: 25 id: 25
...@@ -59,7 +59,7 @@ describe('participants endpoints', () => { ...@@ -59,7 +59,7 @@ describe('participants endpoints', () => {
expect(obj).toEqual({ expect(obj).toEqual({
path: '/somedomain-25/participants', path: '/somedomain-25/participants',
method: 'POST' method: 'POST'
}) });
}; };
participantsInstance.create({ participantsInstance.create({
id: 25 id: 25
...@@ -74,7 +74,7 @@ describe('participants endpoints', () => { ...@@ -74,7 +74,7 @@ describe('participants endpoints', () => {
expect(obj).toEqual({ expect(obj).toEqual({
path: '/25/participants/456', path: '/25/participants/456',
method: 'GET' method: 'GET'
}) });
}; };
participantsInstance.show({ participantsInstance.show({
id: 25, id: 25,
...@@ -87,7 +87,7 @@ describe('participants endpoints', () => { ...@@ -87,7 +87,7 @@ describe('participants endpoints', () => {
expect(obj).toEqual({ expect(obj).toEqual({
path: '/somedomain-25/participants/456', path: '/somedomain-25/participants/456',
method: 'GET' method: 'GET'
}) });
}; };
participantsInstance.show({ participantsInstance.show({
id: 25, id: 25,
...@@ -103,7 +103,7 @@ describe('participants endpoints', () => { ...@@ -103,7 +103,7 @@ describe('participants endpoints', () => {
expect(obj).toEqual({ expect(obj).toEqual({
path: '/25/participants/456', path: '/25/participants/456',
method: 'PUT' method: 'PUT'
}) });
}; };
participantsInstance.update({ participantsInstance.update({
id: 25, id: 25,
...@@ -116,7 +116,7 @@ describe('participants endpoints', () => { ...@@ -116,7 +116,7 @@ describe('participants endpoints', () => {
expect(obj).toEqual({ expect(obj).toEqual({
path: '/somedomain-25/participants/456', path: '/somedomain-25/participants/456',
method: 'PUT' method: 'PUT'
}) });
}; };
participantsInstance.update({ participantsInstance.update({
id: 25, id: 25,
...@@ -132,7 +132,7 @@ describe('participants endpoints', () => { ...@@ -132,7 +132,7 @@ describe('participants endpoints', () => {
expect(obj).toEqual({ expect(obj).toEqual({
path: '/25/participants/456', path: '/25/participants/456',
method: 'DELETE' method: 'DELETE'
}) });
}; };
participantsInstance.destroy({ participantsInstance.destroy({
id: 25, id: 25,
...@@ -145,7 +145,7 @@ describe('participants endpoints', () => { ...@@ -145,7 +145,7 @@ describe('participants endpoints', () => {
expect(obj).toEqual({ expect(obj).toEqual({
path: '/somedomain-25/participants/456', path: '/somedomain-25/participants/456',
method: 'DELETE' method: 'DELETE'
}) });
}; };
participantsInstance.destroy({ participantsInstance.destroy({
id: 25, id: 25,
...@@ -161,7 +161,7 @@ describe('participants endpoints', () => { ...@@ -161,7 +161,7 @@ describe('participants endpoints', () => {
expect(obj).toEqual({ expect(obj).toEqual({
path: '/25/participants/randomize', path: '/25/participants/randomize',
method: 'POST' method: 'POST'
}) });
}; };
participantsInstance.randomize({ participantsInstance.randomize({
id: 25 id: 25
...@@ -173,7 +173,7 @@ describe('participants endpoints', () => { ...@@ -173,7 +173,7 @@ describe('participants endpoints', () => {
expect(obj).toEqual({ expect(obj).toEqual({
path: '/somedomain-25/participants/randomize', path: '/somedomain-25/participants/randomize',
method: 'POST' method: 'POST'
}) });
}; };
participantsInstance.randomize({ participantsInstance.randomize({
id: 25 id: 25
......
lib/api/tournaments.spec.js
View file @ 91559004
...@@ -39,7 +39,7 @@ describe('tournaments endpoints', () => { ...@@ -39,7 +39,7 @@ describe('tournaments endpoints', () => {
expect(domain).toEqual(''); expect(domain).toEqual('');
}); });
}) });
// index GET tournaments // index GET tournaments
describe('index', () => { describe('index', () => {
...@@ -48,7 +48,7 @@ describe('tournaments endpoints', () => { ...@@ -48,7 +48,7 @@ describe('tournaments endpoints', () => {
expect(obj).toEqual({ expect(obj).toEqual({
id: 25, id: 25,
method: 'GET' method: 'GET'
}) });
}; };
tournamentsInstance.index({ tournamentsInstance.index({
id: 25 id: 25
...@@ -61,7 +61,7 @@ describe('tournaments endpoints', () => { ...@@ -61,7 +61,7 @@ describe('tournaments endpoints', () => {
id: 25, id: 25,
method: 'GET', method: 'GET',
subdomain: 'somedomain' subdomain: 'somedomain'
}) });
}; };
tournamentsInstance.index({ tournamentsInstance.index({
id: 25 id: 25
...@@ -76,7 +76,7 @@ describe('tournaments endpoints', () => { ...@@ -76,7 +76,7 @@ describe('tournaments endpoints', () => {
expect(obj).toEqual({ expect(obj).toEqual({
id: 25, id: 25,
method: 'POST' method: 'POST'
}) });
}; };
tournamentsInstance.create({ tournamentsInstance.create({
id: 25 id: 25
...@@ -91,7 +91,7 @@ describe('tournaments endpoints', () => { ...@@ -91,7 +91,7 @@ describe('tournaments endpoints', () => {
tournament: { tournament: {
subdomain: 'somedomain' subdomain: 'somedomain'
} }
}) });
}; };
tournamentsInstance.create({ tournamentsInstance.create({
id: 25, id: 25,
...@@ -107,7 +107,7 @@ describe('tournaments endpoints', () => { ...@@ -107,7 +107,7 @@ describe('tournaments endpoints', () => {
expect(obj).toEqual({ expect(obj).toEqual({
path: '/25', path: '/25',
method: 'GET' method: 'GET'
}) });
}; };
tournamentsInstance.show({ tournamentsInstance.show({
id: 25 id: 25
...@@ -119,7 +119,7 @@ describe('tournaments endpoints', () => { ...@@ -119,7 +119,7 @@ describe('tournaments endpoints', () => {
expect(obj).toEqual({ expect(obj).toEqual({
path: '/somedomain-25', path: '/somedomain-25',
method: 'GET' method: 'GET'
}) });
}; };
tournamentsInstance.show({ tournamentsInstance.show({
id: 25 id: 25
...@@ -134,7 +134,7 @@ describe('tournaments endpoints', () => { ...@@ -134,7 +134,7 @@ describe('tournaments endpoints', () => {
expect(obj).toEqual({ expect(obj).toEqual({
path: '/25', path: '/25',
method: 'PUT' method: 'PUT'
}) });
}; };
tournamentsInstance.update({ tournamentsInstance.update({
id: 25 id: 25
...@@ -146,7 +146,7 @@ describe('tournaments endpoints', () => { ...@@ -146,7 +146,7 @@ describe('tournaments endpoints', () => {
expect(obj).toEqual({ expect(obj).toEqual({
path: '/somedomain-25', path: '/somedomain-25',
method: 'PUT' method: 'PUT'
}) });
}; };
tournamentsInstance.update({ tournamentsInstance.update({
id: 25 id: 25
...@@ -161,7 +161,7 @@ describe('tournaments endpoints', () => { ...@@ -161,7 +161,7 @@ describe('tournaments endpoints', () => {
expect(obj).toEqual({ expect(obj).toEqual({
path: '/25', path: '/25',
method: 'DELETE' method: 'DELETE'
}) });
}; };
tournamentsInstance.destroy({ tournamentsInstance.destroy({
id: 25 id: 25
...@@ -173,7 +173,7 @@ describe('tournaments endpoints', () => { ...@@ -173,7 +173,7 @@ describe('tournaments endpoints', () => {
expect(obj).toEqual({ expect(obj).toEqual({
path: '/somedomain-25', path: '/somedomain-25',
method: 'DELETE' method: 'DELETE'
}) });
}; };
tournamentsInstance.destroy({ tournamentsInstance.destroy({
id: 25 id: 25
...@@ -188,7 +188,7 @@ describe('tournaments endpoints', () => { ...@@ -188,7 +188,7 @@ describe('tournaments endpoints', () => {
expect(obj).toEqual({ expect(obj).toEqual({
path: '/25/start', path: '/25/start',
method: 'POST' method: 'POST'
}) });
}; };
tournamentsInstance.start({ tournamentsInstance.start({
id: 25 id: 25
...@@ -200,7 +200,7 @@ describe('tournaments endpoints', () => { ...@@ -200,7 +200,7 @@ describe('tournaments endpoints', () => {
expect(obj).toEqual({ expect(obj).toEqual({
path: '/somedomain-25/start', path: '/somedomain-25/start',
method: 'POST' method: 'POST'
}) });
}; };
tournamentsInstance.start({ tournamentsInstance.start({
id: 25 id: 25
...@@ -215,7 +215,7 @@ describe('tournaments endpoints', () => { ...@@ -215,7 +215,7 @@ describe('tournaments endpoints', () => {
expect(obj).toEqual({ expect(obj).toEqual({
path: '/25/finalize', path: '/25/finalize',
method: 'POST' method: 'POST'
}) });
}; };
tournamentsInstance.finalize({ tournamentsInstance.finalize({
id: 25 id: 25
...@@ -227,7 +227,7 @@ describe('tournaments endpoints', () => { ...@@ -227,7 +227,7 @@ describe('tournaments endpoints', () => {
expect(obj).toEqual({ expect(obj).toEqual({
path: '/somedomain-25/finalize', path: '/somedomain-25/finalize',
method: 'POST' method: 'POST'
}) });
}; };
tournamentsInstance.finalize({ tournamentsInstance.finalize({
id: 25 id: 25
...@@ -242,7 +242,7 @@ describe('tournaments endpoints', () => { ...@@ -242,7 +242,7 @@ describe('tournaments endpoints', () => {
expect(obj).toEqual({ expect(obj).toEqual({
path: '/25/reset', path: '/25/reset',
method: 'POST' method: 'POST'
}) });
}; };
tournamentsInstance.reset({ tournamentsInstance.reset({
id: 25 id: 25
...@@ -254,7 +254,7 @@ describe('tournaments endpoints', () => { ...@@ -254,7 +254,7 @@ describe('tournaments endpoints', () => {
expect(obj).toEqual({ expect(obj).toEqual({
path: '/somedomain-25/reset', path: '/somedomain-25/reset',
method: 'POST' method: 'POST'
}) });
}; };
tournamentsInstance.reset({ tournamentsInstance.reset({
id: 25 id: 25
......
lib/challonge.spec.js
View file @ 91559004
...@@ -47,5 +47,5 @@ describe('Challonge object', () => { ...@@ -47,5 +47,5 @@ describe('Challonge object', () => {
expect(client.participants.setSubdomain).toHaveBeenCalled(); expect(client.participants.setSubdomain).toHaveBeenCalled();
expect(client.matches.setSubdomain).toHaveBeenCalled(); expect(client.matches.setSubdomain).toHaveBeenCalled();
}); });
}) });
}); });
package.json
View file @ 91559004
...@@ -4,13 +4,16 @@ ...@@ -4,13 +4,16 @@
"author": "Aaron Tiwell <aaron.tidwell@gmail.com>", "author": "Aaron Tiwell <aaron.tidwell@gmail.com>",
"main": "./lib/challonge.js", "main": "./lib/challonge.js",
"version": "1.2.0", "version": "1.2.0",
"contributors": [{ "contributors": [
"name": "Ricardo Reis", {
"email": "ricardojoaoreis@gmail.com" "name": "Ricardo Reis",
}, { "email": "ricardojoaoreis@gmail.com"
"name": "Jonas Vanen", },
"email": "jonas.vanen@gmail.com" {
}], "name": "Jonas Vanen",
"email": "jonas.vanen@gmail.com"
}
],
"repository": { "repository": {
"type": "git", "type": "git",
"url": "https://github.com/Tidwell/node-challonge" "url": "https://github.com/Tidwell/node-challonge"
...@@ -28,11 +31,23 @@ ...@@ -28,11 +31,23 @@
"devDependencies": { "devDependencies": {
"istanbul": "^0.4.5", "istanbul": "^0.4.5",
"jasmine": "^2.5.3", "jasmine": "^2.5.3",
"jsfmt": "^0.5.3",
"jshint": "^2.9.4",
"mockery": "^2.0.0" "mockery": "^2.0.0"
}, },
"scripts": { "scripts": {
"test": "./node_modules/jasmine/bin/jasmine.js", "test": "./node_modules/jasmine/bin/jasmine.js",
"coverage": "node ./node_modules/istanbul/lib/cli.js cover --include-all-sources ./node_modules/jasmine/bin/jasmine.js -x '**/spec/**' -x '**/key.js'" "coverage": "node ./node_modules/istanbul/lib/cli.js cover --include-all-sources ./node_modules/jasmine/bin/jasmine.js -x '**/spec/**' -x '**/key.js'",
"format-lib": "./node_modules/jsfmt/bin/jsfmt -w ./lib ./*.js",
"format-spec": "./node_modules/jsfmt/bin/jsfmt -w ./spec",
"format": "npm run-script format-lib && npm run-script format-spec",
"lint-lib": "./node_modules/jshint/bin/jshint ./lib",
"lint-spec": "./node_modules/jshint/bin/jshint ./spec",
"lint": "npm run-script lint-lib && npm run-script lint-spec",
"integrate": "npm run-script test && npm run-script format && npm run-script lint"
}, },
"engine": "node >= 0.10.x" "engine": "node >= 0.10.x"
} }
spec/helpers/index.js
View file @ 91559004
const mockery = require('mockery'); const mockery = require('mockery');
mockery.enable({ mockery.enable({
warnOnReplace: false, warnOnReplace: false,
warnOnUnregistered: false warnOnUnregistered: false
}); });
const httpsMock = { const httpsMock = {
...@@ -15,7 +15,9 @@ const httpsMock = { ...@@ -15,7 +15,9 @@ const httpsMock = {
}, },
res: { res: {
on: (method, cb) => { on: (method, cb) => {
if (!httpsMock.listeners[method]) { httpsMock.listeners[method] = []; } if (!httpsMock.listeners[method]) {
httpsMock.listeners[method] = [];
}
httpsMock.listeners[method].push(cb); httpsMock.listeners[method].push(cb);
} }
}, },
...@@ -24,7 +26,8 @@ const httpsMock = { ...@@ -24,7 +26,8 @@ const httpsMock = {
pipe(this.res); pipe(this.res);
return { return {
end: () => {} end: () => {
}
}; };
} }
}; };
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment