gistfile1.diff

diff --git a/pages/app/controllers/refinery/pages_controller.rb b/pages/app/controllers/refinery/pages_controller.rb
index d4d6dbf..b6526f0 100644
--- a/pages/app/controllers/refinery/pages_controller.rb
+++ b/pages/app/controllers/refinery/pages_controller.rb
@@ -10,7 +10,7 @@ module Refinery
 
     # This action is usually accessed with the root path, normally '/'
     def home
-      render_with_templates?
+      render_with_templates?(page, :template => "refinery/pages/home")
     end
 
     # This action can be accessed normally, or as nested pages.
diff --git a/pages/lib/refinery/pages/render_options.rb b/pages/lib/refinery/pages/render_options.rb
index 3b95992..7c11739 100644
--- a/pages/lib/refinery/pages/render_options.rb
+++ b/pages/lib/refinery/pages/render_options.rb
@@ -7,17 +7,15 @@ module Refinery
         if Refinery::Pages.use_layout_templates && page.layout_template.present?
           render_options[:layout] = page.layout_template
         end
-        if Refinery::Pages.use_view_templates && page.view_template.present?
-          render_options[:template] = "refinery/pages/#{page.view_template}"
-        elsif
-          render_options[:template] = "refinery/pages/show"
-        end
+
+        render_options[:template] = "refinery/pages/#{page.view_template || 'show'}"
+
         render_options
       end
 
       def render_with_templates?(page = @page, render_options = {})
-        render_options.update render_options_for_template(page)
-        render render_options
+        options = render_options_for_template(page).update render_options
+        render options
       end
 
       protected :render_options_for_template, :render_with_templates?
diff --git a/pages/spec/controllers/refinery/pages_controller_spec.rb b/pages/spec/controllers/refinery/pages_controller_spec.rb
new file mode 100644
index 0000000..8e834d4
--- /dev/null
+++ b/pages/spec/controllers/refinery/pages_controller_spec.rb
@@ -0,0 +1,24 @@
+require "spec_helper"
+
+module Refinery
+  describe PagesController do
+    before do
+      FactoryGirl.create(:page, :link_url => "/")
+      FactoryGirl.create(:page, :title => "test")
+    end
+
+    describe "#home" do
+      it "renders home template" do
+        get :home
+        expect(response).to render_template("home")
+      end
+    end
+
+    describe "#show" do
+      it "renders show template" do
+        get :show, :path => "test"
+        expect(response).to render_template("show")
+      end
+    end
+  end
+end