diff options
Diffstat (limited to 'spec')
| -rw-r--r-- | spec/controllers/user_controller_spec.rb | 2 | ||||
| -rw-r--r-- | spec/models/holiday_spec.rb | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/spec/controllers/user_controller_spec.rb b/spec/controllers/user_controller_spec.rb index 6dc971bd6..f6f3c16ca 100644 --- a/spec/controllers/user_controller_spec.rb +++ b/spec/controllers/user_controller_spec.rb @@ -5,7 +5,7 @@ require File.dirname(__FILE__) + '/../spec_helper' describe UserController, "when showing a user" do integrate_views - fixtures :users, :outgoing_messages, :incoming_messages, :raw_emails, :info_requests, :info_request_events + fixtures :users, :outgoing_messages, :incoming_messages, :raw_emails, :info_requests, :info_request_events, :comments it "should be successful" do get :show, :url_name => "bob_smith" diff --git a/spec/models/holiday_spec.rb b/spec/models/holiday_spec.rb index ebfdeba4b..34526388d 100644 --- a/spec/models/holiday_spec.rb +++ b/spec/models/holiday_spec.rb @@ -4,7 +4,7 @@ describe Holiday, " when calculating due date" do fixtures :holidays def due_date(ymd) - return Holiday.due_date_from(Date.strptime(ymd)).strftime("%F") + return Holiday.due_date_from(Date.strptime(ymd), 20).strftime("%F") end it "handles no holidays" do @@ -43,7 +43,7 @@ describe Holiday, " when calculating due date" do end it "handles Time objects" do - Holiday.due_date_from(Time.utc(2009, 03, 16, 12, 0, 0)).strftime('%F').should == '2009-04-16' + Holiday.due_date_from(Time.utc(2009, 03, 16, 12, 0, 0), 20).strftime('%F').should == '2009-04-16' end end |