spec fixes

tukanos · May 4, 2010 · b8d9bd5 · b8d9bd5
1 parent 4ef1c96
commit b8d9bd5
Showing 1 changed file with 9 additions and 9 deletions.
diff --git a/spec/models/role_activities_in_project_summary_spec.rb b/spec/models/role_activities_in_project_summary_spec.rb
@@ -24,14 +24,14 @@
 
   context "with some activities" do
     before do
-      @role = mock('role')
+      @role = Role.first_or_generate
       @user = mock('user', :role => @role)
       @summary = RoleActivitiesInProjectSummary.new(@user.role, [
-        mock('activity', :role => @role, :duration => 1.hour,              :price => Money.new(20, @euro)),
-        mock('activity', :role => @role, :duration => 1.hour + 20.minutes, :price => nil),
-        mock('activity', :role => @role, :duration =>          15.minutes, :price => Money.new( 7, @dollar)),
-        mock('activity', :role => @role, :duration =>          45.minutes, :price => nil),
-        mock('activity', :role => @role, :duration =>           5.minutes, :price => Money.new(11, @euro))
+        mock('activity', :role_id => @role.id, :duration => 1.hour,              :price => Money.new(20, @euro)),
+        mock('activity', :role_id => @role.id, :duration => 1.hour + 20.minutes, :price => nil),
+        mock('activity', :role_id => @role.id, :duration =>          15.minutes, :price => Money.new( 7, @dollar)),
+        mock('activity', :role_id => @role.id, :duration =>          45.minutes, :price => nil),
+        mock('activity', :role_id => @role.id, :duration =>           5.minutes, :price => Money.new(11, @euro))
       ])
     end
 
@@ -46,12 +46,12 @@
 
   describe "#<<" do
     before do
-      @role = mock('role')
+      @role = Role.first_or_generate
       @summary = RoleActivitiesInProjectSummary.new(@role, [])
     end
 
     context "if called with activity of proper role" do
-      before { @summary << mock('activity', :role => @role, :duration => 1.hour, :price => nil) }
+      before { @summary << mock('activity', :role_id => @role.id, :duration => 1.hour, :price => nil) }
       it "should add activity" do
         @summary.non_billable_time.should == 1.hour
       end
@@ -61,7 +61,7 @@
       it "should add activity" do
         block_should(raise_error(ArgumentError)) do
           @summary << mock('activity',
-            :role => mock('another role'),
+            :role_id => Role.generate.id,
             :duration => 1.hour,
             :price => nil
           )