karma - npm Package Compare versions

Comparing version 4.4.0 to 4.4.1

lib/browser_collection.js

@@ -49,4 +49,4 @@ 'use strict'
     }
-    if (results.success + results.failed === 0 && !config.failOnEmptyTestSuite) {
-      return 0
+    if (results.success + results.failed === 0 && !!config.failOnEmptyTestSuite) {
+      return 1
     }
@@ -53,0 +53,0 @@ if (results.error) {

lib/preprocessor.js

@@ -27,3 +27,11 @@ 'use strict'
   })
-  return process(content, file, done) || donePromise
+
+  return (process(content, file, done) || Promise.resolve()).then((content) => {
+    if (content) {
+      // async process correctly returned content
+      return content
+    }
+    // process called done() (Either old sync api or an async function that did not return content)
+    return donePromise
+  })
 }
@@ -58,3 +66,6 @@
 
-    let p
+    let p = instances[name]
+    if (p) {
+      return p
+    }
 
@@ -73,2 +84,10 @@ try {
 
+    if (!p && !alreadyDisplayedErrors[name]) {
+      alreadyDisplayedErrors[name] = true
+      log.error(`Failed to instantiate preprocessor ${name}`)
+      emitter.emit('load_error', 'preprocessor', name)
+    } else {
+      instances[name] = p
+    }
+
     return p
@@ -113,28 +132,17 @@ }
         // Apply preprocessor priority.
-        let sortedPreprocessorNames = preprocessorNames
+        const preprocessors = preprocessorNames
           .map((name) => [name, preprocessorPriority[name] || 0])
           .sort((a, b) => b[1] - a[1])
           .map((duo) => duo[0])
+          .reduce((res, name) => {
+            const p = instantiatePreprocessor(name)
 
-        let preprocessors = []
-        sortedPreprocessorNames.forEach((name) => {
-          const p = instances[name] || instantiatePreprocessor(name)
-
-          if (p == null) {
-            if (!alreadyDisplayedErrors[name]) {
-              alreadyDisplayedErrors[name] = true
-              log.error(`Failed to instantiate preprocessor ${name}`)
-              emitter.emit('load_error', 'preprocessor', name)
+            if (!isBinary || (p && p.handleBinaryFiles)) {
+              res.push(p)
+            } else {
+              log.warn(`Ignored preprocessing ${file.originalPath} because ${name} has handleBinaryFiles=false.`)
             }
-            return
-          }
+            return res
+          }, [])
 
-          instances[name] = p
-          if (!isBinary || p.handleBinaryFiles) {
-            preprocessors.push(p)
-          } else {
-            log.warn(`Ignored preprocessing ${file.originalPath} because ${name} has handleBinaryFiles=false.`)
-          }
-        })
-
         runProcessors(preprocessors, file, isBinary ? buffer : buffer.toString()).then(done, done)
@@ -141,0 +149,0 @@ })

lib/server.js

@@ -286,3 +286,3 @@ 'use strict'
       if (Object.keys(singleRunDoneBrowsers).every((key) => singleRunDoneBrowsers[key])) {
-        this.emit('run_complete', singleRunBrowsers, singleRunBrowsers.getResults(singleRunBrowserNotCaptured, config.failOnEmptyTestSuite, config.failOnFailingTestSuite))
+        this.emit('run_complete', singleRunBrowsers, singleRunBrowsers.getResults(singleRunBrowserNotCaptured, config))
       }
@@ -313,2 +313,4 @@ }
       })
