Merge pull request #655 from Countly/next

Next

Author: ar2rsawseen

Gruntfile.js

@@ -161,8 +161,41 @@ module.exports = function(grunt) {
         },
         src: ['test/*/*.js']
       }
-    }
+    },
+	mocha_nyc: {
+	  coverage: {
+		  src: ['test/*/*.js'], // a folder works nicely
+		  options: {
+              coverage:true, // this will make the grunt.event.on('coverage') event listener to be triggered
+			  mask: '*.js',
+			  excludes: ['bin/*', 'frontend/*', 'extend/*', 'Gruntfile.js', 'test/*'],
+              mochaOptions: ['--harmony', '--async-only', '--reporter', 'spec', '--timeout', '50000', '--exit'],
+              nycOptions: ['--harmony', '--clean', 'false'],//,'--include-all-sources' '--all'
+              reportFormats: ['none']
+		  }
+	  }
+	},
+	istanbul_check_coverage: {
+	  default: {
+		  options: {
+			  coverageFolder: 'coverage*', // will check both coverage folders and merge the coverage results
+			  check: {
+				  lines: 80,
+				  statements: 80
+			  }
+		  }
+	  }
+	}
+  });
+
+  //code coverage
+  grunt.event.on('coverage', function(lcovFileContents, done){
+	// Check below on the section "The coverage event"
+	done();
   });
+  grunt.loadNpmTasks('grunt-mocha-nyc');
+  grunt.registerTask('coverage', ['mocha_nyc:coverage']);
+  //-----------code coverage-----------
 
   grunt.loadNpmTasks('grunt-contrib-jshint');
   grunt.loadNpmTasks('grunt-contrib-concat');

bin/config/supervisord.conf

@@ -22,6 +22,7 @@ programs=countly-dashboard, countly-api
 [program:countly-dashboard]
 environment=NODE_ENV=production
 command=node %(here)s/../../frontend/express/app.js
+;command=nyc node %(here)s/../../frontend/express/app.js ;replace previous line with this in case you want to run nyc
 directory=.
 autorestart=true
 redirect_stderr=true
@@ -35,6 +36,7 @@ loglevel=warn
 [program:countly-api]
 environment=NODE_ENV=production
 command=node %(here)s/../../api/api.js
+;command=nyc --nycrc-path nyc.config node %(here)s/../../api/api.js ;replace previous line with this in case you want to run nyc
 directory=%(here)s
 autorestart=true
 redirect_stderr=true

nyc.config

@@ -0,0 +1,25 @@
+{
+  "report-dir": "./CoverageReportDir",
+  "exclude": [
+    ".git/**",
+    "frontend/**",
+    "bin/**",
+    "frontend/**",
+    "test/**",
+    "core/**",
+    "extend/**",
+    "**/tests/**",
+    "**/tests.js",
+    "CodeCoverageResult/**",
+    "CoverageReportDir/**",
+    "plugins/*/frontend/**",
+    "node_modules/**",
+    "**/node_modules/**"
+
+  ],
+  "reporter": [
+        "html",
+        "text"
+      ],
+  "all": true
+}

package.json

@@ -21,8 +21,10 @@
     "grunt-contrib-cssmin": "2.2.1",
     "grunt-contrib-jshint": "1.1.0",
     "grunt-contrib-uglify": "3.3.0",
+    "grunt-mocha-nyc": "^1.0.3",
     "grunt-mocha-test": "0.13.3",
     "mocha": "^5.1.1",
+    "nyc": "^13.0.1",
     "should": "13.2.1",
     "supertest": "3.1.0"
   },

plugins/browser/tests.js

@@ -21,7 +21,7 @@ describe('Testing Browser metrics', function(){
 				if (err) return done(err);
 				var ob = JSON.parse(res.text);
 				ob.should.be.empty;
-				setTimeout(done, 100)
+				done();
 			});
 		});
 	});
@@ -35,7 +35,7 @@ describe('Testing Browser metrics', function(){
 				if (err) return done(err);
 				var ob = JSON.parse(res.text);
 				ob.should.have.property('result','Success');
-				setTimeout(done, 100)
+				setTimeout(done, 300 * testUtils.testScalingFactor)
 			});
 		});
 	});
@@ -59,15 +59,14 @@ describe('Testing Browser metrics', function(){
 				{"device_id":DEVICE_ID+"4", "app_key":APP_KEY, "begin_session":1, "metrics":{"_browser": "Firefox"}},
 				{"device_id":DEVICE_ID+"5", "app_key":APP_KEY, "begin_session":1, "metrics":{"_browser": "IE"}}
 			];
-            this.timeout(params.length*10000+10000);
 			request
 			.get('/i/bulk?requests='+JSON.stringify(params))
 			.expect(200)
 			.end(function(err, res){
 				if (err) return done(err);
 				var ob = JSON.parse(res.text);
 				ob.should.have.property('result', 'Success');
-				setTimeout(done, params.length*10000)
+				setTimeout(done, testUtils.testWaitTimeForDrillEvents * testUtils.testScalingFactor)
 			});
 		});
 	});
@@ -91,7 +90,7 @@ describe('Testing Browser metrics', function(){
 				if (err) return done(err);
 				var ob = JSON.parse(res.text);
 				ob.should.have.property('result', 'Success');
-				setTimeout(done, 5000)
+				setTimeout(done, 10 * testUtils.testScalingFactor)
 			});
 		});
 	});
@@ -104,7 +103,7 @@ describe('Testing Browser metrics', function(){
 				if (err) return done(err);
 				var ob = JSON.parse(res.text);
 				ob.should.be.empty;
-				setTimeout(done, 100)
+				done();
 			});
 		});
 	});