fix: allow passing only to suites with skip lists (#321)

Travis Person · alanshaw · commit c47c4ce93405 · 2018-07-03T09:04:17.000+01:00
License: MIT
Signed-off-by: Travis Person &lt;travis@protocol.ai&gt;
diff --git a/js/src/utils/mocha.js b/js/src/utils/mocha.js
@@ -15,7 +15,6 @@ const isObject = (o) => Object.prototype.toString.call(o) === '[object Object]'
 // want to skip/only the whole suite
 function getDescribe (config) {
   if (config) {
-    if (config.only === true) return describe.only
     if (config.skip === true) return describe.skip
 
     if (isObject(config.skip)) {
@@ -30,6 +29,8 @@ function getDescribe (config) {
 
       return _describe
     }
+
+    if (config.only === true) return describe.only
   }
 
   return describe

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,6 @@ const isObject = (o) => Object.prototype.toString.call(o) === '[object Object]'`
`15`	`15`	`// want to skip/only the whole suite`
`16`	`16`	`function getDescribe (config) {`
`17`	`17`	`if (config) {`
`18`		`- if (config.only === true) return describe.only`
`19`	`18`	`if (config.skip === true) return describe.skip`
`20`	`19`
`21`	`20`	`if (isObject(config.skip)) {`
`@@ -30,6 +29,8 @@ function getDescribe (config) {`
`30`	`29`
`31`	`30`	`return _describe`
`32`	`31`	`}`
	`32`	`+`
	`33`	`+ if (config.only === true) return describe.only`
`33`	`34`	`}`
`34`	`35`
`35`	`36`	`return describe`