diff --git a/app/views/gardens/_thumbnail.html.haml b/app/views/gardens/_thumbnail.html.haml
index c622098c9..bd3fc7eb1 100644
--- a/app/views/gardens/_thumbnail.html.haml
+++ b/app/views/gardens/_thumbnail.html.haml
@@ -25,9 +25,9 @@
%dd= garden.active ? "Yes" : "No"
.col-md-12
%b
- = "#{pluralize(garden.plantings.count, "Planting")} : "
+ = "#{pluralize(garden.plantings.size, "Planting")} : "
= display_garden_plantings(garden.plantings.current)
- - if garden.plantings.count > 2
+ - if garden.plantings.size > 2
%br
= link_to "See more plantings >>", garden_path(garden)
.panel-footer
diff --git a/app/views/home/_stats.html.haml b/app/views/home/_stats.html.haml
index e13f74719..53ffd2492 100644
--- a/app/views/home/_stats.html.haml
+++ b/app/views/home/_stats.html.haml
@@ -1,7 +1,7 @@
- cache("homepage_stats") do
%p.stats
- = t('.message_html', { member: link_to(t('.member_linktext', count: Member.confirmed.count.to_i), members_path),
- number_crops: link_to(t('.number_crops_linktext', count: Crop.count.to_i), crops_path),
+ = t('.message_html', { member: link_to(t('.member_linktext', count: Member.confirmed.size.to_i), members_path),
+ number_crops: link_to(t('.number_crops_linktext', count: Crop.count.to_i), crops_path),
number_plantings: link_to(t('.number_plantings_linktext', count: Planting.count.to_i), plantings_path),
number_gardens: link_to(t('.number_gardens_linktext', count: Garden.count.to_i), gardens_path) })
diff --git a/spec/controllers/photos_controller_spec.rb b/spec/controllers/photos_controller_spec.rb
index 286b23b64..603959b46 100644
--- a/spec/controllers/photos_controller_spec.rb
+++ b/spec/controllers/photos_controller_spec.rb
@@ -115,7 +115,7 @@ describe PhotosController do
post :create, {:photo => { :flickr_photo_id => photo.flickr_photo_id },
:type => "planting",
:id => planting.id }
- Photo.last.plantings.count.should eq 1
+ Photo.last.plantings.size.should eq 1
end
it "attaches the photo to a harvest" do
@@ -140,7 +140,7 @@ describe PhotosController do
post :create, {:photo => { :flickr_photo_id => photo.flickr_photo_id },
:type => "harvest",
:id => harvest.id }
- Photo.last.harvests.count.should eq 1
+ Photo.last.harvests.size.should eq 1
end
end
diff --git a/spec/models/member_spec.rb b/spec/models/member_spec.rb
index b91584953..66ea5a597 100644
--- a/spec/models/member_spec.rb
+++ b/spec/models/member_spec.rb
@@ -23,7 +23,7 @@ describe 'member' do
end
it 'should have a default garden' do
- member.gardens.count.should == 1
+ member.gardens.size.should == 1
end
it 'should have a accounts entry' do
@@ -221,12 +221,12 @@ describe 'member' do
end
it 'sees confirmed members' do
- Member.confirmed.count.should == 2
+ Member.confirmed.size.should == 2
end
it 'ignores unconfirmed members' do
@member3 = FactoryGirl.create(:unconfirmed_member)
- Member.confirmed.count.should == 2
+ Member.confirmed.size.should == 2
end
end
diff --git a/spec/models/photo_spec.rb b/spec/models/photo_spec.rb
index 650f0f57c..36a9eb068 100644
--- a/spec/models/photo_spec.rb
+++ b/spec/models/photo_spec.rb
@@ -11,19 +11,19 @@ describe Photo do
context "adds photos" do
it 'to a planting' do
planting.photos << photo
- expect(planting.photos.count).to eq 1
+ expect(planting.photos.size).to eq 1
expect(planting.photos.first).to eq photo
end
it 'to a harvest' do
harvest.photos << photo
- expect(harvest.photos.count).to eq 1
+ expect(harvest.photos.size).to eq 1
expect(harvest.photos.first).to eq photo
end
it 'to a garden' do
garden.photos << photo
- expect(garden.photos.count).to eq 1
+ expect(garden.photos.size).to eq 1
expect(garden.photos.first).to eq photo
end
end
@@ -32,19 +32,19 @@ describe Photo do
it 'from a planting' do
planting.photos << photo
photo.destroy
- expect(planting.photos.count).to eq 0
+ expect(planting.photos.size).to eq 0
end
it 'from a harvest' do
harvest.photos << photo
photo.destroy
- expect(harvest.photos.count).to eq 0
+ expect(harvest.photos.size).to eq 0
end
it 'from a garden' do
garden.photos << photo
photo.destroy
- expect(garden.photos.count).to eq 0
+ expect(garden.photos.size).to eq 0
end
it "automatically if unused" do
diff --git a/vendor/gems/activemerchant-1.33.0/lib/support/ssl_verify.rb b/vendor/gems/activemerchant-1.33.0/lib/support/ssl_verify.rb
index 1ba28878a..ccb6650d5 100644
--- a/vendor/gems/activemerchant-1.33.0/lib/support/ssl_verify.rb
+++ b/vendor/gems/activemerchant-1.33.0/lib/support/ssl_verify.rb
@@ -10,7 +10,7 @@ class SSLVerify
def test_gateways
success, failed, missing, errored, disabled = [], [], [], [], []
- puts "Verifying #{@gateways.count} SSL certificates\n\n"
+ puts "Verifying #{@gateways.size} SSL certificates\n\n"
@gateways.each do |g|
if !g.live_url