Merge pull request #1423 from Growstuff/dev

Release 31

.rubocop.yml

@@ -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
 

.rubocop_todo.yml

@@ -6,17 +6,6 @@
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
-Lint/AmbiguousRegexpLiteral:
-  Exclude:
-    - 'spec/controllers/admin/orders_controller_spec.rb'
-    - 'spec/controllers/orders_controller_spec.rb'
-    - 'spec/features/cms_spec.rb'
-    - 'spec/lib/haml/filters/escaped_markdown_spec.rb'
-    - 'spec/lib/haml/filters/growstuff_markdown_spec.rb'
-    - 'spec/models/comment_spec.rb'
-    - 'spec/models/planting_spec.rb'
-    - 'spec/views/members/show.rss.haml_spec.rb'
-    - 'spec/views/posts/show.html.haml_spec.rb'
 
 Lint/HandleExceptions:
   Exclude:

CONTRIBUTORS.md

@@ -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
 

Gemfile

@@ -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

Gemfile.lock

@@ -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)
@@ -55,14 +55,14 @@ GEM
       public_suffix (>= 2.0.2, < 4.0)
     arel (6.0.4)
     ast (2.3.0)
-    autoprefixer-rails (7.1.5)
+    autoprefixer-rails (7.1.6)
       execjs
     bcrypt (3.1.11)
     better_errors (2.2.0)
       coderay (>= 1.0.0)
       erubis (>= 2.6.6)
       rack (>= 0.9.0)
-    binding_of_caller (0.7.2)
+    binding_of_caller (0.7.3)
       debug_inspector (>= 0.0.1)
     bluecloth (2.2.0)
     bonsai-elasticsearch-rails (0.2.0)
@@ -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)
@@ -276,18 +276,18 @@ GEM
       sprockets-rails
     json (2.1.0)
     jwt (1.5.6)
-    kaminari (1.1.0)
+    kaminari (1.1.1)
       activesupport (>= 4.1.0)
-      kaminari-actionview (= 1.1.0)
-      kaminari-activerecord (= 1.1.0)
-      kaminari-core (= 1.1.0)
-    kaminari-actionview (1.1.0)
+      kaminari-actionview (= 1.1.1)
+      kaminari-activerecord (= 1.1.1)
+      kaminari-core (= 1.1.1)
+    kaminari-actionview (1.1.1)
       actionview
-      kaminari-core (= 1.1.0)
-    kaminari-activerecord (1.1.0)
+      kaminari-core (= 1.1.1)
+    kaminari-activerecord (1.1.1)
       activerecord
-      kaminari-core (= 1.1.0)
-    kaminari-core (1.1.0)
+      kaminari-core (= 1.1.1)
+    kaminari-core (1.1.1)
     kgio (2.11.0)
     kramdown (1.15.0)
     launchy (2.4.3)
@@ -372,7 +372,7 @@ GEM
       cliver (~> 0.3.1)
       websocket-driver (>= 0.2.0)
     powerpack (0.1.1)
-    pry (0.11.1)
+    pry (0.11.2)
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
     public_suffix (3.0.0)
@@ -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)
@@ -425,31 +425,31 @@ GEM
     responders (2.4.0)
       actionpack (>= 4.2.0, < 5.3)
       railties (>= 4.2.0, < 5.3)
-    rspec (3.6.0)
-      rspec-core (~> 3.6.0)
-      rspec-expectations (~> 3.6.0)
-      rspec-mocks (~> 3.6.0)
+    rspec (3.7.0)
+      rspec-core (~> 3.7.0)
+      rspec-expectations (~> 3.7.0)
+      rspec-mocks (~> 3.7.0)
     rspec-activemodel-mocks (1.0.3)
       activemodel (>= 3.0)
       activesupport (>= 3.0)
       rspec-mocks (>= 2.99, < 4.0)
