Fix test workflow, bis

.eslintrc

@@ -19,7 +19,11 @@
     "dot-notation": [2, { "allowKeywords": false }],
     "eol-last": 2,
     "eqeqeq": [2, "smart"],
-    "indent": [2, 2, {"SwitchCase": 1, "VariableDeclarator": 2}],
+    "indent": [2, 2, {
+      "MemberExpression": 0,
+      "SwitchCase": 1,
+      "VariableDeclarator": 2
+    }],
     "key-spacing": 1,
     "keyword-spacing": [2, { "after": true }],
     "linebreak-style": 2,
@@ -76,7 +80,7 @@
     "no-unused-expressions": [2, {"allowTernary": true, "allowShortCircuit": true}],
     "no-with": 2,
     "object-curly-spacing": [2, "never"],
-    "quote-props": [1, "consistent-as-needed"],
+    "quote-props": [1, "consistent-as-needed", {"keywords": true}],
     "quotes": [2, "single", "avoid-escape"],
     "radix": 2,
     "semi": 2,

.github/workflows/tests.yml

@@ -3,11 +3,13 @@ name: Test
 on:
   push:
     branches:
-      - ${{ github.event.repository.default_branch }}
+      - master
   pull_request:
     branches:
-      - ${{ github.event.repository.default_branch }}
+      - master
     paths:
+      - '.github/workflows/**'
+      - 'test/**'
       - '*.js'
       - 'package.json'
 
@@ -22,18 +24,16 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-node@v2
         with:
-          node-version: 6
+          node-version: 14
           cache: 'npm'
-      - run: npm install --no-audit && npm install --no-audit karma-cli karma-sauce-launcher
-      - name: Setup Sauce Labs
-        run: sh -e /etc/init.d/xvfb start
-        env:
-          DISPLAY: ':99.0'
-      - run: npm test
-      - run: ./node_modules/.bin/karma start karma.conf-sauce.js
+      - name: Install dependencies
+        run: |
+          npm ci
+          npm install --no-audit karma-cli karma-sauce-launcher
+      - name: Test
+        run: npm test
+      - name: Test in Sauce Labs
+        run: BUILD_NUMBER="$GITHUB_RUN_NUMBER" BUILD_ID="$GITHUB_RUN_ID" JOB_NUMBER="$GITHUB_JOB" ./node_modules/.bin/karma start karma.conf-sauce.js
         env:
           SAUCE_USERNAME: ${{ secrets.SauceUsername }}
           SAUCE_ACCESS_KEY: ${{ secrets.SauceAccessKey }}
-          BUILD_NUMBER: ${{ GITHUB_RUN_NUMBER }}
-          BUILD_ID: ${{ GITHUB_RUN_ID }}
-          JOB_NUMBER: ${{ GITHUB_JOB }}

backbone.js

@@ -1625,11 +1625,11 @@
 
   // Map from CRUD to HTTP for our default `Backbone.sync` implementation.
   var methodMap = {
-    create: 'POST',
-    update: 'PUT',
-    patch: 'PATCH',
-    delete: 'DELETE',
-    read: 'GET'
+    'create': 'POST',
+    'update': 'PUT',
+    'patch': 'PATCH',
+    'delete': 'DELETE',
+    'read': 'GET'
   };
 
   // Set the default implementation of `Backbone.ajax` to proxy through to `$`.
@@ -1722,11 +1722,11 @@
     // against the current location hash.
     _routeToRegExp: function(route) {
       route = route.replace(escapeRegExp, '\\$&')
-        .replace(optionalParam, '(?:$1)?')
-        .replace(namedParam, function(match, optional) {
-          return optional ? match : '([^/?]+)';
-        })
-        .replace(splatParam, '([^?]*?)');
+      .replace(optionalParam, '(?:$1)?')
+      .replace(namedParam, function(match, optional) {
+        return optional ? match : '([^/?]+)';
+      })
+      .replace(splatParam, '([^?]*?)');
       return new RegExp('^' + route + '(?:\\?([\\s\\S]*))?$');
     },
 

