Skip to content

Commit fc0c397

Browse files
committed
Merge remote-tracking branch 'origin/master'
# Conflicts: # index.js
2 parents 4dc974b + e1d0117 commit fc0c397

4 files changed

Lines changed: 17 additions & 50 deletions

File tree

.travis.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,3 +11,7 @@ script:
1111

1212
# Send coverage data to Coveralls
1313
after_script: "cat coverage/lcov.info | node_modules/coveralls/bin/coveralls.js"
14+
15+
notifications:
16+
webhooks:
17+
- http://krake.one/travis-ci/407618350911455232/8ssENZyEyrG_oyX3yAFuNBOLCoruVQTbAdiAn4rqOKc0OHgTZNP6DcWNCEIorDURKgrb

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ Splatoon2.ink Node API Client
66
[![npm](https://img.shields.io/npm/dt/express.svg)](https://www.npmjs.com/package/splatoon2.ink-node-api-client)
77
[![GitHub stars](https://img.shields.io/github/stars/Dog2puppy/splatoon2.ink-node-api-client.svg?style=social&label=Stars)](https://github.com/Dog2puppy/splatoon2.ink-node-api-client)
88

9-
An API client for the site Splatoon2.ink.
9+
An API client for Splatoon2.ink.
1010

1111
## Installation
1212

index.js

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,13 @@
11
'use strict';
22

33
/**
4-
* Fetches API data
5-
* @param {number} number
6-
* @param {string} locale
7-
* @return {string}
4+
* Gets the current battles
5+
* @param {string} mode
6+
* @return {object}
87
*/
98
module.exports.getCurrentStages = function(mode) {
10-
if (mode) {
11-
return;
12-
}else{
13-
return data;
14-
}
9+
var data = {
10+
apiVersion: "0.1.1"
11+
};
12+
return data;
1513
};

test/test.js

Lines changed: 5 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -1,46 +1,11 @@
1-
'use strict';
1+
'use strict';
22

33
var expect = require('chai').expect;
4-
var numFormatter = require('../index');
4+
var client = require('../index');
55

66
describe('#numFormatter', function() {
7-
it('should convert single digits', function() {
8-
var result = numFormatter(1);
9-
expect(result).to.equal('1');
10-
});
11-
12-
it('should convert double digits', function() {
13-
var result = numFormatter(12);
14-
expect(result).to.equal('12');
15-
});
16-
17-
it('should convert triple digits', function() {
18-
var result = numFormatter(123);
19-
expect(result).to.equal('123');
20-
});
21-
22-
it('should convert 4 digits', function() {
23-
var result = numFormatter(1234);
24-
expect(result).to.equal('1,234');
25-
});
26-
27-
it('should convert 5 digits', function() {
28-
var result = numFormatter(12345);
29-
expect(result).to.equal('12,345');
30-
});
31-
32-
it('should convert 6 digits', function() {
33-
var result = numFormatter(123456);
34-
expect(result).to.equal('123,456');
35-
});
36-
37-
it('should convert 7 digits', function() {
38-
var result = numFormatter(1234567);
39-
expect(result).to.equal('1,234,567');
40-
});
41-
42-
it('should convert 8 digits', function() {
43-
var result = numFormatter(12345678);
44-
expect(result).to.equal('12,345,678');
7+
it('should give API version', function() {
8+
var data = client.getCurrentStages();
9+
expect(data.apiVersion).to.equal('0.1.1');
4510
});
4611
});

0 commit comments

Comments
 (0)