Skip to content

Commit 82f909b

Browse files
author
Chris Park
committed
Merge branch 'develop' of github.com:rosette-api/nodejs into develop
2 parents 77b0ecd + ec377eb commit 82f909b

File tree

7 files changed

+76
-103
lines changed

7 files changed

+76
-103
lines changed

‎.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ node_modules
33

44
target
55

6+
.grunt
7+
68
# Instrumented versions of lib/ files
79
instrumented
810

‎Gruntfile.js‎

Lines changed: 19 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,22 @@ module.exports = function(grunt) {
2424
}
2525
}
2626
},
27-
instrument: {
28-
files: ["lib/*.js", "index.js"],
29-
options: {
30-
lazy: true,
31-
basePath: "target/instrumented"
27+
mochaTest: {
28+
test: {
29+
options: {
30+
reporter: 'spec',
31+
quiet: false, // Optionally suppress output to standard out (defaults to false)
32+
clearRequireCache: false // Optionally clear the require cache before running tests (defaults to false)
33+
},
34+
src: ['tests/**/*.js']
3235
}
3336
},
37+
'gh-pages': {
38+
options: {
39+
base: 'target/html'
40+
},
41+
src: ['**/*']
42+
},
3443
watch: {
3544
gruntfile: {
3645
files: "<%= eslint.gruntfile.lib %>",
@@ -47,9 +56,12 @@ module.exports = function(grunt) {
4756
grunt.loadNpmTasks("grunt-contrib-clean");
4857
grunt.loadNpmTasks("grunt-contrib-watch");;
4958
grunt.loadNpmTasks("grunt-jsdoc");
59+
grunt.loadNpmTasks('grunt-mocha-test');
60+
grunt.loadNpmTasks('grunt-gh-pages');
5061

5162
// Task definitions.
5263
// run `grunt <task>` in command line and it will run the sequence in brackets
53-
grunt.registerTask("default", ["clean","jsdoc"]);
54-
grunt.registerTask("doc", ["jsdoc"]);
64+
grunt.registerTask("default", ["clean","jsdoc", "test"]);
65+
grunt.registerTask("doc", ["jsdoc", "gh-pages"]);
66+
grunt.registerTask("test", ["mochaTest"]);
5567
};

‎docker/Dockerfile‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,10 @@ ENV API_KEY api_key
88

99
RUN mkdir /nodejs-dev
1010
COPY runAll.sh /nodejs-dev/runAll.sh
11-
RUN chmod 755 /nodejs-dev/runAll.sh
11+
RUN chmod 0755 /nodejs-dev/runAll.sh
1212

1313
#set the working directory
1414
WORKDIR /nodejs-dev
1515

16-
CMD ./runAll.sh $API_KEY $FILENAME $ALT_URL $GIT_USERNAME $VERSION
17-
16+
CMD ./runAll.sh $API_KEY $FILENAME $ALT_URL $GIT_USERNAME $GIT_EMAIL $VERSION
1817
VOLUME ["/source"]

‎docker/runAll.sh‎

Lines changed: 8 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -100,26 +100,20 @@ validateURL
100100
cp -r -n /source/. .
101101

102102
#Run unit tests
103-
104-
cd tests
105-
npm install -g mocha
106-
npm install mocha
107-
npm install -g istanbul
108-
npm install chai
109-
npm install nock
103+
npm install -g grunt-cli
110104
npm install -g eslint
111-
npm install multipart-stream
112-
istanbul cover _mocha unittests.js
105+
npm install
106+
grunt test
113107
#run eslint
114-
eslint ../lib/**
108+
eslint lib/*.js
115109

116110

117111

118112
#Run the examples
119113
if [ ! -z ${API_KEY} ]; then
120114
checkAPI
121115
#Prerequisite
122-
cd ../examples
116+
cd examples
123117
npm install argparse
124118
npm install temporary
125119
if [ ! -z ${FILENAME} ]; then
@@ -135,24 +129,9 @@ else
135129
fi
136130

137131
#Generate gh-pages and push them to git account (if git username is provided)
138-
if [ ! -z ${GIT_USERNAME} ] && [ ! -z ${VERSION} ]; then
139-
#clone nodejs git repo
140-
cd /
141-
git clone [email protected]:${GIT_USERNAME}/nodejs.git
142-
cd nodejs
143-
git checkout origin/gh-pages -b gh-pages
144-
git branch -d develop
145-
#generate gh-pages and set ouput dir to git repo (gh-pages branch)
146-
cd ../nodejs-dev
147-
npm install -g grunt-cli
148-
npm install grunt
149-
npm install
150-
grunt
151-
cd ../nodejs
152-
rm -rf node_modules
153-
git add .
154-
git commit -a -m "publish grunt apidocs ${VERSION}"
155-
git push
132+
if [ ! -z ${GIT_USERNAME} ]; then
133+
134+
grunt doc
156135
fi
157136

158137
exit ${retcode}

‎npm-debug.log‎

Lines changed: 0 additions & 20 deletions
This file was deleted.

‎package.json‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,13 +33,14 @@
3333
"devDependencies": {
3434
"argparse": "^1.0.6",
3535
"chai": "^3.5.0",
36+
"eslint": "^2.7.0",
3637
"grunt": "^0.4.5",
37-
"grunt-cli": "^0.1.13",
3838
"grunt-contrib-clean": "^1.0.0",
3939
"grunt-contrib-watch": "^0.6.1",
40+
"grunt-gh-pages": "^1.0.0",
4041
"grunt-jsdoc": "^1.1.0",
4142
"grunt-jslint": "^1.1.14",
42-
"istanbul": "^0.4.2",
43+
"grunt-mocha-test": "^0.12.7",
4344
"mocha": "^2.4.5",
4445
"nock": "^7.2.1",
4546
"temporary": "0.0.8"

‎tests/unittests.js‎

Lines changed: 42 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@ var requestArray, statusArray, responseArray;
2626

2727
before(function() {
2828
// get the names of all the mock data files
29-
requestArray = fs.readdirSync('../mock-data/request/');
30-
statusArray = fs.readdirSync('../mock-data/status/');
31-
responseArray = fs.readdirSync('../mock-data/response/');
29+
requestArray = fs.readdirSync(__dirname + '/../mock-data/request/');
30+
statusArray = fs.readdirSync(__dirname + '/../mock-data/status/');
31+
responseArray = fs.readdirSync(__dirname + '/../mock-data/response/');
3232

3333
});
3434

@@ -41,9 +41,9 @@ function langTests(index, done) {
4141

4242
var lang = new language();
4343
var param = new paramObj();
44-
var request = fs.readFileSync('../mock-data/request/' + requestArray[index]);
45-
var status = fs.readFileSync('../mock-data/status/' + statusArray[index]);
46-
var response = fs.readFileSync('../mock-data/response/' + responseArray[index]);
44+
var request = fs.readFileSync(__dirname + '/../mock-data/request/' + requestArray[index], 'utf8');
45+
var status = fs.readFileSync(__dirname + '/../mock-data/status/' + statusArray[index], 'utf8');
46+
var response = fs.readFileSync(__dirname + '/../mock-data/response/' + responseArray[index], 'utf8');
4747
var expected = JSON.parse(response.toString());
4848

4949
// nock interceptor for endpoint
@@ -96,9 +96,9 @@ function sentTests(index, done) {
9696

9797
var sent = new sentiment();
9898
var param = new paramObj();
99-
var request = fs.readFileSync('../mock-data/request/' + requestArray[index]);
100-
var status = fs.readFileSync('../mock-data/status/' + statusArray[index]);
101-
var response = fs.readFileSync('../mock-data/response/' + responseArray[index]);
99+
var request = fs.readFileSync(__dirname + '/../mock-data/request/' + requestArray[index], 'utf8');
100+
var status = fs.readFileSync(__dirname + '/../mock-data/status/' + statusArray[index], 'utf8');
101+
var response = fs.readFileSync(__dirname + '/../mock-data/response/' + responseArray[index], 'utf8');
102102
var expected = JSON.parse(response.toString());
103103

104104
// nock interceptor for endpoint
@@ -152,9 +152,9 @@ function catTests(index, done) {
152152

153153
var cat = new categories();
154154
var param = new paramObj();
155-
var request = fs.readFileSync('../mock-data/request/' + requestArray[index]);
156-
var status = fs.readFileSync('../mock-data/status/' + statusArray[index]);
157-
var response = fs.readFileSync('../mock-data/response/' + responseArray[index]);
155+
var request = fs.readFileSync(__dirname + '/../mock-data/request/' + requestArray[index], 'utf8');
156+
var status = fs.readFileSync(__dirname + '/../mock-data/status/' + statusArray[index], 'utf8');
157+
var response = fs.readFileSync(__dirname + '/../mock-data/response/' + responseArray[index], 'utf8');
158158
var expected = JSON.parse(response.toString());
159159

160160
// nock interceptor for endpoint
@@ -208,9 +208,9 @@ function morphTests(index, done) {
208208

209209
var morph = new morphology();
210210
var param = new paramObj();
211-
var request = fs.readFileSync('../mock-data/request/' + requestArray[index]);
212-
var status = fs.readFileSync('../mock-data/status/' + statusArray[index]);
213-
var response = fs.readFileSync('../mock-data/response/' + responseArray[index]);
211+
var request = fs.readFileSync(__dirname + '/../mock-data/request/' + requestArray[index], 'utf8');
212+
var status = fs.readFileSync(__dirname + '/../mock-data/status/' + statusArray[index], 'utf8');
213+
var response = fs.readFileSync(__dirname + '/../mock-data/response/' + responseArray[index], 'utf8');
214214
var expected = JSON.parse(response.toString());
215215

216216
// nock interceptor for endpoint
@@ -264,9 +264,9 @@ function entitiesTests(index, done) {
264264

265265
var entity = new entities();
266266
var param = new paramObj();
267-
var request = fs.readFileSync('../mock-data/request/' + requestArray[index]);
268-
var status = fs.readFileSync('../mock-data/status/' + statusArray[index]);
269-
var response = fs.readFileSync('../mock-data/response/' + responseArray[index]);
267+
var request = fs.readFileSync(__dirname + '/../mock-data/request/' + requestArray[index], 'utf8');
268+
var status = fs.readFileSync(__dirname + '/../mock-data/status/' + statusArray[index], 'utf8');
269+
var response = fs.readFileSync(__dirname + '/../mock-data/response/' + responseArray[index], 'utf8');
270270
var expected = JSON.parse(response.toString());
271271

272272
// nock interceptor for endpoint
@@ -320,9 +320,9 @@ function entitiesLinkedTests(index, done) {
320320

321321
var entity = new entities();
322322
var param = new paramObj();
323-
var request = fs.readFileSync('../mock-data/request/' + requestArray[index]);
324-
var status = fs.readFileSync('../mock-data/status/' + statusArray[index]);
325-
var response = fs.readFileSync('../mock-data/response/' + responseArray[index]);
323+
var request = fs.readFileSync(__dirname + '/../mock-data/request/' + requestArray[index], 'utf8');
324+
var status = fs.readFileSync(__dirname + '/../mock-data/status/' + statusArray[index], 'utf8');
325+
var response = fs.readFileSync(__dirname + '/../mock-data/response/' + responseArray[index], 'utf8');
326326
var expected = JSON.parse(response.toString());
327327

328328
// nock interceptor for endpoint
@@ -377,9 +377,9 @@ function relationshipsTests(index, done) {
377377

378378
var relationship = new relationships();
379379
var param = new paramObj();
380-
var request = fs.readFileSync('../mock-data/request/' + requestArray[index]);
381-
var status = fs.readFileSync('../mock-data/status/' + statusArray[index]);
382-
var response = fs.readFileSync('../mock-data/response/' + responseArray[index]);
380+
var request = fs.readFileSync(__dirname + '/../mock-data/request/' + requestArray[index], 'utf8');
381+
var status = fs.readFileSync(__dirname + '/../mock-data/status/' + statusArray[index], 'utf8');
382+
var response = fs.readFileSync(__dirname + '/../mock-data/response/' + responseArray[index], 'utf8');
383383
var expected = JSON.parse(response.toString());
384384

385385
// nock interceptor for endpoint
@@ -433,9 +433,9 @@ function nameSimilarityTests(index, done) {
433433

434434
var name = new nameSimilarity();
435435
var param = new paramObj();
436-
var request = fs.readFileSync('../mock-data/request/' + requestArray[index]);
437-
var status = fs.readFileSync('../mock-data/status/' + statusArray[index]);
438-
var response = fs.readFileSync('../mock-data/response/' + responseArray[index]);
436+
var request = fs.readFileSync(__dirname + '/../mock-data/request/' + requestArray[index], 'utf8');
437+
var status = fs.readFileSync(__dirname + '/../mock-data/status/' + statusArray[index], 'utf8');
438+
var response = fs.readFileSync(__dirname + '/../mock-data/response/' + responseArray[index], 'utf8');
439439
var expected = JSON.parse(response.toString());
440440

441441
// nock interceptor for endpoint
@@ -491,9 +491,9 @@ function nameTranslationTests(index, done) {
491491

492492
var name = new nameTranslation();
493493
var param = new paramObj();
494-
var request = fs.readFileSync('../mock-data/request/' + requestArray[index]);
495-
var status = fs.readFileSync('../mock-data/status/' + statusArray[index]);
496-
var response = fs.readFileSync('../mock-data/response/' + responseArray[index]);
494+
var request = fs.readFileSync(__dirname + '/../mock-data/request/' + requestArray[index], 'utf8');
495+
var status = fs.readFileSync(__dirname + '/../mock-data/status/' + statusArray[index], 'utf8');
496+
var response = fs.readFileSync(__dirname + '/../mock-data/response/' + responseArray[index], 'utf8');
497497
var expected = JSON.parse(response.toString());
498498

499499
// nock interceptor for endpoint
@@ -555,9 +555,9 @@ function sentencesTests(index, done) {
555555

556556
var sentence = new sentences();
557557
var param = new paramObj();
558-
var request = fs.readFileSync('../mock-data/request/' + requestArray[index]);
559-
var status = fs.readFileSync('../mock-data/status/' + statusArray[index]);
560-
var response = fs.readFileSync('../mock-data/response/' + responseArray[index]);
558+
var request = fs.readFileSync(__dirname + '/../mock-data/request/' + requestArray[index], 'utf8');
559+
var status = fs.readFileSync(__dirname + '/../mock-data/status/' + statusArray[index], 'utf8');
560+
var response = fs.readFileSync(__dirname + '/../mock-data/response/' + responseArray[index], 'utf8');
561561
var expected = JSON.parse(response.toString());
562562

563563
// nock interceptor for endpoint
@@ -619,9 +619,9 @@ function tokensTests(index, done) {
619619

620620
var token = new tokens();
621621
var param = new paramObj();
622-
var request = fs.readFileSync('../mock-data/request/' + requestArray[index]);
623-
var status = fs.readFileSync('../mock-data/status/' + statusArray[index]);
624-
var response = fs.readFileSync('../mock-data/response/' + responseArray[index]);
622+
var request = fs.readFileSync(__dirname + '/../mock-data/request/' + requestArray[index], 'utf8');
623+
var status = fs.readFileSync(__dirname + '/../mock-data/status/' + statusArray[index], 'utf8');
624+
var response = fs.readFileSync(__dirname + '/../mock-data/response/' + responseArray[index], 'utf8');
625625
var expected = JSON.parse(response.toString());
626626

627627
// nock interceptor for endpoint
@@ -760,8 +760,8 @@ describe('Rosette API check version endpoint', function() {
760760
this.timeout(150000);
761761
it('should return a response', function(done) {
762762
var c = new checkVersion();
763-
var status = fs.readFileSync('../mock-data/status/' + 'checkVersion.status');
764-
var response = fs.readFileSync('../mock-data/other/' + 'checkVersion.json');
763+
var status = fs.readFileSync(__dirname + '/../mock-data/status/' + 'checkVersion.status', 'utf8');
764+
var response = fs.readFileSync(__dirname + '/../mock-data/other/' + 'checkVersion.json', 'utf8');
765765
var expected = JSON.parse(response.toString());
766766

767767
// nock interceptor for endpoint
@@ -783,8 +783,8 @@ describe('Rosette API info endpoint', function() {
783783
it('should return a response', function(done) {
784784
var i = new info();
785785
var param = new paramObj();
786-
var status = fs.readFileSync('../mock-data/status/' + 'info.status');
787-
var response = fs.readFileSync('../mock-data/other/' + 'info.json');
786+
var status = fs.readFileSync(__dirname + '/../mock-data/status/' + 'info.status', 'utf8');
787+
var response = fs.readFileSync(__dirname + '/../mock-data/other/' + 'info.json', 'utf8');
788788
var expected = JSON.parse(response.toString());
789789

790790
// nock interceptor for endpoint
@@ -806,8 +806,8 @@ describe('Rosette API ping endpoint', function() {
806806
it('should return a response', function(done) {
807807
var p = new ping();
808808
var param = new paramObj();
809-
var status = fs.readFileSync('../mock-data/status/' + 'ping.status');
810-
var response = fs.readFileSync('../mock-data/other/' + 'ping.json');
809+
var status = fs.readFileSync(__dirname + '/../mock-data/status/' + 'ping.status', 'utf8');
810+
var response = fs.readFileSync(__dirname + '/../mock-data/other/' + 'ping.json', 'utf8');
811811
var expected = JSON.parse(response.toString());
812812

813813
// nock interceptor for endpoint

0 commit comments

Comments
 (0)