added contact page

skyhirider · Jun 1, 2013 · 391ce63 · 391ce63
1 parent c9e7d50
commit 391ce63
Show file tree

Hide file tree

Showing 7 changed files with 36 additions and 6 deletions.
diff --git a/app/controllers/static_pages_controller.rb b/app/controllers/static_pages_controller.rb
@@ -8,4 +8,7 @@ def help
   def about
   end
 
+  def contact	
+  end
+
 end
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>Ruby on Rails Tutorial Sample App | <% yield(:title) %> </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,4 +1,4 @@
-<% provide(:title,'About') %>
+<% provide(:title,'About Us') %>
     <h1>About Us</h1>
     <p>
       The <a href="http://railstutorial.org/">Ruby on Rails Tutorial</a>

diff --git a/app/views/static_pages/contact.html.erb b/app/views/static_pages/contact.html.erb
@@ -0,0 +1,7 @@
+<% provide(:title, 'Contact Us') %>
+    <h1>Our contact info</h1>
+    <p>
+      This is the contact page for the
+      <a href="http://railstutorial.org/">Ruby on Rails Tutorial</a>
+      sample application.
+    </p>
diff --git a/app/views/static_pages/home.html.erb b/app/views/static_pages/home.html.erb
@@ -1,4 +1,4 @@
-<% provide(:title,'Home') %>
+<% provide(:title, 'Home') %>
     <h1>Sample App</h1>
     <p>
       This is the home page for the

diff --git a/config/routes.rb b/config/routes.rb
@@ -5,6 +5,8 @@
 
   get "static_pages/about"
 
+  get "static_pages/contact"
+
   # The priority is based upon order of creation:
   # first created -> highest priority.
 

diff --git a/spec/requests/static_pages_spec.rb b/spec/requests/static_pages_spec.rb
@@ -2,6 +2,9 @@
 
 describe "Static pages" do
 
+let(:base_title) {"Ruby on Rails Tutorial Sample App"}
+
+
   describe "Home page" do
 
     it "should have the h1 'Sample App'" do
@@ -12,7 +15,7 @@
     it "should have the title 'Home'" do
       visit '/static_pages/home'
       page.should have_selector('title',
-                        :text => "Ruby on Rails Tutorial Sample App | Home")
+                        :text => "#{base_title} | Home")
     end
   end
 
@@ -26,7 +29,7 @@
     it "should have the title 'Help'" do
       visit '/static_pages/help'
       page.should have_selector('title',
-                        :text => "Ruby on Rails Tutorial Sample App | Help")
+                        :text => "#{base_title} | Help")
     end
   end
 
@@ -40,7 +43,22 @@
     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")
+                    :text => "#{base_title} | About Us")
+    end
+  end
+
+    describe "Contact Us" do
+
+    it "should have the h1 'Contact Us'" do
+      visit '/static_pages/contact'
+      page.should have_selector('h1', :text => 'Our contact info')
+    end
+
+    it "should have the title 'Contact Us'" do
+      visit '/static_pages/contact'
+      page.should have_selector('title',
+                    :text => "#{base_title} | Contact Us")
     end
   end
+
 end
-Original file line number
+Diff line change
@@ Expand Up / @@ -8,4 +8,7 @@ def help @@
       def about
       end
+      def contact
+      end
     end