Merge pull request #639 from ArtursKadikis/next

Test optimization. Reduced total test runtime by reducing time in timeouts.

Author: ar2rsawseen

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, 100 * 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();
 			});
 		});
 	});