Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions Rakefile
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ require 'rake/testtask'
Rake::TestTask.new(:test) do |t|
t.libs << 'lib'
t.libs << 'test'
t.pattern = 'test/**/*_test.rb'
t.verbose = false
t.pattern = ENV['TEST_PATTERN'] || 'test/**/*_test.rb'
t.verbose = ENV['TEST_VERBOSE'] == '1'
end

task default: :test
10 changes: 9 additions & 1 deletion lib/react/renderer.rb
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,14 @@ def self.render(component, args={})
def self.combined_js
@@combined_js ||= <<-CODE
var global = global || this;

var console = global.console || {};
['error', 'log', 'info', 'warn'].forEach(function (fn) {
if (!(fn in console)) {
console[fn] = function () {};
}
});

#{@@react_js};
React = global.React;
#{@@components_js};
Expand All @@ -48,4 +56,4 @@ def render(component, args={})
end

end
end
end
7 changes: 7 additions & 0 deletions test/react_renderer_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,11 @@ class ReactRendererTest < ActiveSupport::TestCase
assert_match /data-react-checksum/, result
end

test 'Rendering does not throw an exception when console log api is used' do
%W(error info log warn).each do |fn|
assert_nothing_raised(ExecJS::ProgramError) do
React::Renderer.pool.checkout.context.eval("console.#{fn}()")
end
end
end
end