From c178f616d58991788423a8298f49a063d0017cda Mon Sep 17 00:00:00 2001
From: Eric Davis <edavis@littlestreamsoftware.com>
Date: Mon, 19 Jan 2009 10:56:39 -0800
Subject: [PATCH] Integrated views into the controller specs. #1916

---
 app/views/rates/edit.html.erb             |  2 --
 spec/controllers/rates_controller_spec.rb | 18 ++++++++++++++++--
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/app/views/rates/edit.html.erb b/app/views/rates/edit.html.erb
index 822d4bc..72154f8 100644
--- a/app/views/rates/edit.html.erb
+++ b/app/views/rates/edit.html.erb
@@ -1,8 +1,6 @@
 <h1>Editing rate</h1>
 
 <% form_for(@rate) do |f| %>
-  <%= f.error_messages %>
-
   <p>
     <%= f.label :amount %><br />
     <%= f.text_field :amount %>
diff --git a/spec/controllers/rates_controller_spec.rb b/spec/controllers/rates_controller_spec.rb
index 804c939..d04da8d 100644
--- a/spec/controllers/rates_controller_spec.rb
+++ b/spec/controllers/rates_controller_spec.rb
@@ -28,12 +28,14 @@ describe "unauthorized", :shared => true do
 end
 
 describe RatesController, "as regular user" do
+  integrate_views
+
   def mock_rate(stubs={})
     @mock_rate ||= mock_model(Rate, stubs)
   end
   
   before(:each) do
-    @user = mock_model(User, :logged? => true, :admin? => false)
+    @user = mock_model(User, :logged? => true, :admin? => false, :anonymous? => false, :name => "Normal User", :memberships => [])
     User.stub!(:current).and_return(@user)
   end
   
@@ -110,12 +112,24 @@ end
 
 
 describe RatesController, "as an administrator" do
+  integrate_views
+
   def mock_rate(stubs={})
+    project = mock_model(Project)
+    stubs = {
+      :date_in_effect => Date.today,
+      :project => project,
+      :project_id => project.id,
+      :amount => 100.0,
+      :user => @user,
+      :user_id => @user.id,
+      :unlocked? => true
+    }.merge(stubs)
     @mock_rate ||= mock_model(Rate, stubs)
   end
 
   before(:each) do
-    @user = mock_model(User, :logged? => true, :admin? => true)
+    @user = mock_model(User, :logged? => true, :admin? => true, :anonymous? => false, :name => "Admin User", :memberships => [])
     User.stub!(:current).and_return(@user)
   end