diff --git a/.github/contributing.md b/.github/contributing.md index c3d8a7b7..5b1a2cc4 100644 --- a/.github/contributing.md +++ b/.github/contributing.md @@ -17,7 +17,7 @@ Hi! I'm really excited that you are interested in contributing to Vue.js. Before ## Pull Request Guidelines -- Checkout a topic branch from a base branch, e.g. `master`, and merge back against that branch. +- Checkout a topic branch from a base branch, e.g. `main`, and merge back against that branch. - If adding a new feature: diff --git a/packages/vue/examples/__tests__/commits.mock.ts b/packages/vue/examples/__tests__/commits.mock.ts index 4b2d21c1..8bcb8d8f 100644 --- a/packages/vue/examples/__tests__/commits.mock.ts +++ b/packages/vue/examples/__tests__/commits.mock.ts @@ -1,5 +1,5 @@ export default { - master: [ + main: [ { sha: 'd1527fbee422c7170e56845e55b49c4fd6de72a7', node_id: @@ -273,7 +273,7 @@ export default { ] } ], - sync: [ + 'v2-compat': [ { sha: 'ecf4da822eea97f5db5fa769d39f994755384a4b', node_id: diff --git a/packages/vue/examples/__tests__/commits.spec.ts b/packages/vue/examples/__tests__/commits.spec.ts index 2190fb0d..52e2fda7 100644 --- a/packages/vue/examples/__tests__/commits.spec.ts +++ b/packages/vue/examples/__tests__/commits.spec.ts @@ -22,7 +22,7 @@ describe('e2e: commits', () => { status: 200, contentType: 'application/json', headers: { 'Access-Control-Allow-Origin': '*' }, - body: JSON.stringify(mocks[match[1] as 'master' | 'sync']) + body: JSON.stringify(mocks[match[1] as 'main' | 'v2-compat']) }) } }) @@ -31,16 +31,16 @@ describe('e2e: commits', () => { await page().waitForSelector('li') expect(await count('input')).toBe(2) expect(await count('label')).toBe(2) - expect(await text('label[for="master"]')).toBe('master') - expect(await text('label[for="sync"]')).toBe('sync') - expect(await isChecked('#master')).toBe(true) - expect(await isChecked('#sync')).toBe(false) - expect(await text('p')).toBe('vuejs/vue@master') + expect(await text('label[for="main"]')).toBe('main') + expect(await text('label[for="v2-compat"]')).toBe('v2-compat') + expect(await isChecked('#main')).toBe(true) + expect(await isChecked('#v2-compat')).toBe(false) + expect(await text('p')).toBe('vuejs/core@main') expect(await count('li')).toBe(3) expect(await count('li .commit')).toBe(3) expect(await count('li .message')).toBe(3) - await click('#sync') - expect(await text('p')).toBe('vuejs/vue@sync') + await click('#v2-compat') + expect(await text('p')).toBe('vuejs/core@v2-compat') expect(await count('li')).toBe(3) expect(await count('li .commit')).toBe(3) expect(await count('li .message')).toBe(3) diff --git a/packages/vue/examples/classic/commits.html b/packages/vue/examples/classic/commits.html index 8803009b..811f0edc 100644 --- a/packages/vue/examples/classic/commits.html +++ b/packages/vue/examples/classic/commits.html @@ -10,7 +10,7 @@ v-model="currentBranch"> -
vuejs/vue@{{ currentBranch }}
+vuejs/core@{{ currentBranch }}
vuejs/vue@{{ currentBranch }}
+vuejs/core@{{ currentBranch }}