Brenda Wallace
c66a5b12a5
Reduced the tests of signout on photos/new
2017-11-24 19:02:54 +13:00
Brenda Wallace
f98bb32612
Shaved some yaks to remove a rescue from a controller
2017-11-24 19:02:54 +13:00
Brenda Wallace
771443ee85
Removed rescue in a controller
2017-11-24 19:02:54 +13:00
Brenda Wallace
1322ebd8e3
Use the ||= operator
2017-11-24 19:02:54 +13:00
Brenda Wallace
9e98db423e
Tidy up photos logic, and test of signin/out on photos#new
2017-11-24 19:02:54 +13:00
Logan Gingerich
305702f644
Refactored and specs updated
2017-11-24 19:02:54 +13:00
Logan Gingerich
1f4f806bb0
Now displays correctly for planting, harvest or garden
2017-11-24 19:02:54 +13:00
Logan Gingerich
6a17ba547f
fixes #1433 Says what item you're adding a photo to on photos#new
2017-11-24 19:02:54 +13:00
deppbot
3ffdc61428
Bundle Update on 2017-11-18
2017-11-24 19:02:54 +13:00
milesgould
bb6e9e32e6
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-24 19:02:54 +13:00
Brenda Wallace
229396d9e7
Add id and type back to photos#new
2017-11-22 22:06:41 +13:00
Daniel O'Connor
0fa02272b0
Merge pull request #1465 from Growstuff/bundle-update-2017-11-21-121132
...
Bundle Update on 2017-11-21
2017-11-22 16:36:46 +10:30
deppbot
a91b8605c4
Bundle Update on 2017-11-21
2017-11-21 12:11:33 +08:00
pozorvlak
f1107b518c
Merge pull request #1460 from Br3nda/fix/gardens-index
...
Fix gardens actions, and add specs
2017-11-20 11:21:07 +00:00
Shiny
52d93a7ccd
Merge branch 'dev' into fix/1211
2017-11-19 18:22:02 +13:00
Brenda Wallace
d3df1e8f33
Move planting's add photo button to _actions.haml
2017-11-19 18:02:09 +13:00
Shiny
eb77715b70
Merge branch 'dev' into fix/gardens-index
2017-11-19 16:35:56 +13:00
Shiny
252910694d
Merge branch 'master' into dev
2017-11-19 16:34:58 +13:00
Brenda Wallace
bd063be3a9
Fix gardens actions, and add specs
...
A bug slipped into all garden display pages - and there were no tests that caught it.
This adds feature specs for gardens#index, which would have detected the un-initialised
variable in haml
2017-11-19 16:31:17 +13:00
Shiny
9a6d827b6d
Merge branch 'dev' into fix/1211
2017-11-19 11:14:09 +13:00
Logan Gingerich
ede5187369
Whitespace fix, spec fix, and spec addition
2017-11-19 11:13:41 +13:00
Logan Gingerich
610a5b7a48
deleted line 70 on plantings view to clean up logic
2017-11-19 11:13:41 +13:00
Logan Gingerich
1fa71c1546
Moved add photo button from garden show view to garden actions
2017-11-19 11:13:41 +13:00
Logan Gingerich
7574eb554e
Adds a more prominent add photo button to garden and planting show views
2017-11-19 11:13:41 +13:00
Shiny
eea7e19ecf
Merge branch 'dev' into fix/1211
2017-11-18 22:27:04 +13:00
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
