Skud
8d9fc66cd5
cleaned up member.flickr_photos based on flickraw author's advice
2013-07-19 00:17:43 +10:00
Skud
a035e70db6
show the name of the selected set
2013-07-19 00:05:20 +10:00
Miles Gould
96e66cd9bb
New photo: show an h2 with the name of the current set
...
Also don't show a sets dropdown if the user has no sets.
2013-07-18 14:45:36 +01:00
Miles Gould
2b863cd62e
Fix problem adding photos from photosets.
...
When we fetched photos from a photoset, the response object didn't
respond to to_a, breaking our controller code. This turned out to be due
to weirdness in FlickRaw's API:
https://github.com/hanklords/flickraw/issues/58
2013-07-18 14:16:22 +01:00
Miles Gould
c977709235
Stop controller tests from connecting to Flickr
...
... by stubbing out Member#flickr_sets in a photo_controller test. I
looked at the flickrmocks gem, but it doesn't seem very helpful - it
still requires you to connect to Flickr.
2013-07-18 13:18:01 +01:00
Miles Gould
8b3c1e9c1d
Typo fix.
2013-07-18 12:41:59 +01:00
Ryan Clark
6729a8a28c
Pass set to member.flickr_photos - broken\!
2013-07-16 18:52:13 -07:00
Ryan Clark
106c3a74ba
Display a set dropdown on the new photo page.
2013-07-16 18:27:06 -07:00
Ryan Clark
7f82e481ec
Merging dev
2013-07-16 17:23:15 -07: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
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
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
Miles Gould
6469ed9418
Delete unused helpers and tests for same.
2013-07-03 11:34:08 +01:00
Lucy
e7b0165628
Updated script/deploy-tasks.sh to include nil_account_type task.
...
We added a rake task to ensure all account have a Free account
type. This ensures the new nil_account_type rake task will be run
at deploy time.
2013-07-03 11:22:47 +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
278db17108
Removed redundant logic for free account type in apps/views
...
A couple of pages were testing for an account type and displaying
"Free" if account type was nil. Now that we've ensured every account
has an account type, this is no longer necessary.
2013-07-03 11:15:31 +01:00
Lucy
650f24099d
Added default account type of "Free" in config/applications.rb
2013-07-03 11:04:42 +01:00
Lucy
1b0a708b04
Documented reason for using south_pole_member in tests.
2013-07-03 10:51:55 +01:00
Joseph Caudle
ce0c7b1e2c
Merge pull request #242 from Skud/cancan-messages
...
prettified some of the error messages
2013-07-02 21:12:21 -07:00
Skud
9f65aad5c6
prettified some of the error messages
2013-07-03 13:06:57 +10:00
