Skud
6aea16028e
Merge pull request #452 from wsmoak/negative-area
...
Prevent the creation of a garden with a negative number for the area.
2014-11-19 17:18:09 +11:00
Wendy Smoak
02994bd5cc
Added a test for the validator to show it doesn't accept negative numbers for garden area.
2014-11-18 20:58:00 -05:00
Taylor Griffin
0ffe9adc86
tests are green
2014-11-16 21:40:43 +11:00
Taylor Griffin
f1945151c7
update RSpec true / false matchers
2014-11-16 14:40:50 +11:00
Taylor Griffin
7fc886f43c
implement custom Sweeper class as stop gap against errors when running specs
2014-11-16 12:01:27 +11:00
Yoong Kang Lim
e687bd43dc
Added model tests for follows
2014-11-13 01:22:28 +11:00
Yoong Kang Lim
b5e1b6bc22
Delete unused views, add feature tests
2014-11-13 00:46:34 +11:00
Yoong Kang Lim
a9fdab5d7c
Basic follower relationship
2014-11-12 00:23:01 +11:00
Skud
2426c51951
Fixed bug in deleting unused photos
...
... and wow, my tests were really not testing what I thought they were
testing :-/
2014-11-11 19:29:32 +11:00
pozorvlak
24d276da37
Merge pull request #420 from Skud/plantingreminder
...
Planting reminder
2014-11-07 14:31:43 +00:00
Skud
7595d75d20
Merge pull request #432 from pozorvlak/alternate_crop_names
...
Model and CRUD for alternate crop names
2014-10-19 16:34:44 +01:00
Miles Gould
dc2cf5275c
Fix model tests for alternate names.
2014-10-18 17:30:22 +01:00
Miles Gould
83fa291060
Fetch alternate names for a crop.
2014-10-18 13:50:28 +01:00
Miles Gould
e85cb4598d
Add alternate name model.
2014-10-18 12:38:44 +01:00
Skud
f18feaa131
Merge branch 'dev' of https://github.com/Growstuff/growstuff into plantingreminder
2014-10-18 11:23:30 +01:00
Skud
e4cf636bef
Merge branch 'dev' of https://github.com/Growstuff/growstuff into plantingreminder
...
Conflicts:
app/models/harvest.rb
db/schema.rb
spec/models/harvest_spec.rb
2014-10-15 14:20:16 +01:00
Skud
75e076cef5
Merge branch 'dev' of https://github.com/Growstuff/growstuff into tomatoes
...
Conflicts:
spec/models/crop_spec.rb
2014-10-15 14:07:03 +01:00
Skud
25cb3fd469
Fixed scientific name upload bug and wrote tests
...
Wrote unit tests and refactored Crop.create_from_csv
The actual bug (now fixed) is that if you didn't specify a SN in the
CSV, it would try and pick it up from the parent crop, but then the
testing for "is this a dup?" was based on what was in the CSV and didn't
take that parent SN into account. This is now fixed.
2014-10-15 13:58:21 +01:00
Skud
ff61739716
s/boring_planting/no_photo_planting for clarity
2014-10-08 18:59:10 +01:00
Shiho Takagi
cf07ecfa4a
improved test spec, crop page and added rake task
2014-10-05 23:16:46 +11:00
Shiho Takagi
6e02f40e0a
merging from dev
2014-10-05 13:47:12 +11:00
Shiho Takagi
14d039ee01
Added crops-posts association as well as updated GUI for crop show
2014-10-05 13:32:08 +11:00
Skud
a5b856b506
Merge pull request #410 from maco/dev
...
Harvest photos
2014-10-02 17:45:59 +10:00
Mackenzie Morgan
48ad561b76
convert tabs to spaces
2014-10-01 23:58:54 -04:00
Skud
65c46c334b
Delete unused photos
...
Make sure the models are setup so that if a photo is not used for
anything, it's removed from the system.
Also wrote a rake task (which should be run on deploy) to remove older
unused photos.
2014-09-29 09:18:28 +10:00
Skud
4a62add88e
Merge branch 'dev' of https://github.com/Growstuff/growstuff into plantingreminder
...
Conflicts:
spec/models/planting_spec.rb
2014-09-28 15:32:53 +10:00
Skud
3cf2a50a34
modified Planting.interesting to have some options re: howmany and photos
2014-09-12 13:20:41 +10:00
Skud
374987488f
Fixed broken tests.
2014-09-12 08:30:44 +10:00
Skud
85b5ac12ca
added validation for finished_at (must be after planted_at)
2014-09-12 07:50:25 +10:00
Mackenzie Morgan
512ccdbaa2
merging the schema changes from finished plantings and making the timestamp newer, then making the styling on harvest photos match the new styling (no li) on planting photos
2014-09-09 20:19:25 -04:00
Mackenzie Morgan
7d54ab347f
Adding photo functionality to harvests
2014-09-09 19:55:40 -04:00
Skud
e0485ade1d
Added test to make sure the wrong plantings aren't finished
2014-09-10 08:06:07 +10:00
Skud
2be199abbc
Merge branch 'dev' of https://github.com/Growstuff/growstuff into plantingreminder
...
Conflicts:
Gemfile
Gemfile.lock
app/views/devise/registrations/edit.html.haml
2014-08-30 17:45:19 +10:00
Skud
af2d0e22ee
Automatically set plantings to finished when a garden is marked inactive
2014-08-30 10:51:33 +10:00
Skud
e7dd50c3f1
Added scopes for finished and current plantings
2014-08-30 09:28:02 +10:00
Skud
b07d9d8db0
Added finished fields for plantings
2014-08-30 09:27:41 +10:00
Skud
c68b029d50
Switch to match_array to get around spuriously failing tests
2014-08-28 10:16:31 +10:00
Marlena Compton
36199054c0
changed method so that you can now call crop_wranglers and admins. meta-programming ftw
2014-08-21 20:11:10 -07:00
Marlena Compton
13e015b441
fixed role factory to not create extra roles when new members
2014-08-21 20:11:10 -07:00
Marlena Compton
ec25f2ab91
created list of crop wranglers on the crop wranglers page
2014-08-21 20:11:10 -07:00
Mackenzie Morgan
f3c3d73ef1
updating test for harvest units to list the valid units and adding a task to correct misspelled pint harvests already in the database
2014-08-10 19:49:10 -04:00
Mackenzie Morgan
0a256a2dd0
update harvest model test for oz
2014-07-30 09:15:53 -04:00
Skud
817663bdaf
Merge branch 'dev' of https://github.com/Growstuff/growstuff into regularemail
...
Conflicts:
db/schema.rb
2014-07-20 19:30:20 +10:00
Skud
846a2c89c5
Tweaked FactoryGirl to use create_list
2014-07-20 19:29:06 +10:00
Skud
f4c2c2481d
Include plantings/harvests in regular email
2014-07-20 18:45:48 +10:00
Skud
aeb14021f3
Removed unpopular scope (guess it really was unpopular)
2014-07-18 18:17:37 +10:00
Skud
573e555bcf
Added unpopular scope to crop
2014-07-18 17:52:11 +10:00
Skud
c9857bf1c8
popular scope for crops
2014-07-18 17:38:15 +10:00
Skud
77d2b0e950
make crop search case insensitive
2014-07-06 20:16:59 +10:00
Mackenzie Morgan
062add32dc
Add 'root/tuber' to 'planted from:' list, for things like potatoes
2014-05-04 22:46:45 -04:00
