Fixes #324 Use branch name from config when creating PR #353

josephearl · 2017-04-12T22:03:13Z

- Summary

Fixes #324 - Publishing using editorial workflow does not merge with correct branch when using Github backend

- Test plan

Tested correct branch name from config is passed to createPR as the base branch.

- Description for the changelog

Pass the branch name from the config to createPR as the base branch.

josephearl · 2017-04-12T22:04:16Z

Another solution would be to have the default value in createPR be this.branch instead of "master".

josephearl · 2017-04-12T22:08:08Z

I tried to write a test for this, but just import API from "../API" gave me the following error:

TypeError: Super expression must either be null or a function, not undefined
      
      at _inherits (src/backends/netlify-auth/API.js:1:1704)
      at src/backends/netlify-auth/API.js:3:30
      at Object.<anonymous> (src/backends/netlify-auth/API.js:74:23)
      at Object.<anonymous> (src/backends/netlify-auth/implementation.js:5:38)
      at Object.<anonymous> (src/backends/backend.js:243:433)
      at Object.<anonymous> (src/valueObjects/AssetProxy.js:43:151)
      at Object.<anonymous> (src/backends/github/API.js:5:45)
      at Object.<anonymous> (src/backends/github/__tests__/API.spec.js:1:166)
      at process._tickCallback (internal/process/next_tick.js:109:7)

which seemed very weird

josephearl · 2017-04-13T00:27:21Z

Even weirder:

import AssetProxy from "../../../valueObjects/AssetProxy";
import API from "../API";

does work!

josephearl · 2017-04-13T02:40:28Z

