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
29d43f4e5b
Merge branch 'finished' of github.com:Skud/growstuff into Skud-finished2
2014-09-12 08:40:57 +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
Skud
9d5c15a7da
Merge branch 'finished' of github.com:Skud/growstuff into Skud-finished
...
Conflicts:
spec/features/plantings/planting_a_crop_spec.rb
2014-09-10 09:12:27 +10:00
Skud
e0485ade1d
Added test to make sure the wrong plantings aren't finished
2014-09-10 08:06:07 +10:00
Taylor Griffin
138904bd82
write regression test for creating plantings, harvests and seeds form crop page
2014-09-09 21:52:50 +10:00
catfriend
b0ee83bc3e
added test for adding placeholder text
2014-09-05 16:23:33 -07:00
Skud
56eaea9c06
Merge pull request #405 from Skud/cropmess
...
Crop and photo bugfixes
2014-09-04 21:23:31 +10:00
Skud
495f4194e7
Fixed test for branding in navbar
2014-09-04 19:02:38 +10:00
Skud
baf8b91a4e
Removed fairly pointless test for markup
2014-09-04 18:05:10 +10:00
Skud
a8a34d8dc8
s/user/member/g in crop wrangler tests
...
We don't use the term "user" in Growstuff -- this should ideally have
been caught in code review but I missed it :-/
2014-08-31 18:28:50 +10:00
Skud
965a3bf2a1
Modernise redirection after signup to use devise's stored_location_for
2014-08-31 18:28:26 +10:00
Skud
597e878413
Removed spurious seeds tests (moved to subdir)
2014-08-30 17:40:16 +10:00
Skud
29f83b8c18
Merge branch 'coverage' of github.com:Skud/growstuff into coverage
...
Conflicts:
Gemfile.lock
app/views/gardens/_form.html.haml
spec/spec_helper.rb
2014-08-30 17:32:50 +10:00
Skud
b0378fab69
Cleaned up tests a little bit
2014-08-30 17:30:24 +10:00
Skud
d35639d7cb
Add page content test suggested by tygriffin
2014-08-30 17:10:36 +10:00
Skud
d55d2c6409
Ongoing coverage improvements
2014-08-30 17:09:47 +10:00
Skud
082663c885
Show coverage locally and send to coveralls
2014-08-30 17:09:47 +10:00
Taylor Griffin
1cd2fd9b07
Merge branch 'dev' of https://github.com/Growstuff/growstuff into crop-suggest
2014-08-30 12:15:02 +10:00
Taylor Griffin
3fbae6a5ee
write regression spec for resource id bug when editing resource
2014-08-30 12:14:36 +10:00
Skud
fbeafd4299
Improving test coverage for gardens
2014-08-30 11:28:52 +10:00
Skud
4ebc184188
Add finished planting data (and buttons) to plantings index
...
I also removed description from the table as it was getting way too full
2014-08-30 11:11: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
170d6b474e
Updated garden page with "finished" plantings
...
Also added a similar "mark as inactive" button for the garden itself
and rearranged some things on the page.
2014-08-30 10:42:16 +10:00
Skud
9f9ef10b6a
Added finished fields to planting form and display
2014-08-30 09:52:26 +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
40c7124769
Merge pull request #379 from tygriffin/crop-suggest
...
Crop suggest
2014-08-29 11:35:25 +10:00
Skud
8a5d1f2e5e
Fixed crop wrangler tests to not be order dependent
2014-08-29 10:38:35 +10:00
Taylor Griffin
7fa05d81e9
fix tests to match new implementation of of auto_suggest
2014-08-29 07:38:55 +10:00
Taylor Griffin
2c50c3b703
merge in a bunch of (mostly bootstrap 3) changes
2014-08-29 07:14:44 +10:00
Skud
c68b029d50
Switch to match_array to get around spuriously failing tests
2014-08-28 10:16:31 +10:00
Skud
840a5efc4e
Merge remote-tracking branch 'upstream/bootstrap3' into dev
...
Conflicts:
Gemfile.lock
2014-08-28 08:00:10 +10:00
Skud
f6c2873f97
Add page content test suggested by tygriffin
2014-08-27 18:43:44 +10:00
Skud
a5c2c0bb5c
Fixed twitter link on contact page
2014-08-25 13:41:15 +10:00
Taylor Griffin
2a51f66d88
fix seed view tests
2014-08-24 12:11:10 +10:00
Taylor Griffin
fd651de7ea
implement auto suggest on new seed page
2014-08-24 12:02:53 +10:00
Taylor Griffin
d038ac6d8a
test that input value is not affected by auto suggest
2014-08-24 10:53:24 +10:00
Skud
1250206c5e
Ongoing coverage improvements
2014-08-22 14:44:00 +10:00
Skud
9c5f7753ca
Show coverage locally and send to coveralls
2014-08-22 14:09:12 +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
Skud
561b7c45ac
b3ify and improve design of edit profile page
2014-08-11 14:42:00 +10: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
Taylor Griffin
e0d81f5693
improve and abstract auto_suggest api
2014-08-02 22:14:10 +10:00
Taylor Griffin
7aef1264ce
fix edge case where user types in full name of crop and doesn't use autocomplete suggestions
2014-08-02 20:44:19 +10:00
Taylor Griffin
c282b3b208
abstract crop suggest autocomplete tests into a shared example
2014-08-01 20:18:28 +10:00
Taylor Griffin
69162cf228
write feature specs for harvesting a crop
2014-08-01 19:38:47 +10:00