-    rspec-core (3.6.0)
-      rspec-support (~> 3.6.0)
-    rspec-expectations (3.6.0)
+    rspec-core (3.7.0)
+      rspec-support (~> 3.7.0)
+    rspec-expectations (3.7.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.6.0)
-    rspec-mocks (3.6.0)
+      rspec-support (~> 3.7.0)
+    rspec-mocks (3.7.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.6.0)
-    rspec-rails (3.6.1)
+      rspec-support (~> 3.7.0)
+    rspec-rails (3.7.1)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       railties (>= 3.0)
-      rspec-core (~> 3.6.0)
-      rspec-expectations (~> 3.6.0)
-      rspec-mocks (~> 3.6.0)
-      rspec-support (~> 3.6.0)
-    rspec-support (3.6.0)
+      rspec-core (~> 3.7.0)
+      rspec-expectations (~> 3.7.0)
+      rspec-mocks (~> 3.7.0)
+      rspec-support (~> 3.7.0)
+    rspec-support (3.7.0)
     rubocop (0.47.1)
       parser (>= 2.3.3.1, < 3.0)
       powerpack (~> 0.1)
@@ -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
 

app/assets/stylesheets/overrides.sass

@@ -337,3 +337,11 @@ ul.plantings
 ul.thumbnail-buttons
   list-style-type: none
   text-align: right
+
+
+.hover-wrapper .text
+  position: absolute
+  visibility: hidden
+
+.hover-wrapper:hover .text
+  visibility: visible

app/controllers/photos_controller.rb

@@ -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
 

app/controllers/plantings_controller.rb

@@ -64,7 +64,7 @@ class PlantingsController < ApplicationController
 
   def destroy
     @planting.destroy
-    respond_with @planting, location: garden
+    respond_with @planting, location: @planting.garden
   end
 
   private

app/models/crop.rb

@@ -39,7 +39,7 @@ class Crop < ActiveRecord::Base
   scope :approved, -> { where(approval_status: "approved") }
   scope :rejected, -> { where(approval_status: "rejected") }
 
-  scope :interesting, -> { approved.has_photos }
+  scope :interesting, -> { approved.has_photos.randomized }
   scope :has_photos, -> { includes(:photos).where.not(photos: { id: nil }) }
 
   ## Wikipedia urls are only necessary when approving a crop
@@ -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],

app/models/garden.rb

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

app/models/member.rb

@@ -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

app/views/crops/_photos.html.haml

@@ -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)

app/views/gardens/_actions.html.haml

@@ -0,0 +1,23 @@
+- if can?(:edit, garden) || can?(:delete, garden)
+  - if can? :edit, garden
+    - if garden.active
+      = link_to new_planting_path(garden_id: garden.id), class: 'btn btn-primary' do
+        %span.glyphicon.glyphicon-grain{ title: "Plant" }
+        Plant something
+      = link_to "Mark as inactive", garden_path(garden, garden: { active: 0 }),
+        method: :put, class: 'btn btn-default',
+        data: { confirm: 'All plantings associated with this garden will be marked as finished. Are you sure?' }
+    - else
+      = link_to "Mark as active", garden_path(garden, garden: { active: 1 }),
+                method: :put,
+                class: 'btn btn-default'
+    = link_to edit_garden_path(garden), class: 'btn btn-default', id: 'edit_garden_link' do
+      %span.glyphicon.glyphicon-pencil{ title: "Edit garden" }
+      Edit
+  - if can?(:destroy, garden)
+    = link_to garden,
+              method: :delete,
+              data: { confirm: 'All plantings associated with this garden will also be deleted. Are you sure?' },
+              class: 'btn btn-default', id: 'delete_garden_link' do
+      %span.glyphicon.glyphicon-trash{ title: "Delete" }
+      Delete

app/views/gardens/_overview.html.haml

@@ -0,0 +1,25 @@
+
+.panel.panel-success
+  .panel-heading
+    %h3.panel-title
+      = link_to garden.name, garden_path(garden)
+
+  .panel-body
+    .row
+      .col-md-2.col-xs-12.garden-info
+        .row
+          .col-md-12.col-xs-6
+            = render 'gardens/photo', garden: garden
+          .col-md-12.col-xs-6
+            = render 'gardens/actions', garden: garden
+      .col-md-10
+        .row
+          - if garden.plantings.current.size.positive?
+            - garden.plantings.current.includes(:crop).each do |planting|
+              .col-md-2.col-sm-6.col-xs-6
+                .hover-wrapper
+                  .text= render 'plantings/actions', planting: planting
+                  = render partial: "plantings/thumbnail", locals: { planting: planting }
+          - else
+            no plantings
+  -# .panel-footer

app/views/gardens/_photo.html.haml

