From 840bc62e9691a8a148313dca23b74abe299df1e2 Mon Sep 17 00:00:00 2001 From: eacaps Date: Fri, 22 Jul 2016 09:57:28 -0400 Subject: [PATCH] resolved some reviewed suggestions --- app/helpers/react_on_rails_helper.rb | 2 +- spec/dummy/app/mailers/dummy_mailer.rb | 1 - spec/dummy/app/views/dummy_mailer/hello_email.html.erb | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/app/helpers/react_on_rails_helper.rb b/app/helpers/react_on_rails_helper.rb index b9d6e5038..305900d87 100644 --- a/app/helpers/react_on_rails_helper.rb +++ b/app/helpers/react_on_rails_helper.rb @@ -345,7 +345,7 @@ def initialize_redux_stores def rails_context(server_side:) @rails_context ||= begin result = {} - unless request.nil? + if request.present? # Using Addressable instead of standard URI to better deal with # non-ASCII characters (see https://github.com/shakacode/react_on_rails/pull/405) uri = Addressable::URI.parse(request.original_url) diff --git a/spec/dummy/app/mailers/dummy_mailer.rb b/spec/dummy/app/mailers/dummy_mailer.rb index c1404e95a..b176e72f5 100644 --- a/spec/dummy/app/mailers/dummy_mailer.rb +++ b/spec/dummy/app/mailers/dummy_mailer.rb @@ -1,7 +1,6 @@ class DummyMailer < ActionMailer::Base add_template_helper(ReactOnRailsHelper) default from: "nobody@nope.com" - # layout 'mailer' def hello_email mail(to: "otherperson@nope.com", subject: "you've got mail") diff --git a/spec/dummy/app/views/dummy_mailer/hello_email.html.erb b/spec/dummy/app/views/dummy_mailer/hello_email.html.erb index c28997edc..c80f1041a 100644 --- a/spec/dummy/app/views/dummy_mailer/hello_email.html.erb +++ b/spec/dummy/app/views/dummy_mailer/hello_email.html.erb @@ -4,4 +4,4 @@ Someone emailed this to you: helloWorldData: { name: "Mr. Mailing Server Side Rendering" } -}, prerender: true) %> \ No newline at end of file +}, prerender: true) %>