Done with static pages

MrEdwardo · Apr 27, 2011 · dbaced1 · dbaced1
1 parent 714c3cb
commit dbaced1
Show file tree

Hide file tree

Showing 15 changed files with 62 additions and 40 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/.autotest b/.autotest
@@ -0,0 +1,2 @@
+require 'autotest/growl'
+require 'autotest/fsevent'
diff --git a/app/controllers/pages_controller.rb b/app/controllers/pages_controller.rb
@@ -1,8 +1,14 @@
 class PagesController < ApplicationController
   def home
+  	@title = "Home"
   end
 
   def contact
+  	@title = "Contact"
+  end
+
+  def about
+  	@title = "About"
   end
 
 end
diff --git a/app/views/.DS_Store b/app/views/.DS_Store
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
@@ -1,14 +1,10 @@
 <!DOCTYPE html>
 <html>
-<head>
-  <title>SampleApp</title>
-  <%= stylesheet_link_tag :all %>
-  <%= javascript_include_tag :defaults %>
-  <%= csrf_meta_tag %>
-</head>
-<body>
-
-<%= yield %>
-
-</body>
+  <head>
+    <title>Ruby on Rails Tutorial Sample App | <%= @title %></title>
+    <%= csrf_meta_tag %>
+  </head>
+  <body>
+    <%= yield %>
+  </body>
 </html>
diff --git a/app/views/pages/.DS_Store b/app/views/pages/.DS_Store
diff --git a/app/views/pages/about.html.erb b/app/views/pages/about.html.erb
@@ -0,0 +1,7 @@
+<h1>About Us</h1>
+    <p>
+      <a href="http://railstutorial.org/">Ruby on Rails Tutorial</a>
+      is a project to make a book and screencasts to teach web development
+      with <a href="http://rubyonrails.org/">Ruby on Rails</a>. This
+      is the sample application for the tutorial.
+    </p>
diff --git a/app/views/pages/contact.html.erb b/app/views/pages/contact.html.erb
@@ -1,2 +1,5 @@
-<h1>Pages#contact</h1>
-<p>Find me in app/views/pages/contact.html.erb</p>
+<h1>Contact</h1>
+    <p>
+      Contact Ruby on Rails Tutorial about the sample app at the
+      <a href="http://railstutorial.org/feedback">feedback page</a>.
+    </p>
diff --git a/app/views/pages/home.html.erb b/app/views/pages/home.html.erb
@@ -1,2 +1,6 @@
-<h1>Pages#home</h1>
-<p>Find me in app/views/pages/home.html.erb</p>
+<h1>Sample App</h1>
+    <p>
+      This is the home page for the
+      <a href="http://railstutorial.org/">Ruby on Rails Tutorial</a>
+      sample application.
+    </p>
diff --git a/config/routes.rb b/config/routes.rb
@@ -2,6 +2,8 @@
   get "pages/home"
 
   get "pages/contact"
+
+  get "pages/about"
 
   # The priority is based upon order of creation:
   # first created -> highest priority.

diff --git a/spec/.DS_Store b/spec/.DS_Store
diff --git a/spec/controllers/pages_controller_spec.rb b/spec/controllers/pages_controller_spec.rb
@@ -1,19 +1,46 @@
 require 'spec_helper'
 
 describe PagesController do
+  render_views
 
   describe "GET 'home'" do
     it "should be successful" do
       get 'home'
       response.should be_success
     end
+
+    it "should have the right title" do
+      get 'home'
+      response.should have_selector("title",
+                        :content => "Ruby on Rails Tutorial Sample App | Home")
+    end
   end
 
   describe "GET 'contact'" do
     it "should be successful" do
       get 'contact'
       response.should be_success
     end
+
+    it "should have the right title" do
+      get 'contact'
+      response.should have_selector("title",
+                        :content =>
+                          "Ruby on Rails Tutorial Sample App | Contact")
+    end
   end
 
+  describe "GET 'about'" do
+    it "should be successful" do
+      get 'about'
+      response.should be_success
+    end
+
+    it "should have the right title" do
+      get 'about'
+      response.should have_selector("title",
+                        :content =>
+                          "Ruby on Rails Tutorial Sample App | About")
+    end
+  end
 end
diff --git a/spec/helpers/pages_helper_spec.rb b/spec/helpers/pages_helper_spec.rb
diff --git a/spec/views/pages/contact.html.erb_spec.rb b/spec/views/pages/contact.html.erb_spec.rb
diff --git a/spec/views/pages/home.html.erb_spec.rb b/spec/views/pages/home.html.erb_spec.rb
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		require 'autotest/growl'
		require 'autotest/fsevent'