Merge faaca0e into a673aa8

karma-runner · Mar 6, 2020 · 4e0c5b3 · 4e0c5b3
2 parents a673aa8 + faaca0e
commit 4e0c5b3
Show file tree

Hide file tree

Showing 15 changed files with 59 additions and 73 deletions.
diff --git a/lib/helper.js b/lib/helper.js
@@ -3,14 +3,16 @@
 const fs = require('graceful-fs')
 const path = require('path')
 const _ = require('lodash')
-const useragent = require('useragent')
+const useragent = require('ua-parser-js')
 const Promise = require('bluebird')
 const mm = require('minimatch')
 
 exports.browserFullNameToShort = (fullName) => {
-  const agent = useragent.parse(fullName)
-  const isUnknown = agent.family === 'Other' || agent.os.family === 'Other'
-  return isUnknown ? fullName : `${agent.toAgent()} (${agent.os})`
+  const au = useragent(fullName)
+  if (!au.browser.name && !au.browser.version && !au.os.name && !au.os.version) {
+    return fullName
+  }
+  return `${au.browser.name} ${au.browser.version || '0.0.0'} (${au.os.name} ${au.os.version || '0.0.0'})`
 }
 
 exports.isDefined = (value) => {

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -415,7 +415,7 @@
     "socket.io": "2.1.1",
     "source-map": "^0.6.1",
     "tmp": "0.0.33",
-    "useragent": "2.3.0"
+    "ua-parser-js": "0.7.21"
   },
   "devDependencies": {
     "browserify": "^16.2.3",

diff --git a/test/e2e/basic.feature b/test/e2e/basic.feature
@@ -17,7 +17,7 @@ Feature: Basic Testrunner
     Then it passes with:
       """
       ..
-      HeadlessChrome
+      Chrome Headless
       """
   @not-jenkins
   Scenario: Execute a test in Chrome

diff --git a/test/e2e/browser_console.feature b/test/e2e/browser_console.feature
@@ -128,7 +128,7 @@ Feature: Browser Console Configuration
     When I start Karma
     Then the file at test/e2e/console.log contains:
       """
-      HeadlessChrome
+      Chrome Headless
       """
 
   Scenario: Execute logging program and disabling terminal
@@ -150,7 +150,7 @@ Feature: Browser Console Configuration
     Then it passes with:
       """
       .
-      HeadlessChrome
+      Chrome Headless
       """
 
   Scenario: Execute logging program and disabling terminal
@@ -170,7 +170,7 @@ Feature: Browser Console Configuration
     Then it passes with:
       """
       .
-      HeadlessChrome
+      Chrome Headless
       """
   Scenario: Execute logging program with singleRun
     Given a configuration with:

diff --git a/test/e2e/custom-context.feature b/test/e2e/custom-context.feature
@@ -18,5 +18,5 @@ Feature: Custom Context File
     Then it passes with:
       """
       .
-      HeadlessChrome
+      Chrome Headless
       """
diff --git a/test/e2e/files.feature b/test/e2e/files.feature
@@ -20,7 +20,7 @@ Feature: Including files
     Then it passes with:
       """
       .
-      HeadlessChrome
+      Chrome Headless
       """
 
   Scenario: Execute a test excluding an explicitly included file
@@ -41,7 +41,7 @@ Feature: Including files
     Then it passes with like:
       """
       .
-      HeadlessChrome
+      Chrome Headless
       """
     And it passes with like:
       """
@@ -66,7 +66,7 @@ Feature: Including files
     Then it passes with like:
       """
       .
-      HeadlessChrome
+      Chrome Headless
       """
     And it passes with like:
       """
@@ -91,7 +91,7 @@ Feature: Including files
     Then it passes with like:
       """
       .
-      HeadlessChrome
+      Chrome Headless
       """
     And it passes with like:
       """
@@ -116,7 +116,7 @@ Feature: Including files
     Then it passes with like:
       """
       .
-      HeadlessChrome
+      Chrome Headless
       """
     And it passes with like:
       """
@@ -141,7 +141,7 @@ Feature: Including files
     Then it passes with like:
       """
       .
-      HeadlessChrome
+      Chrome Headless
       """
     And it passes with like:
       """
@@ -167,7 +167,7 @@ Feature: Including files
     Then it passes with like:
       """
       .
-      HeadlessChrome
+      Chrome Headless
       """
     And it passes with like:
       """

diff --git a/test/e2e/headers.feature b/test/e2e/headers.feature
@@ -22,5 +22,5 @@ Feature: Custom Headers
     Then it passes with:
       """
       .
-      HeadlessChrome
+      Chrome Headless
       """
diff --git a/test/e2e/middleware.feature b/test/e2e/middleware.feature
@@ -21,7 +21,7 @@ Feature: Middleware
     Then it passes with:
       """
       .
-      HeadlessChrome
+      Chrome Headless
       """
 
   Scenario: Frameworks can add middleware
@@ -40,5 +40,5 @@ Feature: Middleware
     Then it passes with:
       """
       .
-      HeadlessChrome
+      Chrome Headless
       """
diff --git a/test/e2e/proxy.feature b/test/e2e/proxy.feature
@@ -20,7 +20,7 @@ Feature: Proxying
     Then it passes with:
       """
       .
-      HeadlessChrome
+      Chrome Headless
       """
 
   Scenario: Added by a framework
@@ -39,7 +39,7 @@ Feature: Proxying
     Then it passes with:
       """
       .
-      HeadlessChrome
+      Chrome Headless
       """
 
   Scenario: URLRoot
@@ -60,5 +60,5 @@ Feature: Proxying
     Then it passes with:
       """
       .
-      HeadlessChrome
+      Chrome Headless
       """
diff --git a/test/e2e/reconnecting.feature b/test/e2e/reconnecting.feature
@@ -22,5 +22,5 @@ Feature: Passing Options
     Then it passes with:
       """
       .....
-      HeadlessChrome
+      Chrome Headless
       """
diff --git a/test/e2e/runInParent.feature b/test/e2e/runInParent.feature
@@ -21,7 +21,7 @@ Feature: runInParent option
     Then it passes with:
       """
       ..
-      HeadlessChrome
+      Chrome Headless
       """
   @not-jenkins
   Scenario: Execute a test in Chrome

diff --git a/test/e2e/upstream-proxy.feature b/test/e2e/upstream-proxy.feature
@@ -6,6 +6,7 @@ Feature: UpstreamProxy
   Scenario: UpstreamProxy
     Given a configuration with:
       """
+      browserDisconnectTolerance: 3,
       files = ['behind-proxy/plus.js', 'behind-proxy/test.js'];
       browsers = ['ChromeHeadlessNoSandbox'];
       plugins = [
@@ -20,5 +21,5 @@ Feature: UpstreamProxy
     When I start Karma behind a proxy on port 9875 that prepends '/__proxy__/' to the base path
     Then it passes with regexp:
       """
-      HeadlessChrome.*Executed.*SUCCESS
+      Chrome Headless.*Executed.*SUCCESS
       """
diff --git a/test/unit/browser.spec.js b/test/unit/browser.spec.js
@@ -28,7 +28,7 @@ describe('Browser', () => {
   it('should set fullName and name', () => {
     const fullName = 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_6_8) AppleWebKit/535.7 ' + '(KHTML, like Gecko) Chrome/16.0.912.63 Safari/535.7'
     browser = new Browser('id', fullName, collection, emitter, socket)
-    expect(browser.name).to.equal('Chrome 16.0.912 (Mac OS X 10.6.8)')
+    expect(browser.name).to.equal('Chrome 16.0.912.63 (Mac OS 10.6.8)')
     expect(browser.fullName).to.equal(fullName)
   })
 
@@ -66,7 +66,7 @@ describe('Browser', () => {
     it('should return browser name', () => {
       const fullName = 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_6_8) AppleWebKit/535.7 ' + '(KHTML, like Gecko) Chrome/16.0.912.63 Safari/535.7'
       browser = new Browser('id', fullName, collection, emitter, socket)
-      expect(browser.toString()).to.equal('Chrome 16.0.912 (Mac OS X 10.6.8)')
+      expect(browser.toString()).to.equal('Chrome 16.0.912.63 (Mac OS 10.6.8)')
     })
 
     it('should return verbatim user agent string for unrecognized browser', () => {