Commit Graph

11959 Commits

Author SHA1 Message Date
pozorvlak
d00b5febe8 Merge pull request #87 from Skud/user2member
Rename "user" to "member" throughout codebase
2013-01-13 17:12:03 -08:00
pozorvlak
aaeb5641e7 Merge pull request #85 from Skud/fg2
Moar factory girl
2013-01-13 13:41:47 -08:00
Skud
47719709ad Remove broken migrations
It seems these should never have been migrations in the first place.
It's considered an anti-pattern to include model code in your migrations
(these referred to User and Update), and we can see why -- having
renamed the models, these migrations now fail.

Apparently the Right Thing is to write a rake task to do the work in
question, and then run it via whatever deployment mechanism you use.
Since these have already been run on our dev server, and they're not all
that important anyway (i.e. won't break people's local machines they're
developing on, etc), and on top of all that they're a couple of months
old so most active developers should have run them already... as I was
saying, considering all that, I'm just blowing them away.
2013-01-13 11:49:58 +00:00
Skud
7abe7167d3 Fixed reference to User in db/seeds.rb 2013-01-13 11:33:16 +00:00
Skud
4dec806589 FGified the login_member method 2013-01-13 21:46:46 +11:00
Skud
c4cac871d5 Fixed up tests for garden display
These were just wrong wrongety wrong. I think they were from before we
were auto-creating a garden for new members.  Fixed now.
2013-01-13 21:43:20 +11:00
Skud
7579d894aa Renamed default garden in /spec/factory/garden
"My Garden" was too generic and hard to test for -- tests like
rendered.should contain "Garden" are far too easy to have a false
positive pass.  So I renamed it "Springfield Community Garden" so that
false-positive passes were less likely.
2013-01-13 21:32:54 +11:00
Skud
8da9a13eae Changed garden.member_id to garden.owner_id 2013-01-13 21:29:28 +11:00
Skud
df76f2497a renamed Post.member_id to Post.author 2013-01-13 20:57:28 +11:00
Skud
689448f87c renamed Member.username to login_name 2013-01-13 19:14:46 +11:00
Skud
354c712948 Rearranged routes so that devise worked with "members" 2013-01-13 18:38:38 +11:00
Skud
edb59e07ee s/users/members/g -- all tests pass
There's still probably stuff broken, but this seemed like a good spot to
commit.  Sorry for the enormous chunk of code.  I was attempting to
update the views, but found that I needed to update a few things
elsewhere as well to make them work.
2013-01-13 18:33:43 +11:00
Skud
fdb309cdd2 s/users/members/g -- controllers and their tests 2013-01-13 17:53:24 +11:00
Skud
657ccf7cd8 s/users/members/g -- models and tests for them 2013-01-13 17:24:46 +11:00
Skud
801a3d0f6c Added some basic tests for RSS feeds. 2013-01-13 17:06:36 +11:00
Skud
cc7519cd59 s/update/post in routing. I think this is it! 2013-01-13 16:44:03 +11:00
Skud
48d8b39b0a s/update/post in members controller, plus tests 2013-01-13 16:40:07 +11:00
Skud
dc9b8b8aa9 All spec tests now pass with s/update/post
Haven't done a full runthrough of the site yet, so will probably need to
make a few more changes.
2013-01-13 16:33:08 +11:00
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