Skud
fc4c409cf4
Tests for views/posts now work.
...
Not going to make any claims for other views though! About to test them
next.
2013-01-13 16:18:48 +11:00
Skud
21f0f39bf9
Model and controller spec files pass.
...
Views are another matter (and will explode badly at this point)
2013-01-13 16:12:45 +11:00
Skud
576ba289eb
FGified model/update tests
2013-01-13 15:51:09 +11:00
Skud
72bb1a641f
Made the :user factory be confirmed by default.
...
We hardly ever actually need an unconfirmed user, but if we do, there is
now :unconfirmed_user for that purpose.
2013-01-13 13:10:24 +11:00
Skud
cf7c092220
FGified models/garden tests.
...
Also tweaked slug generation to be lowercase, and avoid spaces in slugs.
This probably needs more work to handle unusual characters, but I
punted on that for now.
2013-01-13 12:58:26 +11:00
Skud
ecd9cc19fc
FGified models/planting tests
2013-01-13 12:52:57 +11:00
Skud
1e02e42665
FGified view/plantings tests
2013-01-13 12:49:30 +11:00
Skud
0972429087
Turned a contains into an assert_select. This is better.
2013-01-13 12:33:47 +11:00
Skud
8b0fa9e050
FGified garden tests. Removed some spurious bits.
2013-01-13 12:17:06 +11:00
Skud
988d2c67c0
FGified and slightly improved updates tests
2013-01-13 12:08:02 +11:00
Skud
7aac659749
FGified and generally improved members/show tests
2013-01-13 11:38:54 +11:00
Skud
8b44b97c7e
This doesn't need a confirmed user, just a basic one.
2013-01-13 11:37:13 +11:00
Skud
007c7e5fae
FGified views/members/index
...
Note that all users need different email addresses otherwise you get
"email address is already taken" problems if you try to create two at
once.
2013-01-13 11:15:07 +11:00
Skud
b1277d4132
FGified user model tests
2013-01-13 11:05:55 +11:00
pozorvlak
7dd17c4e8b
Merge pull request #84 from gnattery/factorygirl
...
Factorygirl
2013-01-11 04:43:58 -08:00
gnattery
a3de3ddbb2
Removed some stuff hanging around from previous experiments
2013-01-11 13:35:49 +11:00
gnattery
74a11c5554
Factory-girl-ified the scientific name tests
2013-01-11 13:15:39 +11:00
gnattery
de49c6499a
Added model tests for scientific names
2013-01-11 12:12:41 +11:00
Skud
e854858971
factory-girl-ified models/crop tests
2013-01-11 11:41:51 +11:00
Skud
46fd6953ac
factory-girl-ified the views/crops tests
2013-01-11 11:39:50 +11:00
Skud
fe24802790
added factorygirl, using it for one test so far
2013-01-11 11:01:34 +11:00
Skud
f31acc31e2
Merge pull request #83 from cesullivan/dev
...
Remove time field in planting/new PT 41633333
2013-01-10 01:47:53 -08:00
Cathy Sullivan
46d84903ae
Remove time field in planting/new PT 41633333
2013-01-09 11:54:38 -08:00
pozorvlak
6f9470c31f
Merge pull request #82 from Skud/heroku-environments
...
Make dev/staging work on Heroku
2013-01-09 04:55:57 -08:00
Skud
71750889d3
added mandrill smtp settings for staging environment
2013-01-09 23:36:17 +11:00
Skud
89ab3fc347
Merge branch 'dev' of https://github.com/Growstuff/growstuff into dev
2013-01-09 15:45:37 +11:00
Skud
02cdb26ab1
Merge pull request #81 from Skud/upgrade_rails
...
Upgrade rails
2013-01-08 20:44:02 -08:00
Skud
f5f5e35853
Switched from WebRick to thin for a couple of reasons
...
- webrick spits out spurious warnings when serving assets
- heroku recomments thin, and we're working on using heroku a bit
2013-01-09 11:09:58 +11:00
Skud
bd17546635
and now rails 3.2.11 because of another security patch
2013-01-09 11:05:44 +11:00
Skud
e010dc7f4f
Merge pull request #79 from pozorvlak/upgrade_rails
...
Fix version of cape
2013-01-04 05:08:39 -08:00
Miles Gould
075fbae086
Fix version of cape
...
Upgrading to 1.6.0 was breaking deployments.
2013-01-04 13:01:09 +00:00
Skud
7319dcffc5
Merge pull request #78 from pozorvlak/upgrade_rails
...
Upgrade rails
2013-01-04 04:54:30 -08:00
Miles Gould
26f8367430
Fix version of Twitter bootstrap to avoid dependency hell.
...
Bootstrap 2.1.9 depends on therubyracer 0.11 which depends on native v8
which requires root access.
2013-01-04 12:45:00 +00:00
Miles Gould
03fd77b03e
Upgrade to Rails 3.2.10
...
- there was a SQL injection bug in 3.2.8
- also fixed the version of therubyracer, to avoid dependency on native
v8.
- we need therubyracer to build bootstrap stuff.
2013-01-04 12:33:22 +00:00
Skud
e58b470c16
Merge pull request #76 from pozorvlak/clickable_avatars
...
Clickable avatars
2013-01-03 03:50:22 -08:00
Miles Gould
9ece3e9864
Make user pictures into clickable links.
2013-01-02 13:21:11 +00:00
Miles Gould
a481ea25b1
Factor out gravatar + name into a partial.
2013-01-02 13:21:11 +00:00
pozorvlak
42683d733b
Merge pull request #72 from gnattery/unconfirmed
...
Unconfirmed
2012-12-28 07:26:43 -08:00
gnattery
f5adf601cb
Merge pull request #1 from pozorvlak/unconfirmed
...
Move "is user confirmed" checks into model.
2012-12-28 07:25:45 -08:00
Miles Gould
5d4ba46ce4
Move "is user confirmed" checks into model.
2012-12-28 13:29:46 +00:00
pozorvlak
898b41d656
Merge pull request #74 from Skud/plantsomething
...
Plantsomething
2012-12-22 15:29:41 -08:00
Skud
dd301d1777
improved crop/garden pre-selection in planting form
2012-12-23 10:20:51 +11:00
Skud
02daab4fc1
added crop_id and garden_id params to controller
2012-12-23 10:01:19 +11:00
pozorvlak
e5e3bfa93a
Merge pull request #71 from pozorvlak/creategarden
...
Links and forms to create new gardens
2012-12-21 06:09:29 -08:00
Miles Gould
30fc533748
Document the need for @garden in MembersController#show
2012-12-21 14:07:00 +00:00
Miles Gould
2978a18d4f
Add title to "New garden" tab on profile.
2012-12-21 11:02:39 +00:00
Miles Gould
8cd97deea2
Use Bootstrap formatting on "new garden" form.
2012-12-21 10:36:34 +00:00
pozorvlak
600d27429b
Merge pull request #73 from Skud/planting_markdown
...
render markdown in planting descriptions
2012-12-21 02:14:02 -08:00
Skud
626fc55f37
render markdown in planting descriptions
2012-12-21 13:45:22 +11:00
Skud
bf2b1d6596
select garden/crop based on params - BROKEN TESTSwq
2012-12-21 13:32:32 +11:00
