chore: fix generate-docs.js to use 'main' instead of 'master' (isomor…

…phic-git#1168) * chore: fix generate-docs.js to use 'main' instead of 'master' * chore: fix Sauce Labs no longer supports MacOS Safari 13.0 * chore: fix the skip browser feature detection to use Browser Stack for android chrome
modesty · Jun 28, 2020 · 0b53ce9 · 0b53ce9
1 parent 0e9b083
commit 0b53ce9
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/__tests__/__helpers__/can-i-skip-tests.js b/__tests__/__helpers__/can-i-skip-tests.js
@@ -2,7 +2,7 @@
 var whitelist = process.argv.slice(2)
 var { execSync } = require('child_process')
 
-var result = execSync('git diff master --name-only', { encoding: 'utf8' })
+var result = execSync('git diff main --name-only', { encoding: 'utf8' })
 
 var files = result.trim().split('\n')
 

diff --git a/__tests__/__helpers__/generate-docs.js b/__tests__/__helpers__/generate-docs.js
@@ -291,7 +291,7 @@ console.log('done')
 (function rewriteEditLink() {
   const el = document.querySelector('a.edit-page-link.button');
   if (el) {
-    el.href = 'https://github.com/isomorphic-git/isomorphic-git/edit/master/src/api/${obj.name}.js';
+    el.href = 'https://github.com/isomorphic-git/isomorphic-git/edit/main/src/api/${obj.name}.js';
   }
 })();
 </script>`

diff --git a/__tests__/__helpers__/karma-translate-browser.js b/__tests__/__helpers__/karma-translate-browser.js
@@ -7,7 +7,7 @@ module.exports = function translateBrowser(fullname) {
   } else if (fullname.startsWith('Mobile Safari')) {
     return 'sl_ios_safari'
   } else if (fullname.startsWith('Chrome Mobile')) {
-    return 'sl_android_chrome'
+    return 'bs_android_chrome'
   } else if (fullname.startsWith('Safari')) {
     return 'sl_safari'
   } else if (fullname.startsWith('Chrome')) {

diff --git a/__tests__/__helpers__/set-TRAVIS_PULL_REQUEST_SHA.js b/__tests__/__helpers__/set-TRAVIS_PULL_REQUEST_SHA.js
@@ -4,7 +4,7 @@ if (!process.env.TRAVIS_PULL_REQUEST_SHA) {
   // I'm trying not to rely on isomorphic-git here since that's the thing being tested.
   const log = execSync('git log --pretty=%P -n 1', { encoding: 'utf8' })
   const parents = log.split(' ').map(x => x.trim())
-  // parents[0] === master branch
+  // parents[0] === main branch
   // parents[1] === pr branch
   process.env.TRAVIS_PULL_REQUEST_SHA = parents[1]
 }
diff --git a/karma.conf.js b/karma.conf.js
@@ -79,7 +79,7 @@ module.exports = function(config) {
         base: 'SauceLabs',
         browserName: 'safari',
         platform: 'macOS 10.15',
-        version: '13.0',
+        version: '13.1',
       },
       sl_ios_safari: {
         base: 'SauceLabs',