mirror/growstuff
1
0
Fork 0
mirror of https://github.com/Growstuff/growstuff.git synced 2026-06-05 22:57:05 -04:00
Code Issues Packages Projects Releases Wiki Activity
11,959 Commits 64 Branches 82 Tags
Layout/HashAlignment
Commit Graph

783 Commits

Author SHA1 Message Date
Taylor Griffin
9b10a7c3ce write shared example group for append date 2014-10-23 22:18:52 +11:00
pozorvlak
4a8297360c Merge pull request #434 from Skud/memberprofile 
Member profile
 2014-10-19 17:32:27 +01:00
Skud
a79a8dc927 Merge branch 'dev' of https://github.com/Growstuff/growstuff into memberprofile 
Conflicts:
	app/views/scientific_names/index.html.haml
 2014-10-19 16:54:10 +01:00
Miles Gould
b17aaf262d Test HTTP statuses in sciname feature tests 
This makes it easier to tell the difference between "test failed because
the expected content isn't there" and "test failed because the whole
page is broken". It also guards against "test passed incorrectly because
the expected content was part of the error message".
 2014-10-19 16:36:10 +01:00
Miles Gould
56b7d89d9e Link scinames to crops, don't show numeric crop IDs 2014-10-19 16:36:10 +01:00
Miles Gould
2aabcce70d Feature tests for scientific names. 2014-10-19 16:36:10 +01:00
Skud
7595d75d20 Merge pull request #432 from pozorvlak/alternate_crop_names 
Model and CRUD for alternate crop names
 2014-10-19 16:34:44 +01:00
Skud
41566d39f3 Added map to member profile page 2014-10-19 13:50:43 +01:00
Miles Gould
e613907506 Check status codes on page visits. 2014-10-19 13:21:30 +01:00
Skud
82a61387a3 Improved layout of member profile page 
In doing this, I added some content areas for all pages on the site:

1) subtitle
2) buttonbar

