Commit Graph

1477 Commits

Author SHA1 Message Date
Brenda Wallace
c747d46ab5 Request spec for seeds api 2017-11-17 23:22:10 +13:00
Brenda Wallace
3009ed2d83 Merge branch 'api' of github.com:Br3nda/growstuff into api 2017-11-17 23:16:16 +13:00
Shiny
f68a15c04e Merge branch 'dev' into api 2017-11-17 22:02:12 +13:00
Brenda Wallace
c4a1806a87 Request spec for photos api 2017-11-17 22:01:37 +13:00
Brenda Wallace
fa5e151af0 Request spec for photos api 2017-11-17 22:00:32 +13:00
Brenda Wallace
13e8d1f5a5 Merge remote-tracking branch 'upstream/dev' into api 2017-11-17 21:51:39 +13:00
Brenda Wallace
67dec795a0 Reinstated test of first harvest prediction display 2017-11-17 21:50:59 +13:00
Brenda Wallace
8884056ff3 Run existing crop specs with annual crop 2017-11-17 21:50:59 +13:00
Brenda Wallace
1b4d77e017 Requests spec for member api 2017-11-13 20:03:39 +13:00
Brenda Wallace
08e7c7dd29 Request specs for harvests api 2017-11-13 19:19:18 +13:00
Brenda Wallace
5fec826c41 Add more attributes to crops 2017-11-13 19:19:18 +13:00
Brenda Wallace
c29234c40c Request specs for crops api 2017-11-13 19:19:18 +13:00
Brenda Wallace
2f0cb5c815 DRY the api specs 2017-11-13 19:19:18 +13:00
Brenda Wallace
b6cbfe25d2 Factory girl becomes factory bot 2017-11-13 19:19:18 +13:00
Brenda Wallace
d8f5876518 Added predictions to planting api, and added specs 2017-11-13 19:19:18 +13:00
Brenda Wallace
ae2cbf0bec requests spec for modifying immutable gardens on api 2017-11-13 19:19:18 +13:00
Brenda Wallace
d86e0af5ad Request for for getting api gardens#index 2017-11-13 19:19:18 +13:00
Brenda Wallace
2fbba52bc8 Updating specs to use same owner for garden and planting 2017-11-13 19:18:14 +13:00
Brenda Wallace
a2ae429f6b If a harvest has a planting, it must have the same owner 2017-11-13 19:18:14 +13:00
Brenda Wallace
7ca76e69cf Get planting factory's owner from its garden 2017-11-13 19:18:14 +13:00
Brenda Wallace
809dd81378 "Changed last_harvest" to "days_to_last_harvest" 2017-11-08 17:17:58 +13:00
Brenda Wallace
62beec23a1 "Changed first_harvest" to "days_to_first_harvest" 2017-11-08 17:17:15 +13:00
Brenda Wallace
7206f99510 Updated spec to match new crop detail page text 2017-11-07 08:39:45 +13:00
Brenda Wallace
6bf87c243c Feature spec for crop predictions on crop#show 2017-11-06 22:38:48 +13:00
Brenda Wallace
470aacd1c9 Fixed %w for an array of words 2017-11-06 09:11:27 +13:00
Brenda Wallace
eaa65fda9e update median_last_harvest too, with specs 2017-11-05 20:28:51 +13:00
Brenda Wallace
6c33c335d8 Default ordering for harvests are gone, so order it in spec 2017-11-05 19:26:50 +13:00
Brenda Wallace
26537943e3 Removed pending spec 2017-11-05 18:00:49 +13:00
Brenda Wallace
b3fd8e32d0 Fixed ordering of Harvests - don't order in scope. 2017-11-05 17:42:59 +13:00
Brenda Wallace
9b1b22afa8 Bugfix and specs for first and last harvest 2017-11-05 17:33:58 +13:00
Brenda Wallace
996706ee78 Tests for planting lifespan predictions when there's no crop data 2017-11-05 17:29:42 +13:00
Brenda Wallace
ec00baef0d Updated feature spec to look for new annual/perennial text 2017-11-05 14:07:33 +13:00
Brenda Wallace
eb585611fe Fixed spec to call update_lifespan_medians 2017-11-05 14:05:54 +13:00
Brenda Wallace
5e5773aa59 feature spec for displaying annual/perennial on crops#show 2017-11-05 12:52:02 +13:00
Brenda Wallace
f2fac9db1b Time.zone.local 2017-11-04 11:39:53 +13:00
Brenda Wallace
20fe9e4cc5 Merge remote-tracking branch 'upstream/dev' into feature/harvest-predictions 2017-11-04 10:09:53 +13:00
Logan Gingerich
fa600bea9e changed spec to reflect factorybot change 2017-11-03 14:53:20 +13:00
Logan Gingerich
99e7fb1f7d Name added to contributors and spec added 2017-11-03 14:53:20 +13:00
Logan Gingerich
10a8df47a9 Factorygirl to factorybot - fixes #1413 (#1425)
* FactoryGirl Changed to FactoryBot

file fix

changes based on comments received

Bundle Update on 2017-10-29

style update to align hash literal

added package-lock

* indentation fixes with rubocop

* name added to contributors
2017-11-01 15:03:31 +00:00
Brenda Wallace
d540342acb removed the days_before_maturity specs because function no longer exists 2017-11-01 13:57:49 +13:00
Brenda Wallace
251f44b0c7 Updated tests of progress bar 2017-11-01 13:57:49 +13:00
Brenda Wallace
adf07ce5ef Planting feature specs passing 2017-11-01 13:57:49 +13:00
Brenda Wallace
ff446c2139 Updated spec, new message when not enough data to predict progress 2017-11-01 13:57:49 +13:00
Brenda Wallace
92fa09a1d3 Mark harvest predictions as pending 2017-11-01 13:57:49 +13:00
Brenda Wallace
9ef40532ad removed old percentage grow specs 2017-11-01 13:57:49 +13:00
Brenda Wallace
70ba8c8421 Updating planting model specs, for predictions 2017-11-01 13:57:49 +13:00
Brenda Wallace
7d6c49d8c3 Set harvest preductions on plantings 2017-11-01 13:57:49 +13:00
Brenda Wallace
e42ec4f8ae Test crop photo display when not signed in 2017-10-27 23:43:23 +13:00
Brenda Wallace
f7b75157e7 Feature spec for harvest photos 2017-10-27 23:34:37 +13:00
Brenda Wallace
7e27b6deef Merge branch 'feature/more-crop-photos' of github.com:Br3nda/growstuff into feature/more-crop-photos 2017-10-27 23:33:01 +13:00