Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Loading…

Fixed failing tests... #2

Merged
2 commits merged into from

1 participant

David Chapman
David Chapman

No description provided.

Deleted user ghost merged commit 8c46fd0 into from
This issue was closed.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on May 26, 2011
  1. David Chapman
  2. David Chapman

    Fixed conflicts

    dchapman1988 authored
This page is out of date. Refresh to see the latest.
80 Gemfile.lock
View
@@ -30,11 +30,11 @@ GEM
activesupport (= 3.0.3)
activesupport (3.0.3)
archive-tar-minitar (0.5.2)
- arel (2.0.8)
- awesome_print (0.3.2)
+ arel (2.0.10)
+ awesome_print (0.4.0)
bcrypt-ruby (2.1.4)
builder (2.1.2)
- capistrano (2.5.19)
+ capistrano (2.5.21)
highline
net-scp (>= 1.0.0)
net-sftp (>= 2.0.0)
@@ -47,9 +47,9 @@ GEM
rack (>= 1.0.0)
rack-test (>= 0.5.4)
selenium-webdriver (>= 0.0.3)
- childprocess (0.1.7)
- ffi (~> 0.6.3)
- chunky_png (0.12.0)
+ childprocess (0.1.9)
+ ffi (~> 1.0.6)
+ chunky_png (1.2.0)
columnize (0.3.2)
compass (0.10.6)
haml (>= 3.0.4)
@@ -65,9 +65,9 @@ GEM
cucumber-rails (0.3.2)
cucumber (>= 0.8.0)
culerity (0.2.15)
- daemons (1.1.0)
+ daemons (1.1.3)
database_cleaner (0.5.2)
- devise (1.1.7)
+ devise (1.1.9)
bcrypt-ruby (~> 2.1.2)
warden (~> 1.0.2)
diff-lcs (1.1.2)
@@ -77,20 +77,19 @@ GEM
eventmachine (0.12.10)
faker (0.9.5)
i18n (~> 0.4)
- ffi (0.6.3)
- rake (>= 0.8.7)
- forgery (0.3.7)
+ ffi (1.0.9)
+ forgery (0.3.8)
nokogiri (~> 1.4)
gherkin (2.2.9)
json (~> 1.4.6)
term-ansicolor (~> 1.0.5)
gravtastic (3.1.0)
haml (3.0.25)
- highline (1.6.1)
- i18n (0.5.0)
- jquery-rails (0.2.7)
- rails (~> 3.0)
- thor (~> 0.14.4)
+ highline (1.6.2)
+ i18n (0.6.0)
+ jquery-rails (1.0.9)
+ railties (~> 3.0)
+ thor (~> 0.14)
json (1.4.6)
json_pure (1.5.1)
launchy (0.3.7)
@@ -100,11 +99,11 @@ GEM
chunky_png (>= 0.8.0)
compass (>= 0.10.0)
haml (>= 3.0.0)
- linecache19 (0.5.11)
+ linecache19 (0.5.12)
ruby_core_source (>= 0.1.4)
macaddr (1.0.0)
machinist (1.0.6)
- mail (2.2.15)
+ mail (2.2.19)
activesupport (>= 2.3.6)
i18n (>= 0.4.0)
mime-types (~> 1.16)
@@ -115,21 +114,19 @@ GEM
net-ssh (>= 1.99.1)
net-sftp (2.0.5)
net-ssh (>= 2.0.9)
- net-ssh (2.1.0)
- net-ssh-gateway (1.0.1)
+ net-ssh (2.1.4)
+ net-ssh-gateway (1.1.0)
net-ssh (>= 1.99.1)
nokogiri (1.4.4)
- paperclip (2.3.8)
- activerecord
- activesupport
- pickle (0.4.4)
+ paperclip (2.3.11)
+ activerecord (>= 2.3.0)
+ activesupport (>= 2.3.2)
+ pickle (0.4.7)
cucumber (>= 0.8)
rake
- rspec (>= 1.3)
- yard
polyglot (0.3.1)
- rack (1.2.1)
- rack-mount (0.6.13)
+ rack (1.2.3)
+ rack-mount (0.6.14)
rack (>= 1.0.0)
rack-test (0.5.7)
rack (>= 1.0)
@@ -159,7 +156,7 @@ GEM
rspec-expectations (= 2.0.0)
rspec-rails (2.0.1)
rspec (~> 2.0.0)
- ruby-debug-base19 (0.11.24)
+ ruby-debug-base19 (0.11.25)
columnize (>= 0.3.1)
linecache19 (>= 0.5.11)
ruby_core_source (>= 0.1.4)
@@ -167,34 +164,33 @@ GEM
columnize (>= 0.3.1)
linecache19 (>= 0.5.11)
ruby-debug-base19 (>= 0.11.19)
- ruby_core_source (0.1.4)
+ ruby_core_source (0.1.5)
archive-tar-minitar (>= 0.5.2)
rubyzip (0.9.4)
- selenium-webdriver (0.1.3)
- childprocess (~> 0.1.5)
- ffi (~> 0.6.3)
+ selenium-webdriver (0.2.0)
+ childprocess (>= 0.1.7)
+ ffi (>= 1.0.7)
json_pure
rubyzip
shoulda (2.11.3)
- simplecov (0.4.0)
- simplecov-html (~> 0.4.0)
- simplecov-html (0.4.3)
+ simplecov (0.4.2)
+ simplecov-html (~> 0.4.4)
+ simplecov-html (0.4.5)
spork (0.8.4)
term-ansicolor (1.0.5)
- thin (1.2.7)
+ thin (1.2.11)
daemons (>= 1.0.9)
eventmachine (>= 0.12.6)
rack (>= 1.0.0)
thor (0.14.6)
treetop (1.4.9)
polyglot (>= 0.3.1)
- tzinfo (0.3.24)
- uuid (2.3.1)
+ tzinfo (0.3.27)
+ uuid (2.3.2)
macaddr (~> 1.0)
- warden (1.0.3)
- rack (>= 1.0.0)
+ warden (1.0.4)
+ rack (>= 1.0)
yajl-ruby (0.7.9)
- yard (0.6.4)
PLATFORMS
ruby
11 spec/models/user_spec.rb
View
@@ -57,20 +57,19 @@
end
describe '#work_units_for_day' do
- subject { user.work_units_for_day(Date.current) }
before do
- work_unit1.update_attributes(:scheduled_at => Date.current)
- work_unit2.update_attributes(:scheduled_at => Date.yesterday)
+ work_unit1.update_attributes(:scheduled_at => Time.now)
+ work_unit2.update_attributes(:scheduled_at => 1.days.ago)
end
it 'should return a collection of work units for the user scheduled on a given day' do
- should == [work_unit1]
+ user.work_units_for_day(Time.now).should == [work_unit1]
end
end
- describe '#clients_for_day' do
- subject { user.clients_for_day(Date.current) }
+ describe '.clients_for_day' do
+ subject { user.clients_for_day(Time.now) }
before do
work_unit1.update_attributes(:scheduled_at => Date.current)
8 spec/models/work_unit_spec.rb
View
@@ -17,12 +17,12 @@
it { should validate_presence_of :effective_hours }
- describe '.scheduled_between' do
- subject { WorkUnit.scheduled_between(Date.yesterday.beginning_of_day, Date.current.end_of_day) }
+ describe '#scheduled_between' do
+ subject { WorkUnit.scheduled_between(1.days.ago.beginning_of_day, Time.now.end_of_day) }
before do
- work_unit1.update_attribute(:scheduled_at, Date.yesterday)
- work_unit2.update_attribute(:scheduled_at, Date.current)
+ work_unit1.update_attribute(:scheduled_at, 1.days.ago)
+ work_unit2.update_attribute(:scheduled_at, Time.now)
end
it 'should return a collection of work units scheduled between the two given dates' do
Something went wrong with that request. Please try again.