Fixes #324 Use branch name from config when creating PR #353
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,39 @@ | ||
| import AssetProxy from "../../../valueObjects/AssetProxy"; | ||
|
There was a problem hiding this comment. Fantastic - mocking the GH API is an existing issue (#330). This is a great step towards that, which will let us add a test suite for the editorial workflow. |
||
| import API from "../API"; | ||
|
|
||
| describe('github API', () => { | ||
| const mockAPI = (api, responses) => { | ||
| api.request = (path, options = {}) => { | ||
| const normalizedPath = path.indexOf('?') !== -1 ? path.substr(0, path.indexOf('?')) : path; | ||
| const response = responses[normalizedPath]; | ||
| return typeof response === 'function' | ||
| ? Promise.resolve(response(options)) | ||
| : Promise.reject(new Error(`No response for path '${normalizedPath}'`)) | ||
| }; | ||
| } | ||
|
|
||
| it('should create PR with correct base branch name when publishing with editorial workflow', () => { | ||
| let prBaseBranch = null; | ||
| const api = new API({ branch: 'gh-pages', repo: 'my-repo' }); | ||
| const responses = { | ||
| '/repos/my-repo/branches/gh-pages': () => ({ commit: { sha: 'def' } }), | ||
| '/repos/my-repo/git/trees/def': () => ({ tree: [] }), | ||
| '/repos/my-repo/git/trees': () => ({}), | ||
| '/repos/my-repo/git/commits': () => ({}), | ||
| '/repos/my-repo/git/refs': () => ({}), | ||
| '/repos/my-repo/pulls': (pullRequest) => { | ||
| prBaseBranch = JSON.parse(pullRequest.body).base; | ||
| return { head: { sha: 'cbd' } }; | ||
| }, | ||
| '/user': () => ({}), | ||
| '/repos/my-repo/git/blobs': () => ({}), | ||
| '/repos/my-repo/git/refs/meta/_netlify_cms': () => ({ 'object': {} }) | ||
| }; | ||
| mockAPI(api, responses); | ||
|
|
||
| return expect( | ||
| api.editorialWorkflowGit(null, { slug: 'entry', sha: 'abc' }, null, {}) | ||
| .then(() => prBaseBranch) | ||
| ).resolves.toEqual('gh-pages') | ||
| }); | ||
| }); | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,5 @@ | ||
| // Jest Snapshot v1, https://goo.gl/fbAQLP | ||
|
There was a problem hiding this comment. These snapshot changes shouldn't be a part of this PR - it looks like these are due to either the |
||
|
|
||
| exports[`EntryEditorToolbar should disable and update label of Save button when persisting 1`] = `"<div><button disabled=\\"\\" class=\\"\\" type=\\"button\\" data-react-toolbox=\\"button\\">Saving...</button> <button class=\\"\\" type=\\"button\\" data-react-toolbox=\\"button\\">Cancel</button></div>"`; | ||
|
|
||
| exports[`EntryEditorToolbar should have both buttons enabled initially 1`] = `"<div><button class=\\"\\" type=\\"button\\" data-react-toolbox=\\"button\\">Save</button> <button class=\\"\\" type=\\"button\\" data-react-toolbox=\\"button\\">Cancel</button></div>"`; | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Wondering if that
Super expressionerror you saw was related to this use ofthis. The fact that we didn't get to the bottom of that error, and that the preceding import mysteriously stopped it, gives me pause. We should dig a little deeper.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Just tested -- I still get the error if I change it back to
base = "master"and usethis.createPR(options.commitMessage, branchName, this.branch), so it seems not