Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix build for useCreateElement: false, run Travis #6070

Merged
merged 2 commits into from
Feb 19, 2016

Conversation

sophiebits
Copy link
Collaborator

It's important that we keep these code paths working because they're the only comprehensive test of adopting server-rendered HTML that we have right now. This is terrible and hacky but I am hopeful that it will at least catch stuff.

cc @mwiencek for text changes (I missed these in #5753), @zpao for clowny Travis stuff I added here

@facebook-github-bot
Copy link

@spicyj updated the pull request.

@facebook-github-bot
Copy link

@spicyj updated the pull request.

@facebook-github-bot
Copy link

@spicyj updated the pull request.

@sophiebits
Copy link
Collaborator Author

yay travis passes

@@ -149,13 +150,29 @@ assign(ReactDOMTextComponent.prototype, {
if (nativeNode) {
return nativeNode;
}
nativeNode = [this._openingComment, this._nativeNode];
if (!this._closingComment) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Woops, sorry, I guess I assumed useCreateElement=false was already tested. But this seems obvious now. Too bad we needed the code to find the other comment, after all.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, I forgot about it too. Ah well.

@sophiebits sophiebits added this to the 0.15 milestone Feb 19, 2016
@@ -73,6 +73,11 @@ script:
else
./node_modules/.bin/grunt jest:normal
fi
echo 'Testing in server-render (HTML generation) mode...'
printf '\nmodule.exports.useCreateElement = false;\n' \
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I personally would have used echo for this too but meh.

Otherwise it seems good.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think you can escape stuff (newlines) inside echo reliably cross-platform.

These weren't caught by CI in facebook#5753 because we don't automatically test that yet... fixing that next.
It's important that we keep these code paths working because they're the only comprehensive test of adopting server-rendered HTML that we have right now. This is terrible and hacky but I am hopeful that it will at least catch stuff.
sophiebits added a commit that referenced this pull request Feb 19, 2016
Fix build for useCreateElement: false, run Travis
@sophiebits sophiebits merged commit 98d3327 into facebook:master Feb 19, 2016
@facebook-github-bot
Copy link

@spicyj updated the pull request.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants