Merge branch 'dev' into bundle-update-2017-03-30-121732

CONTRIBUTORS.md

@@ -79,6 +79,7 @@ submit the change with your pull request.
 - Thomas Countz / [thomascountz](https://github.com/thomascountz)
 - Megan Talbot / [meganft](https://github.com/meganft)
 - Arun Kumar / [arun1595](https://github.com/arun1595)
+- Harry Brodsky / [hbrodsk1](https://github.com/hbrodsk1)
 
 ## Bots
 

config/initializers/inflections.rb

@@ -23,4 +23,8 @@ ActiveSupport::Inflector.inflections do |inflect|
   inflect.plural 'achiote', 'achiote'
   inflect.plural 'alfalfa', 'alfalfa'
   inflect.plural 'allspice', 'allspice'
+  inflect.plural 'spinach', 'spinach'
+  inflect.plural 'garlic', 'garlic'
+  inflect.plural 'licorice', 'licorice'
+  inflect.plural 'lillipilli', 'lillipillies'
 end

spec/features/crops/inflections_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require 'rails_helper'
 
 feature "irregular crop inflections" do
   # We're just testing a couple of representative crops to
@@ -7,5 +7,15 @@ feature "irregular crop inflections" do
   scenario "crops which are mass nouns" do
     expect("kale".pluralize).to eq "kale"
     expect("broccoli".pluralize).to eq "broccoli"
+    expect("square foot".pluralize).to eq "square feet"
+    expect("squash".pluralize).to eq "squash"
+    expect("bok choy".pluralize).to eq "bok choy"
+    expect("achiote".pluralize).to eq "achiote"
+    expect("alfalfa".pluralize).to eq "alfalfa"
+    expect("allspice".pluralize).to eq "allspice"
+    expect("spinach".pluralize).to eq "spinach"
+    expect("garlic".pluralize).to eq "garlic"
+    expect("licorice".pluralize).to eq "licorice"
+    expect("lillipilli".pluralize).to eq "lillipillies"
   end
 end