diff --git a/__tests__/set-tokens.test.ts b/__tests__/set-tokens.test.ts index d6c373c03..ea8a4a52f 100644 --- a/__tests__/set-tokens.test.ts +++ b/__tests__/set-tokens.test.ts @@ -47,6 +47,32 @@ describe('setGithubToken()', () => { expect(test).toMatch(expected); }); + test('return remote url with GITHUB_TOKEN gh-pages (RegExp)', () => { + const expected = 'https://x-access-token:GITHUB_TOKEN@github.com/owner/repo.git'; + const test = setGithubToken( + 'GITHUB_TOKEN', + 'owner/repo', + 'gh-pages', + '', + 'refs/heads/gh-pages-base', + 'push' + ); + expect(test).toMatch(expected); + }); + + test('throw error gh-pages-base to gh-pages-base (RegExp)', () => { + expect(() => { + setGithubToken( + 'GITHUB_TOKEN', + 'owner/repo', + 'gh-pages-base', + '', + 'refs/heads/gh-pages-base', + 'push' + ); + }).toThrowError('You deploy from gh-pages-base to gh-pages-base'); + }); + test('throw error master to master', () => { expect(() => { setGithubToken('GITHUB_TOKEN', 'owner/repo', 'master', '', 'refs/heads/master', 'push'); diff --git a/src/set-tokens.ts b/src/set-tokens.ts index ab1e4623d..abe099761 100644 --- a/src/set-tokens.ts +++ b/src/set-tokens.ts @@ -83,7 +83,7 @@ Use deploy_key or personal_token. } if (eventName === 'push') { - isProhibitedBranch = ref.includes(`refs/heads/${publishBranch}`); + isProhibitedBranch = ref.match(new RegExp(`^refs/heads/${publishBranch}$`)) !== null; if (isProhibitedBranch) { throw new Error(`You deploy from ${publishBranch} to ${publishBranch}`); }