Added a test (which mocks the GitHub API - #330).
I updated to Jest 19 alpha so I could use resolves to test the promises.

josephearl · 2017-04-13T16:51:47Z

Updated snapshots

Benaiah

This looks good - just seems to have some changes that are unrelated or unintentional. I think we should squash "Add test" into the main commit and remove the snapshot update from the PR, in addition to my comments on specific pieces.

Benaiah · 2017-04-13T19:16:19Z

package.json

@@ -68,7 +68,7 @@
    "file-loader": "^0.8.5",
    "identity-obj-proxy": "^3.0.0",
    "imports-loader": "^0.6.5",
-    "jest-cli": "^16.0.1",
+    "jest-cli": "19.1.0-alpha.eed82034",


Why are we updating this and jest below to a specific alpha version? This looks like it was an unintentional change - if so, can you remove this from the commit?

EDIT: saw your reasoning for adding this above. IDK if I'm comfortable with pinning our test tooling to a specific alpha version - @erquhart what are your thoughts?

as long as the tests pass, it's fine. But we should update it as soon as there is a stable version.

I'd second that it's fine, mostly because it's a dev dependency. Let's keep an eye out to update soon.

Benaiah · 2017-04-13T19:19:21Z

yarn.lock

@@ -59,11 +59,11 @@ JSONStream@^0.8.4:
    jsonparse "0.0.5"
    through ">=2.2.7 <3"

-abab@^1.0.0:
+abab@^1.0.3:


Are these changes coming from the updated jest and jest-cli dependencies?

Yes, the abab dependency comes from jsdom which is used by jest.

Benaiah · 2017-04-13T19:23:29Z

src/backends/github/__tests__/API.spec.js

@@ -0,0 +1,39 @@
+import AssetProxy from "../../../valueObjects/AssetProxy";


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.

Benaiah · 2017-04-13T19:24:09Z

src/components/EntryEditor/__tests__/__snapshots__/EntryEditorToolbar.spec.js.snap

@@ -1,3 +1,5 @@
-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>"`;
+// Jest Snapshot v1, https://goo.gl/fbAQLP


These snapshot changes shouldn't be a part of this PR - it looks like these are due to either the jest update above or a previous commit not updating the snapshots when they should have been. Either way, this is unrelated to the rest of the PR, and should probably be handled separately.

josephearl · 2017-04-13T19:56:16Z

@Benaiah the jest updates were because '.resolve' for testing promises was only introduced to jest recently (and will be released in 20.0.0). The snapshot updates were because jest 19+ has a new escaping syntax for snapshots.

josephearl · 2017-04-13T19:57:02Z

I'll see if there's an easy way of testing promises with an earlier version of jest

Benaiah · 2017-04-13T19:57:31Z

@josephearl I see. As far as I can tell, though, that version notation will keep us on 19.1.0-alpha even after 20 is released - is that the case?

josephearl · 2017-04-14T09:47:19Z

@Benaiah I see your point, yes I believe it will, let me fix that

josephearl · 2017-04-14T12:47:10Z

@Benaiah I've rebased and updated the jest and jest-cli version ranges in package.json.

josephearl · 2017-04-14T12:53:00Z

@Benaiah let me if that's OK - or if we should look at keeping on a release version of jest and using another method to test the promise.

erquhart · 2017-04-14T16:27:19Z

src/backends/github/API.js

@@ -386,7 +386,7 @@ export default class API {
    return this.deleteRef("heads", branchName);
  }

-  createPR(title, head, base = "master") {
+  createPR(title, head, base = this.branch) {


Wondering if that Super expression error you saw was related to this use of this. 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.

Just tested -- I still get the error if I change it back to base = "master" and use this.createPR(options.commitMessage, branchName, this.branch), so it seems not

Benaiah · 2017-04-14T18:53:57Z

@josephearl the consensus is that it's fine - we'll just want to update to a stable version as soon as it's available.

josephearl · 2017-04-18T22:29:05Z

@Benaiah 👍 rebased

calavera

LGTM

Benaiah · 2017-04-28T16:40:41Z

@josephearl Jest has released v19.0.2 - could you update this PR to use the non-alpha version? Once that's complete this should be good to go.

josephearl · 2017-04-28T19:18:15Z

@Benaiah this is using the alpha of v19.2.0, not v19.0.2

Benaiah · 2017-04-28T20:40:36Z

@josephearl oh, my bad. I'll give it one more look over and merge then. Thanks for the contribution!

Benaiah

LGTM

calavera · 2017-04-28T22:41:02Z

conflict on yarn.lock 😭

josephearl · 2017-04-29T15:12:30Z

@calavera conflict resolved 😄

calavera · 2017-05-01T15:17:38Z

Awesome! Thanks 🎉

Benaiah suggested changes Apr 13, 2017

View reviewed changes

josephearl force-pushed the fix-234-editorial-workflow-wrong-branch branch from a5a3f56 to 3aaafaf Compare April 14, 2017 12:44

erquhart reviewed Apr 14, 2017

View reviewed changes

josephearl changed the title ~~Use branch name from config when creating PR~~ Fixes #324 Use branch name from config when creating PR Apr 18, 2017

josephearl force-pushed the fix-234-editorial-workflow-wrong-branch branch from 3aaafaf to 213d645 Compare April 18, 2017 22:28

calavera approved these changes Apr 25, 2017

View reviewed changes

Benaiah approved these changes Apr 28, 2017

View reviewed changes

Fixes decaporg#324 Use branch name from config when creating PR

f3643a5

josephearl force-pushed the fix-234-editorial-workflow-wrong-branch branch from 213d645 to f3643a5 Compare April 29, 2017 15:11

calavera merged commit bfe46a8 into decaporg:master May 1, 2017

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fixes #324 Use branch name from config when creating PR #353

Fixes #324 Use branch name from config when creating PR #353

josephearl commented Apr 12, 2017 •

edited

josephearl commented Apr 12, 2017

josephearl commented Apr 12, 2017

josephearl commented Apr 13, 2017 •

edited

josephearl commented Apr 13, 2017 •

edited

josephearl commented Apr 13, 2017

Benaiah left a comment

Benaiah Apr 13, 2017 •

edited

calavera Apr 13, 2017

erquhart Apr 14, 2017

Benaiah Apr 13, 2017

josephearl Apr 14, 2017

Benaiah Apr 13, 2017

Benaiah Apr 13, 2017

josephearl commented Apr 13, 2017

josephearl commented Apr 13, 2017

Benaiah commented Apr 13, 2017

josephearl commented Apr 14, 2017

josephearl commented Apr 14, 2017

josephearl commented Apr 14, 2017

erquhart Apr 14, 2017 •

edited

josephearl Apr 14, 2017

Benaiah commented Apr 14, 2017

josephearl commented Apr 18, 2017

calavera left a comment

Benaiah commented Apr 28, 2017 •

edited

josephearl commented Apr 28, 2017

Benaiah commented Apr 28, 2017

Benaiah left a comment

calavera commented Apr 28, 2017

josephearl commented Apr 29, 2017

calavera commented May 1, 2017

		@@ -0,0 +1,39 @@
		import AssetProxy from "../../../valueObjects/AssetProxy";

		@@ -1,3 +1,5 @@
		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>"`;
		// Jest Snapshot v1, https://goo.gl/fbAQLP

Fixes #324 Use branch name from config when creating PR #353

Fixes #324 Use branch name from config when creating PR #353

Conversation

josephearl commented Apr 12, 2017 • edited

josephearl commented Apr 12, 2017

josephearl commented Apr 12, 2017

josephearl commented Apr 13, 2017 • edited

josephearl commented Apr 13, 2017 • edited

josephearl commented Apr 13, 2017

Benaiah left a comment

Choose a reason for hiding this comment

Benaiah Apr 13, 2017 • edited

Choose a reason for hiding this comment

calavera Apr 13, 2017

Choose a reason for hiding this comment

erquhart Apr 14, 2017

Choose a reason for hiding this comment

Benaiah Apr 13, 2017

Choose a reason for hiding this comment

josephearl Apr 14, 2017

Choose a reason for hiding this comment

Benaiah Apr 13, 2017

Choose a reason for hiding this comment

Benaiah Apr 13, 2017

Choose a reason for hiding this comment

josephearl commented Apr 13, 2017

josephearl commented Apr 13, 2017

Benaiah commented Apr 13, 2017

josephearl commented Apr 14, 2017

josephearl commented Apr 14, 2017

josephearl commented Apr 14, 2017

erquhart Apr 14, 2017 • edited

Choose a reason for hiding this comment

josephearl Apr 14, 2017

Choose a reason for hiding this comment

Benaiah commented Apr 14, 2017

josephearl commented Apr 18, 2017

calavera left a comment

Choose a reason for hiding this comment

Benaiah commented Apr 28, 2017 • edited

josephearl commented Apr 28, 2017

Benaiah commented Apr 28, 2017

Benaiah left a comment

Choose a reason for hiding this comment

calavera commented Apr 28, 2017

josephearl commented Apr 29, 2017

calavera commented May 1, 2017

josephearl commented Apr 12, 2017 •

edited

josephearl commented Apr 13, 2017 •

edited

josephearl commented Apr 13, 2017 •

edited

Benaiah Apr 13, 2017 •

edited

erquhart Apr 14, 2017 •

edited

Benaiah commented Apr 28, 2017 •

edited