Skud
2b6bdeda16
Merge branch 'dev' of https://github.com/Growstuff/growstuff into dev
...
Conflicts:
spec/views/crops/show.html.haml_spec.rb
2013-07-23 19:35:31 +10:00
pozorvlak
2950da9900
Merge pull request #254 from Skud/seed_trade
...
Seed trade
2013-07-18 07:11:19 -07:00
Skud
610b100f7f
seed page: cleaned up views/tests for location
2013-07-18 23:54:51 +10:00
Ryan Clark
269162c759
Tidied up seed views and added location stuff
2013-07-17 19:37:35 -07:00
Ryan Clark
21a0590114
Add tradable attributes to seed views
2013-07-17 18:59:32 -07:00
Ryan Clark
e9dd18d977
Added tradable and tradable_to to seeds
2013-07-17 18:25:55 -07:00
Ryan Clark
973567bfdc
Remane use_by to plant_before to humor Skud
2013-07-17 18:24:12 -07:00
Ryan Clark
454e7ceb3d
merging dev
2013-07-17 17:51:08 -07:00
Skud
1083763fbd
Merge branch 'sun_shade_metadata' of https://github.com/Skud/growstuff into Skud-sun_shade_metadata
2013-07-18 10:21:11 +10:00
Skud
a259b60c2d
Merge pull request #252 from Skud/seeds
...
Seeds
2013-07-17 17:20:15 -07:00
Ryan Clark
7f82e481ec
Merging dev
2013-07-16 17:23:15 -07:00
Skud
491e97c997
connected seeds into other parts of the site
2013-07-15 23:29:14 +10:00
Skud
cc711a0a48
prettified seed-related views
2013-07-15 22:53:30 +10:00
Skud
b27e1d4db3
let's not use nested resources (yet)
2013-07-15 22:53:30 +10:00
Skud
91ea5146ac
rails g scaffold seed...
2013-07-15 22:53:29 +10:00
Skud
334ca315b2
Merge pull request #250 from Skud/hidden-headings
...
fixed broken CSS that was hiding headings
2013-07-14 17:32:19 -07:00
Skud
b9a3dec6cc
fixed broken CSS that was hiding headings
2013-07-15 10:27:54 +10:00
Skud
ece34149a2
need to test sunniness/planted_from.blank?
2013-07-11 22:15:56 +10:00
Miles Gould
c4f4f4f7ef
Show planted_from frequencies on crop page.
2013-07-11 13:08:01 +01:00
Miles Gould
4d9ddd2707
Crop: method to return hash of planted_from frequencies
...
Also tidied up tests which relied on the default planting factory having
a planted_from value set.
2013-07-11 13:01:52 +01:00
Miles Gould
744b526dd1
Show sunniness frequencies on crop page
...
Also cleaned up tests that were relying on the default planting factory
to have a sunniness value set.
2013-07-11 12:41:22 +01:00
Miles Gould
fbc64a1ee2
Crop: method to return hash of sunniness values.
2013-07-11 12:13:38 +01:00
pozorvlak
7209eb41bf
Merge pull request #247 from Skud/staff
...
Lots of stuff, including staff on homepage, testing on postgres, and various others
2013-07-09 04:05:12 -07:00
Skud
e3cddf183e
Cleaned up seeds.rb, added methods etc.
...
Also ensured that things that are needed in production are created in
production: staff and free account types, admin and wrangler roles.
2013-07-09 21:02:01 +10:00
Skud
9df5feaf1c
Removed test user seeding from test/travis envs
...
We don't actually use these for testing (and shouldn't).
2013-07-09 20:41:05 +10:00
Skud
7801a7ec09
Merge branch 'dev' into staff
2013-07-09 10:05:37 +10:00
Skud
c2be06e68f
Fixed failing timestamp test on postgres
2013-07-08 13:28:59 +10:00
Skud
923f01cd72
cleaned up boring controller tests
2013-07-08 13:24:26 +10:00
Skud
1ff2211c0f
removed boring tests from controllers
...
the tests generated by 'rails g scaffold...' are boring and brittle.
they don't actually test anything other than the rails framework, and
they were causing us all kinds of trouble. we've started to blow them
away (and raised a PT chore to remove them from other controllers in due
course).
2013-07-08 13:09:37 +10:00
Skud
ec80b01c7a
cleaning up tests on postgres
...
- still trying to make sure we explicitly use a real member, not just
assume there's one with id = 1
- also it looks like the tests for post activity are passing for obscure
reasons on sqlite when they shouldn't be. this is a known bug
(https://www.pivotaltracker.com/story/show/51280861 ) apparently
invisible to us under sqlite.
2013-07-08 12:18:51 +10:00
Skud
0508837303
Can't assume we have a member with id = 1
...
this works on sqlite but not on postgres (which we now test on, on
travis)
2013-07-08 12:00:45 +10:00
Skud
878af07419
gave up on not_staff, shuffling interesting members instead
2013-07-08 11:54:55 +10:00
Skud
706881dbdb
set up test users in travis environment
2013-07-08 11:30:17 +10:00
Skud
68923d49fe
load test gems in travis environment too
2013-07-08 11:15:47 +10:00
Skud
8314851a8e
fixed c&p error in database.yml
2013-07-08 11:05:46 +10:00
Skud
c17ef8e566
attempt to get travis to test on psql not sqlite
2013-07-08 10:59:31 +10:00
pozorvlak
f16999c3bd
Merge pull request #246 from Skud/older-photos
...
view/select older flickr photos
2013-07-05 08:52:25 -07:00
pozorvlak
c6d038edc0
Merge pull request #245 from Skud/planting-method
...
Planting method
2013-07-05 07:08:27 -07:00
Skud
db16ad34f7
view/select older flickr photos
2013-07-05 22:07:55 +10:00
Skud
8bee9fcd1b
use blank instead of != 0 for qty
2013-07-05 21:11:07 +10:00
Skud
902b82a295
display planted_from on planting page
2013-07-05 21:09:21 +10:00
Skud
1689d7fdb1
added planted_from to planting form
2013-07-05 20:57:14 +10:00
Skud
b71ac3decb
added planted_from (eg seed, seedling)
2013-07-05 20:53:11 +10:00
Skud
2483d760d3
Merge pull request #244 from pozorvlak/fix_rake
...
Fix "uninitialized constant Rake::DSL" on Heroku.
2013-07-04 16:26:03 -07:00
Miles Gould
ffacf272e7
Fix "uninitialized constant Rake::DSL" on Heroku.
...
From http://stackoverflow.com/questions/6181312/how-to-fix-the-uninitialized-constant-rakedsl-problem-on-heroku/6263256#6263256
2013-07-04 13:46:36 +01:00
Skud
e4dd0f98e8
Merge pull request #243 from lucymclaughlin/forex_link
...
Forex link
2013-07-04 01:28:40 -07:00
Skud
067fd27837
Merge pull request #238 from pozorvlak/exclude-staff-from-members
...
Exclude staff from list of interesting members
2013-07-03 16:58:13 -07:00
Skud
6e895376a0
Merge pull request #239 from pozorvlak/kill_unused_helpers
...
Delete unused helpers and tests for same.
2013-07-03 16:55:06 -07:00
Lucy
778d7a68c3
Fix bug in order total; add conversion link to order show.
...
The old order total method did not account for quantities. The
view test for order totals was not catching this, so we've
strengthened it. We also added a conversion link to the order
summary page and created an additional test to check that orders
with more than one item were generating the correct total.
2013-07-03 14:10:37 +01:00
Lucy
e674a6572e
Added conversion links for recommended prices.
...
The paragraphs were getting a bit verbose so we shortened the link
text as well. Added an additional test to make sure the link is
working here too.
2013-07-03 13:22:07 +01:00
Skud