@@ -0,0 +1,3 @@
+= link_to image_tag((garden.default_photo ? garden.default_photo.thumbnail_url : 'placeholder_150.png'),
+                    alt: garden.name, class: 'img-responsive'),
+          garden_path(garden)

app/views/gardens/index.html.haml

@@ -6,15 +6,13 @@
   = page_entries_info @gardens
   = will_paginate @gardens
 
-.row
-  - if @gardens.empty?
-    %p There are no gardens to display.
-  - else
-    - @gardens.each do |garden|
-      .col-md-6
-        = render partial: 'gardens/thumbnail', locals: { garden: garden }
+
+- if @gardens.empty?
+  %p There are no gardens to display.
+- else
+  - @gardens.each do |garden|
+    = render 'overview', garden: garden
 
 .pagination
   = page_entries_info @gardens
   = will_paginate @gardens
-

app/views/gardens/show.html.haml

@@ -11,28 +11,7 @@
   = tag("meta", property: "og:site_name", content: ENV['GROWSTUFF_SITE_NAME'])
 .row
   .col-md-9
-    - if can?(:edit, @garden) || can?(:delete, @garden)
-      %p.btn-group
-        - if can? :edit, @garden
-          - if @garden.active
-            = link_to new_planting_path(garden_id: @garden.id), class: 'btn btn-primary' do
-              %span.glyphicon.glyphicon-grain{ title: "Plant" }
-              Plant something
-            = link_to "Mark as inactive", garden_path(@garden, garden: { active: 0 }),
-              method: :put, class: 'btn btn-default',
-              data: { confirm: 'All plantings associated with this garden will be marked as finished. Are you sure?' }
-          - else
-            = link_to "Mark as active", garden_path(@garden, garden: { active: 1 }),
-                      method: :put,
-                      class: 'btn btn-default'
-          = link_to edit_garden_path(@garden), class: 'btn btn-default', id: 'edit_garden_link' do
-            %span.glyphicon.glyphicon-pencil{ title: "Edit garden" }
-        - if can?(:destroy, @garden)
-          = link_to @garden,
-                    method: :delete,
-                    data: { confirm: 'All plantings associated with this garden will also be deleted. Are you sure?' },
-                    class: 'btn btn-default', id: 'delete_garden_link' do
-            %span.glyphicon.glyphicon-trash{ title: "Delete" }
+    %p.btn-group= render 'gardens/actions', garden: @garden
 
     - unless @garden.active
       .alert.alert-warning
@@ -119,4 +98,4 @@
       .row
         - @garden.photos.includes(:owner).each do |photo|
           .col-xs-6
-            = render partial: 'photos/thumbnail', locals: { photo: photo }
+            = render partial: 'photos/thumbnail', locals: { photo: photo }

app/views/harvests/_thumbnail.html.haml

@@ -10,7 +10,7 @@
       .col-md-4
         = link_to image_tag((harvest.default_photo ? harvest.default_photo.thumbnail_url : 'placeholder_150.png'),
                             alt: harvest.crop.name, class: 'img'),
-                  harvest.crop
+                  harvest
       .col-md-8
         %dl.dl-horizontal
           %dt Crop :

app/views/notifications/index.html.haml

@@ -15,10 +15,13 @@
       - if can? :read, n
         %tr
           %td
-            - if n.read
-              = link_to n.sender, member_path(n.sender)
+            - if n.sender.present?
+              - if n.read
+                = link_to n.sender, member_path(n.sender)
+              - else
+                %strong= link_to n.sender, member_path(n.sender)
             - else
-              %strong= link_to n.sender, member_path(n.sender)
+              *deleted member*
           %td
             - if n.read
               = link_to n.subject, notification_path(n)

app/views/photos/index.html.haml

@@ -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
-
-

app/views/plantings/_actions.html.haml

@@ -0,0 +1,16 @@
+- if can?(:edit, planting) || can?(:destroy, planting)
+  - if can? :edit, planting
+    = link_to edit_planting_path(planting), class: 'btn btn-default btn-xs' do
+      %span.glyphicon.glyphicon-pencil{ title: "Edit garden" }
+      Edit
+  - if can? :destroy, planting
+    = link_to planting, method: :delete,
+              data: { confirm: 'Are you sure?' },
+                  class: 'btn btn-default btn-xs' do
+      %span.glyphicon.glyphicon-trash{ title: "Delete" }
+      Delete
+    - unless planting.finished
+      = link_to "Mark as finished", planting_path(planting, planting: { finished: 1 }),
+                method: :put, class: 'btn btn-default btn-xs append-date'
+  - if can? :create, Harvest
+    = link_to 'Harvest', new_planting_harvest_path(planting), class: 'btn btn-default btn-xs'

