Brenda Wallace 8e0b7d9ded Merge branch 'charts' into upgrade/rails-5 ...

Conflicts:
	app/assets/javascripts/crops.js.erb
	spec/controllers/comments_controller_spec.rb
	spec/controllers/harvests_controller_spec.rb
	spec/controllers/photos_controller_spec.rb
	spec/controllers/plantings_controller_spec.rb
	spec/models/post_spec.rb
	spec/views/home/_crops.html.haml_spec.rb

2018-01-11 08:34:20 +13:00

..

ability_spec.rb

Avoid {} for multiline

2017-12-06 14:29:21 +13:00

account_spec.rb

Factorygirl to factorybot - fixes #1413 (#1425)

2017-11-01 15:03:31 +00:00

account_type_spec.rb

implement custom Sweeper class as stop gap against errors when running specs

2014-11-16 12:01:27 +11:00

alternate_name_spec.rb

Factorygirl to factorybot - fixes #1413 (#1425)

2017-11-01 15:03:31 +00:00

authentication_spec.rb

Factorygirl to factorybot - fixes #1413 (#1425)

2017-11-01 15:03:31 +00:00

comment_spec.rb

Avoid {} for multiline

2017-12-06 14:29:21 +13:00

crop_spec.rb

Auto corrected by following RSpec/EmptyLineAfterFinalLet

2018-01-09 02:00:40 +00:00

follow_spec.rb

Avoid {} for multiline

2017-12-06 14:29:21 +13:00

forum_spec.rb

Removed some model ordering specs

2017-11-29 20:59:37 +13:00

garden_spec.rb

Specify login name in spec, so we know what to look for

2018-01-06 11:38:47 +13:00

harvest_spec.rb

Default ordering for harvests are gone, so order it in spec

2017-11-05 19:26:50 +13:00

like_spec.rb

Factorygirl to factorybot - fixes #1413 (#1425)

2017-11-01 15:03:31 +00:00

member_spec.rb

Merge branch 'charts' into upgrade/rails-5

2018-01-11 08:34:20 +13:00

notification_spec.rb

spec for notifications needs to be agnostic about the order

2017-11-29 20:59:37 +13:00

order_item_spec.rb

Factorygirl to factorybot - fixes #1413 (#1425)

2017-11-01 15:03:31 +00:00

order_spec.rb

Removed some model ordering specs

2017-11-29 20:59:37 +13:00

photo_spec.rb

Auto corrected by following RSpec/EmptyLineAfterFinalLet

2018-01-09 02:00:40 +00:00

plant_part_spec.rb

Factorygirl to factorybot - fixes #1413 (#1425)

2017-11-01 15:03:31 +00:00

planting_spec.rb

Merge branch 'charts' into upgrade/rails-5

2018-01-11 08:34:20 +13:00

post_spec.rb

Auto corrected by following RSpec/EmptyLineAfterFinalLet

2018-01-09 02:00:40 +00:00

product_spec.rb

Factorygirl to factorybot - fixes #1413 (#1425)

2017-11-01 15:03:31 +00:00

role_spec.rb

Auto corrected by following RSpec/EmptyLineAfterFinalLet

2018-01-09 02:00:40 +00:00

scientific_name_spec.rb

Factorygirl to factorybot - fixes #1413 (#1425)

2017-11-01 15:03:31 +00:00

seed_spec.rb

Merge branch 'charts' into upgrade/rails-5

2018-01-11 08:34:20 +13:00