finish master->main job (transloadit#3315)

closes transloadit#3286
docsend · Nov 15, 2021 · 6f0c01e · 6f0c01e
1 parent 998fab8
commit 6f0c01e
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/README.md b/README.md
@@ -2,7 +2,7 @@
 
 <img src="http://uppy.io/images/logos/uppy-dog-full.svg" width="120" alt="Uppy logo — a superman puppy in a pink suit" align="right">
 
-[![Build Status](https://travis-ci.org/transloadit/uppy.svg?branch=master)](https://travis-ci.org/transloadit/uppy)
+[![Build Status](https://travis-ci.org/transloadit/uppy.svg?branch=main)](https://travis-ci.org/transloadit/uppy)
 
 Companion is a server integration for [Uppy](https://github.com/transloadit/uppy) file uploader.
 

diff --git a/test/__tests__/companion.js b/test/__tests__/companion.js
@@ -133,12 +133,12 @@ describe('validate upload data', () => {
   })
 })
 
-describe('handle master oauth redirect', () => {
-  const serverWithMasterOauth = getServer({
+describe('handle main oauth redirect', () => {
+  const serverWithMainOauth = getServer({
     COMPANION_OAUTH_DOMAIN: 'localhost:3040',
   })
   test('redirect to a valid uppy instance', () => {
-    return request(serverWithMasterOauth)
+    return request(serverWithMainOauth)
       .get(`/dropbox/redirect?state=${OAUTH_STATE}`)
       .set('uppy-auth-token', token)
       .expect(302)
@@ -147,7 +147,7 @@ describe('handle master oauth redirect', () => {
 
   test('do not redirect to invalid uppy instances', () => {
     const state = 'state-with-invalid-instance-url' // see mock ../../src/server/helpers/oauth-state above
-    return request(serverWithMasterOauth)
+    return request(serverWithMainOauth)
       .get(`/dropbox/redirect?state=${state}`)
       .set('uppy-auth-token', token)
       .expect(400)

diff --git a/test/__tests__/provider-manager.js b/test/__tests__/provider-manager.js
@@ -125,7 +125,7 @@ describe('Test Provider options', () => {
     expect(grantConfig.zoom.secret).toBeUndefined()
   })
 
-  test('sets a master redirect uri, if oauthDomain is set', () => {
+  test('sets a main redirect uri, if oauthDomain is set', () => {
     companionOptions.server.oauthDomain = 'domain.com'
     providerManager.addProviderOptions(companionOptions, grantConfig)