Skip to content

Commit 7eb8325

Browse files
polonelpolonel
committed
Istanbul
Travis -> Coveralls test
1 parent b8068ea commit 7eb8325

File tree

5 files changed

+69
-69
lines changed

5 files changed

+69
-69
lines changed

‎.gitignore

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
# Logs
2-
logs
32
*.log
43

54
# Runtime data
@@ -45,3 +44,4 @@ public/css/app.css.map
4544
*.diff
4645
private/
4746
.sass-cache/
47+
coverage/

‎gruntfile.js

+59-62
Original file line numberDiff line numberDiff line change
@@ -82,25 +82,24 @@ module.exports = function(grunt) {
8282
}, {
8383
grunt: true,
8484
args: ['watch:web']
85-
}]
85+
}
86+
]
8687
},
8788
docs: {
8889
options: {
8990
stream: true
9091
},
91-
tasks: [
92-
{
93-
grunt: true,
94-
args: ['watch:docs']
95-
}
96-
]
92+
tasks: [{
93+
grunt: true,
94+
args: ['watch:docs']
95+
}]
9796
}
9897
},
9998

10099
cssmin: {
101100
target: {
102-
files: {
103-
'public/css/plugins.css' : [
101+
files: {
102+
'public/css/plugins.css': [
104103
'public/css/plugins/datatables/dataTables.scroller.css',
105104
'public/css/plugins/datatables/dataTables.foundation.css',
106105
'public/js/vendor/chosen/chosen.css',
@@ -149,15 +148,15 @@ module.exports = function(grunt) {
149148
}
150149
},
151150

152-
jsdoc : {
153-
dist : {
151+
jsdoc: {
152+
dist: {
154153
src: ['README.md', 'src/**/*.js', '!src/public/js/vendor/**/*.js', '!src/public/js/plugins/*.js'],
155154
options: {
156155
destination: 'docs',
157156
template: 'docs/jaguarjs-jsdoc',
158157
configure: 'docs/jaguarjs-jsdoc/conf.json'
159-
//template : "node_modules/grunt-jsdoc/node_modules/ink-docstrap/template",
160-
//configure : "node_modules/grunt-jsdoc/node_modules/ink-docstrap/template/jsdoc.conf.json"
158+
//template : "node_modules/grunt-jsdoc/node_modules/ink-docstrap/template",
159+
//configure : "node_modules/grunt-jsdoc/node_modules/ink-docstrap/template/jsdoc.conf.json"
161160
}
162161
}
163162
},
@@ -215,60 +214,58 @@ module.exports = function(grunt) {
215214
uglify2: {
216215
mangle: false
217216
},
218-
modules: [
219-
{
220-
name: 'trudesk.min',
221-
create: true,
222-
include: [
223-
'jquery',
224-
'jquery_scrollTo',
225-
'jquery_custom',
226-
'uikit',
227-
'angular',
228-
'angularRoute',
229-
'angularCookies',
230-
'modernizr',
231-
'fastclick',
232-
'placeholder',
233-
'nicescroll',
234-
'underscore',
235-
'history',
236-
'd3',
237-
'metricsgraphics',
238-
'd3pie',
239-
'peity',
240-
'countup',
241-
'selectize',
242-
'waves',
243-
'formvalidator',
244-
'snackbar',
217+
modules: [{
218+
name: 'trudesk.min',
219+
create: true,
220+
include: [
221+
'jquery',
222+
'jquery_scrollTo',
223+
'jquery_custom',
224+
'uikit',
225+
'angular',
226+
'angularRoute',
227+
'angularCookies',
228+
'modernizr',
229+
'fastclick',
230+
'placeholder',
231+
'nicescroll',
232+
'underscore',
233+
'history',
234+
'd3',
235+
'metricsgraphics',
236+
'd3pie',
237+
'peity',
238+
'countup',
239+
'selectize',
240+
'waves',
241+
'formvalidator',
242+
'snackbar',
245243

246-
'../../src/permissions/roles',
244+
'../../src/permissions/roles',
247245

248-
'angularjs/main',
249-
'angularjs/controllers',
250-
'app',
246+
'angularjs/main',
247+
'angularjs/controllers',
248+
'app',
251249

252-
'modules/ajaxify',
253-
'modules/ajaximgupload',
254-
'modules/attachmentUpload',
250+
'modules/ajaxify',
251+
'modules/ajaximgupload',
252+
'modules/attachmentUpload',
255253

256-
'pages/accounts',
257-
'pages/dashboard',
258-
'pages/editaccount',
259-
'pages/groups',
260-
'pages/messages',
261-
'pages/reports',
262-
'pages/singleTicket',
263-
'pages/tickets'
264-
],
265-
shim: {
266-
angular: {
267-
exports: 'angular'
268-
}
254+
'pages/accounts',
255+
'pages/dashboard',
256+
'pages/editaccount',
257+
'pages/groups',
258+
'pages/messages',
259+
'pages/reports',
260+
'pages/singleTicket',
261+
'pages/tickets'
262+
],
263+
shim: {
264+
angular: {
265+
exports: 'angular'
269266
}
270267
}
271-
],
268+
}],
272269
paths: {
273270
//foundation: 'empty:',
274271
angular: 'empty:',
@@ -299,4 +296,4 @@ module.exports = function(grunt) {
299296
grunt.registerTask('swinbuild', ['shell:requirejswin']);
300297
grunt.registerTask('winbuild', ['uglify:uikit', 'shell:requirejswin', 'buildcss', 'builddocs']);
301298
grunt.registerTask('default', ['server']);
302-
};
299+
};

‎logs/.gitkeep

Whitespace-only changes.

‎package.json

+9-5
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"postinstall": "npm install -g [email protected] grunt-cli && grunt build",
88
"build": "grunt build",
99
"test": "mocha --recursive",
10-
"coverage": "mocha --recursive --require blanket -R html-cov > coverage.html"
10+
"coverage": "istanbul cover ./node_modules/mocha/bin/_mocha -- --recursive"
1111
},
1212
"dependencies": {
1313
"ansi_up": "^1.3.0",
@@ -73,16 +73,17 @@
7373
"winston": "^2.2.0"
7474
},
7575
"devDependencies": {
76-
"blanket": "1.2.3",
7776
"chai": "*",
7877
"coveralls": "^2.11.11",
7978
"grunt-contrib-uglify": "^1.0.1",
8079
"grunt-contrib-watch": "^1.0.0",
8180
"grunt-express-server": "^0.5.3",
8281
"grunt-htmlhint": "^0.9.13",
8382
"grunt-parallel": "^0.5.1",
84-
"mocha": "*",
85-
"mocha-lcov-reporter": "1.2.0",
83+
"istanbul": "^0.4.4",
84+
"istanbul-coveralls": "^1.0.3",
85+
"mocha": "^2.5.3",
86+
"mocha-lcov-reporter": "^1.2.0",
8687
"request": "^2.73.0",
8788
"superagent": "^2.0.0",
8889
"supertest": "^1.2.0"
@@ -93,7 +94,10 @@
9394
"data-cover-never": [
9495
"node_modules",
9596
"tests"
96-
]
97+
],
98+
"data-cover-reporter-options": {
99+
"shortnames": true
100+
}
97101
}
98102
}
99103
}

‎test/0_database.js

-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
require('blanket');
21
var expect = require('chai').expect;
32
var should = require('chai').should();
43
var winston = require('winston');

0 commit comments

Comments
 (0)