app/views/plantings/_card.html.haml

@@ -16,7 +16,7 @@
           %dt Owner:
           %dd= link_to planting.owner.login_name, planting.owner
           %dt Garden:
-          %dd= link_to planting.garden.name, planting.garden
+          %dd= link_to planting.garden&.name, planting.garden
           %dt Planted on:
           %dd= planting.planted_at
           - if planting.quantity
@@ -38,7 +38,7 @@
             = display_days_before_maturity(planting)
             days
 
-    %p= render partial: 'plantings/planting_progress', locals: { planting: planting }
+    %p= render 'plantings/progress', planting: planting, show_explanation: true
 
     = link_to 'Details', planting_path(planting),
       class: 'btn btn-default btn-xs'
@@ -58,4 +58,3 @@
                   data: { confirm: 'Are you sure?' },
                   class: 'btn btn-default btn-xs' do
         %span.glyphicon.glyphicon-trash{ title: "Delete" }
-

app/views/plantings/_planting_progress.html.haml

@@ -1,10 +0,0 @@
-- if !planting.planted?
-  Progress: 0% - not planted yet
-- elsif planting.finished?
-  Progress: 100%
-  = render partial: "plantings/progress_bar", locals: { status: "success", progress: "100%" }
-- elsif planting.days_before_maturity.nil?
-  Progress: Not calculated, days before maturity unknown
-- else
-  Progress: #{planting.percentage_grown}%
-  = render partial: "plantings/progress_bar", locals: { status: "success", progress: "#{planting.percentage_grown}%" }

app/views/plantings/_progress.html.haml

@@ -0,0 +1,19 @@
+- if !planting.planted?
+  - if show_explanation == true
+    Progress: 0% - not planted yet
+  = render "plantings/progress_bar", status: "not planted", progress: 0
+
+- elsif planting.finished?
+  - if show_explanation == true
+    Progress: 100%
+  = render "plantings/progress_bar", status: 'finished', progress: 100
+
+- elsif planting.days_before_maturity.nil?
+  - if show_explanation == true
+    Progress: Not calculated, days before maturity unknown
+  = render "plantings/progress_bar", status: "unknown", progress: nil
+
+- else
+  - if show_explanation == true
+    Progress: #{planting.percentage_grown}%
+  = render "plantings/progress_bar", status: 'growing', progress: planting.percentage_grown

app/views/plantings/_progress_bar.html.haml

@@ -1,3 +1,11 @@
 .progress
-  %div{ class: "progress-bar progress-bar-#{status}", role: "progressbar", style: "width: #{progress}" }
-
+  - if progress.nil?
+    = status
+  - else
+    -# haml-lint:disable InlineStyles
+    %div{ class: "progress-bar progress-bar-#{status}", role: "progressbar", style: "width: #{progress}%" }
+      - if progress >= 30
+        #{progress}%
+    - if progress < 30
+      #{progress}%
+    -# haml-lint:enable InlineStyles

app/views/plantings/_thumbnail.html.haml

@@ -6,6 +6,5 @@
                           planting
       .plantinginfo
         .planting-name
+          = render 'plantings/progress', planting: planting, show_explanation: false
           = link_to planting.crop.name, planting
-        %small.planting-date
-          = display_finished(planting)

app/views/plantings/show.html.haml

@@ -48,22 +48,10 @@
       %dt Finished:
       %dd= display_finished(@planting)
 
-    %p= render 'plantings/planting_harvest', planting: @planting
-    %p= render 'planting_progress', planting: @planting
+    %p= render 'plantings/harvests', planting: @planting
+    %p= render 'plantings/progress', planting: @planting, show_explanation: true
 
