Merge pull request #436 from thaliproject/fix-running-tests

vjrantal · vjrantal · commit 8f4f8847c5bd · 2016-01-13T13:48:44.000+02:00
Fix running tests when `userConfig` isn't given.
diff --git a/test/TestServer/TestFramework.js b/test/TestServer/TestFramework.js
@@ -39,7 +39,7 @@ function TestFramework(testConfig, userConfig, _logger) {
   // of devices
   Object.keys(this.userConfig).forEach(function(platform) {
     // -1 indicates to inherit from testConfig (i.e. all available)
-    if (self.userConfig[platform].numDevices != -1) {
+    if (self.userConfig[platform].numDevices && self.userConfig[platform].numDevices !== -1) {
       self.requiredDevices[platform] = self.userConfig[platform].numDevices;
     }
   });

Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ function TestFramework(testConfig, userConfig, _logger) {`
`39`	`39`	`// of devices`
`40`	`40`	`Object.keys(this.userConfig).forEach(function(platform) {`
`41`	`41`	`// -1 indicates to inherit from testConfig (i.e. all available)`
`42`		`- if (self.userConfig[platform].numDevices != -1) {`
	`42`	`+ if (self.userConfig[platform].numDevices && self.userConfig[platform].numDevices !== -1) {`
`43`	`43`	`self.requiredDevices[platform] = self.userConfig[platform].numDevices;`
`44`	`44`	`}`
`45`	`45`	`});`