Brenda Wallace 13e8d1f5a5 Merge remote-tracking branch 'upstream/dev' into api

2017-11-17 21:51:39 +13:00

..

controllers

Updating specs to use same owner for garden and planting

2017-11-13 19:18:14 +13:00

factories

Updating specs to use same owner for garden and planting

2017-11-13 19:18:14 +13:00

features

Reinstated test of first harvest prediction display

2017-11-17 21:50:59 +13:00

helpers

Merge remote-tracking branch 'upstream/dev' into feature/harvest-predictions

2017-11-04 10:09:53 +13:00

javascripts

Yaml file clean up

2017-03-12 10:38:39 +13:00

lib

Factorygirl to factorybot - fixes #1413 (#1425)

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

mailers

Factorygirl to factorybot - fixes #1413 (#1425)

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

models

Updating specs to use same owner for garden and planting

2017-11-13 19:18:14 +13:00

requests

Requests spec for member api

2017-11-13 20:03:39 +13:00

routing

Removed extra empty blank lines

2016-11-26 12:06:02 +13:00

support

Factorygirl to factorybot - fixes #1413 (#1425)

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

views

Updating specs to use same owner for garden and planting

2017-11-13 19:18:14 +13:00

custom_matchers.rb

Spacing fixes

2016-11-26 12:13:17 +13:00

rails_helper.rb

Factorygirl to factorybot - fixes #1413 (#1425)

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

spec_helper.rb

Store spec failures, for rspec --only-failures

2017-02-16 13:24:50 +00:00