karma.conf-sauce.js

@@ -2,37 +2,36 @@ var _ = require('underscore');
 
 // Browsers to run on Sauce Labs platforms
 var sauceBrowsers = _.reduce([
-  ['firefox', '35'],
-  ['firefox', '30'],
-  ['firefox', '21'],
-  ['firefox', '11'],
-  ['firefox', '4'],
+  ['firefox', 'latest'],
+  ['firefox', '60'],
+  ['firefox', '40'],
+  // TODO: find a way to get testing on old Firefox to work. (#4253)
+  // ['firefox', '11'],
 
-  ['chrome', '40'],
-  ['chrome', '39'],
-  ['chrome', '31'],
-  ['chrome', '26'],
+  ['chrome', 'latest'],
+  ['chrome', '60'],
+  // TODO: these versions of Chrome fail with a mysterious
+  // "_T_ is not defined" (#4253)
+  // ['chrome', '40'],
+  // ['chrome', '26'],
 
-  ['microsoftedge', '20.10240', 'Windows 10'],
-  ['internet explorer', '11', 'Windows 10'],
-  ['internet explorer', '10', 'Windows 8'],
-  ['internet explorer', '9', 'Windows 7'],
+  // latest Edge as well as pre-Blink versions
+  ['microsoftedge', 'latest', 'Windows 11'],
+  ['microsoftedge', '18', 'Windows 10'],
+  ['microsoftedge', '13', 'Windows 10'],
 
-  ['opera', '12'],
-  ['opera', '11'],
+  ['internet explorer', 'latest', 'Windows 10'],
+  // TODO: these versions of IE run 50 out of 425 tests, then hang for unknown
+  // reasons. (#4253)
+  // ['internet explorer', '10', 'Windows 8'],
+  // ['internet explorer', '9', 'Windows 7'],
+  // Older versions of IE no longer supported by Sauce Labs
 
-  ['android', '5'],
-  ['android', '4.4'],
+  ['safari', 'latest', 'macOS 12'],
+  ['safari', '12', 'macOS 10.14'],
+  ['safari', '11', 'macOS 10.13'],
+  ['safari', '8', 'OS X 10.10'],
 
-  // 4.3 currently erros with some router tests
-  // ['android', '4.3'],
-
-  ['android', '4.0'],
-
-  ['safari', '8.0', 'OS X 10.10'],
-  ['safari', '7'],
-  ['safari', '6'],
-  ['safari', '5']
 ], function(memo, platform) {
   // internet explorer -> ie
   var label = platform[0].split(' ');
@@ -60,6 +59,9 @@ module.exports = function(config) {
     basePath: '',
     frameworks: ['qunit'],
     singleRun: true,
+    browserDisconnectTimeout: 60000,
+    browserDisconnectTolerance: 2,
+    browserNoActivityTimeout: 60000,
 
     // list of files / patterns to load in the browser
     files: [
@@ -72,7 +74,7 @@ module.exports = function(config) {
     ],
 
     // Number of sauce tests to start in parallel
-    concurrency: 9,
+    concurrency: 4,
 
     // test results reporter to use
     reporters: ['dots', 'saucelabs'],
@@ -82,10 +84,11 @@ module.exports = function(config) {
     sauceLabs: {
       build: 'GH #' + process.env.BUILD_NUMBER + ' (' + process.env.BUILD_ID + ')',
       startConnect: true,
-      tunnelIdentifier: process.env.JOB_NUMBER
+      tunnelIdentifier: process.env.JOB_NUMBER,
+      region: 'eu'
     },
 
-    captureTimeout: 120000,
+    captureTimeout: 60000,
     customLaunchers: sauceBrowsers,
 
     // Browsers to launch, commented out to prevent karma from starting