-    - if can?(:edit, @planting) || can?(:destroy, @planting)
-      %p
-        - if can? :edit, @planting
-          = link_to 'Edit', edit_planting_path(@planting), class: 'btn btn-default btn-xs'
-          - unless @planting.finished
-            = link_to "Mark as finished", planting_path(@planting, planting: { finished: 1 }),
-                      method: :put, class: 'btn btn-default btn-xs append-date'
-        - if can? :create, Harvest
-          = link_to 'Harvest', new_planting_harvest_path(@planting), class: 'btn btn-default btn-xs'
-        - if can? :destroy, @planting
-          = link_to 'Delete', @planting, method: :delete,
-                    data: { confirm: 'Are you sure?' },
-                    class: 'btn btn-default btn-xs'
+    = render 'plantings/actions', planting: @planting
 
   .col-md-6
     = render partial: "crops/index_card", locals: { crop: @planting.crop }

config/environments/development.rb

@@ -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

config/factory_bot.rb

@@ -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

config/factory_girl.rb

@@ -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

config/routes.rb

@@ -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

spec/controllers/accounts_controller_spec.rb

@@ -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

spec/controllers/admin/orders_controller_spec.rb

@@ -17,14 +17,14 @@ 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
 
     it "sets an error message if nothing found" do
       get :search, search_by: 'order_id', search_text: 'foo'
-      flash[:alert].should match /Couldn't find order with/
+      flash[:alert].should have_text "Couldn't find order with"
     end
   end
 end

spec/controllers/admin_controller_spec.rb

@@ -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

spec/controllers/authentications_controller_spec.rb

@@ -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',

spec/controllers/comments_controller_spec.rb

@@ -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

spec/controllers/gardens_controller_spec.rb

@@ -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') }

spec/controllers/harvests_controller_spec.rb

@@ -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)

spec/controllers/likes_controller_spec.rb

@@ -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

spec/controllers/member_controller_spec.rb

@@ -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

spec/controllers/notifications_controller_spec.rb

@@ -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

spec/controllers/order_items_controller_spec.rb

@@ -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,

spec/controllers/orders_controller_spec.rb

@@ -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,18 +34,18 @@ 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
       response.status.should eq 302
-      response.redirect_url.should match /paypal\.com/
+      response.redirect_url.should match(/paypal\.com/)
     end
   end
 
   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

spec/controllers/photo_associations_controller_spec.rb

@@ -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

spec/controllers/photos_controller_spec.rb

@@ -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

spec/controllers/places_controller_spec.rb

@@ -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

spec/controllers/plantings_controller_spec.rb

@@ -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

spec/controllers/posts_controller_spec.rb

@@ -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
 

spec/controllers/registrations_controller_spec.rb

@@ -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

spec/controllers/scientific_names_controller_spec.rb

@@ -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

spec/controllers/seeds_controller_spec.rb

@@ -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

spec/controllers/shop_controller_spec.rb

@@ -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

spec/factories/account_types.rb

@@ -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

spec/factories/accounts.rb

@@ -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.)

spec/factories/alternate_names.rb

@@ -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

spec/factories/authentications.rb

@@ -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'

spec/factories/comments.rb

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

spec/factories/crop.rb

@@ -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"

spec/factories/follows.rb

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

spec/factories/forums.rb

@@ -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!"

spec/factories/garden.rb

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

spec/factories/harvests.rb

@@ -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

spec/factories/like.rb

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

spec/factories/member.rb

@@ -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
 

spec/factories/notifications.rb

@@ -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

spec/factories/order_items.rb

@@ -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

spec/factories/orders.rb

@@ -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

spec/factories/photos.rb

@@ -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

spec/factories/plant_parts.rb

@@ -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

spec/factories/planting.rb

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

spec/factories/post.rb

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

spec/factories/products.rb

@@ -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*"

spec/factories/roles.rb

@@ -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"

spec/factories/scientific_name.rb

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

spec/factories/seeds.rb

@@ -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

spec/features/cms_spec.rb

@@ -21,6 +21,6 @@ feature "cms admin" do
   scenario "admin members can view CMS admin area" do
     login_as admin_member
     visit comfy_admin_cms_path
-    expect(current_path).to match /#{comfy_admin_cms_path}/ # match any CMS admin page
+    expect(current_path).to match(/#{comfy_admin_cms_path}/) # match any CMS admin page
   end
 end

spec/features/crops/crop_photos_spec.rb

@@ -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

spec/features/gardens/adding_gardens_spec.rb

@@ -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

spec/features/gardens_spec.rb

@@ -58,7 +58,7 @@ feature "Planting a crop", js: true do
     end
 
     scenario "button on index to edit garden" do
-      first(".panel-title").click_link("edit_garden_glyphicon")
+      first(".garden-info").click_link("Edit")
       expect(page).to have_content 'Edit garden'
     end
   end

spec/features/likeable_spec.rb

@@ -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

spec/features/members/deletion_spec.rb

@@ -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)

