Skip to content

Resolves Issue #521 Draft #541

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.

Sign up for GitHub

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

Merged
merged 10 commits into from
Jun 10, 2018
Merged

Resolves Issue #521 Draft #541

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
d0fcea1
Added ClientOnly property to ReactComponent
suhailnaw May 10, 2018
e1b503a
added conditional to RenderJavascript to decide between ReactDOM.rend…
suhailnaw May 13, 2018
e13331c
Added 2 tests to check if correct method ReactDOM.render or ReactDOM.…
suhailnaw May 13, 2018
02ce118
Made available ClientOnly and correctly implemented ternary operator …
suhailnaw Jun 6, 2018
f319c8f
Removed redundant call to ClientOnly
suhailnaw Jun 6, 2018
49c013f
Changed tests to correctly take in ClientOnly
suhailnaw Jun 6, 2018
ccf55bc
Changed incorrect punctuation in test file
suhailnaw Jun 6, 2018
dfdd90b
Corrected tests to use render if true
suhailnaw Jun 6, 2018
67ad514
Update examples to react 16.4
dustinsoftware Jun 10, 2018
7efeccc
Merge branch 'master' into issue521
dustinsoftware Jun 10, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Changed incorrect punctuation in test file
  • Loading branch information
@suhailnaw
suhailnaw committed Jun 6, 2018
commit ccf55bcc5f182ee5765d71c6595234c8122835bc
6 changes: 2 additions & 4 deletions tests/React.Tests/Core/ReactComponentTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,13 +217,12 @@ public void RenderJavaScriptShouldCallRenderComponent()
public void RenderJavaScriptShouldCallRenderComponentWithReactDOMRender()
{
var environment = new Mock<IReactEnvironment>();
var clientOnly = true;
var config = new Mock<IReactSiteConfiguration>();
var reactIdGenerator = new Mock<IReactIdGenerator>();

var component = new ReactComponent(environment.Object, config.Object, reactIdGenerator.Object, "Foo", "container")
{
ClientOnly = true;
ClientOnly = true,
Props = new { hello = "World" }
};
var result = component.RenderJavaScript();
Expand All @@ -238,13 +237,12 @@ public void RenderJavaScriptShouldCallRenderComponentWithReactDOMRender()
public void RenderJavaScriptShouldCallRenderComponentwithReactDOMHydrate()
{
var environment = new Mock<IReactEnvironment>();
var clientOnly = false;
var config = new Mock<IReactSiteConfiguration>();
var reactIdGenerator = new Mock<IReactIdGenerator>();

var component = new ReactComponent(environment.Object, config.Object, reactIdGenerator.Object, "Foo", "container")
{
ClientOnly = false;
ClientOnly = false,
Props = new { hello = "World" }
};
var result = component.RenderJavaScript();
Expand Down