+
+      // This is the normal exit trigger.
       this.on('browser_complete_with_no_more_retries', function (completedBrowser) {
@@ -315,0 +317,0 @@ singleRunDoneBrowsers[completedBrowser.id] = true

package.json

@@ -39,39 +39,38 @@ {
     "lukasz <[e-mail]>",
+    "Todd Wolfson <[e-mail]>",
     "Michał Gołębiowski-Owczarek <[e-mail]>",
-    "Todd Wolfson <[e-mail]>",
     "Mark Trostler <[e-mail]>",
     "Ciro Nunes <[e-mail]>",
     "Shyam Seshadri <[e-mail]>",
-    "Pawel Kozlowski <[e-mail]>",
-    "Christian Budde Christensen <[e-mail]>",
     "Tim Cuthbertson <[e-mail]>",
     "Robo <[e-mail]>",
+    "Christian Budde Christensen <[e-mail]>",
+    "Pawel Kozlowski <[e-mail]>",
+    "Mourad <[e-mail]>",
+    "Daniel Compton <[e-mail]>",
     "Mark Ethan Trostler <[e-mail]>",
-    "Daniel Compton <[e-mail]>",
-    "Mourad <[e-mail]>",
-    "Kim Joar Bekkelund <[e-mail]>",
-    "joshjb84 <[e-mail]>",
+    "vivganes <[e-mail]>",
     "Georgii Dolzhykov <[e-mail]>",
+    "Anton <[e-mail]>",
     "Brian Di Palma <[e-mail]>",
     "Nick Malaguti <[e-mail]>",
-    "vivganes <[e-mail]>",
+    "Kim Joar Bekkelund <[e-mail]>",
+    "joshjb84 <[e-mail]>",
+    "David Souther <[e-mail]>",
+    "Daniel Aleksandersen <[e-mail]>",
+    "Jake Champion <[e-mail]>",
+    "Marcello Nuccio <[e-mail]>",
+    "Pieter Mees <[e-mail]>",
+    "Brian Ford <[e-mail]>",
+    "Aymeric Beaumet <[e-mail]>",
+    "Chris Casola <[e-mail]>",
+    "Jeff Jewiss <[e-mail]>",
     "Jérémy Judéaux <[e-mail]>",
-    "Pieter Mees <[e-mail]>",
-    "ywong <[e-mail]>",
     "Andrew Martin <[e-mail]>",
-    "Iristyle <Iristyle@github>",
     "pavelgj <[e-mail]>",
+    "sylvain-hamel <[e-mail]>",
     "Ilya Volodin <[e-mail]>",
-    "sylvain-hamel <[e-mail]>",
-    "David Souther <[e-mail]>",
-    "Marcello Nuccio <[e-mail]>",
-    "Jake Champion <[e-mail]>",
+    "ywong <[e-mail]>",
+    "Iristyle <Iristyle@github>",
     "Chris Hunt <[e-mail]>",
-    "Daniel Aleksandersen <[e-mail]>",
-    "Chris Casola <[e-mail]>",
-    "Aymeric Beaumet <[e-mail]>",
-    "Brian Ford <[e-mail]>",
-    "Jeff Jewiss <[e-mail]>",
-    "Roarke Gaskill <[e-mail]>",
-    "Ethan J. Brown <[e-mail]>",
     "Robert Stein <[e-mail]>",
@@ -124,3 +123,2 @@ "ngiebel <[e-mail]>",
     "PatrickJS <[e-mail]>",
-    "Anton <[e-mail]>",
     "Levi Thomason <[e-mail]>",
@@ -135,2 +133,4 @@ "ChangZhuo Chen (陳昌倬) <[e-mail]>",
     "DarthCharles <[e-mail]>",
+    "Roarke Gaskill <[e-mail]>",
+    "Ethan J. Brown <[e-mail]>",
     "Karol Fabjańczuk <[e-mail]>",
@@ -452,3 +452,3 @@ "Karolis Narkevicius <[e-mail]>",
     "karma-browserify": "^6.0.0",
-    "karma-browserstack-launcher": "^1.5.1",
+    "karma-browserstack-launcher": "^1.4.0",
     "karma-chai": "^0.1.0",
@@ -482,3 +482,3 @@ "karma-chrome-launcher": "^2.2.0",
   },
-  "version": "4.4.0",
+  "version": "4.4.1",
   "license": "MIT",
@@ -485,0 +485,0 @@ "scripts": {

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

489234

increased by0.18%

Lines of code

10330

increased by0.09%

No dependency changes