Brenda Wallace
dafaffcd73
Path remains same after sign out for our test cases
2017-11-18 22:25:58 +13:00
Brenda Wallace
3e149a5d1d
Feature spec for showing item details on photo adding page
2017-11-18 22:25:58 +13:00
Brenda Wallace
c20d9b78c5
Reduced the tests of signout on photos/new
2017-11-18 22:25:58 +13:00
Brenda Wallace
7906d50d13
Shaved some yaks to remove a rescue from a controller
2017-11-18 22:25:58 +13:00
Brenda Wallace
faed8b019e
Removed rescue in a controller
2017-11-18 22:25:58 +13:00
Brenda Wallace
c8974a869f
Use the ||= operator
2017-11-18 22:25:58 +13:00
Brenda Wallace
3969f410f1
Tidy up photos logic, and test of signin/out on photos#new
2017-11-18 22:25:58 +13:00
Logan Gingerich
6304f230a5
Refactored and specs updated
2017-11-18 22:25:58 +13:00
Logan Gingerich
73524b8883
Now displays correctly for planting, harvest or garden
2017-11-18 22:25:58 +13:00
Logan Gingerich
fd9fc38def
fixes #1433 Says what item you're adding a photo to on photos#new
2017-11-18 22:25:58 +13:00
deppbot
949c7c31d8
Bundle Update on 2017-11-18
2017-11-18 15:27:04 +13:00
pozorvlak
e34dcd03bc
Merge pull request #1454 from pozorvlak/dedeprecate_view_specs
...
De-deprecate controller and view specs
2017-11-17 17:05:07 +00:00
pozorvlak
929229379e
Merge pull request #1455 from Growstuff/dev
...
Release 34
2017-11-17 16:55:01 +00:00
milesgould
d8bf8ae4df
De-deprecate controller and view specs
...
We deprecated controller and view specs on the grounds that they were
brittle, and were a poorer measure of user experience than feature
specs. However, feature specs have their own problems: they're much
slower to run, and flakier (see #901 ). We also ran into a few cases
where feature specs erroneously passed because they were checking for
the presence of a string that occurred in the error page!
Hence, we're cautiously un-deprecating controller and view specs.
Fixes #1132
2017-11-17 16:51:24 +00:00
pozorvlak
ac0e52f15d
Merge pull request #1412 from Br3nda/api
...
Basic read only api - members, gardens, plantings, crops, photos, harvests, seeds
2017-11-17 16:44:41 +00:00
Shiny
c7f427fe8a
Merge branch 'dev' into api
2017-11-18 00:48:03 +13:00
Shiny
50fd9ae9b0
Merge branch 'master' into dev
2017-11-18 00:44:44 +13:00
Brenda Wallace
efe39da878
Removed un-used method, to reduce class size
2017-11-18 00:43:17 +13:00
Brenda Wallace
1cd3c64590
Reducing class line count
2017-11-18 00:43:17 +13:00
Brenda Wallace
b591529892
Reinstated test of first harvest prediction display
2017-11-18 00:43:17 +13:00
Brenda Wallace
cef236d8f8
Reducing crop class size
2017-11-18 00:43:17 +13:00
Brenda Wallace
5ad0068142
Run existing crop specs with annual crop
2017-11-18 00:43:17 +13:00
Brenda Wallace
b8a5ff9acf
Don't show lifespan of perennials
2017-11-18 00:43:17 +13:00
deppbot
90653aa57f
Bundle Update on 2017-11-15
2017-11-18 00:43:17 +13:00
Shiny
80a4739f34
Underscore prefix on our last unused args ( #1442 )
2017-11-18 00:43:17 +13:00
Brenda Wallace
a6cc530fe5
Updating specs to use same owner for garden and planting
2017-11-18 00:43:17 +13:00
Brenda Wallace
97f19a0038
If a harvest has a planting, it must have the same owner
2017-11-18 00:43:17 +13:00
Brenda Wallace
140611d868
Get planting factory's owner from its garden
2017-11-18 00:43:17 +13:00
Brenda Wallace
3fa5ffc544
Planting's owner must be the same as its garden's owner
2017-11-18 00:43:17 +13:00
deppbot
eeafb4caa5
Bundle Update on 2017-11-12
2017-11-18 00:43:17 +13:00
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
06295fb9e9
Merge branch 'api' of github.com:Br3nda/growstuff into api
2017-11-17 22:02:06 +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
c1836cc78e
Removed un-used method, to reduce class size
2017-11-17 21:50:59 +13:00
Brenda Wallace
28fdb6e1ed
Reducing class line count
2017-11-17 21:50:59 +13:00
Brenda Wallace
67dec795a0
Reinstated test of first harvest prediction display
2017-11-17 21:50:59 +13:00
Brenda Wallace
86ea8eab39
Reducing crop class size
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
d01a5d7976
Don't show lifespan of perennials
2017-11-17 21:50:59 +13:00
pozorvlak
66c08650ba
Merge pull request #1445 from Br3nda/feature/planting-garden-owner-match
...
planting owner needs to match garden owner
2017-11-15 17:49:00 +00:00
Shiny
521873b656
Merge branch 'dev' into feature/planting-garden-owner-match
2017-11-15 09:27:41 +13:00
Shiny
83fea92353
Merge branch 'dev' into fix/1211
2017-11-15 09:27:17 +13:00
deppbot
2060d9ab9e
Bundle Update on 2017-11-15
2017-11-15 09:26:47 +13:00
Shiny
1795b27152
Merge branch 'dev' into feature/planting-garden-owner-match
2017-11-13 23:09:04 +13:00
Shiny
1317ce9db0
Merge branch 'dev' into fix/1211
2017-11-13 23:08:38 +13:00
Shiny
93193c9fba
Merge branch 'dev' into api
2017-11-13 23:00:33 +13:00
Brenda Wallace