mirror/growstuff
1
0
Fork 0
mirror of https://github.com/Growstuff/growstuff.git synced 2026-05-18 21:56:55 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1423 from Growstuff/dev

Browse Source 
Release 31
This commit is contained in:
pozorvlak
2017-11-03 08:32:35 +00:00
committed by GitHub
parent 494dd1d658 fa600bea9e
commit fac24c5e99
178 changed files with 2587 additions and 1084 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
.rubocop.yml
View File

@@ -19,6 +19,13 @@ Style/FileName:
Style/StringLiterals:
Enabled: false
# Stop hound and codeclimate fighting
Style/PercentLiteralDelimiters:
PreferredDelimiters:
default: ()
'%i': ()
'%w': ()
Style/MultilineMethodCallIndentation:
EnforcedStyle: indented

1
CONTRIBUTORS.md
View File

@@ -81,6 +81,7 @@ submit the change with your pull request.
- Arun Kumar / [arun1595](https://github.com/arun1595)
- Harry Brodsky / [hbrodsk1](https://github.com/hbrodsk1)
- Jeff Kingswood / [ancyentmariner](https://github.com/ancyentmariner)
- Logan Gingerich / [logangingerich](https://github.com/logangingerich)
## Bots

2
Gemfile
View File

@@ -124,7 +124,7 @@ group :development, :test do
gem 'capybara-screenshot' # for test debugging
gem 'coveralls', require: false # coverage analysis
gem 'database_cleaner'
gem 'factory_girl_rails' # for creating test data
gem 'factory_bot_rails' # for creating test data
gem 'haml-i18n-extractor'
gem 'haml-rails' # HTML templating language
gem 'haml_lint' # Checks haml files for goodness

21
Gemfile.lock
View File

@@ -31,7 +31,7 @@ GEM
activejob (4.2.10)
activesupport (= 4.2.10)
globalid (>= 0.3.0)
activemerchant (1.73.0)
activemerchant (1.74.0)
activesupport (>= 3.2.14, < 6.x)
builder (>= 2.1.2, < 4.0.0)
i18n (>= 0.6.9)
@@ -143,7 +143,7 @@ GEM
d3-rails (3.5.17)
railties (>= 3.1)
dalli (2.7.6)
database_cleaner (1.6.1)
database_cleaner (1.6.2)
debug_inspector (0.0.3)
devise (4.3.0)
bcrypt (~> 3.0)
@@ -173,10 +173,10 @@ GEM
erubis (2.7.0)
excon (0.59.0)
execjs (2.7.0)
factory_girl (4.8.1)
factory_bot (4.8.2)
activesupport (>= 3.0.0)
factory_girl_rails (4.8.0)
factory_girl (~> 4.8.0)
factory_bot_rails (4.8.2)
factory_bot (~> 4.8.2)
railties (>= 3.0.0)
faraday (0.12.2)
multipart-post (>= 1.2, < 3)
@@ -193,7 +193,7 @@ GEM
gibbon (1.2.1)
httparty
multi_json (>= 1.9.0)
globalid (0.4.0)
globalid (0.4.1)
activesupport (>= 4.2.0)
gravatar-ultimate (2.0.0)
activesupport (>= 2.3.14)
@@ -417,7 +417,7 @@ GEM
thor (>= 0.18.1, < 2.0)
rainbow (2.1.0)
raindrops (0.19.0)
rake (12.1.0)
rake (12.2.1)
rb-fsevent (0.10.2)
rb-inotify (0.9.10)
ffi (>= 0.5.0, < 2)
@@ -462,7 +462,7 @@ GEM
ruby_parser (3.10.1)
sexp_processor (~> 4.9)
rubyzip (1.2.1)
sass (3.5.2)
sass (3.5.3)
sass-listen (~> 4.0.0)
sass-listen (4.0.0)
rb-fsevent (~> 0.9, >= 0.9.4)
@@ -510,7 +510,7 @@ GEM
timecop (0.9.1)
tins (1.15.0)
trollop (1.16.2)
tzinfo (1.2.3)
tzinfo (1.2.4)
thread_safe (~> 0.1)
uglifier (3.2.0)
execjs (>= 0.3.0, < 3)
@@ -567,7 +567,7 @@ DEPENDENCIES
elasticsearch-api (~> 2.0.0)
elasticsearch-model
elasticsearch-rails
factory_girl_rails
factory_bot_rails
figaro
flickraw
font-awesome-sass
@@ -622,7 +622,6 @@ DEPENDENCIES
will_paginate
xmlrpc
RUBY VERSION
ruby 2.4.1p111

8
app/controllers/photos_controller.rb
View File

@@ -6,7 +6,13 @@ class PhotosController < ApplicationController
responders :flash
def index
@photos = Photo.paginate(page: params[:page])
if params[:crop_id]
@crop = Crop.find params[:crop_id]
@photos = @crop.photos
else
@photos = Photo.all
end
@photos = @photos.includes(:owner).order(:created_at).paginate(page: params[:page])
respond_with(@photos)
end

4
app/models/crop.rb
View File

@@ -106,6 +106,10 @@ class Crop < ActiveRecord::Base
end
end
def harvest_photos
Photo.joins(:harvests).where("harvests.crop_id": id)
end
def as_indexed_json(_options = {})
as_json(
only: [:id, :name, :approval_status],

2
app/models/garden.rb
View File

@@ -23,7 +23,7 @@ class Garden < ActiveRecord::Base
validates :name,
format: {
with: /\A\w+[\w ]+\z/
with: /\A\w+[\w ()]+\z/
},
length: { maximum: 255 }

2
app/models/member.rb
View File

@@ -91,7 +91,7 @@ class Member < ActiveRecord::Base
# and an account record (for paid accounts etc)
# we use find_or_create to avoid accidentally creating a second one,
# which can happen sometimes especially with FactoryGirl associations
# which can happen sometimes especially with FactoryBot associations
after_create { |member| Account.find_or_create_by(member_id: member.id) }
after_save :update_newsletter_subscription

14
app/views/crops/_photos.html.haml
View File

@@ -1,5 +1,15 @@
%h2 Photos of #{crop.name} harvests
.row
- unless crop.harvest_photos.empty?
- crop.harvest_photos.includes(:owner).first(3).each do |p|
.col-md-4
= render "photos/thumbnail", photo: p
%h2 Photos of #{crop.name} plants
.row
- unless crop.photos.empty?
- crop.photos.first(3).each do |p|
- crop.photos.includes(:owner).first(3).each do |p|
.col-md-4
= render partial: "photos/thumbnail", locals: { photo: p }
= render "photos/thumbnail", photo: p
.row
= link_to "more photos", crop_photos_path(crop_id: crop.id)

6
app/views/photos/index.html.haml
View File

@@ -1,11 +1,15 @@
- content_for :title, "Photos"
- if @crop
%h2= @crop.name
%p Most recent photos added to #{ENV['GROWSTUFF_SITE_NAME']}.
.pagination
= page_entries_info @photos
= will_paginate @photos
.row
- @photos.each do |p|
.col-md-2.six-across
@@ -19,5 +23,3 @@
.pagination
= page_entries_info @photos
= will_paginate @photos

4
config/environments/development.rb
View File

@@ -44,7 +44,7 @@ Growstuff::Application.configure do
# config.action_view.raise_on_missing_translations = true
# Growstuff config
config.action_mailer.default_url_options = { host: 'localhost:8080' }
config.action_mailer.default_url_options = { host: 'localhost:3000' }
config.action_mailer.delivery_method = :letter_opener
config.action_mailer.smtp_settings = {
@@ -55,7 +55,7 @@ Growstuff::Application.configure do
authentication: :login
}
config.host = 'localhost:8080'
config.host = 'localhost:3000'
config.analytics_code = ''
# this config variable cannot be put in application.yml as it is needed

9
config/factory_bot.rb Normal file
View File

@@ -0,0 +1,9 @@
ActionDispatch::Callbacks.after do
# Reload the factories
return unless Rails.env.development? || Rails.env.test?
if FactoryBot.factories.present? # first init will load factories, this should only run on subsequent reloads
FactoryBot.factories.clear
FactoryBot.find_definitions
end
end

9
config/factory_girl.rb
View File

@@ -1,9 +0,0 @@
ActionDispatch::Callbacks.after do
# Reload the factories
return unless Rails.env.development? || Rails.env.test?
unless FactoryGirl.factories.blank? # first init will load factories, this should only run on subsequent reloads
FactoryGirl.factories.clear
FactoryGirl.find_definitions
end
end

4
config/routes.rb
View File

@@ -48,7 +48,9 @@ Growstuff::Application.routes.draw do
get 'crops/wrangle' => 'crops#wrangle', :as => 'wrangle_crops'
get 'crops/hierarchy' => 'crops#hierarchy', :as => 'crops_hierarchy'
get 'crops/search' => 'crops#search', :as => 'crops_search'
resources :crops
resources :crops do
get 'photos' => 'photos#index'
end
resources :comments
resources :roles

1414
package-lock.json generated Normal file
View File

File diff suppressed because it is too large Load Diff

2
spec/controllers/accounts_controller_spec.rb
View File

@@ -24,7 +24,7 @@ describe AccountsController do
# member; creating them manually will just cause errors as only one is
# allowed. This method has been left here in case it's useful in
# future.
member = FactoryGirl.create(:member)
member = FactoryBot.create(:member)
member.account
end
end

2
spec/controllers/admin/orders_controller_spec.rb
View File

@@ -17,7 +17,7 @@ describe Admin::OrdersController do
describe "GET search" do
it "assigns @orders" do
order = FactoryGirl.create(:order)
order = FactoryBot.create(:order)
get :search, search_by: 'order_id', search_text: order.id
assigns(:orders).should eq([order])
end

2
spec/controllers/admin_controller_spec.rb
View File

@@ -23,7 +23,7 @@ describe AdminController do
end
it 'assigns @members' do
m = FactoryGirl.create(:newsletter_recipient_member)
m = FactoryBot.create(:newsletter_recipient_member)
get :newsletter
assigns(:members).should eq [m]
end

4
spec/controllers/authentications_controller_spec.rb
View File

@@ -14,10 +14,10 @@ require 'rails_helper'
describe AuthenticationsController do
before(:each) do
@member = FactoryGirl.create(:member)
@member = FactoryBot.create(:member)
sign_in @member
controller.stub(:current_member) { @member }
@auth = FactoryGirl.create(:authentication, member: @member)
@auth = FactoryBot.create(:authentication, member: @member)
request.env['omniauth.auth'] = {
'provider' => 'foo',
'uid' => 'bar',

30
spec/controllers/comments_controller_spec.rb
View File

@@ -14,13 +14,13 @@ require 'rails_helper'
describe CommentsController do
before(:each) do
@member = FactoryGirl.create(:member)
@member = FactoryBot.create(:member)
sign_in @member
controller.stub(:current_member) { @member }
end
def valid_attributes
@post = FactoryGirl.create(:post)
@post = FactoryBot.create(:post)
{ post_id: @post.id, body: "some text" }
end
@@ -34,7 +34,7 @@ describe CommentsController do
end
describe "GET new" do
let(:post) { FactoryGirl.create(:post) }
let(:post) { FactoryBot.create(:post) }
describe "with valid params" do
before { get :new, post_id: post.id }
@@ -43,7 +43,7 @@ describe CommentsController do
assigns(:post).should eq(post)
end
let(:old_comment) { FactoryGirl.create(:comment, post: post) }
let(:old_comment) { FactoryBot.create(:comment, post: post) }
it "assigns the old comments as @comments" do
assigns(:comments).should eq [old_comment]
end
@@ -56,19 +56,19 @@ describe CommentsController do
end
describe "GET edit" do
let(:post) { FactoryGirl.create(:post) }
let(:post) { FactoryBot.create(:post) }
before { get :edit, id: comment.to_param }
describe "my comment" do
let!(:comment) { FactoryGirl.create :comment, author: @member, post: post }
let!(:old_comment) { FactoryGirl.create(:comment, post: post, created_at: Time.zone.yesterday) }
let!(:comment) { FactoryBot.create :comment, author: @member, post: post }
let!(:old_comment) { FactoryBot.create(:comment, post: post, created_at: Time.zone.yesterday) }
it "assigns previous comments as @comments" do
assigns(:comments).should eq([comment, old_comment])
end
end
describe "not my comment" do
let(:comment) { FactoryGirl.create :comment, post: post }
let(:comment) { FactoryBot.create :comment, post: post }
it { expect(response).not_to be_success }
end
end
@@ -77,20 +77,20 @@ describe CommentsController do
before { put :update, id: comment.to_param, comment: valid_attributes }
describe "my comment" do
let(:comment) { FactoryGirl.create :comment, author: @member }
let(:comment) { FactoryBot.create :comment, author: @member }
it "redirects to the comment's post" do
expect(response).to redirect_to(comment.post)
end
end
describe "not my comment" do
let(:comment) { FactoryGirl.create :comment }
let(:comment) { FactoryBot.create :comment }
it { expect(response).not_to be_success }
end
describe "attempting to change post_id" do
let(:post) { FactoryGirl.create :post, subject: 'our post' }
let(:other_post) { FactoryGirl.create :post, subject: 'the other post' }
let(:post) { FactoryBot.create :post, subject: 'our post' }
let(:other_post) { FactoryBot.create :post, subject: 'the other post' }
let(:valid_attributes) { { post_id: other_post.id, body: "kōrero" } }
let(:comment) { FactoryGirl.create :comment, author: @member, post: post }
let(:comment) { FactoryBot.create :comment, author: @member, post: post }
it "does not change post_id" do
comment.reload
expect(comment.post_id).to eq(post.id)
@@ -102,14 +102,14 @@ describe CommentsController do
before { delete :destroy, id: comment.to_param }
describe "my comment" do
let(:comment) { FactoryGirl.create :comment, author: @member }
let(:comment) { FactoryBot.create :comment, author: @member }
it "redirects to the post the comment was on" do
expect(response).to redirect_to(comment.post)
end
end
describe "not my comment" do
let(:comment) { FactoryGirl.create :comment }
let(:comment) { FactoryBot.create :comment }
it { expect(response).not_to be_success }
end
end

2
spec/controllers/gardens_controller_spec.rb
View File

@@ -53,7 +53,7 @@ RSpec.describe GardensController, type: :controller do
context "when signed in" do
before(:each) { sign_in member }
let!(:member) { FactoryGirl.create(:member) }
let!(:member) { FactoryBot.create(:member) }
describe "for another member's garden" do
let(:not_my_garden) { double('garden') }

26
spec/controllers/harvests_controller_spec.rb
View File

@@ -18,19 +18,19 @@ describe HarvestsController do
def valid_attributes
{
owner_id: subject.current_member.id,
crop_id: FactoryGirl.create(:crop).id,
plant_part_id: FactoryGirl.create(:plant_part).id
crop_id: FactoryBot.create(:crop).id,
plant_part_id: FactoryBot.create(:plant_part).id
}
end
describe "GET index" do
before do
@member1 = FactoryGirl.create(:member)
@member2 = FactoryGirl.create(:member)
@tomato = FactoryGirl.create(:tomato)
@maize = FactoryGirl.create(:maize)
@harvest1 = FactoryGirl.create(:harvest, owner_id: @member1.id, crop_id: @tomato.id)
@harvest2 = FactoryGirl.create(:harvest, owner_id: @member2.id, crop_id: @maize.id)
@member1 = FactoryBot.create(:member)
@member2 = FactoryBot.create(:member)
@tomato = FactoryBot.create(:tomato)
@maize = FactoryBot.create(:maize)
@harvest1 = FactoryBot.create(:harvest, owner_id: @member1.id, crop_id: @tomato.id)
@harvest2 = FactoryBot.create(:harvest, owner_id: @member2.id, crop_id: @maize.id)
end
it "assigns all harvests as @harvests" do
@@ -104,7 +104,7 @@ describe HarvestsController do
end
it "links to planting" do
planting = FactoryGirl.create(:planting, owner_id: member.id)
planting = FactoryBot.create(:planting, owner_id: member.id)
post :create, harvest: valid_attributes.merge(planting_id: planting.id)
expect(Harvest.last.planting.id).to eq(planting.id)
end
@@ -126,8 +126,8 @@ describe HarvestsController do
end
describe "not my planting" do
let(:not_my_planting) { FactoryGirl.create(:planting) }
let(:harvest) { FactoryGirl.create(:harvest) }
let(:not_my_planting) { FactoryBot.create(:planting) }
let(:harvest) { FactoryBot.create(:harvest) }
it "does not save planting_id" do
allow(Harvest).to receive(:new).and_return(harvest)
post :create, harvest: valid_attributes.merge(planting_id: not_my_planting.id)
@@ -178,8 +178,8 @@ describe HarvestsController do
end
describe "not my planting" do
let(:not_my_planting) { FactoryGirl.create(:planting) }
let(:harvest) { FactoryGirl.create(:harvest) }
let(:not_my_planting) { FactoryBot.create(:planting) }
let(:harvest) { FactoryBot.create(:harvest) }
it "does not save planting_id" do
put :update, id: harvest.to_param,
harvest: valid_attributes.merge(planting_id: not_my_planting.id)

12
spec/controllers/likes_controller_spec.rb
View File

@@ -1,10 +1,10 @@
require 'rails_helper'
describe LikesController do
let(:like) { FactoryGirl.create :like, member: member }
let(:member) { FactoryGirl.create(:member) }
let(:blogpost) { FactoryGirl.create(:post) }
let(:mypost) { FactoryGirl.create(:post, author: member) }
let(:like) { FactoryBot.create :like, member: member }
let(:member) { FactoryBot.create(:member) }
let(:blogpost) { FactoryBot.create(:post) }
let(:mypost) { FactoryBot.create(:post, author: member) }
before { sign_in member }
@@ -20,7 +20,7 @@ describe LikesController do
end
describe "Liking your own post" do
let(:blogpost) { FactoryGirl.create(:post, author: member) }
let(:blogpost) { FactoryBot.create(:post, author: member) }
end
end
@@ -34,7 +34,7 @@ describe LikesController do
end
describe "Deleting someone else's like" do
let(:like) { FactoryGirl.create :like }
let(:like) { FactoryBot.create :like }
it { expect(response.code).to eq('403') }
it { JSON.parse(response.body)["error"] == "Unable to like" }
end

10
spec/controllers/member_controller_spec.rb
View File

@@ -14,10 +14,10 @@ require 'rails_helper'
describe MembersController do
before :each do
@member = FactoryGirl.create(:member)
@posts = [FactoryGirl.create(:post, author: @member)]
@twitter_auth = FactoryGirl.create(:authentication, member: @member)
@flickr_auth = FactoryGirl.create(:flickr_authentication, member: @member)
@member = FactoryBot.create(:member)
@posts = [FactoryBot.create(:post, author: @member)]
@twitter_auth = FactoryBot.create(:authentication, member: @member)
@flickr_auth = FactoryBot.create(:flickr_authentication, member: @member)
end
describe "GET index" do
@@ -60,7 +60,7 @@ describe MembersController do
end
it "doesn't show unconfirmed members" do
@member2 = FactoryGirl.create(:unconfirmed_member)
@member2 = FactoryBot.create(:unconfirmed_member)
lambda { get :show, id: @member2.id }.should raise_error(ActiveRecord::RecordNotFound)
end
end

18
spec/controllers/notifications_controller_spec.rb
View File

@@ -18,7 +18,7 @@ describe NotificationsController do
def valid_attributes
{
"recipient_id" => subject.current_member.id,
"sender_id" => FactoryGirl.create(:member).id,
"sender_id" => FactoryBot.create(:member).id,
"subject" => 'test'
}
end
@@ -31,7 +31,7 @@ describe NotificationsController do
def valid_attributes_for_sender
{
"sender_id" => subject.current_member.id,
"recipient_id" => FactoryGirl.create(:member).id,
"recipient_id" => FactoryBot.create(:member).id,
"subject" => 'test'
}
end
@@ -42,7 +42,7 @@ describe NotificationsController do
describe "GET index" do
it "assigns all notifications as @notifications" do
notification = FactoryGirl.create(:notification, recipient_id: subject.current_member.id)
notification = FactoryBot.create(:notification, recipient_id: subject.current_member.id)
get :index, {}
assigns(:notifications).should eq([notification])
end
@@ -50,13 +50,13 @@ describe NotificationsController do
describe "GET show" do
it "assigns the requested notification as @notification" do
notification = FactoryGirl.create(:notification, recipient_id: subject.current_member.id)
notification = FactoryBot.create(:notification, recipient_id: subject.current_member.id)
get :show, id: notification.to_param
assigns(:notification).should eq(notification)
end
it "assigns the reply link for a post comment" do
notification = FactoryGirl.create(:notification, recipient_id: subject.current_member.id)
notification = FactoryBot.create(:notification, recipient_id: subject.current_member.id)
get :show, id: notification.to_param
assigns(:reply_link).should_not be_nil
@@ -66,7 +66,7 @@ describe NotificationsController do
end
it "marks notifications as read" do
notification = FactoryGirl.create(:notification, recipient_id: subject.current_member.id)
notification = FactoryBot.create(:notification, recipient_id: subject.current_member.id)
get :show, id: notification.to_param
# we need to fetch it from the db again, can't test against the old one
n = Notification.find(notification.id)
@@ -76,7 +76,7 @@ describe NotificationsController do
describe "GET reply" do
it "marks notifications as read" do
notification = FactoryGirl.create(:notification, recipient_id: subject.current_member.id)
notification = FactoryBot.create(:notification, recipient_id: subject.current_member.id)
get :reply, id: notification.to_param
# we need to fetch it from the db again, can't test against the old one
n = Notification.find(notification.id)
@@ -86,7 +86,7 @@ describe NotificationsController do
describe "GET new" do
it "assigns a recipient" do
@recipient = FactoryGirl.create(:member)
@recipient = FactoryBot.create(:member)
get :new, recipient_id: @recipient.id
assigns(:recipient).should be_an_instance_of(Member)
end
@@ -95,7 +95,7 @@ describe NotificationsController do
describe "POST create" do
describe "with valid params" do
it "redirects to the recipient's profile" do
@recipient = FactoryGirl.create(:member)
@recipient = FactoryBot.create(:member)
post :create, notification: { recipient_id: @recipient.id, subject: 'foo' }
response.should redirect_to(notifications_path)
end

18
spec/controllers/order_items_controller_spec.rb
View File

@@ -16,11 +16,11 @@ describe OrderItemsController do
login_member(:admin_member)
before(:each) do
@member = FactoryGirl.create(:member)
@member = FactoryBot.create(:member)
sign_in @member
@product = FactoryGirl.create(:product)
@order = FactoryGirl.create(:order, member: @member)
@order_item = FactoryGirl.create(:order_item,
@product = FactoryBot.create(:product)
@order = FactoryBot.create(:order, member: @member)
@order_item = FactoryBot.create(:order_item,
order: @order,
product: @product,
price: @product.min_price)
@@ -28,7 +28,7 @@ describe OrderItemsController do
describe "POST create" do
it "redirects to order" do
@order = FactoryGirl.create(:order, member: @member)
@order = FactoryBot.create(:order, member: @member)
post :create, order_item: {
order_id: @order.id,
product_id: @product.id,
@@ -38,9 +38,9 @@ describe OrderItemsController do
end
it 'creates an order for you' do
@member = FactoryGirl.create(:member)
@member = FactoryBot.create(:member)
sign_in @member
@product = FactoryGirl.create(:product)
@product = FactoryBot.create(:product)
expect {
post :create, order_item: {
product_id: @product.id,
@@ -52,8 +52,8 @@ describe OrderItemsController do
describe "with non-int price" do
it "converts 3.33 to 333 cents" do
@order = FactoryGirl.create(:order, member: @member)
@product = FactoryGirl.create(:product, min_price: 1)
@order = FactoryBot.create(:order, member: @member)
@product = FactoryBot.create(:product, min_price: 1)
expect {
post :create, order_item: {
order_id: @order.id,

8
spec/controllers/orders_controller_spec.rb
View File

@@ -25,7 +25,7 @@ describe OrdersController do
describe "GET checkout" do
it 'sets the referral_code' do
member = FactoryGirl.create(:member)
member = FactoryBot.create(:member)
sign_in member
order = Order.create!(member_id: member.id)
get :checkout, id: order.to_param, referral_code: 'FOOBAR'
@@ -34,7 +34,7 @@ describe OrdersController do
end
it "redirects to Paypal" do
member = FactoryGirl.create(:member)
member = FactoryBot.create(:member)
sign_in member
order = Order.create!(member_id: member.id)
get :checkout, id: order.to_param
@@ -45,7 +45,7 @@ describe OrdersController do
describe "GET complete" do
it "assigns the requested order as @order" do
member = FactoryGirl.create(:member)
member = FactoryBot.create(:member)
sign_in member
order = Order.create!(member_id: member.id)
get :complete, id: order.to_param
@@ -55,7 +55,7 @@ describe OrdersController do
describe "DELETE destroy" do
it "redirects to the shop" do
member = FactoryGirl.create(:member)
member = FactoryBot.create(:member)
sign_in member
order = Order.create!(member_id: member.id)
delete :destroy, id: order.id

8
spec/controllers/photo_associations_controller_spec.rb
View File

@@ -15,8 +15,8 @@ describe PhotoAssociationsController do
before { photo.harvests << harvest }
describe "my harvest my photo" do
let(:harvest) { FactoryGirl.create :harvest, owner: member }
let(:photo) { FactoryGirl.create :photo, owner: member }
let(:harvest) { FactoryBot.create :harvest, owner: member }
let(:photo) { FactoryBot.create :photo, owner: member }
it "removes link" do
expect { delete :destroy, valid_params }.to change { photo.harvests.count }.by(-1)
@@ -24,8 +24,8 @@ describe PhotoAssociationsController do
end
describe "another member's harvest from another member's photo" do
let(:harvest) { FactoryGirl.create :harvest }
let(:photo) { FactoryGirl.create :photo }
let(:harvest) { FactoryBot.create :harvest }
let(:photo) { FactoryBot.create :photo }
it do
expect do
begin

28
spec/controllers/photos_controller_spec.rb
View File

@@ -17,7 +17,7 @@ describe PhotosController do
login_member
def valid_attributes
member = FactoryGirl.create(:member)
member = FactoryBot.create(:member)
{
"owner_id" => member.id,
"flickr_photo_id" => 1,
@@ -35,7 +35,7 @@ describe PhotosController do
describe "GET new" do
before(:each) do
@member = FactoryGirl.create(:member)
@member = FactoryBot.create(:member)
sign_in @member
@member.stub(:flickr_photos) { [[], 0] }
@member.stub(:flickr_sets) { { "foo" => "bar" } }
@@ -43,7 +43,7 @@ describe PhotosController do
end
it "assigns the flickr auth as @flickr_auth" do
@auth = FactoryGirl.create(:flickr_authentication, member: @member)
@auth = FactoryBot.create(:flickr_authentication, member: @member)
get :new, {}
assigns(:flickr_auth).should be_an_instance_of(Authentication)
end
@@ -86,11 +86,11 @@ describe PhotosController do
link_url: "http://example.com")
end
let(:member) { FactoryGirl.create(:member) }
let(:garden) { FactoryGirl.create(:garden, owner: member) }
let(:planting) { FactoryGirl.create(:planting, garden: garden, owner: member) }
let(:harvest) { FactoryGirl.create(:harvest, owner: member) }
let(:photo) { FactoryGirl.create(:photo, owner: member) }
let(:member) { FactoryBot.create(:member) }
let(:garden) { FactoryBot.create(:garden, owner: member) }
let(:planting) { FactoryBot.create(:planting, garden: garden, owner: member) }
let(:harvest) { FactoryBot.create(:harvest, owner: member) }
let(:photo) { FactoryBot.create(:photo, owner: member) }
describe "with valid params" do
before { controller.stub(:current_member) { member } }
it "attaches the photo to a planting" do
@@ -120,7 +120,7 @@ describe PhotosController do
end
it "doesn't attach photo to a comment" do
comment = FactoryGirl.create(:comment)
comment = FactoryBot.create(:comment)
post :create, photo: { flickr_photo_id: photo.flickr_photo_id }, type: "comment", id: comment.id
expect(flash[:alert]).to be_present
end
@@ -140,8 +140,8 @@ describe PhotosController do
describe "with matching owners" do
before { controller.stub(:current_member) { member } }
it "creates the planting/photo link" do
planting = FactoryGirl.create(:planting, garden: garden, owner: member)
photo = FactoryGirl.create(:photo, owner: member)
planting = FactoryBot.create(:planting, garden: garden, owner: member)
photo = FactoryBot.create(:photo, owner: member)
post :create, photo: { flickr_photo_id: photo.flickr_photo_id }, type: "planting", id: planting.id
expect(flash[:alert]).not_to be_present
Photo.last.plantings.first.should eq planting
@@ -155,10 +155,10 @@ describe PhotosController do
end
describe "with mismatched owners" do
let(:photo) { FactoryGirl.create(:photo) }
let(:photo) { FactoryBot.create(:photo) }
it "does not create the planting/photo link" do
# members will be auto-created, and different
another_planting = FactoryGirl.create(:planting)
another_planting = FactoryBot.create(:planting)
post :create, photo: { flickr_photo_id: photo.flickr_photo_id }, type: "planting", id: another_planting.id
expect(flash[:alert]).to be_present
Photo.last.plantings.first.should_not eq another_planting
@@ -166,7 +166,7 @@ describe PhotosController do
it "does not create the harvest/photo link" do
# members will be auto-created, and different
another_harvest = FactoryGirl.create(:harvest)
another_harvest = FactoryBot.create(:harvest)
post :create, photo: { flickr_photo_id: photo.flickr_photo_id }, type: "harvest", id: another_harvest.id
expect(flash[:alert]).to be_present
Photo.last.harvests.first.should_not eq another_harvest

4
spec/controllers/places_controller_spec.rb
View File

@@ -19,8 +19,8 @@ describe PlacesController do
describe "GET show" do
before(:each) do
@member_london = FactoryGirl.create(:london_member)
@member_south_pole = FactoryGirl.create(:south_pole_member)
@member_london = FactoryBot.create(:london_member)
@member_south_pole = FactoryBot.create(:south_pole_member)
end
it "assigns place name" do

32
spec/controllers/plantings_controller_spec.rb
View File

@@ -17,19 +17,19 @@ describe PlantingsController do
def valid_attributes
{
garden_id: FactoryGirl.create(:garden, owner: subject.current_member).id,
crop_id: FactoryGirl.create(:crop).id
garden_id: FactoryBot.create(:garden, owner: subject.current_member).id,
crop_id: FactoryBot.create(:crop).id
}
end
describe "GET index" do
before do
@member1 = FactoryGirl.create(:member)
@member2 = FactoryGirl.create(:member)
@tomato = FactoryGirl.create(:tomato)
@maize = FactoryGirl.create(:maize)
@planting1 = FactoryGirl.create(:planting, crop: @tomato, owner: @member1)
@planting2 = FactoryGirl.create(:planting, crop: @maize, owner: @member2)
@member1 = FactoryBot.create(:member)
@member2 = FactoryBot.create(:member)
@tomato = FactoryBot.create(:tomato)
@maize = FactoryBot.create(:maize)
@planting1 = FactoryBot.create(:planting, crop: @tomato, owner: @member1)
@planting2 = FactoryBot.create(:planting, crop: @maize, owner: @member2)
end
it "assigns all plantings as @plantings" do
@@ -52,7 +52,7 @@ describe PlantingsController do
describe "GET new" do
it "picks up crop from params" do
crop = FactoryGirl.create(:crop)
crop = FactoryBot.create(:crop)
get :new, crop_id: crop.id
assigns(:crop).should eq(crop)
end
@@ -63,28 +63,28 @@ describe PlantingsController do
end
it "picks up member's garden from params" do
garden = FactoryGirl.create(:garden, owner: member)
garden = FactoryBot.create(:garden, owner: member)
get :new, garden_id: garden.id
assigns(:garden).should eq(garden)
end
it "Doesn't display another member's garden on planting form" do
member = FactoryGirl.create(:member) # over-riding member from login_member()
garden = FactoryGirl.create(:garden, owner: member)
member = FactoryBot.create(:member) # over-riding member from login_member()
garden = FactoryBot.create(:garden, owner: member)
get :new, garden_id: garden.id
assigns(:garden).should_not eq(garden)
end
it "Doesn't display un-approved crops on planting form" do
crop = FactoryGirl.create(:crop, approval_status: 'pending')
FactoryGirl.create(:garden, owner: member)
crop = FactoryBot.create(:crop, approval_status: 'pending')
FactoryBot.create(:garden, owner: member)
get :new, crop_id: crop.id
assigns(:crop).should_not eq(crop)
end
it "Doesn't display rejected crops on planting form" do
crop = FactoryGirl.create(:crop, approval_status: 'rejected', reason_for_rejection: 'nope')
FactoryGirl.create(:garden, owner: member)
crop = FactoryBot.create(:crop, approval_status: 'rejected', reason_for_rejection: 'nope')
FactoryBot.create(:garden, owner: member)
get :new, crop_id: crop.id
assigns(:crop).should_not eq(crop)
end

2
spec/controllers/posts_controller_spec.rb
View File

@@ -16,7 +16,7 @@ describe PostsController do
login_member
def valid_attributes
member = FactoryGirl.create(:member)
member = FactoryBot.create(:member)
{ author_id: member.id, subject: "blah", body: "blah blah" }
end

6
spec/controllers/registrations_controller_spec.rb
View File

@@ -14,7 +14,7 @@ require 'rails_helper'
describe RegistrationsController do
before :each do
@member = FactoryGirl.create(:member)
@member = FactoryBot.create(:member)
sign_in @member
controller.stub(:current_user) { @member }
controller.stub(:devise_mapping).and_return(Devise.mappings[:member])
@@ -27,13 +27,13 @@ describe RegistrationsController do
end
it "picks up the twitter auth" do
@auth = FactoryGirl.create(:authentication, member: @member)
@auth = FactoryBot.create(:authentication, member: @member)
get :edit
assigns(:twitter_auth).should eq @auth
end
it "picks up the flickr auth" do
@auth = FactoryGirl.create(:flickr_authentication, member: @member)
@auth = FactoryBot.create(:flickr_authentication, member: @member)
get :edit
assigns(:flickr_auth).should eq @auth
end

2
spec/controllers/scientific_names_controller_spec.rb
View File

@@ -16,7 +16,7 @@ describe ScientificNamesController do
login_member(:crop_wrangling_member)
before(:each) do
@crop = FactoryGirl.create(:tomato)
@crop = FactoryBot.create(:tomato)
end
def valid_attributes

2
spec/controllers/seeds_controller_spec.rb
View File

@@ -15,7 +15,7 @@ require 'rails_helper'
describe SeedsController do
describe "GET index" do
it "picks up owner from params" do
owner = FactoryGirl.create(:member)
owner = FactoryBot.create(:member)
get :index, owner: owner.slug
assigns(:owner).should eq(owner)
end

8
spec/controllers/shop_controller_spec.rb
View File

@@ -14,8 +14,8 @@ require 'rails_helper'
describe ShopController do
before :each do
@product1 = FactoryGirl.create(:product)
@product2 = FactoryGirl.create(:product)
@product1 = FactoryBot.create(:product)
@product2 = FactoryBot.create(:product)
end
describe "GET index" do
@@ -35,9 +35,9 @@ describe ShopController do
end
it "assigns @order as current_order if there is one" do
@member = FactoryGirl.create(:member)
@member = FactoryBot.create(:member)
sign_in @member
@order = FactoryGirl.create(:order, member: @member)
@order = FactoryBot.create(:order, member: @member)
get :index, {}
assigns(:order).should eq @order
end

4
spec/factories/account_types.rb
View File

@@ -1,6 +1,6 @@
# Read about factories at https://github.com/thoughtbot/factory_girl
# Read about factories at https://github.com/thoughtbot/factory_bot
FactoryGirl.define do
FactoryBot.define do
factory :account_type do
name "Free"
is_paid false

4
spec/factories/accounts.rb
View File

@@ -1,6 +1,6 @@
# Read about factories at https://github.com/thoughtbot/factory_girl
# Read about factories at https://github.com/thoughtbot/factory_bot
FactoryGirl.define do
FactoryBot.define do
# never do this directly.
# create a member then look at member.account_detail instead.
# (because it's auto-created, and there can only be one.)

4
spec/factories/alternate_names.rb
View File

@@ -1,6 +1,6 @@
# Read about factories at https://github.com/thoughtbot/factory_girl
# Read about factories at https://github.com/thoughtbot/factory_bot
FactoryGirl.define do
FactoryBot.define do
factory :alternate_name do
name "alternate name"
crop

4
spec/factories/authentications.rb
View File

@@ -1,6 +1,6 @@
# Read about factories at https://github.com/thoughtbot/factory_girl
# Read about factories at https://github.com/thoughtbot/factory_bot
FactoryGirl.define do
FactoryBot.define do
factory :authentication do
member
provider 'twitter'

2
spec/factories/comments.rb
View File

@@ -1,4 +1,4 @@
FactoryGirl.define do
FactoryBot.define do
factory :comment do
post
author

2
spec/factories/crop.rb
View File

@@ -1,4 +1,4 @@
FactoryGirl.define do
FactoryBot.define do
factory :crop do
name "magic bean"
en_wikipedia_url "http://en.wikipedia.org/wiki/Magic_bean"

2
spec/factories/follows.rb
View File

@@ -1,4 +1,4 @@
FactoryGirl.define do
FactoryBot.define do
factory :follow do
follower
followed

4
spec/factories/forums.rb
View File

@@ -1,6 +1,6 @@
# Read about factories at https://github.com/thoughtbot/factory_girl
# Read about factories at https://github.com/thoughtbot/factory_bot
FactoryGirl.define do
FactoryBot.define do
factory :forum do
name "Permaculture"
description "*Everything* about permaculture!"

2
spec/factories/garden.rb
View File

@@ -1,4 +1,4 @@
FactoryGirl.define do
FactoryBot.define do
factory :garden do
name 'Springfield Community Garden'
description "This is a **totally** cool garden"

4
spec/factories/harvests.rb
View File

@@ -1,6 +1,6 @@
# Read about factories at https://github.com/thoughtbot/factory_girl
# Read about factories at https://github.com/thoughtbot/factory_bot
FactoryGirl.define do
FactoryBot.define do
factory :harvest do
crop
plant_part

2
spec/factories/like.rb
View File

@@ -1,4 +1,4 @@
FactoryGirl.define do
FactoryBot.define do
factory :like do
member
association :likeable, factory: "post"

6
spec/factories/member.rb
View File

@@ -1,4 +1,4 @@
FactoryGirl.define do
FactoryBot.define do
sequence(:email) { |n| "member#{n}@example.com" }
sequence(:login_name) { |n| "member#{n}" }
@@ -60,11 +60,11 @@ FactoryGirl.define do
end
factory :admin_member do
roles { [FactoryGirl.create(:admin)] }
roles { [FactoryBot.create(:admin)] }
end
factory :crop_wrangling_member do
roles { [FactoryGirl.create(:crop_wrangler)] }
roles { [FactoryBot.create(:crop_wrangler)] }
sequence(:login_name) { |n| "wrangler#{n}" }
end

6
spec/factories/notifications.rb
View File

@@ -1,6 +1,6 @@
# Read about factories at https://github.com/thoughtbot/factory_girl
# Read about factories at https://github.com/thoughtbot/factory_bot
FactoryGirl.define do
FactoryBot.define do
factory :notification, aliases: [:message] do
sender
recipient
@@ -10,7 +10,7 @@ FactoryGirl.define do
post
factory :no_email_notification do
recipient { FactoryGirl.create(:no_email_notifications_member) }
recipient { FactoryBot.create(:no_email_notifications_member) }
end
end
end

4
spec/factories/order_items.rb
View File

@@ -1,6 +1,6 @@
# Read about factories at https://github.com/thoughtbot/factory_girl
# Read about factories at https://github.com/thoughtbot/factory_bot
FactoryGirl.define do
FactoryBot.define do
factory :order_item do
order
product

4
spec/factories/orders.rb
View File

@@ -1,6 +1,6 @@
# Read about factories at https://github.com/thoughtbot/factory_girl
# Read about factories at https://github.com/thoughtbot/factory_bot
FactoryGirl.define do
FactoryBot.define do
factory :order do
member
factory :completed_order do

4
spec/factories/photos.rb
View File

@@ -1,6 +1,6 @@
# Read about factories at https://github.com/thoughtbot/factory_girl
# Read about factories at https://github.com/thoughtbot/factory_bot
FactoryGirl.define do
FactoryBot.define do
factory :photo do
owner
flickr_photo_id 1

4
spec/factories/plant_parts.rb
View File

@@ -1,6 +1,6 @@
# Read about factories at https://github.com/thoughtbot/factory_girl
# Read about factories at https://github.com/thoughtbot/factory_bot
FactoryGirl.define do
FactoryBot.define do
factory :plant_part do
name "pollen"
end

2
spec/factories/planting.rb
View File

@@ -1,4 +1,4 @@
FactoryGirl.define do
FactoryBot.define do
factory :planting do
garden
owner

2
spec/factories/post.rb
View File

@@ -1,4 +1,4 @@
FactoryGirl.define do
FactoryBot.define do
factory :post do
subject "A Post"
body "This is some text."

4
spec/factories/products.rb
View File

@@ -1,6 +1,6 @@
# Read about factories at https://github.com/thoughtbot/factory_girl
# Read about factories at https://github.com/thoughtbot/factory_bot
FactoryGirl.define do
FactoryBot.define do
factory :product do
name "annual subscription"
description "paid membership, renewing yearly, *hurrah*"

4
spec/factories/roles.rb
View File

@@ -1,6 +1,6 @@
# Read about factories at https://github.com/thoughtbot/factory_girl
# Read about factories at https://github.com/thoughtbot/factory_bot
FactoryGirl.define do
FactoryBot.define do
factory :role do
name "Moderator"
description "These people moderate the forums"

2
spec/factories/scientific_name.rb
View File

@@ -1,4 +1,4 @@
FactoryGirl.define do
FactoryBot.define do
factory :scientific_name do
association :crop, factory: :crop
name "Beanus Magicus"

4
spec/factories/seeds.rb
View File

@@ -1,6 +1,6 @@
# Read about factories at https://github.com/thoughtbot/factory_girl
# Read about factories at https://github.com/thoughtbot/factory_bot
FactoryGirl.define do
FactoryBot.define do
factory :seed do
owner
crop

53
spec/features/crops/crop_photos_spec.rb Normal file
View File

@@ -0,0 +1,53 @@
require 'rails_helper'
feature "crop detail page", js: true do
let(:member) { create :member }
let(:crop) { create :crop, plantings: [planting], harvests: [harvest] }
let(:planting) { create :planting, owner: member, photos: [photo1, photo2] }
let(:harvest) { create :harvest, owner: member, photos: [photo3, photo4] }
let(:photo1) do
create(:photo, owner: member, title: 'photo 1',
fullsize_url: 'photo1.jpg', thumbnail_url: 'thumb1.jpg')
end
let(:photo2) do
create(:photo, owner: member, title: 'photo 2',
fullsize_url: 'photo2.jpg', thumbnail_url: 'thumb2.jpg')
end
let(:photo3) do
create(:photo, owner: member, title: 'photo 3',
fullsize_url: 'photo3.jpg', thumbnail_url: 'thumb3.jpg')
end
let(:photo4) do
create(:photo, owner: member, title: 'photo 4',
fullsize_url: 'photo4.jpg', thumbnail_url: 'thumb4.jpg')
end
before { visit crop_path(crop) }
subject { page }
shared_examples "shows photos" do
describe "show planting photos" do
it { is_expected.to have_xpath("//img[contains(@src,'#{photo1.thumbnail_url}')]") }
it { is_expected.to have_xpath("//img[contains(@src,'#{photo2.thumbnail_url}')]") }
end
describe "show harvest photos" do
it { is_expected.to have_xpath("//img[contains(@src,'#{photo3.thumbnail_url}')]") }
it { is_expected.to have_xpath("//img[contains(@src,'#{photo4.thumbnail_url}')]") }
end
describe "link to more photos" do
it { is_expected.to have_link "more photos" }
end
end
context "when signed in" do
background { login_as(create(:member)) }
include_examples "shows photos"
end
context "when signed in as photos owner" do
background { login_as(member) }
include_examples "shows photos"
end
context "when not signed in " do
include_examples "shows photos"
end
end

2
spec/features/gardens/adding_gardens_spec.rb
View File

@@ -2,7 +2,7 @@ require 'rails_helper'
require 'custom_matchers'
feature "Gardens", :js do
let(:member) { FactoryGirl.create :member }
let(:member) { FactoryBot.create :member }
background do
login_as member

6
spec/features/likeable_spec.rb
View File

@@ -1,9 +1,9 @@
require 'rails_helper'
feature 'Likeable', js: true do
let(:member) { FactoryGirl.create(:member) }
let(:another_member) { FactoryGirl.create(:london_member) }
let(:post) { FactoryGirl.create(:post) }
let(:member) { FactoryBot.create(:member) }
let(:another_member) { FactoryBot.create(:london_member) }
let(:post) { FactoryBot.create(:post) }
context 'logged in member' do
background do

38
spec/features/members/deletion_spec.rb
View File

@@ -2,16 +2,16 @@ require 'rails_helper'
feature "member deletion" do
context "with activity and followers" do
let(:member) { FactoryGirl.create(:member) }
let(:other_member) { FactoryGirl.create(:member) }
let(:memberpost) { FactoryGirl.create(:post, author: member) }
let(:othermemberpost) { FactoryGirl.create(:post, author: other_member) }
let!(:planting) { FactoryGirl.create(:planting, owner: member) }
let!(:harvest) { FactoryGirl.create(:harvest, owner: member) }
let!(:seed) { FactoryGirl.create(:seed, owner: member) }
let!(:secondgarden) { FactoryGirl.create(:garden, owner: member) }
let!(:order) { FactoryGirl.create(:order, member: member, completed_at: Time.zone.now) }
let(:admin) { FactoryGirl.create(:admin_member) }
let(:member) { FactoryBot.create(:member) }
let(:other_member) { FactoryBot.create(:member) }
let(:memberpost) { FactoryBot.create(:post, author: member) }
let(:othermemberpost) { FactoryBot.create(:post, author: other_member) }
let!(:planting) { FactoryBot.create(:planting, owner: member) }
let!(:harvest) { FactoryBot.create(:harvest, owner: member) }
let!(:seed) { FactoryBot.create(:seed, owner: member) }
let!(:secondgarden) { FactoryBot.create(:garden, owner: member) }
let!(:order) { FactoryBot.create(:order, member: member, completed_at: Time.zone.now) }
let(:admin) { FactoryBot.create(:admin_member) }
background do
login_as(member)
visit member_path(other_member)
@@ -22,12 +22,12 @@ feature "member deletion" do
click_link 'Follow'
logout
login_as(member)
FactoryGirl.create(:comment, author: member, post: othermemberpost)
FactoryGirl.create(:comment, author: other_member, post: memberpost, body: "Fun comment-y thing")
FactoryBot.create(:comment, author: member, post: othermemberpost)
FactoryBot.create(:comment, author: other_member, post: memberpost, body: "Fun comment-y thing")
# deletion breaks if no wranglers exist
FactoryGirl.create(:cropbot)
FactoryBot.create(:cropbot)
# deletion breaks if ex_member doesn't exist
FactoryGirl.create(:member, login_name: "ex_member")
FactoryBot.create(:member, login_name: "ex_member")
end
scenario "has option to delete on member profile page" do
@@ -143,11 +143,11 @@ feature "member deletion" do
end
context "for a crop wrangler" do
let(:member) { FactoryGirl.create(:crop_wrangling_member) }
let(:otherwrangler) { FactoryGirl.create(:crop_wrangling_member) }
let(:crop) { FactoryGirl.create(:crop, creator: member) }
FactoryGirl.create(:cropbot)
let!(:ex_wrangler) { FactoryGirl.create(:crop_wrangling_member, login_name: "ex_wrangler") }
let(:member) { FactoryBot.create(:crop_wrangling_member) }
let(:otherwrangler) { FactoryBot.create(:crop_wrangling_member) }
let(:crop) { FactoryBot.create(:crop, creator: member) }
FactoryBot.create(:cropbot)
let!(:ex_wrangler) { FactoryBot.create(:crop_wrangling_member, login_name: "ex_wrangler") }
scenario "leaves crops behind" do
login_as(otherwrangler)

2
spec/features/notifications_spec.rb
View File

@@ -31,7 +31,7 @@ feature "Notifications", :js do
describe 'pagination' do
before do
34.times { FactoryGirl.create :notification, recipient: recipient }
34.times { FactoryBot.create :notification, recipient: recipient }
login_as recipient
visit notifications_path
end

4
spec/helpers/application_helper_spec.rb
View File

@@ -23,7 +23,7 @@ describe ApplicationHelper do
describe '#avatar_uri' do
context 'with a normal user' do
before :each do
@member = FactoryGirl.build(:member, email: 'example@example.com', preferred_avatar_uri: nil)
@member = FactoryBot.build(:member, email: 'example@example.com', preferred_avatar_uri: nil)
end
it 'should render a gravatar uri' do
expect(avatar_uri(@member)).to eq 'http://www.gravatar.com/avatar/23463b99b62a72f26ed677cc556c44e8?size=150&default=identicon'
@@ -36,7 +36,7 @@ describe ApplicationHelper do
context 'with a user who specified a preferred avatar uri' do
before :each do
@member = FactoryGirl.build(:member, email: 'example@example.com', preferred_avatar_uri: 'http://media.catmoji.com/post/ujg/cat-in-hat.jpg')
@member = FactoryBot.build(:member, email: 'example@example.com', preferred_avatar_uri: 'http://media.catmoji.com/post/ujg/cat-in-hat.jpg')
end
it 'should render a the specified uri' do
expect(avatar_uri(@member)).to eq 'http://media.catmoji.com/post/ujg/cat-in-hat.jpg'

32
spec/helpers/gardens_helper_spec.rb
View File

@@ -3,28 +3,28 @@ require 'rails_helper'
describe GardensHelper do
describe "garden description" do
it "is missing" do
garden = FactoryGirl.create(:garden,
garden = FactoryBot.create(:garden,
description: nil)
result = helper.display_garden_description(garden)
expect(result).to eq "no description provided."
end
it "is less than 130 characters long" do
garden = FactoryGirl.create(:garden,
garden = FactoryBot.create(:garden,
description: 'a' * 20)
result = helper.display_garden_description(garden)
expect(result).to eq 'a' * 20
end
it "is 130 characters long" do
garden = FactoryGirl.create(:garden,
garden = FactoryBot.create(:garden,
description: 'a' * 130)
result = helper.display_garden_description(garden)
expect(result).to eq 'a' * 130
end
it "is more than 130 characters long" do
garden = FactoryGirl.create(:garden,
garden = FactoryBot.create(:garden,
description: 'a' * 140)
result = helper.display_garden_description(garden)
expect(result).to eq 'a' * 126 + '...' + ' ' + link_to("Read more", garden_path(garden))
@@ -38,8 +38,8 @@ describe GardensHelper do
end
it "has 1 planting" do
crop = FactoryGirl.create(:crop)
plantings = [FactoryGirl.create(:planting, quantity: 10, crop: crop)]
crop = FactoryBot.create(:crop)
plantings = [FactoryBot.create(:planting, quantity: 10, crop: crop)]
result = helper.display_garden_plantings(plantings)
output = '<ul class="plantings"><li>'
@@ -52,11 +52,11 @@ describe GardensHelper do
it "has 2 plantings" do
plantings = []
crop1 = FactoryGirl.create(:crop)
plantings << FactoryGirl.create(:planting, quantity: 10, crop: crop1)
crop1 = FactoryBot.create(:crop)
plantings << FactoryBot.create(:planting, quantity: 10, crop: crop1)
crop2 = FactoryGirl.create(:crop)
plantings << FactoryGirl.create(:planting, quantity: 10, crop: crop2)
crop2 = FactoryBot.create(:crop)
plantings << FactoryBot.create(:planting, quantity: 10, crop: crop2)
result = helper.display_garden_plantings(plantings.first(2))
@@ -74,14 +74,14 @@ describe GardensHelper do
it "has 3 plantings" do
plantings = []
crop1 = FactoryGirl.create(:crop)
plantings << FactoryGirl.create(:planting, quantity: 10, crop: crop1)
crop1 = FactoryBot.create(:crop)
plantings << FactoryBot.create(:planting, quantity: 10, crop: crop1)
crop2 = FactoryGirl.create(:crop)
plantings << FactoryGirl.create(:planting, quantity: 10, crop: crop2)
crop2 = FactoryBot.create(:crop)
plantings << FactoryBot.create(:planting, quantity: 10, crop: crop2)
crop3 = FactoryGirl.create(:crop)
plantings << FactoryGirl.create(:planting, quantity: 10, crop: crop3)
crop3 = FactoryBot.create(:crop)
plantings << FactoryBot.create(:planting, quantity: 10, crop: crop3)
result = helper.display_garden_plantings(plantings.first(2))

14
spec/helpers/harvests_helper_spec.rb
View File

@@ -3,7 +3,7 @@ require 'rails_helper'
describe HarvestsHelper do
describe "display_quantity" do
it "blank" do
harvest = FactoryGirl.create(:harvest,
harvest = FactoryBot.create(:harvest,
quantity: nil,
weight_quantity: nil)
result = helper.display_quantity(harvest)
@@ -11,7 +11,7 @@ describe HarvestsHelper do
end
it '3 individual' do
harvest = FactoryGirl.create(:harvest,
harvest = FactoryBot.create(:harvest,
quantity: 3,
unit: 'individual',
weight_quantity: nil)
@@ -20,7 +20,7 @@ describe HarvestsHelper do
end
it '1 bunch' do
harvest = FactoryGirl.create(:harvest,
harvest = FactoryBot.create(:harvest,
quantity: 1,
unit: 'bunch',
weight_quantity: nil)
@@ -29,7 +29,7 @@ describe HarvestsHelper do
end
it '3 bunches' do
harvest = FactoryGirl.create(:harvest,
harvest = FactoryBot.create(:harvest,
quantity: 3,
unit: 'bunch',
weight_quantity: nil)
@@ -38,7 +38,7 @@ describe HarvestsHelper do
end
it '3 kg' do
harvest = FactoryGirl.create(:harvest,
harvest = FactoryBot.create(:harvest,
quantity: nil,
unit: nil,
weight_quantity: 3,
@@ -48,7 +48,7 @@ describe HarvestsHelper do
end
it '3 individual weighing 3 kg' do
harvest = FactoryGirl.create(:harvest,
harvest = FactoryBot.create(:harvest,
quantity: 3,
unit: 'individual',
weight_quantity: 3,
@@ -58,7 +58,7 @@ describe HarvestsHelper do
end
it '3 bunches weighing 3 kg' do
harvest = FactoryGirl.create(:harvest,
harvest = FactoryBot.create(:harvest,
quantity: 3,
unit: 'bunch',
weight_quantity: 3,

6
spec/helpers/notifications_helper_spec.rb
View File

@@ -2,17 +2,17 @@ require 'rails_helper'
describe NotificationsHelper do
describe "reply_link" do
let(:member) { FactoryGirl.create(:member) }
let(:member) { FactoryBot.create(:member) }
it "replies to PMs with PMs" do
notification = FactoryGirl.create(:notification, recipient_id: member.id, post_id: nil)
notification = FactoryBot.create(:notification, recipient_id: member.id, post_id: nil)
link = helper.reply_link(notification)
link.should_not be_nil
link.should eq reply_notification_url(notification)
end
it "replies to post comments with post comments" do
notification = FactoryGirl.create(:notification, recipient_id: member.id)
notification = FactoryBot.create(:notification, recipient_id: member.id)
link = helper.reply_link(notification)
link.should_not be_nil

26
spec/helpers/plantings_helper_spec.rb
View File

@@ -3,7 +3,7 @@ require 'rails_helper'
describe PlantingsHelper do
describe "display_days_before_maturity" do
it "handles nil planted_at, nil finished_at, non-nil days_until_maturity" do
planting = FactoryGirl.build(:planting,
planting = FactoryBot.build(:planting,
quantity: 5,
planted_at: nil,
finished_at: nil,
@@ -13,7 +13,7 @@ describe PlantingsHelper do
end
it "handles non-nil planted_at and d_b_m, nil finished_at" do
planting = FactoryGirl.build(:planting,
planting = FactoryBot.build(:planting,
quantity: 5,
planted_at: Date.current,
finished_at: nil,
@@ -23,13 +23,13 @@ describe PlantingsHelper do
end
it "handles completed plantings" do
planting = FactoryGirl.build(:planting, finished: true)
planting = FactoryBot.build(:planting, finished: true)
result = helper.display_days_before_maturity(planting)
expect(result).to eq "0"
end
it "handles plantings that should have finished" do
planting = FactoryGirl.build(:planting,
planting = FactoryBot.build(:planting,
quantity: 5,
planted_at: Date.new(0, 1, 1),
finished_at: nil,
@@ -39,7 +39,7 @@ describe PlantingsHelper do
end
it "handles nil d_b_m and nil finished_at" do
planting = FactoryGirl.build(:planting,
planting = FactoryBot.build(:planting,
quantity: 5,
planted_at: Date.new(2012, 5, 12),
finished_at: nil,
@@ -49,7 +49,7 @@ describe PlantingsHelper do
end
it "handles finished_at dates in the future" do
planting = FactoryGirl.build(:planting,
planting = FactoryBot.build(:planting,
quantity: 5,
planted_at: Date.current,
finished_at: Date.current + 5,
@@ -60,10 +60,10 @@ describe PlantingsHelper do
end
describe "display_planting" do
let!(:member) { FactoryGirl.build(:member, login_name: 'crop_lady') }
let!(:member) { FactoryBot.build(:member, login_name: 'crop_lady') }
it "does not have a quantity nor a planted from value provided" do
planting = FactoryGirl.build(:planting,
planting = FactoryBot.build(:planting,
quantity: nil,
planted_from: '',
owner: member)
@@ -72,7 +72,7 @@ describe PlantingsHelper do
end
it "does not have a quantity provided" do
planting = FactoryGirl.build(:planting,
planting = FactoryBot.build(:planting,
quantity: nil,
planted_from: 'seed',
owner: member)
@@ -82,7 +82,7 @@ describe PlantingsHelper do
context "when quantity is greater than 1" do
it "does not have a planted from value provided" do
planting = FactoryGirl.build(:planting,
planting = FactoryBot.build(:planting,
quantity: 10,
planted_from: '',
owner: member)
@@ -91,7 +91,7 @@ describe PlantingsHelper do
end
it "does have a planted from value provided" do
planting = FactoryGirl.build(:planting,
planting = FactoryBot.build(:planting,
quantity: 5,
planted_from: 'seed',
owner: member)
@@ -102,7 +102,7 @@ describe PlantingsHelper do
context "when quantity is 1" do
it "does not have a planted from value provided" do
planting = FactoryGirl.build(:planting,
planting = FactoryBot.build(:planting,
quantity: 1,
planted_from: '',
owner: member)
@@ -111,7 +111,7 @@ describe PlantingsHelper do
end
it "does have a planted from value provided" do
planting = FactoryGirl.build(:planting,
planting = FactoryBot.build(:planting,
quantity: 1,
planted_from: 'seed',
owner: member)

8
spec/helpers/seeds_helper_spec.rb
View File

@@ -3,28 +3,28 @@ require 'rails_helper'
describe SeedsHelper do
describe "seed description" do
it "is missing" do
seed = FactoryGirl.create(:seed,
seed = FactoryBot.create(:seed,
description: nil)
result = helper.display_seed_description(seed)
expect(result).to eq "no description provided."
end
it "is less than 130 characters long" do
seed = FactoryGirl.create(:seed,
seed = FactoryBot.create(:seed,
description: 'a' * 20)
result = helper.display_seed_description(seed)
expect(result).to eq 'a' * 20
end
it "is 130 characters long" do
seed = FactoryGirl.create(:seed,
seed = FactoryBot.create(:seed,
description: 'a' * 130)
result = helper.display_seed_description(seed)
expect(result).to eq 'a' * 130
end
it "is more than 130 characters long" do
seed = FactoryGirl.create(:seed,
seed = FactoryBot.create(:seed,
description: 'a' * 140)
result = helper.display_seed_description(seed)
expect(result).to eq 'a' * 126 + '...' + ' ' + link_to("Read more", seed_path(seed))

2
spec/lib/haml/filters/escaped_markdown_spec.rb
View File

@@ -15,7 +15,7 @@ describe 'Haml::Filters::Escaped_Markdown' do
end
it 'converts quick crop links' do
@crop = FactoryGirl.create(:crop)
@crop = FactoryBot.create(:crop)
rendered = Haml::Filters::EscapedMarkdown.render("[#{@crop.name}](crop)")
rendered.should match(/&lt;a href=&quot;/)
end

22
spec/lib/haml/filters/growstuff_markdown_spec.rb
View File

@@ -29,7 +29,7 @@ describe 'Haml::Filters::Growstuff_Markdown' do
end
it 'converts quick crop links' do
@crop = FactoryGirl.create(:crop)
@crop = FactoryBot.create(:crop)
rendered = Haml::Filters::GrowstuffMarkdown.render(input_link(@crop.name))
expect(rendered).to match(/#{output_link(@crop)}/)
end
@@ -40,14 +40,14 @@ describe 'Haml::Filters::Growstuff_Markdown' do
end
it "doesn't convert escaped crop links" do
@crop = FactoryGirl.create(:crop)
@crop = FactoryBot.create(:crop)
rendered = Haml::Filters::GrowstuffMarkdown.render("\\" << input_link(@crop.name))
expect(rendered).to match(/\[#{@crop.name}\]\(crop\)/)
end
it "handles multiple crop links" do
tomato = FactoryGirl.create(:tomato)
maize = FactoryGirl.create(:maize)
tomato = FactoryBot.create(:tomato)
maize = FactoryBot.create(:maize)
string = "#{input_link(tomato)} #{input_link(maize)}"
rendered = Haml::Filters::GrowstuffMarkdown.render(string)
expect(rendered).to match(/#{output_link(tomato)} #{output_link(maize)}/)
@@ -60,13 +60,13 @@ describe 'Haml::Filters::Growstuff_Markdown' do
end
it "finds crops case insensitively" do
@crop = FactoryGirl.create(:crop, name: 'tomato')
@crop = FactoryBot.create(:crop, name: 'tomato')
rendered = Haml::Filters::GrowstuffMarkdown.render(input_link('ToMaTo'))
expect(rendered).to match(/#{output_link(@crop, 'ToMaTo')}/)
end
it "fixes PT bug #78615258 (Markdown rendering bug with URLs and crops in same text)" do
tomato = FactoryGirl.create(:tomato)
tomato = FactoryBot.create(:tomato)
string = "[test](http://example.com) [tomato](crop)"
rendered = Haml::Filters::GrowstuffMarkdown.render(string)
expect(rendered).to match(/#{output_link(tomato)}/)
@@ -74,7 +74,7 @@ describe 'Haml::Filters::Growstuff_Markdown' do
end
it 'converts quick member links' do
@member = FactoryGirl.create(:member)
@member = FactoryBot.create(:member)
rendered = Haml::Filters::GrowstuffMarkdown.render(input_member_link(@member.login_name))
expect(rendered).to match(/#{output_member_link(@member)}/)
end
@@ -85,13 +85,13 @@ describe 'Haml::Filters::Growstuff_Markdown' do
end
it "doesn't convert escaped members" do
@member = FactoryGirl.create(:member)
@member = FactoryBot.create(:member)
rendered = Haml::Filters::GrowstuffMarkdown.render("\\" << input_member_link(@member.login_name))
expect(rendered).to match(/\[#{@member.login_name}\]\(member\)/)
end
it 'converts @ member links' do
@member = FactoryGirl.create(:member)
@member = FactoryBot.create(:member)
rendered = Haml::Filters::GrowstuffMarkdown.render("Hey @#{@member.login_name}! What's up")
expect(rendered).to match(/#{output_member_link(@member, "@#{@member.login_name}")}/)
end
@@ -102,7 +102,7 @@ describe 'Haml::Filters::Growstuff_Markdown' do
end
it "doesn't convert nonexistent @ members" do
@member = FactoryGirl.create(:member)
@member = FactoryBot.create(:member)
@member_name = @member.login_name
@member.destroy
rendered = Haml::Filters::GrowstuffMarkdown.render("Hey @#{@member_name}")
@@ -110,7 +110,7 @@ describe 'Haml::Filters::Growstuff_Markdown' do
end
it "doesn't convert escaped @ members" do
@member = FactoryGirl.create(:member)
@member = FactoryBot.create(:member)
rendered = Haml::Filters::GrowstuffMarkdown.render("Hey \\@#{@member.login_name}! What's up")
expect(rendered).to include("Hey @#{@member.login_name}!")
end

16
spec/mailers/notifier_spec.rb
View File

@@ -2,7 +2,7 @@ require "rails_helper"
describe Notifier do
describe "notifications" do
let(:notification) { FactoryGirl.create(:notification) }
let(:notification) { FactoryBot.create(:notification) }
let(:mail) { Notifier.notify(notification) }
it 'sets the subject correctly' do
@@ -19,7 +19,7 @@ describe Notifier do
end
describe "planting reminders" do
let(:member) { FactoryGirl.create(:member) }
let(:member) { FactoryBot.create(:member) }
let(:mail) { Notifier.planting_reminder(member) }
it 'sets the subject correctly' do
@@ -44,8 +44,8 @@ describe Notifier do
end
describe "new crop request" do
let(:member) { FactoryGirl.create(:crop_wrangling_member) }
let(:crop) { FactoryGirl.create(:crop_request) }
let(:member) { FactoryBot.create(:crop_wrangling_member) }
let(:crop) { FactoryBot.create(:crop_request) }
let(:mail) { Notifier.new_crop_request(member, crop) }
it 'sets the subject correctly' do
@@ -66,8 +66,8 @@ describe Notifier do
end
describe "crop approved" do
let(:member) { FactoryGirl.create(:member) }
let(:crop) { FactoryGirl.create(:crop) }
let(:member) { FactoryBot.create(:member) }
let(:crop) { FactoryBot.create(:crop) }
let(:mail) { Notifier.crop_request_approved(member, crop) }
it 'sets the subject correctly' do
@@ -94,8 +94,8 @@ describe Notifier do
end
describe "crop rejected" do
let(:member) { FactoryGirl.create(:member) }
let(:crop) { FactoryGirl.create(:rejected_crop) }
let(:member) { FactoryBot.create(:member) }
let(:crop) { FactoryBot.create(:rejected_crop) }
let(:mail) { Notifier.crop_request_rejected(member, crop) }
it 'sets the subject correctly' do

46
spec/models/ability_spec.rb
View File

@@ -2,36 +2,36 @@ require 'rails_helper'
require 'cancan/matchers'
describe Ability do
let(:member) { FactoryGirl.create(:member) }
let(:member) { FactoryBot.create(:member) }
let(:ability) { Ability.new(member) }
context "notifications" do
it 'member can view their own notifications' do
notification = FactoryGirl.create(:notification, recipient: member)
notification = FactoryBot.create(:notification, recipient: member)
ability.should be_able_to(:read, notification)
end
it "member can't view someone else's notifications" do
notification = FactoryGirl.create(:notification,
recipient: FactoryGirl.create(:member))
notification = FactoryBot.create(:notification,
recipient: FactoryBot.create(:member))
ability.should_not be_able_to(:read, notification)
end
it "member can't send messages to themself" do
ability.should_not be_able_to(:create,
FactoryGirl.create(:notification,
FactoryBot.create(:notification,
recipient: member,
sender: member))
end
it "member can send messages to someone else" do
ability.should be_able_to(:create,
FactoryGirl.create(:notification,
recipient: FactoryGirl.create(:member),
FactoryBot.create(:notification,
recipient: FactoryBot.create(:member),
sender: member))
end
end
context "crop wrangling" do
let(:crop) { FactoryGirl.create(:crop) }
let(:crop) { FactoryBot.create(:crop) }
context "standard member" do
it "can't manage crops" do
@@ -49,7 +49,7 @@ describe Ability do
end
context "crop wrangler" do
let(:role) { FactoryGirl.create(:crop_wrangler) }
let(:role) { FactoryBot.create(:crop_wrangler) }
before(:each) do
member.roles << role
@@ -72,7 +72,7 @@ describe Ability do
end
context "products" do
let(:product) { FactoryGirl.create(:product) }
let(:product) { FactoryBot.create(:product) }
context "standard member" do
it "can't read or manage products" do
@@ -84,7 +84,7 @@ describe Ability do
end
context "admin" do
let(:role) { FactoryGirl.create(:admin) }
let(:role) { FactoryBot.create(:admin) }
before do
member.roles << role
@@ -110,19 +110,19 @@ describe Ability do
end
context "orders" do
let(:order) { FactoryGirl.create(:order, member: member) }
let(:order) { FactoryBot.create(:order, member: member) }
let(:strangers_order) {
FactoryGirl.create(:order,
member: FactoryGirl.create(:member)) }
FactoryBot.create(:order,
member: FactoryBot.create(:member)) }
let(:completed_order) {
FactoryGirl.create(:completed_order,
FactoryBot.create(:completed_order,
member: member) }
let(:order_item) { FactoryGirl.create(:order_item, order: order) }
let(:order_item) { FactoryBot.create(:order_item, order: order) }
let(:strangers_order_item) {
FactoryGirl.create(:order_item,
FactoryBot.create(:order_item,
order: strangers_order) }
let(:completed_order_item) {
FactoryGirl.create(:order_item,
FactoryBot.create(:order_item,
order: completed_order) }
context "standard member" do
@@ -202,7 +202,7 @@ describe Ability do
end
context "admin" do
let(:role) { FactoryGirl.create(:admin) }
let(:role) { FactoryBot.create(:admin) }
before do
member.roles << role
@@ -245,7 +245,7 @@ describe Ability do
end
context 'admin' do
let(:role) { FactoryGirl.create(:admin) }
let(:role) { FactoryBot.create(:admin) }
before do
member.roles << role
@@ -263,7 +263,7 @@ describe Ability do
end
context 'plant parts' do
let(:plant_part) { FactoryGirl.create(:plant_part) }
let(:plant_part) { FactoryBot.create(:plant_part) }
context 'ordinary member' do
it "can read plant parts" do
@@ -277,7 +277,7 @@ describe Ability do
end
context 'admin' do
let(:role) { FactoryGirl.create(:admin) }
let(:role) { FactoryBot.create(:admin) }
before do
member.roles << role
@@ -296,7 +296,7 @@ describe Ability do
end
it "can't delete a plant part that has harvests" do
@harvest = FactoryGirl.create(:harvest, plant_part: plant_part)
@harvest = FactoryBot.create(:harvest, plant_part: plant_part)
ability.should_not be_able_to(:destroy, plant_part)
end
end

8
spec/models/account_spec.rb
View File

@@ -1,7 +1,7 @@
require 'rails_helper'
describe Account do
let(:member) { FactoryGirl.create(:member) }
let(:member) { FactoryBot.create(:member) }
it "auto-creates an account detail record when a member is created" do
member.account.should be_an_instance_of Account
@@ -13,13 +13,13 @@ describe Account do
end
it "formats the 'paid until' date nicely" do
member.account.account_type = FactoryGirl.create(:account_type)
member.account.account_type = FactoryBot.create(:account_type)
member.account.paid_until_string.should eq nil
member.account.account_type = FactoryGirl.create(:permanent_paid_account_type)
member.account.account_type = FactoryBot.create(:permanent_paid_account_type)
member.account.paid_until_string.should eq "forever"
member.account.account_type = FactoryGirl.create(:paid_account_type)
member.account.account_type = FactoryBot.create(:paid_account_type)
@time = Time.zone.now
member.account.paid_until = @time
member.account.paid_until_string.should eq @time.to_s

2
spec/models/alternate_name_spec.rb
View File

@@ -1,7 +1,7 @@
require 'rails_helper'
describe AlternateName do
let(:an) { FactoryGirl.create(:alternate_eggplant) }
let(:an) { FactoryBot.create(:alternate_eggplant) }
it 'should save a basic alternate name' do
expect(an.save).to be(true)

2
spec/models/authentication_spec.rb
View File

@@ -2,7 +2,7 @@ require 'rails_helper'
describe Authentication do
it 'creates an authentication' do
@auth = FactoryGirl.create(:authentication)
@auth = FactoryBot.create(:authentication)
@auth.should be_an_instance_of Authentication
@auth.member.should be_an_instance_of Member
end

22
spec/models/comment_spec.rb
View File

@@ -2,7 +2,7 @@ require 'rails_helper'
describe Comment do
context "basic" do
let(:comment) { FactoryGirl.create(:comment) }
let(:comment) { FactoryBot.create(:comment) }
it "belongs to a post" do
comment.post.should be_an_instance_of Post
@@ -14,16 +14,16 @@ describe Comment do
end
context "notifications" do
let(:comment) { FactoryGirl.create(:comment) }
let(:comment) { FactoryBot.create(:comment) }
it "sends a notification when a comment is posted" do
expect {
FactoryGirl.create(:comment)
FactoryBot.create(:comment)
}.to change(Notification, :count).by(1)
end
it "sets the notification fields" do
@c = FactoryGirl.create(:comment)
@c = FactoryBot.create(:comment)
@n = Notification.first
@n.sender.should eq @c.author
@n.recipient.should eq @c.post.author
@@ -33,20 +33,20 @@ describe Comment do
end
it "doesn't send notifications to yourself" do
@m = FactoryGirl.create(:member)
@p = FactoryGirl.create(:post, author: @m)
@m = FactoryBot.create(:member)
@p = FactoryBot.create(:post, author: @m)
expect {
FactoryGirl.create(:comment, post: @p, author: @m)
FactoryBot.create(:comment, post: @p, author: @m)
}.to change(Notification, :count).by(0)
end
end
context "ordering" do
before(:each) do
@m = FactoryGirl.create(:member)
@p = FactoryGirl.create(:post, author: @m)
@c1 = FactoryGirl.create(:comment, post: @p, author: @m)
@c2 = FactoryGirl.create(:comment, post: @p, author: @m)
@m = FactoryBot.create(:member)
@p = FactoryBot.create(:post, author: @m)
@c1 = FactoryBot.create(:comment, post: @p, author: @m)
@c2 = FactoryBot.create(:comment, post: @p, author: @m)
end
it 'is in DESC order by default' do

198
spec/models/crop_spec.rb
View File

@@ -2,7 +2,7 @@ require 'rails_helper'
describe Crop do
context 'all fields present' do
let(:crop) { FactoryGirl.create(:tomato) }
let(:crop) { FactoryBot.create(:tomato) }
it 'should save a basic crop' do
crop.save.should be(true)
@@ -28,15 +28,15 @@ describe Crop do
context 'invalid data' do
it 'should not save a crop without a system name' do
crop = FactoryGirl.build(:crop, name: nil)
crop = FactoryBot.build(:crop, name: nil)
expect { crop.save }.to raise_error ActiveRecord::StatementInvalid
end
end
context 'ordering' do
before do
@uppercase = FactoryGirl.create(:uppercasecrop, created_at: 1.minute.ago)
@lowercase = FactoryGirl.create(:lowercasecrop, created_at: 2.days.ago)
@uppercase = FactoryBot.create(:uppercasecrop, created_at: 1.minute.ago)
@lowercase = FactoryBot.create(:lowercasecrop, created_at: 2.days.ago)
end
it "should be sorted case-insensitively" do
@@ -49,40 +49,40 @@ describe Crop do
end
context 'popularity' do
let(:tomato) { FactoryGirl.create(:tomato) }
let(:maize) { FactoryGirl.create(:maize) }
let(:cucumber) { FactoryGirl.create(:crop, name: 'cucumber') }
let(:tomato) { FactoryBot.create(:tomato) }
let(:maize) { FactoryBot.create(:maize) }
let(:cucumber) { FactoryBot.create(:crop, name: 'cucumber') }
before do
FactoryGirl.create_list(:planting, 10, crop: maize)
FactoryGirl.create_list(:planting, 3, crop: tomato)
FactoryBot.create_list(:planting, 10, crop: maize)
FactoryBot.create_list(:planting, 3, crop: tomato)
end
it "sorts by most plantings" do
Crop.popular.first.should eq maize
FactoryGirl.create_list(:planting, 10, crop: tomato)
FactoryBot.create_list(:planting, 10, crop: tomato)
Crop.popular.first.should eq tomato
end
end
it 'finds a default scientific name' do
@crop = FactoryGirl.create(:tomato)
@crop = FactoryBot.create(:tomato)
@crop.default_scientific_name.should eq nil
@sn = FactoryGirl.create(:solanum_lycopersicum, crop: @crop)
@sn = FactoryBot.create(:solanum_lycopersicum, crop: @crop)
@crop.reload
@crop.default_scientific_name.should eq @sn.name
end
it 'counts plantings' do
@crop = FactoryGirl.create(:tomato)
@crop = FactoryBot.create(:tomato)
@crop.plantings.size.should eq 0
@planting = FactoryGirl.create(:planting, crop: @crop)
@planting = FactoryBot.create(:planting, crop: @crop)
@crop.reload
@crop.plantings.size.should eq 1
end
context "wikipedia url" do
subject { FactoryGirl.build(:tomato, en_wikipedia_url: wikipedia_url) }
subject { FactoryBot.build(:tomato, en_wikipedia_url: wikipedia_url) }
context 'not a url' do
let(:wikipedia_url) { 'this is not valid' }
@@ -122,27 +122,27 @@ describe Crop do
context 'varieties' do
it 'has a crop hierarchy' do
@tomato = FactoryGirl.create(:tomato)
@roma = FactoryGirl.create(:roma, parent_id: @tomato.id)
@tomato = FactoryBot.create(:tomato)
@roma = FactoryBot.create(:roma, parent_id: @tomato.id)
@roma.parent.should eq @tomato
@tomato.varieties.should eq [@roma]
end
it 'toplevel scope works' do
@tomato = FactoryGirl.create(:tomato)
@roma = FactoryGirl.create(:roma, parent_id: @tomato.id)
@tomato = FactoryBot.create(:tomato)
@roma = FactoryBot.create(:roma, parent_id: @tomato.id)
Crop.toplevel.should eq [@tomato]
end
end
context 'photos' do
before :each do
@crop = FactoryGirl.create(:tomato)
@crop = FactoryBot.create(:tomato)
end
context 'with a planting photo' do
before :each do
@planting = FactoryGirl.create(:planting, crop: @crop)
@photo = FactoryGirl.create(:photo)
@planting = FactoryBot.create(:planting, crop: @crop)
@photo = FactoryBot.create(:photo)
@planting.photos << @photo
end
@@ -158,8 +158,8 @@ describe Crop do
context 'with a harvest photo' do
before :each do
@harvest = FactoryGirl.create(:harvest, crop: @crop)
@photo = FactoryGirl.create(:photo)
@harvest = FactoryBot.create(:harvest, crop: @crop)
@photo = FactoryBot.create(:photo)
@harvest.photos << @photo
end
@@ -170,8 +170,8 @@ describe Crop do
context 'and planting photo' do
before :each do
@planting = FactoryGirl.create(:planting, crop: @crop)
@planting_photo = FactoryGirl.create(:photo)
@planting = FactoryBot.create(:planting, crop: @crop)
@planting_photo = FactoryBot.create(:photo)
@planting.photos << @planting_photo
end
@@ -189,81 +189,81 @@ describe Crop do
end
context 'sunniness' do
let(:crop) { FactoryGirl.create(:tomato) }
let(:crop) { FactoryBot.create(:tomato) }
it 'returns a hash of sunniness values' do
FactoryGirl.create(:sunny_planting, crop: crop)
FactoryGirl.create(:sunny_planting, crop: crop)
FactoryGirl.create(:semi_shady_planting, crop: crop)
FactoryGirl.create(:shady_planting, crop: crop)
FactoryBot.create(:sunny_planting, crop: crop)
FactoryBot.create(:sunny_planting, crop: crop)
FactoryBot.create(:semi_shady_planting, crop: crop)
FactoryBot.create(:shady_planting, crop: crop)
crop.sunniness.should be_an_instance_of Hash
end
it 'counts each sunniness value' do
FactoryGirl.create(:sunny_planting, crop: crop)
FactoryGirl.create(:sunny_planting, crop: crop)
FactoryGirl.create(:semi_shady_planting, crop: crop)
FactoryGirl.create(:shady_planting, crop: crop)
FactoryBot.create(:sunny_planting, crop: crop)
FactoryBot.create(:sunny_planting, crop: crop)
FactoryBot.create(:semi_shady_planting, crop: crop)
FactoryBot.create(:shady_planting, crop: crop)
crop.sunniness.should == { 'sun' => 2, 'shade' => 1, 'semi-shade' => 1 }
end
it 'ignores unused sunniness values' do
FactoryGirl.create(:sunny_planting, crop: crop)
FactoryGirl.create(:sunny_planting, crop: crop)
FactoryGirl.create(:semi_shady_planting, crop: crop)
FactoryBot.create(:sunny_planting, crop: crop)
FactoryBot.create(:sunny_planting, crop: crop)
FactoryBot.create(:semi_shady_planting, crop: crop)
crop.sunniness.should == { 'sun' => 2, 'semi-shade' => 1 }
end
end
context 'planted_from' do
let(:crop) { FactoryGirl.create(:tomato) }
let(:crop) { FactoryBot.create(:tomato) }
it 'returns a hash of sunniness values' do
FactoryGirl.create(:seed_planting, crop: crop)
FactoryGirl.create(:seed_planting, crop: crop)
FactoryGirl.create(:seedling_planting, crop: crop)
FactoryGirl.create(:cutting_planting, crop: crop)
FactoryBot.create(:seed_planting, crop: crop)
FactoryBot.create(:seed_planting, crop: crop)
FactoryBot.create(:seedling_planting, crop: crop)
FactoryBot.create(:cutting_planting, crop: crop)
crop.planted_from.should be_an_instance_of Hash
end
it 'counts each planted_from value' do
FactoryGirl.create(:seed_planting, crop: crop)
FactoryGirl.create(:seed_planting, crop: crop)
FactoryGirl.create(:seedling_planting, crop: crop)
FactoryGirl.create(:cutting_planting, crop: crop)
FactoryBot.create(:seed_planting, crop: crop)
FactoryBot.create(:seed_planting, crop: crop)
FactoryBot.create(:seedling_planting, crop: crop)
FactoryBot.create(:cutting_planting, crop: crop)
crop.planted_from.should == { 'seed' => 2, 'seedling' => 1, 'cutting' => 1 }
end
it 'ignores unused planted_from values' do
FactoryGirl.create(:seed_planting, crop: crop)
FactoryGirl.create(:seed_planting, crop: crop)
FactoryGirl.create(:seedling_planting, crop: crop)
FactoryBot.create(:seed_planting, crop: crop)
FactoryBot.create(:seed_planting, crop: crop)
FactoryBot.create(:seedling_planting, crop: crop)
crop.planted_from.should == { 'seed' => 2, 'seedling' => 1 }
end
end
context 'popular plant parts' do
let(:crop) { FactoryGirl.create(:tomato) }
let(:crop) { FactoryBot.create(:tomato) }
it 'returns a hash of plant_part values' do
crop.popular_plant_parts.should be_an_instance_of Hash
end
it 'counts each plant_part value' do
@fruit = FactoryGirl.create(:plant_part)
@seed = FactoryGirl.create(:plant_part, name: 'seed')
@root = FactoryGirl.create(:plant_part, name: 'root')
@bulb = FactoryGirl.create(:plant_part, name: 'bulb')
@harvest1 = FactoryGirl.create(:harvest,
@fruit = FactoryBot.create(:plant_part)
@seed = FactoryBot.create(:plant_part, name: 'seed')
@root = FactoryBot.create(:plant_part, name: 'root')
@bulb = FactoryBot.create(:plant_part, name: 'bulb')
@harvest1 = FactoryBot.create(:harvest,
crop: crop,
plant_part: @fruit)
@harvest2 = FactoryGirl.create(:harvest,
@harvest2 = FactoryBot.create(:harvest,
crop: crop,
plant_part: @fruit)
@harvest3 = FactoryGirl.create(:harvest,
@harvest3 = FactoryBot.create(:harvest,
crop: crop,
plant_part: @seed)
@harvest4 = FactoryGirl.create(:harvest,
@harvest4 = FactoryBot.create(:harvest,
crop: crop,
plant_part: @root)
crop.popular_plant_parts.should == { [@fruit.id, @fruit.name] => 2,
@@ -275,19 +275,19 @@ describe Crop do
context 'interesting' do
it 'lists interesting crops' do
# first, a couple of candidate crops
@crop1 = FactoryGirl.create(:crop)
@crop2 = FactoryGirl.create(:crop)
@crop1 = FactoryBot.create(:crop)
@crop2 = FactoryBot.create(:crop)
# they need 3+ plantings each to be interesting
(1..3).each do
FactoryGirl.create(:planting, crop: @crop1)
FactoryBot.create(:planting, crop: @crop1)
end
(1..3).each do
FactoryGirl.create(:planting, crop: @crop2)
FactoryBot.create(:planting, crop: @crop2)
end
# crops need 3+ photos to be interesting
@photo = FactoryGirl.create(:photo)
@photo = FactoryBot.create(:photo)
[@crop1, @crop2].each do |c|
(1..3).each do
c.plantings.first.photos << @photo
@@ -302,16 +302,16 @@ describe Crop do
it 'ignores crops without plantings' do
# first, a couple of candidate crops
@crop1 = FactoryGirl.create(:crop)
@crop2 = FactoryGirl.create(:crop)
@crop1 = FactoryBot.create(:crop)
@crop2 = FactoryBot.create(:crop)
# only crop1 has plantings
(1..3).each do
FactoryGirl.create(:planting, crop: @crop1)
FactoryBot.create(:planting, crop: @crop1)
end
# ... and photos
@photo = FactoryGirl.create(:photo)
@photo = FactoryBot.create(:photo)
(1..3).each do
@crop1.plantings.first.photos << @photo
@crop1.plantings.first.save
@@ -324,19 +324,19 @@ describe Crop do
it 'ignores crops without photos' do
# first, a couple of candidate crops
@crop1 = FactoryGirl.create(:crop)
@crop2 = FactoryGirl.create(:crop)
@crop1 = FactoryBot.create(:crop)
@crop2 = FactoryBot.create(:crop)
# both crops have plantings
(1..3).each do
FactoryGirl.create(:planting, crop: @crop1)
FactoryBot.create(:planting, crop: @crop1)
end
(1..3).each do
FactoryGirl.create(:planting, crop: @crop2)
FactoryBot.create(:planting, crop: @crop2)
end
# but only crop1 has photos
@photo = FactoryGirl.create(:photo)
@photo = FactoryBot.create(:photo)
(1..3).each do
@crop1.plantings.first.photos << @photo
@crop1.plantings.first.save
@@ -350,20 +350,20 @@ describe Crop do
context "harvests" do
it "has harvests" do
crop = FactoryGirl.create(:crop)
harvest = FactoryGirl.create(:harvest, crop: crop)
crop = FactoryBot.create(:crop)
harvest = FactoryBot.create(:harvest, crop: crop)
crop.harvests.should eq [harvest]
end
end
it 'has plant_parts' do
@maize = FactoryGirl.create(:maize)
@pp1 = FactoryGirl.create(:plant_part)
@pp2 = FactoryGirl.create(:plant_part)
@h1 = FactoryGirl.create(:harvest,
@maize = FactoryBot.create(:maize)
@pp1 = FactoryBot.create(:plant_part)
@pp2 = FactoryBot.create(:plant_part)
@h1 = FactoryBot.create(:harvest,
crop: @maize,
plant_part: @pp1)
@h2 = FactoryGirl.create(:harvest,
@h2 = FactoryBot.create(:harvest,
crop: @maize,
plant_part: @pp2)
@maize.plant_parts.should include @pp1
@@ -371,19 +371,19 @@ describe Crop do
end
it "doesn't duplicate plant_parts" do
@maize = FactoryGirl.create(:maize)
@pp1 = FactoryGirl.create(:plant_part)
@h1 = FactoryGirl.create(:harvest,
@maize = FactoryBot.create(:maize)
@pp1 = FactoryBot.create(:plant_part)
@h1 = FactoryBot.create(:harvest,
crop: @maize,
plant_part: @pp1)
@h2 = FactoryGirl.create(:harvest,
@h2 = FactoryBot.create(:harvest,
crop: @maize,
plant_part: @pp1)
@maize.plant_parts.should eq [@pp1]
end
context "search", :elasticsearch do
let(:mushroom) { FactoryGirl.create(:crop, name: 'mushroom') }
let(:mushroom) { FactoryBot.create(:crop, name: 'mushroom') }
before do
sync_elasticsearch([mushroom])
@@ -402,12 +402,12 @@ describe Crop do
Crop.search('mUsH').should include mushroom
end
it "doesn't find 'rejected' crop" do
@rejected_crop = FactoryGirl.create(:rejected_crop, name: 'tomato')
@rejected_crop = FactoryBot.create(:rejected_crop, name: 'tomato')
sync_elasticsearch([@rejected_crop])
Crop.search('tomato').should_not include @rejected_crop
end
it "doesn't find 'pending' crop" do
@crop_request = FactoryGirl.create(:crop_request, name: 'tomato')
@crop_request = FactoryBot.create(:crop_request, name: 'tomato')
sync_elasticsearch([@crop_request])
Crop.search('tomato').should_not include @crop_request
end
@@ -417,7 +417,7 @@ describe Crop do
before(:each) do
# don't use 'let' for this -- we need to actually create it,
# regardless of whether it's used.
@cropbot = FactoryGirl.create(:cropbot)
@cropbot = FactoryBot.create(:cropbot)
end
context "scientific names" do
@@ -539,7 +539,7 @@ describe Crop do
end
it "loads a crop with a parent" do
parent = FactoryGirl.create(:crop, name: 'parent')
parent = FactoryBot.create(:crop, name: 'parent')
crop = CsvImporter.new.import_crop(
["tomato", "http://en.wikipedia.org/wiki/Tomato", "parent"]
)
@@ -572,9 +572,9 @@ describe Crop do
end
context "crop-post association" do
let!(:tomato) { FactoryGirl.create(:tomato) }
let!(:maize) { FactoryGirl.create(:maize) }
let!(:post) { FactoryGirl.create(:post, body: "[maize](crop)[tomato](crop)[tomato](crop)") }
let!(:tomato) { FactoryBot.create(:tomato) }
let!(:maize) { FactoryBot.create(:maize) }
let!(:post) { FactoryBot.create(:post, body: "[maize](crop)[tomato](crop)[tomato](crop)") }
describe "destroying a crop" do
before do
@@ -593,15 +593,15 @@ describe Crop do
context "crop rejections" do
let!(:rejected_reason) do
FactoryGirl.create(:crop, name: 'tomato',
approval_status: 'rejected',
reason_for_rejection: 'not edible')
FactoryBot.create(:crop, name: 'tomato',
approval_status: 'rejected',
reason_for_rejection: 'not edible')
end
let!(:rejected_other) do
FactoryGirl.create(:crop, name: 'tomato',
approval_status: 'rejected',
reason_for_rejection: 'other',
rejection_notes: 'blah blah blah')
FactoryBot.create(:crop, name: 'tomato',
approval_status: 'rejected',
reason_for_rejection: 'other',
rejection_notes: 'blah blah blah')
end
describe "rejecting a crop" do

4
spec/models/follow_spec.rb
View File

@@ -2,8 +2,8 @@ require 'spec_helper'
describe Follow do
before(:each) do
@member1 = FactoryGirl.create(:member)
@member2 = FactoryGirl.create(:member)
@member1 = FactoryBot.create(:member)
@member2 = FactoryBot.create(:member)
end
it "sends a notification when a follow is created" do

10
spec/models/forum_spec.rb
View File

@@ -1,7 +1,7 @@
require 'rails_helper'
describe Forum do
let(:forum) { FactoryGirl.create(:forum) }
let(:forum) { FactoryBot.create(:forum) }
it "belongs to an owner" do
forum.owner.should be_an_instance_of Member
@@ -16,14 +16,14 @@ describe Forum do
end
it "has many posts" do
@post1 = FactoryGirl.create(:forum_post, forum: forum)
@post2 = FactoryGirl.create(:forum_post, forum: forum)
@post1 = FactoryBot.create(:forum_post, forum: forum)
@post2 = FactoryBot.create(:forum_post, forum: forum)
forum.posts.size.should == 2
end
it "orders posts in reverse chron order" do
@post1 = FactoryGirl.create(:forum_post, forum: forum, created_at: 2.days.ago)
@post2 = FactoryGirl.create(:forum_post, forum: forum, created_at: 1.day.ago)
@post1 = FactoryBot.create(:forum_post, forum: forum, created_at: 2.days.ago)
@post2 = FactoryBot.create(:forum_post, forum: forum, created_at: 1.day.ago)
forum.posts.first.should eq @post2
end
end

115
spec/models/garden_spec.rb
View File

@@ -1,8 +1,8 @@
require 'rails_helper'
describe Garden do
let(:owner) { FactoryGirl.create(:member) }
let(:garden) { FactoryGirl.create(:garden, owner: owner) }
let(:owner) { FactoryBot.create(:member) }
let(:garden) { FactoryBot.create(:garden, owner: owner) }
it "should have a slug" do
garden.slug.should match(/member\d+-springfield-community-garden/)
@@ -13,32 +13,37 @@ describe Garden do
end
it "doesn't allow a nil name" do
garden = FactoryGirl.build(:garden, name: nil)
garden = FactoryBot.build(:garden, name: nil)
garden.should_not be_valid
end
it "doesn't allow a blank name" do
garden = FactoryGirl.build(:garden, name: "")
garden = FactoryBot.build(:garden, name: "")
garden.should_not be_valid
end
it "allows numbers" do
garden = FactoryGirl.build(:garden, name: "100 vines of 2 kamo-kamo")
garden = FactoryBot.build(:garden, name: "100 vines of 2 kamo-kamo")
garden.should_not be_valid
end
it "allows brackets" do
garden = FactoryBot.build(:garden, name: "Garden (second)")
garden.should be_valid
end
it "allows macrons" do
garden = FactoryGirl.build(:garden, name: "Kūmara and pūha patch")
garden = FactoryBot.build(:garden, name: "Kūmara and pūha patch")
garden.should_not be_valid
end
it "doesn't allow a name with only spaces" do
garden = FactoryGirl.build(:garden, name: " ")
garden = FactoryBot.build(:garden, name: " ")
garden.should_not be_valid
end
it "doesn't allow a new lines in garden names" do
garden = FactoryGirl.build(:garden, name: "My garden\nI am a 1337 hacker")
garden = FactoryBot.build(:garden, name: "My garden\nI am a 1337 hacker")
garden.should_not be_valid
end
@@ -51,38 +56,38 @@ describe Garden do
end
context "featured plantings" do
let(:tomato) { FactoryGirl.create(:tomato) }
let(:maize) { FactoryGirl.create(:maize) }
let(:chard) { FactoryGirl.create(:chard) }
let(:apple) { FactoryGirl.create(:apple) }
let(:pear) { FactoryGirl.create(:pear) }
let(:walnut) { FactoryGirl.create(:walnut) }
let(:tomato) { FactoryBot.create(:tomato) }
let(:maize) { FactoryBot.create(:maize) }
let(:chard) { FactoryBot.create(:chard) }
let(:apple) { FactoryBot.create(:apple) }
let(:pear) { FactoryBot.create(:pear) }
let(:walnut) { FactoryBot.create(:walnut) }
it "should fetch < 4 featured plantings if insufficient exist" do
@p1 = FactoryGirl.create(:planting, crop: tomato, garden: garden)
@p2 = FactoryGirl.create(:planting, crop: maize, garden: garden)
@p1 = FactoryBot.create(:planting, crop: tomato, garden: garden)
@p2 = FactoryBot.create(:planting, crop: maize, garden: garden)
garden.featured_plantings.should eq [@p2, @p1]
end
it "should fetch most recent 4 featured plantings" do
@p1 = FactoryGirl.create(:planting, crop: tomato, garden: garden)
@p2 = FactoryGirl.create(:planting, crop: maize, garden: garden)
@p3 = FactoryGirl.create(:planting, crop: chard, garden: garden)
@p4 = FactoryGirl.create(:planting, crop: apple, garden: garden)
@p5 = FactoryGirl.create(:planting, crop: walnut, garden: garden)
@p1 = FactoryBot.create(:planting, crop: tomato, garden: garden)
@p2 = FactoryBot.create(:planting, crop: maize, garden: garden)
@p3 = FactoryBot.create(:planting, crop: chard, garden: garden)
@p4 = FactoryBot.create(:planting, crop: apple, garden: garden)
@p5 = FactoryBot.create(:planting, crop: walnut, garden: garden)
garden.featured_plantings.should eq [@p5, @p4, @p3, @p2]
end
it "should skip repeated plantings" do
@p1 = FactoryGirl.create(:planting, crop: tomato, garden: garden)
@p2 = FactoryGirl.create(:planting, crop: maize, garden: garden)
@p3 = FactoryGirl.create(:planting, crop: chard, garden: garden)
@p4 = FactoryGirl.create(:planting, crop: apple, garden: garden)
@p5 = FactoryGirl.create(:planting, crop: walnut, garden: garden)
@p6 = FactoryGirl.create(:planting, crop: apple, garden: garden)
@p7 = FactoryGirl.create(:planting, crop: pear, garden: garden)
@p1 = FactoryBot.create(:planting, crop: tomato, garden: garden)
@p2 = FactoryBot.create(:planting, crop: maize, garden: garden)
@p3 = FactoryBot.create(:planting, crop: chard, garden: garden)
@p4 = FactoryBot.create(:planting, crop: apple, garden: garden)
@p5 = FactoryBot.create(:planting, crop: walnut, garden: garden)
@p6 = FactoryBot.create(:planting, crop: apple, garden: garden)
@p7 = FactoryBot.create(:planting, crop: pear, garden: garden)
garden.featured_plantings.should eq [@p7, @p6, @p5, @p3]
end
@@ -90,16 +95,16 @@ describe Garden do
context 'ordering' do
it "should be sorted alphabetically" do
FactoryGirl.create(:garden_z)
a = FactoryGirl.create(:garden_a)
FactoryBot.create(:garden_z)
a = FactoryBot.create(:garden_a)
Garden.first.should == a
end
end
it "destroys plantings when deleted" do
garden = FactoryGirl.create(:garden, owner: owner)
@planting1 = FactoryGirl.create(:planting, garden: garden)
@planting2 = FactoryGirl.create(:planting, garden: garden)
garden = FactoryBot.create(:garden, owner: owner)
@planting1 = FactoryBot.create(:planting, garden: garden)
@planting2 = FactoryBot.create(:planting, garden: garden)
garden.plantings.size.should eq(2)
all = Planting.count
garden.destroy
@@ -108,37 +113,37 @@ describe Garden do
context 'area' do
it 'allows numeric area' do
garden = FactoryGirl.build(:garden, area: 33)
garden = FactoryBot.build(:garden, area: 33)
garden.should be_valid
end
it "doesn't allow negative area" do
garden = FactoryGirl.build(:garden, area: -5)
garden = FactoryBot.build(:garden, area: -5)
garden.should_not be_valid
end
it 'allows decimal quantities' do
garden = FactoryGirl.build(:garden, area: 3.3)
garden = FactoryBot.build(:garden, area: 3.3)
garden.should be_valid
end
it 'allows blank quantities' do
garden = FactoryGirl.build(:garden, area: '')
garden = FactoryBot.build(:garden, area: '')
garden.should be_valid
end
it 'allows nil quantities' do
garden = FactoryGirl.build(:garden, area: nil)
garden = FactoryBot.build(:garden, area: nil)
garden.should be_valid
end
it 'cleans up zero quantities' do
garden = FactoryGirl.build(:garden, area: 0)
garden = FactoryBot.build(:garden, area: 0)
garden.area.should == 0
end
it "doesn't allow non-numeric quantities" do
garden = FactoryGirl.build(:garden, area: "99a")
garden = FactoryBot.build(:garden, area: "99a")
garden.should_not be_valid
end
end
@@ -146,27 +151,27 @@ describe Garden do
context 'units' do
Garden::AREA_UNITS_VALUES.values.push(nil, '').each do |s|
it "#{s} should be a valid unit" do
garden = FactoryGirl.build(:garden, area_unit: s)
garden = FactoryBot.build(:garden, area_unit: s)
garden.should be_valid
end
end
it 'should refuse invalid unit values' do
garden = FactoryGirl.build(:garden, area_unit: 'not valid')
garden = FactoryBot.build(:garden, area_unit: 'not valid')
garden.should_not be_valid
garden.errors[:area_unit].should include("not valid is not a valid area unit")
end
it 'sets area unit to blank if area is blank' do
garden = FactoryGirl.build(:garden, area: '', area_unit: 'acre')
garden = FactoryBot.build(:garden, area: '', area_unit: 'acre')
garden.should be_valid
garden.area_unit.should eq nil
end
end
context 'active scopes' do
let(:active) { FactoryGirl.create(:garden) }
let(:inactive) { FactoryGirl.create(:inactive_garden) }
let(:active) { FactoryBot.create(:garden) }
let(:inactive) { FactoryBot.create(:inactive_garden) }
it 'includes active garden in active scope' do
Garden.active.should include active
@@ -179,9 +184,9 @@ describe Garden do
end
it "marks plantings as finished when garden is inactive" do
garden = FactoryGirl.create(:garden)
p1 = FactoryGirl.create(:planting, garden: garden)
p2 = FactoryGirl.create(:planting, garden: garden)
garden = FactoryBot.create(:garden)
p1 = FactoryBot.create(:planting, garden: garden)
p2 = FactoryBot.create(:planting, garden: garden)
p1.finished.should eq false
p2.finished.should eq false
@@ -196,10 +201,10 @@ describe Garden do
end
it "doesn't mark the wrong plantings as finished" do
g1 = FactoryGirl.create(:garden)
g2 = FactoryGirl.create(:garden)
p1 = FactoryGirl.create(:planting, garden: g1)
p2 = FactoryGirl.create(:planting, garden: g2)
g1 = FactoryBot.create(:garden)
g2 = FactoryBot.create(:garden)
p1 = FactoryBot.create(:planting, garden: g1)
p2 = FactoryBot.create(:planting, garden: g2)
# mark the garden as inactive
g1.active = false
@@ -215,8 +220,8 @@ describe Garden do
end
context 'photos' do
let(:garden) { FactoryGirl.create(:garden) }
let(:photo) { FactoryGirl.create(:photo) }
let(:garden) { FactoryBot.create(:garden) }
let(:photo) { FactoryBot.create(:photo) }
before do
garden.photos << photo
@@ -237,7 +242,7 @@ describe Garden do
end
it 'chooses the most recent photo' do
@photo2 = FactoryGirl.create(:photo)
@photo2 = FactoryBot.create(:photo)
garden.photos << @photo2
garden.default_photo.should eq @photo2
end

150
spec/models/harvest_spec.rb
View File

@@ -2,43 +2,43 @@ require 'rails_helper'
describe Harvest do
it "has an owner" do
harvest = FactoryGirl.create(:harvest)
harvest = FactoryBot.create(:harvest)
harvest.owner.should be_an_instance_of Member
end
it "has a crop" do
harvest = FactoryGirl.create(:harvest)
harvest = FactoryBot.create(:harvest)
harvest.crop.should be_an_instance_of Crop
end
context 'quantity' do
it 'allows numeric quantities' do
@harvest = FactoryGirl.build(:harvest, quantity: 33)
@harvest = FactoryBot.build(:harvest, quantity: 33)
@harvest.should be_valid
end
it 'allows decimal quantities' do
@harvest = FactoryGirl.build(:harvest, quantity: 3.3)
@harvest = FactoryBot.build(:harvest, quantity: 3.3)
@harvest.should be_valid
end
it 'allows blank quantities' do
@harvest = FactoryGirl.build(:harvest, quantity: '')
@harvest = FactoryBot.build(:harvest, quantity: '')
@harvest.should be_valid
end
it 'allows nil quantities' do
@harvest = FactoryGirl.build(:harvest, quantity: nil)
@harvest = FactoryBot.build(:harvest, quantity: nil)
@harvest.should be_valid
end
it 'cleans up zero quantities' do
@harvest = FactoryGirl.build(:harvest, quantity: 0)
@harvest = FactoryBot.build(:harvest, quantity: 0)
@harvest.quantity.should == 0
end
it "doesn't allow non-numeric quantities" do
@harvest = FactoryGirl.build(:harvest, quantity: "99a")
@harvest = FactoryBot.build(:harvest, quantity: "99a")
@harvest.should_not be_valid
end
end
@@ -47,19 +47,19 @@ describe Harvest do
it 'all valid units should work' do
['individual', 'bunch', 'sprig', 'handful', 'litre',
'pint', 'quart', 'bucket', 'basket', 'bushel', nil, ''].each do |s|
@harvest = FactoryGirl.build(:harvest, unit: s)
@harvest = FactoryBot.build(:harvest, unit: s)
@harvest.should be_valid
end
end
it 'should refuse invalid unit values' do
@harvest = FactoryGirl.build(:harvest, unit: 'not valid')
@harvest = FactoryBot.build(:harvest, unit: 'not valid')
@harvest.should_not be_valid
@harvest.errors[:unit].should include("not valid is not a valid unit")
end
it 'sets unit to blank if quantity is blank' do
@harvest = FactoryGirl.build(:harvest, quantity: '', unit: 'individual')
@harvest = FactoryBot.build(:harvest, quantity: '', unit: 'individual')
@harvest.should be_valid
@harvest.unit.should eq nil
end
@@ -67,32 +67,32 @@ describe Harvest do
context 'weight quantity' do
it 'allows numeric weight quantities' do
@harvest = FactoryGirl.build(:harvest, weight_quantity: 33)
@harvest = FactoryBot.build(:harvest, weight_quantity: 33)
@harvest.should be_valid
end
it 'allows decimal weight quantities' do
@harvest = FactoryGirl.build(:harvest, weight_quantity: 3.3)
@harvest = FactoryBot.build(:harvest, weight_quantity: 3.3)
@harvest.should be_valid
end
it 'allows blank weight quantities' do
@harvest = FactoryGirl.build(:harvest, weight_quantity: '')
@harvest = FactoryBot.build(:harvest, weight_quantity: '')
@harvest.should be_valid
end
it 'allows nil weight quantities' do
@harvest = FactoryGirl.build(:harvest, weight_quantity: nil)
@harvest = FactoryBot.build(:harvest, weight_quantity: nil)
@harvest.should be_valid
end
it 'cleans up zero quantities' do
@harvest = FactoryGirl.build(:harvest, weight_quantity: 0)
@harvest = FactoryBot.build(:harvest, weight_quantity: 0)
@harvest.weight_quantity.should == 0
end
it "doesn't allow non-numeric weight quantities" do
@harvest = FactoryGirl.build(:harvest, weight_quantity: "99a")
@harvest = FactoryBot.build(:harvest, weight_quantity: "99a")
@harvest.should_not be_valid
end
end
@@ -100,19 +100,19 @@ describe Harvest do
context 'weight units' do
it 'all valid units should work' do
['kg', 'lb', 'oz', nil, ''].each do |s|
@harvest = FactoryGirl.build(:harvest, weight_unit: s)
@harvest = FactoryBot.build(:harvest, weight_unit: s)
@harvest.should be_valid
end
end
it 'should refuse invalid weight unit values' do
@harvest = FactoryGirl.build(:harvest, weight_unit: 'not valid')
@harvest = FactoryBot.build(:harvest, weight_unit: 'not valid')
@harvest.should_not be_valid
@harvest.errors[:weight_unit].should include("not valid is not a valid unit")
end
it 'sets weight_unit to blank if quantity is blank' do
@harvest = FactoryGirl.build(:harvest, weight_quantity: '', weight_unit: 'kg')
@harvest = FactoryBot.build(:harvest, weight_quantity: '', weight_unit: 'kg')
@harvest.should be_valid
@harvest.weight_unit.should eq nil
end
@@ -120,19 +120,19 @@ describe Harvest do
context "standardized weights" do
it 'converts from pounds' do
@harvest = FactoryGirl.create(:harvest, weight_quantity: 2, weight_unit: "lb")
@harvest = FactoryBot.create(:harvest, weight_quantity: 2, weight_unit: "lb")
@harvest.should be_valid
@harvest.reload.si_weight.should eq 0.907
end
it 'converts from ounces' do
@harvest = FactoryGirl.create(:harvest, weight_quantity: 16, weight_unit: "oz")
@harvest = FactoryBot.create(:harvest, weight_quantity: 16, weight_unit: "oz")
@harvest.should be_valid
@harvest.reload.si_weight.should eq 0.454
end
it 'leaves kg alone' do
@harvest = FactoryGirl.create(:harvest, weight_quantity: 2, weight_unit: "kg")
@harvest = FactoryBot.create(:harvest, weight_quantity: 2, weight_unit: "kg")
@harvest.should be_valid
@harvest.reload.si_weight.should eq 2.0
end
@@ -140,91 +140,91 @@ describe Harvest do
context 'ordering' do
it 'lists most recent harvests first' do
@h1 = FactoryGirl.create(:harvest, created_at: 1.day.ago)
@h2 = FactoryGirl.create(:harvest, created_at: 1.hour.ago)
@h1 = FactoryBot.create(:harvest, created_at: 1.day.ago)
@h2 = FactoryBot.create(:harvest, created_at: 1.hour.ago)
Harvest.all.should eq [@h2, @h1]
end
end
context "stringification" do
let(:crop) { FactoryGirl.create(:crop, name: "apricot") }
let(:crop) { FactoryBot.create(:crop, name: "apricot") }
it "apricots" do
@h = FactoryGirl.create(:harvest, crop: crop,
quantity: nil,
unit: nil,
weight_quantity: nil,
weight_unit: nil)
@h = FactoryBot.create(:harvest, crop: crop,
quantity: nil,
unit: nil,
weight_quantity: nil,
weight_unit: nil)
@h.to_s.should eq "apricots"
end
it "1 individual apricot" do
@h = FactoryGirl.create(:harvest, crop: crop,
quantity: 1,
unit: 'individual',
weight_quantity: nil,
weight_unit: nil)
@h = FactoryBot.create(:harvest, crop: crop,
quantity: 1,
unit: 'individual',
weight_quantity: nil,
weight_unit: nil)
@h.to_s.should eq "1 individual apricot"
end
it "10 individual apricots" do
@h = FactoryGirl.create(:harvest, crop: crop,
quantity: 10,
unit: 'individual',
weight_quantity: nil,
weight_unit: nil)
@h = FactoryBot.create(:harvest, crop: crop,
quantity: 10,
unit: 'individual',
weight_quantity: nil,
weight_unit: nil)
@h.to_s.should eq "10 individual apricots"
end
it "1 bushel of apricots" do
@h = FactoryGirl.create(:harvest, crop: crop,
quantity: 1,
unit: 'bushel',
weight_quantity: nil,
weight_unit: nil)
@h = FactoryBot.create(:harvest, crop: crop,
quantity: 1,
unit: 'bushel',
weight_quantity: nil,
weight_unit: nil)
@h.to_s.should eq "1 bushel of apricots"
end
it "1.5 bushels of apricots" do
@h = FactoryGirl.create(:harvest, crop: crop,
quantity: 1.5,
unit: 'bushel',
weight_quantity: nil,
weight_unit: nil)
@h = FactoryBot.create(:harvest, crop: crop,
quantity: 1.5,
unit: 'bushel',
weight_quantity: nil,
weight_unit: nil)
@h.to_s.should eq "1.5 bushels of apricots"
end
it "10 bushels of apricots" do
@h = FactoryGirl.create(:harvest, crop: crop,
quantity: 10,
unit: 'bushel',
weight_quantity: nil,
weight_unit: nil)
@h = FactoryBot.create(:harvest, crop: crop,
quantity: 10,
unit: 'bushel',
weight_quantity: nil,
weight_unit: nil)
@h.to_s.should eq "10 bushels of apricots"
end
it "apricots weighing 1.2 kg" do
@h = FactoryGirl.create(:harvest, crop: crop,
quantity: nil,
unit: nil,
weight_quantity: 1.2,
weight_unit: 'kg')
@h = FactoryBot.create(:harvest, crop: crop,
quantity: nil,
unit: nil,
weight_quantity: 1.2,
weight_unit: 'kg')
@h.to_s.should eq "apricots weighing 1.2 kg"
end
it "10 bushels of apricots weighing 100 kg" do
@h = FactoryGirl.create(:harvest, crop: crop,
quantity: 10,
unit: 'bushel',
weight_quantity: 100,
weight_unit: 'kg')
@h = FactoryBot.create(:harvest, crop: crop,
quantity: 10,
unit: 'bushel',
weight_quantity: 100,
weight_unit: 'kg')
@h.to_s.should eq "10 bushels of apricots weighing 100 kg"
end
end
context 'photos' do
before :each do
@harvest = FactoryGirl.create(:harvest)
@harvest = FactoryBot.create(:harvest)
end
context 'without a photo' do
@@ -234,8 +234,8 @@ describe Harvest do
context 'and with a crop(planting) photo' do
before :each do
@photo = FactoryGirl.create(:photo)
@planting = FactoryGirl.create(:planting, crop: @harvest.crop)
@photo = FactoryBot.create(:photo)
@planting = FactoryBot.create(:planting, crop: @harvest.crop)
@planting.photos << @photo
end
@@ -247,7 +247,7 @@ describe Harvest do
context 'with a photo' do
before do
@photo = FactoryGirl.create(:photo)
@photo = FactoryBot.create(:photo)
@harvest.photos << @photo
end
@@ -272,8 +272,8 @@ describe Harvest do
context 'and with a crop(planting) photo' do
before :each do
@crop_photo = FactoryGirl.create(:photo)
@planting = FactoryGirl.create(:planting, crop: @harvest.crop)
@crop_photo = FactoryBot.create(:photo)
@planting = FactoryBot.create(:planting, crop: @harvest.crop)
@planting.photos << @crop_photo
end
@@ -284,7 +284,7 @@ describe Harvest do
context 'and a second photo' do
before :each do
@photo2 = FactoryGirl.create(:photo)
@photo2 = FactoryBot.create(:photo)
@harvest.photos << @photo2
end
@@ -296,8 +296,8 @@ describe Harvest do
end
it 'excludes deleted members' do
member = FactoryGirl.create :member
harvest = FactoryGirl.create :harvest, owner: member
member = FactoryBot.create :member
harvest = FactoryBot.create :harvest, owner: member
expect(Harvest.joins(:owner).all).to include(harvest)
member.destroy
expect(Harvest.joins(:owner).all).not_to include(harvest)

4
spec/models/like_spec.rb
View File

@@ -1,8 +1,8 @@
require 'rails_helper'
describe 'like' do
let(:member) { FactoryGirl.create(:member) }
let(:post) { FactoryGirl.create(:post) }
let(:member) { FactoryBot.create(:member) }
let(:post) { FactoryBot.create(:post) }
context 'existing like' do
before(:each) do

136
spec/models/member_spec.rb
View File

@@ -2,7 +2,7 @@ require 'rails_helper'
describe 'member' do
context 'valid member' do
let(:member) { FactoryGirl.create(:member) }
let(:member) { FactoryBot.create(:member) }
it 'should be fetchable from the database' do
member2 = Member.find(member.id)
@@ -43,7 +43,7 @@ describe 'member' do
end
it 'should be able to fetch posts' do
post = FactoryGirl.create(:post, author: member)
post = FactoryBot.create(:post, author: member)
member.posts.should eq [post]
end
@@ -52,27 +52,27 @@ describe 'member' do
end
it 'has many plantings' do
FactoryGirl.create(:planting, owner: member)
FactoryBot.create(:planting, owner: member)
member.plantings.size.should eq 1
end
it "has many comments" do
FactoryGirl.create(:comment, author: member)
FactoryGirl.create(:comment, author: member)
FactoryBot.create(:comment, author: member)
FactoryBot.create(:comment, author: member)
member.comments.size.should == 2
end
it "has many forums" do
FactoryGirl.create(:forum, owner: member)
FactoryGirl.create(:forum, owner: member)
FactoryBot.create(:forum, owner: member)
FactoryBot.create(:forum, owner: member)
member.forums.size.should == 2
end
it "has many likes" do
@post1 = FactoryGirl.create(:post, author: member)
@post2 = FactoryGirl.create(:post, author: member)
@like1 = FactoryGirl.create(:like, member: member, likeable: @post1)
@like2 = FactoryGirl.create(:like, member: member, likeable: @post2)
@post1 = FactoryBot.create(:post, author: member)
@post2 = FactoryBot.create(:post, author: member)
@like1 = FactoryBot.create(:like, member: member, likeable: @post1)
@like2 = FactoryBot.create(:like, member: member, likeable: @post2)
expect(member.likes.length).to eq 2
end
@@ -101,7 +101,7 @@ describe 'member' do
end
context 'no TOS agreement' do
let(:member) { FactoryGirl.build(:no_tos_member) }
let(:member) { FactoryBot.build(:no_tos_member) }
it "should refuse to save a member who hasn't agreed to the TOS" do
member.save.should_not be(true)
@@ -110,8 +110,8 @@ describe 'member' do
context 'newsletter scope' do
it 'finds newsletter recipients' do
member1 = FactoryGirl.create(:member)
member2 = FactoryGirl.create(:newsletter_recipient_member)
member1 = FactoryBot.create(:member)
member2 = FactoryBot.create(:newsletter_recipient_member)
Member.wants_newsletter.should include member2
Member.wants_newsletter.should_not include member1
end
@@ -119,15 +119,15 @@ describe 'member' do
context 'same :login_name' do
it "should not allow two members with the same login_name" do
FactoryGirl.create(:member, login_name: "bob")
member = FactoryGirl.build(:member, login_name: "bob")
FactoryBot.create(:member, login_name: "bob")
member = FactoryBot.build(:member, login_name: "bob")
member.should_not be_valid
member.errors[:login_name].should include("has already been taken")
end
it "tests uniqueness case-insensitively" do
FactoryGirl.create(:member, login_name: "bob")
member = FactoryGirl.build(:member, login_name: "BoB")
FactoryBot.create(:member, login_name: "bob")
member = FactoryBot.build(:member, login_name: "BoB")
member.should_not be_valid
member.errors[:login_name].should include("has already been taken")
end
@@ -135,15 +135,15 @@ describe 'member' do
context 'case sensitivity' do
it 'preserves case of login name' do
FactoryGirl.create(:member, login_name: "BOB")
FactoryBot.create(:member, login_name: "BOB")
Member.find('bob').login_name.should eq 'BOB'
end
end
context 'ordering' do
before do
FactoryGirl.create(:member, login_name: "Zoe")
FactoryGirl.create(:member, login_name: "Anna")
FactoryBot.create(:member, login_name: "Zoe")
FactoryBot.create(:member, login_name: "Anna")
end
it "should be sorted by name" do
expect(Member.first.login_name).to eq("Anna")
@@ -152,27 +152,27 @@ describe 'member' do
context 'invalid login names' do
it "doesn't allow short names" do
member = FactoryGirl.build(:invalid_member_shortname)
member = FactoryBot.build(:invalid_member_shortname)
member.should_not be_valid
member.errors[:login_name].should include("should be between 2 and 25 characters long")
end
it "doesn't allow really long names" do
member = FactoryGirl.build(:invalid_member_longname)
member = FactoryBot.build(:invalid_member_longname)
member.should_not be_valid
member.errors[:login_name].should include("should be between 2 and 25 characters long")
end
it "doesn't allow spaces in names" do
member = FactoryGirl.build(:invalid_member_spaces)
member = FactoryBot.build(:invalid_member_spaces)
member.should_not be_valid
member.errors[:login_name].should include("may only include letters, numbers, or underscores")
end
it "doesn't allow other chars in names" do
member = FactoryGirl.build(:invalid_member_badchars)
member = FactoryBot.build(:invalid_member_badchars)
member.should_not be_valid
member.errors[:login_name].should include("may only include letters, numbers, or underscores")
end
it "doesn't allow reserved names" do
member = FactoryGirl.build(:invalid_member_badname)
member = FactoryBot.build(:invalid_member_badname)
member.should_not be_valid
member.errors[:login_name].should include("name is reserved")
end
@@ -180,22 +180,22 @@ describe 'member' do
context 'valid login names' do
it "allows plain alphanumeric chars in names" do
member = FactoryGirl.build(:valid_member_alphanumeric)
member = FactoryBot.build(:valid_member_alphanumeric)
member.should be_valid
end
it "allows uppercase chars in names" do
member = FactoryGirl.build(:valid_member_uppercase)
member = FactoryBot.build(:valid_member_uppercase)
member.should be_valid
end
it "allows underscores in names" do
member = FactoryGirl.build(:valid_member_underscore)
member = FactoryBot.build(:valid_member_underscore)
member.should be_valid
end
end
context 'roles' do
let(:member) { FactoryGirl.create(:member) }
let(:role) { FactoryGirl.create(:role) }
let(:member) { FactoryBot.create(:member) }
let(:role) { FactoryBot.create(:role) }
before do
member.roles << role
@@ -207,13 +207,13 @@ describe 'member' do
end
it 'sets up roles in factories' do
admin = FactoryGirl.create(:admin_member)
admin = FactoryBot.create(:admin_member)
admin.role?(:admin).should eq true
end
it 'converts role names properly' do
# need to make sure spaces get turned to underscores
role = FactoryGirl.create(:role, name: "a b c")
role = FactoryBot.create(:role, name: "a b c")
member.roles << role
member.role?(:a_b_c).should eq true
end
@@ -221,8 +221,8 @@ describe 'member' do
context 'confirmed scope' do
before(:each) do
FactoryGirl.create(:member)
FactoryGirl.create(:member)
FactoryBot.create(:member)
FactoryBot.create(:member)
end
it 'sees confirmed members' do
@@ -230,7 +230,7 @@ describe 'member' do
end
it 'ignores unconfirmed members' do
FactoryGirl.create(:unconfirmed_member)
FactoryBot.create(:unconfirmed_member)
Member.confirmed.size.should == 2
end
end
@@ -238,17 +238,17 @@ describe 'member' do
context 'located scope' do
# located members must have location, lat, long
it 'finds members who have locations' do
london_member = FactoryGirl.create(:london_member)
london_member = FactoryBot.create(:london_member)
Member.located.should include london_member
end
it 'ignores members with blank locations' do
nowhere_member = FactoryGirl.create(:member)
nowhere_member = FactoryBot.create(:member)
Member.located.should_not include nowhere_member
end
it 'ignores members with blank lat/long' do
london_member = FactoryGirl.create(:london_member)
london_member = FactoryBot.create(:london_member)
london_member.latitude = nil
london_member.longitude = nil
london_member.save(validate: false)
@@ -258,8 +258,8 @@ describe 'member' do
context 'near location' do
it 'finds nearby members and sorts them' do
edinburgh_member = FactoryGirl.create(:edinburgh_member)
london_member = FactoryGirl.create(:london_member)
edinburgh_member = FactoryBot.create(:edinburgh_member)
london_member = FactoryBot.create(:london_member)
Member.nearest_to('Greenwich, UK').should eq [london_member, edinburgh_member]
end
end
@@ -278,10 +278,10 @@ describe 'member' do
:unconfirmed_member, # !1
:london_member, # 1, 2, !3
:member # 1, !2, 3
].collect { |m| FactoryGirl.create(m) }
].collect { |m| FactoryBot.create(m) }
[0, 1, 2, 3, 5].each do |i|
FactoryGirl.create(:planting, owner: @members[i])
FactoryBot.create(:planting, owner: @members[i])
end
@members[0].updated_at = 3.days.ago
@@ -294,7 +294,7 @@ describe 'member' do
# Some members have multiple plantings, but should only appear once
3.times do
FactoryGirl.create(:planting, owner: @members[2])
FactoryBot.create(:planting, owner: @members[2])
end
end
@@ -306,32 +306,32 @@ describe 'member' do
context 'orders' do
it 'finds the current order' do
member = FactoryGirl.create(:member)
FactoryGirl.create(:completed_order, member: member)
order2 = FactoryGirl.create(:order, member: member)
member = FactoryBot.create(:member)
FactoryBot.create(:completed_order, member: member)
order2 = FactoryBot.create(:order, member: member)
member.current_order.should eq order2
end
it "copes if there's no current order" do
member = FactoryGirl.create(:member)
FactoryGirl.create(:completed_order, member: member)
FactoryGirl.create(:completed_order, member: member)
member = FactoryBot.create(:member)
FactoryBot.create(:completed_order, member: member)
FactoryBot.create(:completed_order, member: member)
member.current_order.should be_nil
end
end
context "paid accounts" do
let(:member) { FactoryGirl.create(:member) }
let(:member) { FactoryBot.create(:member) }
it "recognises a permanent paid account" do
account_type = FactoryGirl.create(:account_type,
account_type = FactoryBot.create(:account_type,
is_paid: true, is_permanent_paid: true)
member.account.account_type = account_type
member.paid?.should be(true)
end
it "recognises a current paid account" do
account_type = FactoryGirl.create(:account_type,
account_type = FactoryBot.create(:account_type,
is_paid: true, is_permanent_paid: false)
member.account.account_type = account_type
member.account.paid_until = Time.zone.now + 1.month
@@ -339,7 +339,7 @@ describe 'member' do
end
it "recognises an expired paid account" do
account_type = FactoryGirl.create(:account_type,
account_type = FactoryBot.create(:account_type,
is_paid: true, is_permanent_paid: false)
member.account.account_type = account_type
member.account.paid_until = Time.zone.now - 1.minute
@@ -347,14 +347,14 @@ describe 'member' do
end
it "recognises a free account" do
account_type = FactoryGirl.create(:account_type,
account_type = FactoryBot.create(:account_type,
is_paid: false, is_permanent_paid: false)
member.account.account_type = account_type
member.paid?.should be(false)
end
it "recognises a free account even with paid_until set" do
account_type = FactoryGirl.create(:account_type,
account_type = FactoryBot.create(:account_type,
is_paid: false, is_permanent_paid: false)
member.account.account_type = account_type
member.account.paid_until = Time.zone.now + 1.month
@@ -364,9 +364,9 @@ describe 'member' do
context "update account" do
let(:product) {
FactoryGirl.create(:product,
FactoryBot.create(:product,
paid_months: 3)}
let(:member) { FactoryGirl.create(:member) }
let(:member) { FactoryBot.create(:member) }
it "sets account_type" do
member.update_account_after_purchase(product)
@@ -388,16 +388,16 @@ describe 'member' do
context 'harvests' do
it 'has harvests' do
member = FactoryGirl.create(:member)
harvest = FactoryGirl.create(:harvest, owner: member)
member = FactoryBot.create(:member)
harvest = FactoryBot.create(:harvest, owner: member)
member.harvests.should eq [harvest]
end
end
context 'member who followed another member' do
let(:member1) { FactoryGirl.create(:member) }
let(:member2) { FactoryGirl.create(:member) }
let(:member3) { FactoryGirl.create(:member) }
let(:member1) { FactoryBot.create(:member) }
let(:member2) { FactoryBot.create(:member) }
let(:member3) { FactoryBot.create(:member) }
before do
@follow = member1.follows.create(follower_id: member1.id, followed_id: member2.id)
@@ -425,7 +425,7 @@ describe 'member' do
end
context 'subscriptions' do
let(:member) { FactoryGirl.create(:member) }
let(:member) { FactoryBot.create(:member) }
let(:gb) { instance_double("Gibbon::API.new") }
it 'subscribes to the newsletter' do
@@ -440,7 +440,7 @@ describe 'member' do
end
context 'member deleted' do
let(:member) { FactoryGirl.create(:member) }
let(:member) { FactoryBot.create(:member) }
context 'queries a scope' do
before { member.destroy }
it { expect(Member.all).not_to include(member) }
@@ -458,18 +458,18 @@ describe 'member' do
end
context "deleted admin member" do
let(:member) { FactoryGirl.create(:admin_member) }
let(:member) { FactoryBot.create(:admin_member) }
before { member.destroy }
context 'crop creator' do
let!(:crop) { FactoryGirl.create(:crop, creator: member) }
let!(:crop) { FactoryBot.create(:crop, creator: member) }
it "leaves crops behind, reassigned to cropbot" do
expect(Crop.all).to include(crop)
end
end
context 'forum owners' do
let!(:forum) { FactoryGirl.create(:forum, owner: member) }
let!(:forum) { FactoryBot.create(:forum, owner: member) }
it "leaves forums behind, reassigned to ex_admin" do
expect(forum.owner).to eq(member)
end

18
spec/models/notification_spec.rb
View File

@@ -1,7 +1,7 @@
require 'rails_helper'
describe Notification do
let(:notification) { FactoryGirl.create(:notification) }
let(:notification) { FactoryBot.create(:notification) }
it "belongs to a post" do
notification.post.should be_an_instance_of Post
@@ -17,42 +17,42 @@ describe Notification do
it "has a scope for unread" do
Notification.unread.should eq [notification]
@n2 = FactoryGirl.create(:notification, read: true)
@n2 = FactoryBot.create(:notification, read: true)
Notification.unread.should eq [notification]
@n3 = FactoryGirl.create(:notification, read: false)
@n3 = FactoryBot.create(:notification, read: false)
Notification.unread.should eq [@n3, notification]
end
it "counts unread" do
@who = notification.recipient
@n2 = FactoryGirl.create(:notification, recipient: @who, read: false)
@n2 = FactoryBot.create(:notification, recipient: @who, read: false)
@who.notifications.unread_count.should eq 2
end
it "sends email if asked" do
@notification2 = FactoryGirl.create(:notification)
@notification2 = FactoryBot.create(:notification)
@notification2.send_email
ActionMailer::Base.deliveries.last.to.should == [@notification2.recipient.email]
end
it "doesn't send email to people who don't want it" do
notification = FactoryGirl.create(:no_email_notification)
notification = FactoryBot.create(:no_email_notification)
notification.send_email
ActionMailer::Base.deliveries.last.to.should_not == [notification.recipient.email]
end
it "sends email on creation" do
@notification2 = FactoryGirl.create(:notification)
@notification2 = FactoryBot.create(:notification)
ActionMailer::Base.deliveries.last.to.should == [@notification2.recipient.email]
end
it "replaces missing subjects with (no subject)" do
notification = FactoryGirl.create(:notification, subject: nil)
notification = FactoryBot.create(:notification, subject: nil)
notification.subject.should == "(no subject)"
end
it "replaces whitespace-only subjects with (no subject)" do
notification = FactoryGirl.create(:notification, subject: " ")
notification = FactoryBot.create(:notification, subject: " ")
notification.subject.should == "(no subject)"
end
end

14
spec/models/order_item_spec.rb
View File

@@ -1,7 +1,7 @@
require 'rails_helper'
describe OrderItem do
let(:order_item) { FactoryGirl.create(:order_item) }
let(:order_item) { FactoryBot.create(:order_item) }
it "has an order and a product" do
order_item.order.should be_an_instance_of Order
@@ -9,18 +9,18 @@ describe OrderItem do
end
it "validates price > product.min_price" do
@product = FactoryGirl.create(:product)
order_item = FactoryGirl.build(:order_item, price: @product.min_price - 1)
@product = FactoryBot.create(:product)
order_item = FactoryBot.build(:order_item, price: @product.min_price - 1)
order_item.should_not be_valid
end
it "doesn't let you add two items to an order" do
@product = FactoryGirl.create(:product)
@order = FactoryGirl.create(:order)
order_item = FactoryGirl.build(:order_item, order: @order)
@product = FactoryBot.create(:product)
@order = FactoryBot.create(:order)
order_item = FactoryBot.build(:order_item, order: @order)
order_item.should be_valid
order_item.save
@order_item2 = FactoryGirl.build(:order_item, order: @order)
@order_item2 = FactoryBot.build(:order_item, order: @order)
@order_item2.should_not be_valid
end
end

62
spec/models/order_spec.rb
View File

@@ -2,16 +2,16 @@ require 'rails_helper'
describe Order do
before(:each) do
@order = FactoryGirl.create(:order)
@product = FactoryGirl.create(:product)
@order_item = FactoryGirl.create(:order_item,
@order = FactoryBot.create(:order)
@product = FactoryBot.create(:product)
@order_item = FactoryBot.create(:order_item,
order_id: @order.id, product_id: @product.id)
end
describe '#by_member_id' do
before do
@member1 = FactoryGirl.create(:member)
@member2 = FactoryGirl.create(:member)
@member1 = FactoryBot.create(:member)
@member2 = FactoryBot.create(:member)
@order1 = Order.create!(member_id: @member1.id)
@order2 = Order.create!(member_id: @member2.id)
end
@@ -26,18 +26,18 @@ describe Order do
end
it 'sorts by created_at DESC' do
@order2 = FactoryGirl.create(:order)
@order2 = FactoryBot.create(:order)
Order.all.should eq [@order2, @order]
end
it 'updates the account details' do
@member = FactoryGirl.create(:member)
@order = FactoryGirl.create(:order, member: @member)
@account_type = FactoryGirl.create(:account_type, name: 'paid')
@product = FactoryGirl.create(:product,
@member = FactoryBot.create(:member)
@order = FactoryBot.create(:order, member: @member)
@account_type = FactoryBot.create(:account_type, name: 'paid')
@product = FactoryBot.create(:product,
account_type: @account_type,
paid_months: 3)
@order_item = FactoryGirl.create(:order_item,
@order_item = FactoryBot.create(:order_item,
order_id: @order.id, product_id: @product.id)
@member.account.paid_until.should be_nil
@@ -49,40 +49,40 @@ describe Order do
end
it "totals the amount due" do
@member = FactoryGirl.create(:member)
@order = FactoryGirl.create(:order, member: @member)
@product = FactoryGirl.create(:product,
@member = FactoryBot.create(:member)
@order = FactoryBot.create(:order, member: @member)
@product = FactoryBot.create(:product,
min_price: 1000)
# we force an order to only have one item at present. Add more if wanted
# later.
@order_item1 = FactoryGirl.create(:order_item,
@order_item1 = FactoryBot.create(:order_item,
order_id: @order.id, product_id: @product.id, price: 1111, quantity: 1)
@order.total.should eq 1111
end
it "gives the correct total for quantities more than 1" do
@member = FactoryGirl.create(:member)
@order = FactoryGirl.create(:order, member: @member)
@product = FactoryGirl.create(:product,
@member = FactoryBot.create(:member)
@order = FactoryBot.create(:order, member: @member)
@product = FactoryBot.create(:product,
min_price: 1000)
# we force an order to only have one item at present. Add more if wanted
# later.
@order_item1 = FactoryGirl.create(:order_item,
@order_item1 = FactoryBot.create(:order_item,
order_id: @order.id, product_id: @product.id, price: 1111, quantity: 2)
@order.total.should eq 2222
end
it "formats order items for activemerchant" do
@member = FactoryGirl.create(:member)
@order = FactoryGirl.create(:order, member: @member)
@product = FactoryGirl.create(:product,
@member = FactoryBot.create(:member)
@order = FactoryBot.create(:order, member: @member)
@product = FactoryBot.create(:product,
name: 'foo',
min_price: 1000)
# we force an order to only have one item at present. Add more if wanted
# later.
@order_item1 = FactoryGirl.create(:order_item,
@order_item1 = FactoryBot.create(:order_item,
order_id: @order.id, product_id: @product.id, price: 1111, quantity: 1)
@order.activemerchant_items.should eq [{
@@ -94,44 +94,44 @@ describe Order do
context "referral codes" do
it "has a referral code" do
referred_order = FactoryGirl.create(:referred_order)
referred_order = FactoryBot.create(:referred_order)
referred_order.referral_code.should_not be nil
end
it "validates referral codes" do
referred_order = FactoryGirl.build(:order, referral_code: 'CAMP_AIGN1?')
referred_order = FactoryBot.build(:order, referral_code: 'CAMP_AIGN1?')
referred_order.should_not be_valid
end
it "cleans up messy referral codes" do
referred_order = FactoryGirl.create(:order, referral_code: 'CaMpAiGn 1 ')
referred_order = FactoryBot.create(:order, referral_code: 'CaMpAiGn 1 ')
referred_order.referral_code.should eq 'CAMPAIGN1'
end
end
context 'search' do
it 'finds orders by member' do
order = FactoryGirl.create(:order)
order = FactoryBot.create(:order)
Order.search(by: 'member', for: order.member.login_name).should eq [order]
end
it 'finds orders by order_id' do
order = FactoryGirl.create(:order)
order = FactoryBot.create(:order)
Order.search(by: 'order_id', for: order.id).should eq [order]
end
it 'finds orders by paypal_token' do
order = FactoryGirl.create(:order, paypal_express_token: 'foo')
order = FactoryBot.create(:order, paypal_express_token: 'foo')
Order.search(by: 'paypal_token', for: 'foo').should eq [order]
end
it 'finds orders by paypal_payer_id' do
order = FactoryGirl.create(:order, paypal_express_payer_id: 'bar')
order = FactoryBot.create(:order, paypal_express_payer_id: 'bar')
Order.search(by: 'paypal_payer_id', for: 'bar').should eq [order]
end
it 'finds orders by referral_code' do
order = FactoryGirl.create(:order, referral_code: 'baz')
order = FactoryBot.create(:order, referral_code: 'baz')
Order.search(by: 'referral_code', for: 'baz').should eq [order]
end
end

10
spec/models/photo_spec.rb
View File

@@ -1,12 +1,12 @@
require 'rails_helper'
describe Photo do
let(:photo) { FactoryGirl.create(:photo, owner: member) }
let(:member) { FactoryGirl.create(:member) }
let(:photo) { FactoryBot.create(:photo, owner: member) }
let(:member) { FactoryBot.create(:member) }
describe 'add/delete functionality' do
let(:planting) { FactoryGirl.create(:planting) }
let(:harvest) { FactoryGirl.create(:harvest) }
let(:garden) { FactoryGirl.create(:garden) }
let(:planting) { FactoryBot.create(:planting) }
let(:harvest) { FactoryBot.create(:harvest) }
let(:garden) { FactoryBot.create(:garden) }
context "adds photos" do
it 'to a planting' do

20
spec/models/plant_part_spec.rb
View File

@@ -2,18 +2,18 @@ require 'rails_helper'
describe PlantPart do
it 'stringifies' do
@pp = FactoryGirl.create(:plant_part)
@pp = FactoryBot.create(:plant_part)
@pp.to_s.should eq @pp.name
end
it 'has crops' do
@maize = FactoryGirl.create(:maize)
@tomato = FactoryGirl.create(:tomato)
@pp1 = FactoryGirl.create(:plant_part)
@h1 = FactoryGirl.create(:harvest,
@maize = FactoryBot.create(:maize)
@tomato = FactoryBot.create(:tomato)
@pp1 = FactoryBot.create(:plant_part)
@h1 = FactoryBot.create(:harvest,
crop: @tomato,
plant_part: @pp1)
@h2 = FactoryGirl.create(:harvest,
@h2 = FactoryBot.create(:harvest,
crop: @maize,
plant_part: @pp1)
@pp1.crops.should include @tomato
@@ -21,12 +21,12 @@ describe PlantPart do
end
it "doesn't duplicate crops" do
@maize = FactoryGirl.create(:maize)
@pp1 = FactoryGirl.create(:plant_part)
@h1 = FactoryGirl.create(:harvest,
@maize = FactoryBot.create(:maize)
@pp1 = FactoryBot.create(:plant_part)
@h1 = FactoryBot.create(:harvest,
crop: @maize,
plant_part: @pp1)
@h2 = FactoryGirl.create(:harvest,
@h2 = FactoryBot.create(:harvest,
crop: @maize,
plant_part: @pp1)
@pp1.crops.should eq [@maize]

116
spec/models/planting_spec.rb
View File

@@ -1,11 +1,11 @@
require 'rails_helper'
describe Planting do
let(:crop) { FactoryGirl.create(:tomato) }
let(:garden_owner) { FactoryGirl.create(:member) }
let(:garden) { FactoryGirl.create(:garden, owner: garden_owner) }
let(:planting) { FactoryGirl.create(:planting, crop: crop, garden: garden) }
let(:finished_planting) { FactoryGirl.create :planting, planted_at: 4.days.ago, finished_at: 2.days.ago }
let(:crop) { FactoryBot.create(:tomato) }
let(:garden_owner) { FactoryBot.create(:member) }
let(:garden) { FactoryBot.create(:garden, owner: garden_owner) }
let(:planting) { FactoryBot.create(:planting, crop: crop, garden: garden) }
let(:finished_planting) { FactoryBot.create :planting, planted_at: 4.days.ago, finished_at: 2.days.ago }
describe 'maturity calculations' do
describe 'start_to_finish_diff' do
@@ -15,11 +15,11 @@ describe Planting do
describe 'other_finished_plantings_same_crop' do
before do
# eight finished plantings
8.times { FactoryGirl.create :planting, crop: crop, planted_at: 10.days.ago, finished_at: 2.days.ago }
8.times { FactoryBot.create :planting, crop: crop, planted_at: 10.days.ago, finished_at: 2.days.ago }
# eight not finished plantings
8.times { FactoryGirl.create :planting, crop: crop, finished_at: nil }
8.times { FactoryBot.create :planting, crop: crop, finished_at: nil }
end
let!(:planting_with_diff_crop) { FactoryGirl.create :planting, planted_at: 10.days.ago, finished_at: 2.days.ago }
let!(:planting_with_diff_crop) { FactoryBot.create :planting, planted_at: 10.days.ago, finished_at: 2.days.ago }
let(:planting_predictions) { PlantingPredictions.new(planting) }
it { expect(planting_predictions.send(:other_finished_plantings_same_crop).size).to eq(8) }
it { expect(planting_predictions.send(:other_finished_plantings_same_crop)).not_to include(planting) }
@@ -31,14 +31,14 @@ describe Planting do
describe 'mean_days_until_maturity' do
let(:plantings) do
FactoryGirl.create_list(:planting, 10, crop: crop, planted_at: 12.days.ago, finished_at: 2.days.ago)
FactoryBot.create_list(:planting, 10, crop: crop, planted_at: 12.days.ago, finished_at: 2.days.ago)
end
it { expect(plantings.size).to eq(10) }
it { expect(PlantingPredictions.mean_days_until_maturity(plantings)).to eq(10) }
end
describe 'saving planting calculates days_before_maturity' do
before { 5.times { FactoryGirl.create :planting, planted_at: 30.days.ago, finished_at: 9.days.ago, crop: crop } }
before { 5.times { FactoryBot.create :planting, planted_at: 30.days.ago, finished_at: 9.days.ago, crop: crop } }
before { planting.calc_and_set_days_before_maturity }
it { expect(planting.days_before_maturity).to eq(21) }
end
@@ -49,7 +49,7 @@ describe Planting do
end
it "owner isn't necessarily the garden owner" do
# a new owner should be created automatically by FactoryGirl
# a new owner should be created automatically by FactoryBot
# note that formerly, the planting belonged to an owner through the garden
planting.owner.should_not eq garden_owner
end
@@ -59,8 +59,8 @@ describe Planting do
end
it "sorts plantings in descending order of creation" do
@planting1 = FactoryGirl.create(:planting)
@planting2 = FactoryGirl.create(:planting)
@planting1 = FactoryBot.create(:planting)
@planting2 = FactoryBot.create(:planting)
Planting.first.should eq @planting2
end
@@ -69,28 +69,28 @@ describe Planting do
end
it 'should sort in reverse creation order' do
@planting2 = FactoryGirl.create(:planting)
@planting2 = FactoryBot.create(:planting)
Planting.first.should eq @planting2
end
describe '#planted?' do
it "should be false for future plantings" do
planting = FactoryGirl.create :planting, planted_at: Time.zone.today + 1
planting = FactoryBot.create :planting, planted_at: Time.zone.today + 1
expect(planting.planted?).to eq(false)
end
it "should be false for never planted" do
planting = FactoryGirl.create :planting, planted_at: nil
planting = FactoryBot.create :planting, planted_at: nil
expect(planting.planted?).to eq(false)
end
it "should be true for past plantings" do
planting = FactoryGirl.create :planting, planted_at: Time.zone.today - 1
planting = FactoryBot.create :planting, planted_at: Time.zone.today - 1
expect(planting.planted?).to eq(true)
end
end
describe '#percentage_grown' do
it 'should not be more than 100%' do
@planting = FactoryGirl.build(:planting, days_before_maturity: 1, planted_at: 1.day.ago)
@planting = FactoryBot.build(:planting, days_before_maturity: 1, planted_at: 1.day.ago)
Timecop.freeze(2.days.from_now) do
@planting.percentage_grown.should be 100
@@ -98,7 +98,7 @@ describe Planting do
end
it 'should not be less than 0%' do
@planting = FactoryGirl.build(:planting, days_before_maturity: 1, planted_at: 1.day.ago)
@planting = FactoryBot.build(:planting, days_before_maturity: 1, planted_at: 1.day.ago)
Timecop.freeze(2.days.ago) do
@planting.percentage_grown.should be nil
@@ -106,19 +106,19 @@ describe Planting do
end
it 'should reflect the current growth' do
@planting = FactoryGirl.build(:planting, days_before_maturity: 10, planted_at: 4.days.ago)
@planting = FactoryBot.build(:planting, days_before_maturity: 10, planted_at: 4.days.ago)
expect(@planting.percentage_grown).to eq 40
end
it 'should not be calculated for unplanted plantings' do
@planting = FactoryGirl.build(:planting, planted_at: nil)
@planting = FactoryBot.build(:planting, planted_at: nil)
@planting.planted?.should be false
@planting.percentage_grown.should be nil
end
it 'should not be calculated for plantings with an unknown days before maturity' do
@planting = FactoryGirl.build(:planting, days_before_maturity: nil)
@planting = FactoryBot.build(:planting, days_before_maturity: nil)
@planting.percentage_grown.should be nil
end
end
@@ -143,30 +143,30 @@ describe Planting do
context 'quantity' do
it 'allows integer quantities' do
@planting = FactoryGirl.build(:planting, quantity: 99)
@planting = FactoryBot.build(:planting, quantity: 99)
@planting.should be_valid
end
it "doesn't allow decimal quantities" do
@planting = FactoryGirl.build(:planting, quantity: 99.9)
@planting = FactoryBot.build(:planting, quantity: 99.9)
@planting.should_not be_valid
end
it "doesn't allow non-numeric quantities" do
@planting = FactoryGirl.build(:planting, quantity: 'foo')
@planting = FactoryBot.build(:planting, quantity: 'foo')
@planting.should_not be_valid
end
it "allows blank quantities" do
@planting = FactoryGirl.build(:planting, quantity: nil)
@planting = FactoryBot.build(:planting, quantity: nil)
@planting.should be_valid
@planting = FactoryGirl.build(:planting, quantity: '')
@planting = FactoryBot.build(:planting, quantity: '')
@planting.should be_valid
end
end
context 'sunniness' do
let(:planting) { FactoryGirl.create(:sunny_planting) }
let(:planting) { FactoryBot.create(:sunny_planting) }
it 'should have a sunniness value' do
planting.sunniness.should eq 'sun'
@@ -174,13 +174,13 @@ describe Planting do
it 'all three valid sunniness values should work' do
['sun', 'shade', 'semi-shade', nil, ''].each do |s|
@planting = FactoryGirl.build(:planting, sunniness: s)
@planting = FactoryBot.build(:planting, sunniness: s)
@planting.should be_valid
end
end
it 'should refuse invalid sunniness values' do
@planting = FactoryGirl.build(:planting, sunniness: 'not valid')
@planting = FactoryBot.build(:planting, sunniness: 'not valid')
@planting.should_not be_valid
@planting.errors[:sunniness].should include("not valid is not a valid sunniness value")
end
@@ -188,7 +188,7 @@ describe Planting do
context 'planted from' do
it 'should have a planted_from value' do
@planting = FactoryGirl.create(:seed_planting)
@planting = FactoryBot.create(:seed_planting)
@planting.planted_from.should eq 'seed'
end
@@ -196,13 +196,13 @@ describe Planting do
['seed', 'seedling', 'cutting', 'root division',
'runner', 'bare root plant', 'advanced plant',
'graft', 'layering', 'bulb', 'root/tuber', nil, ''].each do |p|
@planting = FactoryGirl.build(:planting, planted_from: p)
@planting = FactoryBot.build(:planting, planted_from: p)
@planting.should be_valid
end
end
it 'should refuse invalid planted_from values' do
@planting = FactoryGirl.build(:planting, planted_from: 'not valid')
@planting = FactoryBot.build(:planting, planted_from: 'not valid')
@planting.should_not be_valid
@planting.errors[:planted_from].should include("not valid is not a valid planting method")
end
@@ -211,8 +211,8 @@ describe Planting do
# we decided that all the tests for the planting/photo association would
# be done on this side, not on the photos side
context 'photos' do
let(:planting) { FactoryGirl.create(:planting) }
let(:photo) { FactoryGirl.create(:photo) }
let(:planting) { FactoryBot.create(:planting) }
let(:photo) { FactoryBot.create(:photo) }
before do
planting.photos << photo
@@ -237,7 +237,7 @@ describe Planting do
end
it 'chooses the most recent photo' do
@photo2 = FactoryGirl.create(:photo)
@photo2 = FactoryBot.create(:photo)
planting.photos << @photo2
planting.default_photo.should eq @photo2
end
@@ -247,13 +247,13 @@ describe Planting do
it 'picks up interesting plantings' do
# plantings have members created implicitly for them
# each member is different, hence these are all interesting
@planting1 = FactoryGirl.create(:planting, created_at: 5.days.ago)
@planting2 = FactoryGirl.create(:planting, created_at: 4.days.ago)
@planting3 = FactoryGirl.create(:planting, created_at: 3.days.ago)
@planting4 = FactoryGirl.create(:planting, created_at: 2.days.ago)
@planting1 = FactoryBot.create(:planting, created_at: 5.days.ago)
@planting2 = FactoryBot.create(:planting, created_at: 4.days.ago)
@planting3 = FactoryBot.create(:planting, created_at: 3.days.ago)
@planting4 = FactoryBot.create(:planting, created_at: 2.days.ago)
# plantings need photos to be interesting
@photo = FactoryGirl.create(:photo)
@photo = FactoryBot.create(:photo)
[@planting1, @planting2, @planting3, @planting4].each do |p|
p.photos << @photo
p.save
@@ -270,12 +270,12 @@ describe Planting do
context "default arguments" do
it 'ignores plantings without photos' do
# first, an interesting planting
@planting = FactoryGirl.create(:planting)
@planting.photos << FactoryGirl.create(:photo)
@planting = FactoryBot.create(:planting)
@planting.photos << FactoryBot.create(:photo)
@planting.save
# this one doesn't have a photo
@no_photo_planting = FactoryGirl.create(:planting)
@no_photo_planting = FactoryBot.create(:planting)
Planting.interesting.should include @planting
Planting.interesting.should_not include @no_photo_planting
@@ -283,15 +283,15 @@ describe Planting do
it 'ignores plantings with the same owner' do
# this planting is older
@planting1 = FactoryGirl.create(:planting, created_at: 1.day.ago)
@planting1.photos << FactoryGirl.create(:photo)
@planting1 = FactoryBot.create(:planting, created_at: 1.day.ago)
@planting1.photos << FactoryBot.create(:photo)
@planting1.save
# this one is newer, and has the same owner, through the garden
@planting2 = FactoryGirl.create(:planting,
@planting2 = FactoryBot.create(:planting,
created_at: 1.minute.ago,
owner_id: @planting1.owner.id)
@planting2.photos << FactoryGirl.create(:photo)
@planting2.photos << FactoryBot.create(:photo)
@planting2.save
# result: the newer one is interesting, the older one isn't
@@ -302,9 +302,9 @@ describe Planting do
context "with howmany argument" do
it "only returns the number asked for" do
@plantings = FactoryGirl.create_list(:planting, 10)
@plantings = FactoryBot.create_list(:planting, 10)
@plantings.each do |p|
p.photos << FactoryGirl.create(:photo, owner: planting.owner)
p.photos << FactoryBot.create(:photo, owner: planting.owner)
end
Planting.interesting.limit(3).count.should eq 3
end
@@ -313,38 +313,38 @@ describe Planting do
context "finished" do
it 'has finished fields' do
@planting = FactoryGirl.create(:finished_planting)
@planting = FactoryBot.create(:finished_planting)
@planting.finished.should be true
@planting.finished_at.should be_an_instance_of Date
end
it 'has finished scope' do
@p = FactoryGirl.create(:planting)
@f = FactoryGirl.create(:finished_planting)
@p = FactoryBot.create(:planting)
@f = FactoryBot.create(:finished_planting)
Planting.finished.should include @f
Planting.finished.should_not include @p
end
it 'has current scope' do
@p = FactoryGirl.create(:planting)
@f = FactoryGirl.create(:finished_planting)
@p = FactoryBot.create(:planting)
@f = FactoryBot.create(:finished_planting)
Planting.current.should include @p
Planting.current.should_not include @f
end
context "finished date validation" do
it 'requires finished date after planting date' do
@f = FactoryGirl.build(:finished_planting, planted_at: '2014-01-01', finished_at: '2013-01-01')
@f = FactoryBot.build(:finished_planting, planted_at: '2014-01-01', finished_at: '2013-01-01')
@f.should_not be_valid
end
it 'allows just the planted date' do
@f = FactoryGirl.build(:planting, planted_at: '2013-01-01', finished_at: nil)
@f = FactoryBot.build(:planting, planted_at: '2013-01-01', finished_at: nil)
@f.should be_valid
end
it 'allows just the finished date' do
@f = FactoryGirl.build(:planting, finished_at: '2013-01-01', planted_at: nil)
@f = FactoryBot.build(:planting, finished_at: '2013-01-01', planted_at: nil)
@f.should be_valid
end
end

70
spec/models/post_spec.rb
View File

@@ -1,15 +1,15 @@
require 'rails_helper'
describe Post do
let(:member) { FactoryGirl.create(:member) }
let(:member) { FactoryBot.create(:member) }
it_behaves_like "it is likeable"
it "should be sorted in reverse order" do
FactoryGirl.create(:post,
FactoryBot.create(:post,
subject: 'first entry',
author: member,
created_at: 2.days.ago)
FactoryGirl.create(:post,
FactoryBot.create(:post,
subject: 'second entry',
author: member,
created_at: 1.day.ago)
@@ -17,7 +17,7 @@ describe Post do
end
it "should have a slug" do
post = FactoryGirl.create(:post, author: member)
post = FactoryBot.create(:post, author: member)
time = post.created_at
datestr = time.strftime("%Y%m%d")
# 2 digit day and month, full-length years
@@ -27,23 +27,23 @@ describe Post do
end
it "has many comments" do
post = FactoryGirl.create(:post, author: member)
FactoryGirl.create(:comment, post: post)
FactoryGirl.create(:comment, post: post)
post = FactoryBot.create(:post, author: member)
FactoryBot.create(:comment, post: post)
FactoryBot.create(:comment, post: post)
post.comments.size.should == 2
end
it "supports counting comments" do
post = FactoryGirl.create(:post, author: member)
FactoryGirl.create(:comment, post: post)
FactoryGirl.create(:comment, post: post)
post = FactoryBot.create(:post, author: member)
FactoryBot.create(:comment, post: post)
FactoryBot.create(:comment, post: post)
post.comment_count.should == 2
end
it "destroys comments when deleted" do
post = FactoryGirl.create(:post, author: member)
FactoryGirl.create(:comment, post: post)
FactoryGirl.create(:comment, post: post)
post = FactoryBot.create(:post, author: member)
FactoryBot.create(:comment, post: post)
FactoryBot.create(:comment, post: post)
post.comments.size.should eq(2)
all = Comment.count
post.destroy
@@ -51,22 +51,22 @@ describe Post do
end
it "belongs to a forum" do
post = FactoryGirl.create(:forum_post)
post = FactoryBot.create(:forum_post)
post.forum.should be_an_instance_of Forum
end
it "doesn't allow a nil subject" do
post = FactoryGirl.build(:post, subject: nil)
post = FactoryBot.build(:post, subject: nil)
post.should_not be_valid
end
it "doesn't allow a blank subject" do
post = FactoryGirl.build(:post, subject: "")
post = FactoryBot.build(:post, subject: "")
post.should_not be_valid
end
it "doesn't allow a subject with only spaces" do
post = FactoryGirl.build(:post, subject: " ")
post = FactoryBot.build(:post, subject: " ")
post.should_not be_valid
end
@@ -75,51 +75,51 @@ describe Post do
Time.stub(now: Time.now)
end
let!(:post) { FactoryGirl.create(:post, created_at: 1.day.ago) }
let!(:post) { FactoryBot.create(:post, created_at: 1.day.ago) }
it "sets recent activity to post time" do
post.recent_activity.to_i.should eq post.created_at.to_i
end
it "sets recent activity to comment time" do
comment = FactoryGirl.create(:comment, post: post,
created_at: 1.hour.ago)
comment = FactoryBot.create(:comment, post: post,
created_at: 1.hour.ago)
post.recent_activity.to_i.should eq comment.created_at.to_i
end
it "shiny new post is recently active" do
# create a shiny new post
post2 = FactoryGirl.create(:post, created_at: 1.minute.ago)
post2 = FactoryBot.create(:post, created_at: 1.minute.ago)
Post.recently_active.first.should eq post2
Post.recently_active.second.should eq post
end
it "new comment on old post is recently active" do
# now comment on an older post
post2 = FactoryGirl.create(:post, created_at: 1.minute.ago)
FactoryGirl.create(:comment, post: post, created_at: 1.second.ago)
post2 = FactoryBot.create(:post, created_at: 1.minute.ago)
FactoryBot.create(:comment, post: post, created_at: 1.second.ago)
Post.recently_active.first.should eq post
Post.recently_active.second.should eq post2
end
end
context "notifications" do
let(:member2) { FactoryGirl.create(:member) }
let(:member2) { FactoryBot.create(:member) }
it "sends a notification when a member is mentioned using @-syntax" do
expect {
FactoryGirl.create(:post, author: member, body: "Hey @#{member2}")
FactoryBot.create(:post, author: member, body: "Hey @#{member2}")
}.to change(Notification, :count).by(1)
end
it "sends a notification when a member is mentioned using [](member) syntax" do
expect {
FactoryGirl.create(:post, author: member, body: "Hey [#{member2}](member)")
FactoryBot.create(:post, author: member, body: "Hey [#{member2}](member)")
}.to change(Notification, :count).by(1)
end
it "sets the notification field" do
p = FactoryGirl.create(:post, author: member, body: "Hey @#{member2}")
p = FactoryBot.create(:post, author: member, body: "Hey @#{member2}")
n = Notification.first
n.sender.should eq member
n.recipient.should eq member2
@@ -128,24 +128,24 @@ describe Post do
end
it "sends notifications to all members mentioned" do
member3 = FactoryGirl.create(:member)
member3 = FactoryBot.create(:member)
expect {
FactoryGirl.create(:post, author: member, body: "Hey @#{member2} & @#{member3}")
FactoryBot.create(:post, author: member, body: "Hey @#{member2} & @#{member3}")
}.to change(Notification, :count).by(2)
end
it "doesn't send notifications if you mention yourself" do
expect {
FactoryGirl.create(:post, author: member, body: "@#{member}")
FactoryBot.create(:post, author: member, body: "@#{member}")
}.to change(Notification, :count).by(0)
end
end
context "crop-post association" do
let!(:tomato) { FactoryGirl.create(:tomato) }
let!(:maize) { FactoryGirl.create(:maize) }
let!(:chard) { FactoryGirl.create(:chard) }
let!(:post) { FactoryGirl.create(:post, body: "[maize](crop)[tomato](crop)[tomato](crop)") }
let!(:tomato) { FactoryBot.create(:tomato) }
let!(:maize) { FactoryBot.create(:maize) }
let!(:chard) { FactoryBot.create(:chard) }
let!(:post) { FactoryBot.create(:post, body: "[maize](crop)[tomato](crop)[tomato](crop)") }
it "should be generated" do
expect(tomato.posts).to eq [post]
@@ -183,7 +183,7 @@ describe Post do
end
it 'excludes deleted members' do
post = FactoryGirl.create :post, author: member
post = FactoryBot.create :post, author: member
expect(Post.joins(:author).all).to include(post)
member.destroy
expect(Post.joins(:author).all).not_to include(post)

2
spec/models/product_spec.rb
View File

@@ -2,7 +2,7 @@ require 'rails_helper'
describe Product do
it "stringifies using the name" do
@product = FactoryGirl.create(:product)
@product = FactoryBot.create(:product)
@product.to_s.should eq @product.name
end
end

8
spec/models/role_spec.rb
View File

@@ -1,10 +1,10 @@
require 'rails_helper'
describe Role do
let(:member) { FactoryGirl.create(:member) }
let(:member) { FactoryBot.create(:member) }
subject do
role = FactoryGirl.create(:role, name: 'Crop Wrangler')
role = FactoryBot.create(:role, name: 'Crop Wrangler')
role.members << member
role
end
@@ -18,14 +18,14 @@ describe Role do
end
describe '.crop_wranglers' do
let!(:crop_wranglers) { FactoryGirl.create_list(:crop_wrangling_member, 3) }
let!(:crop_wranglers) { FactoryBot.create_list(:crop_wrangling_member, 3) }
it 'return the crop wranglers that are members of that role' do
expect(Role.crop_wranglers).to match_array(crop_wranglers)
end
end
describe '.admins' do
let!(:admins) { FactoryGirl.create_list(:admin_member, 3) }
let!(:admins) { FactoryBot.create_list(:admin_member, 3) }
it 'return the members that have the role of admin' do
expect(Role.admins).to match_array(admins)
end

2
spec/models/scientific_name_spec.rb
View File

@@ -2,7 +2,7 @@ require 'rails_helper'
describe ScientificName do
context 'all fields present' do
let(:sn) { FactoryGirl.create(:zea_mays) }
let(:sn) { FactoryBot.create(:zea_mays) }
it 'should save a basic scientific name' do
sn.save.should be(true)

62
spec/models/seed_spec.rb
View File

@@ -1,7 +1,7 @@
require 'rails_helper'
describe Seed do
let(:seed) { FactoryGirl.build(:seed) }
let(:seed) { FactoryBot.build(:seed) }
it 'should save a basic seed' do
seed.save.should be(true)
@@ -14,24 +14,24 @@ describe Seed do
context 'quantity' do
it 'allows integer quantities' do
@seed = FactoryGirl.build(:seed, quantity: 99)
@seed = FactoryBot.build(:seed, quantity: 99)
@seed.should be_valid
end
it "doesn't allow decimal quantities" do
@seed = FactoryGirl.build(:seed, quantity: 99.9)
@seed = FactoryBot.build(:seed, quantity: 99.9)
@seed.should_not be_valid
end
it "doesn't allow non-numeric quantities" do
@seed = FactoryGirl.build(:seed, quantity: 'foo')
@seed = FactoryBot.build(:seed, quantity: 'foo')
@seed.should_not be_valid
end
it "allows blank quantities" do
@seed = FactoryGirl.build(:seed, quantity: nil)
@seed = FactoryBot.build(:seed, quantity: nil)
@seed.should be_valid
@seed = FactoryGirl.build(:seed, quantity: '')
@seed = FactoryBot.build(:seed, quantity: '')
@seed.should be_valid
end
end
@@ -39,13 +39,13 @@ describe Seed do
context 'tradable' do
it 'all valid tradable_to values should work' do
['nowhere', 'locally', 'nationally', 'internationally'].each do |t|
@seed = FactoryGirl.build(:seed, tradable_to: t)
@seed = FactoryBot.build(:seed, tradable_to: t)
@seed.should be_valid
end
end
it 'should refuse invalid tradable_to values' do
@seed = FactoryGirl.build(:seed, tradable_to: 'not valid')
@seed = FactoryBot.build(:seed, tradable_to: 'not valid')
@seed.should_not be_valid
@seed.errors[:tradable_to].should include(
"You may only trade seed nowhere, locally, "\
@@ -54,34 +54,34 @@ describe Seed do
end
it 'should not allow nil or blank values' do
@seed = FactoryGirl.build(:seed, tradable_to: nil)
@seed = FactoryBot.build(:seed, tradable_to: nil)
@seed.should_not be_valid
@seed = FactoryGirl.build(:seed, tradable_to: '')
@seed = FactoryBot.build(:seed, tradable_to: '')
@seed.should_not be_valid
end
it 'tradable? gives the right answers' do
@seed = FactoryGirl.create(:seed, tradable_to: 'nowhere')
@seed = FactoryBot.create(:seed, tradable_to: 'nowhere')
@seed.tradable?.should eq false
@seed = FactoryGirl.create(:seed, tradable_to: 'locally')
@seed = FactoryBot.create(:seed, tradable_to: 'locally')
@seed.tradable?.should eq true
@seed = FactoryGirl.create(:seed, tradable_to: 'nationally')
@seed = FactoryBot.create(:seed, tradable_to: 'nationally')
@seed.tradable?.should eq true
@seed = FactoryGirl.create(:seed, tradable_to: 'internationally')
@seed = FactoryBot.create(:seed, tradable_to: 'internationally')
@seed.tradable?.should eq true
end
it 'recognises a tradable seed' do
FactoryGirl.create(:tradable_seed).tradable?.should == true
FactoryBot.create(:tradable_seed).tradable?.should == true
end
it 'recognises an untradable seed' do
FactoryGirl.create(:untradable_seed).tradable?.should == false
FactoryBot.create(:untradable_seed).tradable?.should == false
end
it 'scopes correctly' do
@tradable = FactoryGirl.create(:tradable_seed)
@untradable = FactoryGirl.create(:untradable_seed)
@tradable = FactoryBot.create(:tradable_seed)
@untradable = FactoryBot.create(:untradable_seed)
Seed.tradable.should include @tradable
Seed.tradable.should_not include @untradable
end
@@ -91,7 +91,7 @@ describe Seed do
it 'all valid organic values should work' do
['certified organic', 'non-certified organic',
'conventional/non-organic', 'unknown'].each do |t|
@seed = FactoryGirl.build(:seed, organic: t)
@seed = FactoryBot.build(:seed, organic: t)
@seed.should be_valid
end
end
@@ -99,21 +99,21 @@ describe Seed do
it 'all valid GMO values should work' do
['certified GMO-free', 'non-certified GMO-free',
'GMO', 'unknown'].each do |t|
@seed = FactoryGirl.build(:seed, gmo: t)
@seed = FactoryBot.build(:seed, gmo: t)
@seed.should be_valid
end
end
it 'all valid heirloom values should work' do
%w(heirloom hybrid unknown).each do |t|
@seed = FactoryGirl.build(:seed, heirloom: t)
@seed = FactoryBot.build(:seed, heirloom: t)
@seed.should be_valid
end
end
it 'should refuse invalid organic/GMO/heirloom values' do
[:organic, :gmo, :heirloom].each do |field|
@seed = FactoryGirl.build(:seed, field => 'not valid')
@seed = FactoryBot.build(:seed, field => 'not valid')
@seed.should_not be_valid
@seed.errors[field].should_not be_empty
end
@@ -121,9 +121,9 @@ describe Seed do
it 'should not allow nil or blank values' do
[:organic, :gmo, :heirloom].each do |field|
@seed = FactoryGirl.build(:seed, field => nil)
@seed = FactoryBot.build(:seed, field => nil)
@seed.should_not be_valid
@seed = FactoryGirl.build(:seed, field => '')
@seed = FactoryBot.build(:seed, field => '')
@seed.should_not be_valid
end
end
@@ -135,11 +135,11 @@ describe Seed do
# 1) be tradable
# 2) the owner must have a location set
@located_member = FactoryGirl.create(:london_member)
@seed1 = FactoryGirl.create(:tradable_seed, owner: @located_member)
@seed2 = FactoryGirl.create(:seed, owner: @located_member)
@seed3 = FactoryGirl.create(:tradable_seed)
@seed4 = FactoryGirl.create(:seed)
@located_member = FactoryBot.create(:london_member)
@seed1 = FactoryBot.create(:tradable_seed, owner: @located_member)
@seed2 = FactoryBot.create(:seed, owner: @located_member)
@seed3 = FactoryBot.create(:tradable_seed)
@seed4 = FactoryBot.create(:seed)
Seed.interesting.should include @seed1
Seed.interesting.should_not include @seed2
@@ -150,8 +150,8 @@ describe Seed do
end
context 'photos' do
let(:seed) { FactoryGirl.create :seed }
before { seed.photos << FactoryGirl.create(:photo) }
let(:seed) { FactoryBot.create :seed }
before { seed.photos << FactoryBot.create(:photo) }
it 'is found in has_photos scope' do
Seed.has_photos.should include(seed)
end

4
spec/rails_helper.rb
View File

@@ -99,8 +99,8 @@ RSpec.configure do |config|
config.include Devise::Test::ControllerHelpers, type: :controller
config.extend ControllerMacros, type: :controller
# Allow just create(:factory) instead of needing to specify FactoryGirl.create(:factory)
config.include FactoryGirl::Syntax::Methods
# Allow just create(:factory) instead of needing to specify FactoryBot.create(:factory)
config.include FactoryBot::Syntax::Methods
# Prevent Poltergeist from fetching external URLs during feature tests
config.before(:each, js: true) do

2
spec/support/controller_macros.rb
View File

@@ -1,7 +1,7 @@
# Taken unashamedly from https://github.com/plataformatec/devise/wiki/How-To%3a-Controllers-and-Views-tests-with-Rails-3-%28and-rspec%29
module ControllerMacros
def login_member(member_factory = :member)
let(:member) { FactoryGirl.create(member_factory || :member) }
let(:member) { FactoryBot.create(member_factory || :member) }
before(:each) do
@request.env["devise.mapping"] = Devise.mappings[:member]
sign_in member

10
spec/support/is_likeable.rb
View File

@@ -2,11 +2,11 @@ shared_examples "it is likeable" do
before(:each) do
# Possibly a horrible hack.
# Will fail if factory name does not match the model name..
@likeable = FactoryGirl.create(described_class.to_s.underscore.to_sym)
@member1 = FactoryGirl.create(:member)
@member2 = FactoryGirl.create(:member)
@like1 = FactoryGirl.create(:like, member: @member1, likeable: @likeable)
@like2 = FactoryGirl.create(:like, member: @member2, likeable: @likeable)
@likeable = FactoryBot.create(described_class.to_s.underscore.to_sym)
@member1 = FactoryBot.create(:member)
@member2 = FactoryBot.create(:member)
@like1 = FactoryBot.create(:like, member: @member1, likeable: @likeable)
@like2 = FactoryBot.create(:like, member: @member2, likeable: @likeable)
end
it "has many likes" do

2
spec/views/account_types/index.html.haml_spec.rb
View File

@@ -14,7 +14,7 @@ require 'rails_helper'
describe "account_types/index" do
before(:each) do
@type = FactoryGirl.create(:account_type)
@type = FactoryBot.create(:account_type)
assign(:account_types, [@type, @type])
end

Some files were not shown because too many files have changed in this diff Show More