Commit Graph

479 Commits

Author SHA1 Message Date
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
pozorvlak
f16999c3bd Merge pull request #246 from Skud/older-photos
view/select older flickr photos
2013-07-05 08:52:25 -07:00
Skud
db16ad34f7 view/select older flickr photos 2013-07-05 22:07:55 +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
e4dd0f98e8 Merge pull request #243 from lucymclaughlin/forex_link
Forex link
2013-07-04 01:28:40 -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
Lucy
5c92bb04d3 Updated the foreign exchange link to use configured currency. 2013-07-03 13:04:43 +01:00
Lucy
67c457dfcd Modified the foreign exchange link to convert the right price.
Changed the forex site to Wolfram Alpha from XE, which allow us
to convert the right number of AUD with one click. Upated tests to
reflect this change.
2013-07-03 12:59:49 +01:00
Lucy
80ed2179e2 Proof of concept for adding a foreign exchange link to the shop.
Added a function that returns a link for a foreign exchange site
and showed it on the Shop page. Also included a test to make sure
it works.
2013-07-03 12:50:56 +01:00
Lucy
9ce85e2f73 Updated tests to test for the default account type.
Tests used to check that the default account type was always "Free".
Now that we have a default account type as a config variable, the
tests test to see the default account type matches the value of that
variable.
2013-07-03 11:17:18 +01:00
Lucy
1b0a708b04 Documented reason for using south_pole_member in tests. 2013-07-03 10:51:55 +01:00
Miles Gould
2d8128e54d Slightly simplify tests for not_staff scope.
There's no reason to set a location on the test member.
2013-06-26 10:55:19 +01:00
Miles Gould
d26dd4499c Deleted unused admin_helper_spec.rb 2013-06-26 10:55:19 +01:00
Miles Gould
8dceb985a1 Fix pending tests in views/shop/index.
We needed to stub out current_member, not current_user.
2013-06-26 10:55:19 +01:00
Miles Gould
5bcd4c2edd Use ActiveRecord methods for not_staff join code.
- set member.account_type directly in tests, because changes to
   member.account.account_type weren't being persisted.
2013-06-26 10:55:19 +01:00
Miles Gould
0a8aaf0ee6 Create free account type if it doesn't exist; fix tests. 2013-06-26 10:55:19 +01:00
Lucy
6ccf8f397f Give new users a free account. 2013-06-26 10:55:18 +01:00
Miles Gould
c6eb835771 Tests and sketch implementation of not_staff scope.
It doesn't work and we don't yet know why :-(
2013-06-26 10:55:18 +01:00
Lucy
3ce246ef5a Allowing Miles to drive. 2013-06-26 10:55:18 +01:00
pozorvlak
5748c0989e Merge pull request #233 from Skud/planted-at-bug
Planted at bug
2013-06-23 07:43:52 -07:00
Miles Gould
1f5c81fdca Filter spec files out of coverage reports. 2013-06-13 20:38:26 +01:00
Miles Gould
033703e9b9 Set up Rails coverage groups. 2013-06-13 20:29:02 +01:00
Miles Gould
66a6f53ae7 Set up Coveralls integration for test coverage. 2013-06-12 13:03:05 +01:00
Skud
2ecbd8315d bugfix: don't say 'not yet set' in planting form
PT: https://www.pivotaltracker.com/story/show/51457917

Maco found this. The problem was that if you had a blank planting date,
and then re-edited the planting, it would say "not yet set" in the form
field, then die when it later tried to convert that to a date.

I replaced Miles's planted_at_string stuff in the model with a simpler
parse_date method in the application helper.
2013-06-11 16:08:02 +10:00
Skud
df60a7c4dc display recommended price on product admin pages 2013-06-07 11:36:03 +10:00
Skud
cb3e0fb526 added optional recommended price to products 2013-06-07 09:53:40 +10:00
Skud
8046790bc7 converted product description to text (not string) 2013-06-07 09:16:18 +10:00
Skud
4c2971f670 oops, fixed broken test for checkout button 2013-06-06 21:19:24 +10:00
Skud
6cf64694f4 added account status info in various places 2013-06-06 21:07:54 +10:00
Skud
170315e4bd added test for default_photo ordering 2013-06-06 20:28:33 +10:00
Miles Gould
cebd6e05ac Merge branch 'dev' into logged-out
Conflicts:
	spec/views/home/index_spec.rb
2013-06-04 13:54:49 +01:00
Miles Gould
a0c91ee884 Changes to homepage
- only show interesting members if logged out
 - don't show your recent posts/plantings
 - change limits on posts/plantings for better visual balance.
2013-06-04 12:59:37 +01:00
Skud
629020237b Merge branch 'dev' into payments-new 2013-06-04 21:20:24 +10:00
Miles Gould
a5d14321b5 Merge branch 'dev' into delete_photos
Conflicts:
	spec/models/planting_spec.rb
2013-06-04 11:45:44 +01:00
Skud
39d1a74745 misc tidying up 2013-06-04 20:27:56 +10:00
Skud
89a5a777e6 Merge branch 'dev' into payments-new
Conflicts:
	.gitignore
	app/models/ability.rb
	app/models/member.rb
	db/schema.rb
2013-06-04 19:42:00 +10:00
Skud
a3d0f15fd5 Delete photo from photos/show page 2013-06-04 13:02:29 +10:00
Skud
43798231dd added crop photos and a new placeholder image 2013-06-04 12:22:31 +10:00
Skud
2a301d352b Reverted uniqueness limits for photo/planting association
It seems this interacts badly with the default_scope on postgres (but
    not on sqlite3).  Error message from the logs:

2013-06-01T02:21:05.312099+00:00 app[web.1]: ActiveRecord::StatementInvalid (PG::Error: ERROR:  for SELECT DISTINCT, ORDER BY expressions must appear in select list
2013-06-01T02:21:05.312099+00:00 app[web.1]: LINE 1: ...photo_id" = 2 AND "plantings"."id" = 181 ORDER BY created_at...
2013-06-01T02:21:05.312099+00:00 app[web.1]:   app/controllers/photos_controller.rb:59:in `create'
2013-06-01T02:21:05.312099+00:00 app[web.1]:                                                              ^
2013-06-01T02:21:05.312099+00:00 app[web.1]: : SELECT  DISTINCT 1 AS one FROM "plantings" INNER JOIN "photos_plantings" ON "plantings"."id" = "photos_plantings"."planting_id" WHERE "photos_plantings"."photo_id" = 2 AND "plantings"."id" = 181 ORDER BY created_at desc LIMIT 1):

For now, we'll just have to rely on the controller (which adds the
association) to keep things unique.
2013-06-01 12:25:43 +10:00
Skud
6ecbf749eb Avoid duplicate photos on plantings (or vice versa)
Strictly speaking this doesn't prevent you adding them if you really
try, but the validation for that was beyond what I could figure out (the
docs don't help, and all SO/blog posts are outdated and didn't
work).

However, if you do somehow manage to add dups, you will never see them
again thanks to the :uniq => true in the model.  That's good enough for
me.
2013-06-01 12:07:17 +10:00
Skud
c63eb64565 photo and planting owners must match 2013-05-31 23:35:07 +10:00