Move logic for test.only filtering to bootstrapper.

DevExpress · Jan 2, 2017 · 3ebb00c · 3ebb00c
1 parent cea63e1
commit 3ebb00c
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/src/compiler/index.js b/src/compiler/index.js
@@ -58,10 +58,6 @@ export default class Compiler {
 
         this.esNextCompiler.cleanUpCache();
 
-        tests = flatten(tests).filter(test => !!test);
-
-        var testsWithOnlyFlag = tests.filter(test => test.only || test.fixture.only);
-
-        return testsWithOnlyFlag.length ? testsWithOnlyFlag : tests;
+        return flatten(tests).filter(test => !!test);
     }
 }
diff --git a/src/runner/bootstrapper.js b/src/runner/bootstrapper.js
@@ -51,6 +51,11 @@ export default class Bootstrapper {
         var compiler = new Compiler(this.sources);
         var tests    = await compiler.getTests();
 
+        var testsWithOnlyFlag = tests.filter(test => test.only || test.fixture.only);
+
+        if (testsWithOnlyFlag.length)
+            tests = testsWithOnlyFlag;
+
         if (this.filter)
             tests = tests.filter(test => this.filter(test.name, test.fixture.name, test.fixture.path));
 

diff --git a/test/functional/setup.js b/test/functional/setup.js
@@ -199,8 +199,10 @@ before(function () {
                     })
                     .then(function () {
                         var taskReport = JSON.parse(report);
-                        var testReport = taskReport.fixtures[0].tests[0];
                         var errorDescr = getTestError(taskReport, actualBrowsers);
+                        var testReport = taskReport.fixtures.length === 1 ?
+                                         taskReport.fixtures[0].tests[0] :
+                                         taskReport;
 
                         testReport.warnings = taskReport.warnings;