These are intended to help standardise the layout of all pages.  On the
member page, the subtitle is the location, and the buttonbar has links
like "edit profile", "upgrade account", etc (or if looking at someone
else's page, then "send message" etc).

I also implemented subtitle/buttonbar on the crop detail page (the
subtitle is the default scientific name).

The rest is just refactoring and tests.  I've removed some view tests
and put them in feature tests instead.
 2014-10-19 12:23:19 +01:00
Miles Gould
29d53a8f8b Test for notices in altname CRUD features. 2014-10-19 12:02:31 +01:00
Miles Gould
d0f7169c59 Put alternate name features in their own file. 2014-10-19 11:50:21 +01:00
Miles Gould
792062e0d2 Make add-altname test more featurey. 2014-10-18 18:02:59 +01:00
Miles Gould
52fd2b86d6 Test altname deletion end-to-end. 2014-10-18 18:01:54 +01:00
Miles Gould
110ae99d83 Fix and test altname index page. 2014-10-18 17:55:56 +01:00
Miles Gould
c447c1cb3a Make edit-altname test more featurey. 2014-10-18 17:49:13 +01:00
Miles Gould
0ae68737c3 Use login_as helper method in altname feature tests. 2014-10-18 17:43:59 +01:00
Miles Gould
8a97aa1a9b Delete redundant old-style test. 2014-10-18 17:34:33 +01:00
Miles Gould
c7c85aaa66 Creation and deletion of alternate names 2014-10-18 17:03:54 +01:00
Miles Gould
eacfadae20 Make editing alternate names actually do something. 2014-10-18 16:51:43 +01:00
Miles Gould
37eb2a0e34 Show alternate names on their own page. 2014-10-18 16:49:27 +01:00
Miles Gould
10f6214c6c Views for adding/editing alternate names. 2014-10-18 16:34:38 +01:00
Skud
29a5fe07c2 use rails paths when visiting pages 2014-10-18 16:01:00 +01:00
Miles Gould
77d1d067fa Crop wranglers can add alternate names 2014-10-18 15:35:57 +01:00
Miles Gould
cdf6d4b09a Delete alternate name button on crops page. 2014-10-18 15:29:21 +01:00
Miles Gould
7e4b51d1cb Add "Edit" link for alternate names on crops page. 2014-10-18 15:18:23 +01:00
Miles Gould
627587ee1b Show alternate names on crop page 2014-10-18 14:34:53 +01:00
Skud
9ededef54d Added tests for content of planting reminder email 2014-10-18 14:00:22 +01:00
Skud
f18feaa131 Merge branch 'dev' of https://github.com/Growstuff/growstuff into plantingreminder 2014-10-18 11:23:30 +01:00
pozorvlak
41d63f8f92 Merge pull request #417 from tygriffin/I18n 
I18n
 2014-10-18 11:11:25 +01:00
Taylor Griffin
2515d34277 add teardown to reset locale to default en 2014-10-16 08:09:20 +11:00
Taylor Griffin
8994bcf28c ok, we'll just remove all references to environment 2014-10-16 07:14:03 +11:00
Taylor Griffin
d627d8394e forgot which env I was in 2014-10-16 06:56:39 +11:00
Taylor Griffin
a4e7f93421 Merge branch 'dev' of https://github.com/Growstuff/growstuff into I18n 2014-10-16 06:39:10 +11:00
Taylor Griffin
0f75a96944 write spec to test that setting a different locale fundamentally works 2014-10-16 06:37:50 +11:00
Skud
8e6a57c442 Attempt at writing tests for planting reminder email 
(Test are broken)

OK, so I decided to use the capybara_email gem to write these tests.
It's basically working but there's a problem with the has_link matcher.
Basically the emails sent by ActionMailer have URLs like
http://localhost:8080... whereas the tests asking for planting_url() or
similar are looking for http://example.com...

I don't understand AT ALL why there is this discrepancy, but it looks
like ActionMailer is using the settings from the development
environment, instead of the testing environment.

WHYYYYYY???

I'm pushing this up so that maybe someone else can figure it out,
because I'm stumped.
 2014-10-15 15:52:13 +01:00
Taylor Griffin
c405639f22 write test for marking a planting finished from show page 2014-10-13 06:42:57 +11:00
Taylor Griffin
d1e0bdb534 toggling planting finished clears the finished at field or populates it with a cached value 2014-10-12 09:53:09 +11:00
Wendy Smoak
557d07d2f1 Rename Sign in tests and add Sign up tests. 2014-10-01 20:24:15 -04:00
Taylor Griffin
aebd9e1d4e remove a file that accidentally found its way in from another unrelated branch 2014-09-28 22:03:50 +10:00
Taylor Griffin
d10a62d336 set locale from subdomain 2014-09-28 21:32:15 +10:00
Wendy Smoak
8ab4f885f1 Renamed gardens.rb to gardens_spec.rb so that these tests will run. 2014-09-26 10:32:06 -04:00
Taylor Griffin
984503480f remove necessity to add locale to url if current locale is English 2014-09-25 07:00:11 +10:00
Taylor Griffin
16f4d2f80e fix spec to check href with newly added locale query param 2014-09-19 07:17:08 +10:00
Skud
29d43f4e5b Merge branch 'finished' of github.com:Skud/growstuff into Skud-finished2 2014-09-12 08:40:57 +10:00
Skud
374987488f Fixed broken tests. 2014-09-12 08:30:44 +10:00
Skud
9d5c15a7da Merge branch 'finished' of github.com:Skud/growstuff into Skud-finished 
Conflicts:
	spec/features/plantings/planting_a_crop_spec.rb
 2014-09-10 09:12:27 +10:00
Taylor Griffin
138904bd82 write regression test for creating plantings, harvests and seeds form crop page 2014-09-09 21:52:50 +10:00
catfriend
b0ee83bc3e added test for adding placeholder text 2014-09-05 16:23:33 -07:00
Skud
a8a34d8dc8 s/user/member/g in crop wrangler tests 
We don't use the term "user" in Growstuff -- this should ideally have
been caught in code review but I missed it :-/
 2014-08-31 18:28:50 +10:00