Brenda Wallace
4bed6da422
Crop validation methods can be private
2017-11-29 20:59:37 +13:00
Brenda Wallace
023c870d49
Fix up crop.recent
2017-11-29 20:59:37 +13:00
Brenda Wallace
9aff65e956
Added ordering to finding first photo
2017-11-29 20:59:37 +13:00
Brenda Wallace
0446c0a405
Add ordering back into controller #index
2017-11-29 20:59:37 +13:00
Brenda Wallace
7719d1f896
Remote default ordering scopes, and clean up models
2017-11-29 20:59:37 +13:00
Brenda Wallace
17fd6f61a5
Added polymorphic relationship to photos
2017-11-29 20:14:27 +13:00
Brenda Wallace
c9558e4d51
Merge branch 'master' into dev
...
Conflicts:
Gemfile.lock
2017-11-29 10:46:08 +13:00
deppbot
8a679670e4
Bundle Update on 2017-11-29
2017-11-29 07:00:25 +13:00
pozorvlak
a7586e9d2b
Merge pull request #1448 from Br3nda/fix/1211
...
upgrade leaflet-rails
2017-11-27 20:42:22 +00:00
Shiny
811011419e
Exit if we can't cd
2017-11-26 09:39:43 +13:00
Shiny
dae3ea2789
removed some debug
2017-11-25 19:41:41 +13:00
Shiny
49aa6bb846
Update .travis.yml
2017-11-25 19:41:03 +13:00
Brenda Wallace
c154a9b845
Upgraded leaflet maskercluster
2017-11-25 19:34:05 +13:00
Shiny
ad14ecb41b
Merge branch 'dev' into fix/1211
2017-11-25 17:03:23 +13:00
deppbot
08a73ce503
Bundle Update on 2017-11-24
2017-11-25 09:53:29 +13:00
Brenda Wallace
6663f3ade4
Add id and type back to photos#new
2017-11-24 19:02:54 +13:00
deppbot
451030761d
Bundle Update on 2017-11-21
2017-11-24 19:02:54 +13:00
Brenda Wallace
d4e4ca6519
Move planting's add photo button to _actions.haml
2017-11-24 19:02:54 +13:00
Brenda Wallace
284f0cddcd
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-24 19:02:54 +13:00
Logan Gingerich
4ced7ee7e9
Whitespace fix, spec fix, and spec addition
2017-11-24 19:02:54 +13:00
Logan Gingerich
b60510e016
deleted line 70 on plantings view to clean up logic
2017-11-24 19:02:54 +13:00
Logan Gingerich
e85daa405b
Moved add photo button from garden show view to garden actions
2017-11-24 19:02:54 +13:00
Logan Gingerich
9ab83f7bbc
Adds a more prominent add photo button to garden and planting show views
2017-11-24 19:02:54 +13:00
Brenda Wallace
329e0106bb
Path remains same after sign out for our test cases
2017-11-24 19:02:54 +13:00
Brenda Wallace
4743fc7a63
Feature spec for showing item details on photo adding page
2017-11-24 19:02:54 +13:00
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