Commit 7353d98

committed

fix(console_replay) clear state between renders

1 parent 292f917 commit 7353d98Copy full SHA for 7353d98

File tree

+31

-0

lines changed

lib/react/server_rendering
- bundle_renderer.rb
- bundle_renderer
  - console_reset.js
test
- dummy/app/assets/javascripts/components
  - TodoList.js.jsx
- react/server_rendering
  - console_replay_test.rb

+31

-0

lines changed

Lines changed: 5 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,7 @@ class BundleRenderer < ExecJSRenderer`
`13`	`13`	`# Reimplement console methods for replaying on the client`
`14`	`14`	`CONSOLE_POLYFILL = File.read(File.join(File.dirname(__FILE__), "bundle_renderer/console_polyfill.js"))`
`15`	`15`	`CONSOLE_REPLAY = File.read(File.join(File.dirname(__FILE__), "bundle_renderer/console_replay.js"))`
	`16`	`+ CONSOLE_RESET = File.read(File.join(File.dirname(__FILE__), "bundle_renderer/console_reset.js"))`
`16`	`17`	`TIMEOUT_POLYFILL = File.read(File.join(File.dirname(__FILE__), "bundle_renderer/timeout_polyfill.js"))`
`17`	`18`
`18`	`19`	`def initialize(options={})`
`@@ -39,6 +40,10 @@ def render(component_name, props, prerender_options)`
`39`	`40`	`super(component_name, t_props, t_options)`
`40`	`41`	`end`
`41`	`42`
	`43`	`+ def before_render(component_name, props, prerender_options)`
	`44`	`+ @replay_console ? CONSOLE_RESET : ""`
	`45`	`+ end`
	`46`	`+`
`42`	`47`	`def after_render(component_name, props, prerender_options)`
`43`	`48`	`@replay_console ? CONSOLE_REPLAY : ""`
`44`	`49`	`end`

Lines changed: 3 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+if (typeof console !== "undefined" && console.history) {`
	`2`	`+ console.history = [];`
	`3`	`+}`

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,7 @@ TodoList = React.createClass({`
`6`	`6`	`this.setState({mounted: 'yep'});`
`7`	`7`	`},`
`8`	`8`	`render: function() {`
	`9`	`+ console.log("Test Console Replay")`
`9`	`10`	`return (`
`10`	`11`	`<ul>`
`11`	`12`	`<li id='status'>{this.state.mounted}</li>`

Lines changed: 22 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,22 @@`
	`1`	`+require "test_helper"`
	`2`	`+`
	`3`	`+class ConsoleReplayTest < ActionDispatch::IntegrationTest`
	`4`	`+ setup do`
	`5`	`+ WebpackerHelpers.compile`
	`6`	`+ React::ServerRendering.reset_pool`
	`7`	`+ end`
	`8`	`+`
	`9`	`+ EXPECTED_REPLAY = <<-HTML`
	`10`	`+<script class="react-rails-console-replay">`
	`11`	`+console.log.apply(console, ["Test Console Replay"]);`
	`12`	`+</script>`
	`13`	`+ HTML`
	`14`	`+`
	`15`	`+ test "it clears the state between each request" do`
	`16`	`+ # Each request should only contain one log:`
	`17`	`+ get '/server/1'`
	`18`	`+ assert_includes(response.body, EXPECTED_REPLAY)`
	`19`	`+ get '/server/1'`
	`20`	`+ assert_includes(response.body, EXPECTED_REPLAY)`
	`21`	`+ end`
	`22`	`+end`

Comments

(0)