spec/features/notifications_spec.rb

@@ -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

spec/helpers/application_helper_spec.rb

@@ -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'

spec/helpers/gardens_helper_spec.rb

@@ -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))
 

spec/helpers/harvests_helper_spec.rb

@@ -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,

spec/helpers/notifications_helper_spec.rb

@@ -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

spec/helpers/plantings_helper_spec.rb

@@ -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)

spec/helpers/seeds_helper_spec.rb

@@ -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))

spec/lib/haml/filters/escaped_markdown_spec.rb

@@ -15,8 +15,8 @@ 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 /<a href="/
+    rendered.should match(/<a href="/)
   end
 end

spec/lib/haml/filters/growstuff_markdown_spec.rb

@@ -29,89 +29,89 @@ 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))
-    rendered.should match /#{output_link(@crop)}/
+    expect(rendered).to match(/#{output_link(@crop)}/)
   end
 
   it "doesn't convert nonexistent crops" do
     rendered = Haml::Filters::GrowstuffMarkdown.render(input_link("not a crop"))
-    rendered.should match /not a crop/
+    expect(rendered).to match(/not a crop/)
   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))
-    rendered.should match /\[#{@crop.name}\]\(crop\)/
+    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)
-    rendered.should match /#{output_link(tomato)} #{output_link(maize)}/
+    expect(rendered).to match(/#{output_link(tomato)} #{output_link(maize)}/)
   end
 
   it "converts normal markdown" do
     string = "**foo**"
     rendered = Haml::Filters::GrowstuffMarkdown.render(string)
-    rendered.should match /<strong>foo<\/strong>/
+    expect(rendered).to match(/<strong>foo<\/strong>/)
   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'))
-    rendered.should match /#{output_link(@crop, '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)
-    rendered.should match /#{output_link(tomato)}/
-    rendered.should match "<a href=\"http://example.com\">test</a>"
+    expect(rendered).to match(/#{output_link(tomato)}/)
+    expect(rendered).to match "<a href=\"http://example.com\">test</a>"
   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))
-    rendered.should match /#{output_member_link(@member)}/
+    expect(rendered).to match(/#{output_member_link(@member)}/)
   end
 
   it "doesn't convert nonexistent members" do
     rendered = Haml::Filters::GrowstuffMarkdown.render(input_member_link("not a member"))
-    rendered.should match /not a member/
+    expect(rendered).to include('not a member')
   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))
-    rendered.should match /\[#{@member.login_name}\]\(member\)/
+    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")
-    rendered.should match /#{output_member_link(@member, "@#{@member.login_name}")}/
+    expect(rendered).to match(/#{output_member_link(@member, "@#{@member.login_name}")}/)
   end
 
   it "doesn't convert invalid @ members" do
-    rendered = Haml::Filters::GrowstuffMarkdown.render("@not-a-member")
-    rendered.should match /@not-a-member/
+    rendered = Haml::Filters::GrowstuffMarkdown.render("@notamember")
+    expect(rendered).to include('@notamember')
   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}")
-    rendered.should match /Hey @#{@member_name}/
+    expect(rendered).to include("Hey @#{@member_name}")
   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")
-    rendered.should match /Hey @#{@member.login_name}!/
+    expect(rendered).to include("Hey @#{@member.login_name}!")
   end
 end

spec/mailers/notifier_spec.rb

@@ -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

spec/models/ability_spec.rb

@@ -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

spec/models/account_spec.rb

@@ -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

spec/models/alternate_name_spec.rb

@@ -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)

spec/models/authentication_spec.rb

@@ -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

spec/models/comment_spec.rb

@@ -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,39 +14,39 @@ 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
-      @n.subject.should match /commented on/
+      @n.subject.should include 'commented on'
       @n.body.should eq @c.body
       @n.post.should eq @c.post
     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

spec/models/crop_spec.rb

@@ -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

spec/models/follow_spec.rb

@@ -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