added inMailer checks for test

eacaps · Jul 25, 2016 · e24fb9f · e24fb9f
1 parent eb6e700
commit e24fb9f
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/app/helpers/react_on_rails_helper.rb b/app/helpers/react_on_rails_helper.rb
@@ -351,7 +351,7 @@ def rails_context(server_side:)
         uri = Addressable::URI.parse(request.original_url)
         # uri = Addressable::URI.parse("http://foo.com:3000/posts?id=30&limit=5#time=1305298413")
 
-        result = {
+        result.merge!({
           # URL settings
           href: request.original_url,
           location: "#{uri.path}#{uri.query.present? ? "?#{uri.query}" : ''}",
@@ -365,7 +365,7 @@ def rails_context(server_side:)
           i18nLocale: I18n.locale,
           i18nDefaultLocale: I18n.default_locale,
           httpAcceptLanguage: request.env["HTTP_ACCEPT_LANGUAGE"]
-        }
+        })
       end
       if ReactOnRails.configuration.rendering_extension
         custom_context = ReactOnRails.configuration.rendering_extension.custom_context(self)

diff --git a/spec/dummy/spec/requests/server_render_check_spec.rb b/spec/dummy/spec/requests/server_render_check_spec.rb
@@ -65,6 +65,12 @@
       expect(mail.body).to match "Mr. Mailing Server Side Rendering"
       expect(mail.body).to match "inMailer&quot;:true"
     end
+
+    it "sets inMailer properly" do
+      get client_side_hello_world_path
+      html_nodes = Nokogiri::HTML(response.body)
+      expect(html_nodes.css('div#js-react-on-rails-context').attr('data-rails-context').value).to match('inMailer\":false')
+    end
   end
 
   describe "server rendering railsContext" do