Finish static pages

saft · Feb 1, 2013 · 474bfa1 · 474bfa1
1 parent a6f6d05
commit 474bfa1
Show file tree

Hide file tree

Showing 5 changed files with 37 additions and 15 deletions.
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
 <head>
-  <title>SampleApp</title>
+  <title>Ruby on Rails Tutorial Sample App | <%= yield(:title) %></title>
   <%= stylesheet_link_tag    "application", :media => "all" %>
   <%= javascript_include_tag "application" %>
   <%= csrf_meta_tags %>

diff --git a/app/views/static_pages/about.html.erb b/app/views/static_pages/about.html.erb
@@ -1,5 +1,3 @@
+<% provide(:title, 'About Us') %>
 <h1>About Us</h1>
-<p>
-Blah blah blah..
-</p>
-
+<p>blay blah blah</p>
diff --git a/app/views/static_pages/help.html.erb b/app/views/static_pages/help.html.erb
@@ -1,2 +1,8 @@
+<% provide(:title, 'Help') %>
 <h1>Help</h1>
-<p>Get help on the Ruby on Rails Tutorial at the Rails Tutorial help page. To get help on this sample app see the Rails Tutorial book.</p>
+<p>
+  Get help on the Ruby on Rails tutorial at the
+  <a href="http://railstutorial.org/help">Rails Tutorial help page</a>
+  To get help on this sample app, see the
+  <a href="http://railstutorial.org/book">Rails Tutorial book</a>
+</p>
diff --git a/app/views/static_pages/home.html.erb b/app/views/static_pages/home.html.erb
@@ -1,5 +1,7 @@
+<% provide(:title, 'Home') %>
 <h1>Sample App</h1>
+  <p>
+    This is the home page for the
+    <a href="http://railstutorial.org/">Ruby on Rails Tutorial</a>
+  </p>
 
-<p>
-This is the home page for the <a href="http://railstutorial.org/">Ruby on Rails Tutorial</a> sample application.
-</p>
diff --git a/spec/requests/static_pages_spec.rb b/spec/requests/static_pages_spec.rb
@@ -1,22 +1,38 @@
 require 'spec_helper'
 
 describe "StaticPages" do
+
   describe "Home page" do
-    it "should have the content 'Sample App'" do
+    it "should have the h1 'Sample App'" do
+      visit '/static_pages/home'
+      page.should have_selector('h1', :text => 'Sample App')
+    end
+    it "should have the title 'Home'" do
       visit '/static_pages/home'
-      page.should have_content('Sample App')
+      page.should have_selector('title', :text => "Ruby on Rails Tutorial Sample App | Home")
     end
   end
+
   describe "Help page" do
-    it "should have the content 'Sample App'" do
+    it "should have the h1 'Help'" do
+      visit '/static_pages/help'
+      page.should have_selector('h1', :text => 'Help')
+    end
+    it "should have the title 'Help'" do
       visit '/static_pages/help'
-      page.should have_content('Help')
+      page.should have_selector('title', :text => "Ruby on Rails Tutorial Sample App | Help")
     end
   end
+
   describe "About page" do
-    it "should have the content 'About Us'" do
+    it "should have the h1 'About Us'" do
       visit '/static_pages/about'
-      page.should have_content('About Us')
+      page.should have_selector('h1', :text => 'About Us')
+    end
+    it "should have the title 'About Us'" do
+      visit '/static_pages/about'
+      page.should have_selector('title', :text => "Ruby on Rails Tutorial Sample App | About Us")
     end
   end
+
 end