closes #148

# Conflicts:
#	Gemfile

Author: catmando

lib/generators/reactive_ruby/test_app/templates/views/layouts/test_layout.html.erb

@@ -34,6 +34,10 @@ def configure_test_app
         "#{test_app_path}/app/views/components/hello_world.rb", force: true
       template 'views/components/todo.rb',
         "#{test_app_path}/app/views/components/todo.rb", force: true
+      template 'views/layouts/test_layout.html.erb',
+        "#{test_app_path}/app/views/layouts/test_layout.html.erb", force: true
+      template 'views/layouts/test_layout.html.erb',
+        "#{test_app_path}/app/views/layouts/explicit_layout.html.erb", force: true
     end
 
     def clean_superfluous_files

lib/generators/reactive_ruby/test_app/test_app_generator.rb

@@ -5,8 +5,10 @@ module Rails
     class ActionController::Base
       def render_component(*args)
         @component_name = ((args[0].is_a? Hash) || args.empty?) ? params[:action].camelize : args.shift
-        @render_params = (args[0].is_a? Hash) ? args[0] : {}
-        render inline: "<%= react_component @component_name, @render_params, { prerender: !params[:no_prerender] } %>", layout: 'application'
+        @render_params = args.shift || {}
+        options = args[0] || {}
+        layout = options.key?(:layout) ? options[:layout].to_s : :default
+        render inline: "<%= react_component @component_name, @render_params, { prerender: !params[:no_prerender] } %>", layout: layout
       end
     end
   end

lib/reactive-ruby/rails/controller_helper.rb

@@ -8,14 +8,26 @@ class TestController < ActionController::Base; end
 
   describe '#render_component' do
     controller do
+
+      layout "test_layout"
+
       def index
         render_component
       end
+
+      def new
+        render_component "Index", {}, layout: :explicit_layout
+      end
     end
 
-    it 'renders the application layout' do
+    it 'renders with the default layout' do
       get :index, no_prerender: true
-      expect(response).to render_template(layout: :application)
+      expect(response).to render_template(layout: :test_layout)
+    end
+
+    it "renders with a specified layout" do
+      get :new, no_prerender: true
+      expect(response).to render_template(layout: :explicit_layout)
     end
   end
 end