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

2432 Commits

Author SHA1 Message Date
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
Miles Gould
83fa291060 Fetch alternate names for a crop. 2014-10-18 13:50:28 +01:00
Miles Gould
e85cb4598d Add alternate name model. 2014-10-18 12:38:44 +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
pozorvlak
7c783ecda3 Merge pull request #428 from tygriffin/finish-plantings-javascript 
Finish plantings javascript
 2014-10-18 10:54:50 +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
Skud
e4cf636bef Merge branch 'dev' of https://github.com/Growstuff/growstuff into plantingreminder 
Conflicts:
	app/models/harvest.rb
	db/schema.rb
	spec/models/harvest_spec.rb
 2014-10-15 14:20:16 +01:00
Skud
75e076cef5 Merge branch 'dev' of https://github.com/Growstuff/growstuff into tomatoes 
Conflicts:
	spec/models/crop_spec.rb
 2014-10-15 14:07:03 +01:00
Skud
25cb3fd469 Fixed scientific name upload bug and wrote tests 
Wrote unit tests and refactored Crop.create_from_csv

The actual bug (now fixed) is that if you didn't specify a SN in the
CSV, it would try and pick it up from the parent crop, but then the
testing for "is this a dup?" was based on what was in the CSV and didn't
take that parent SN into account.  This is now fixed.
 2014-10-15 13:58:21 +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
Skud
ff61739716 s/boring_planting/no_photo_planting for clarity 2014-10-08 18:59:10 +01:00
Shiho Takagi
cf07ecfa4a improved test spec, crop page and added rake task 2014-10-05 23:16:46 +11:00
Shiho Takagi
6e02f40e0a merging from dev 2014-10-05 13:47:12 +11:00
Shiho Takagi
14d039ee01 Added crops-posts association as well as updated GUI for crop show 2014-10-05 13:32:08 +11:00
pozorvlak
494a600766 Merge pull request #423 from Skud/removebrokentest 
Removing tests for migrations
 2014-10-02 13:42:07 +01:00
Skud
45d34f7f79 Merge pull request #424 from wsmoak/testing 
Rename Sign in tests and add Sign up tests.
 2014-10-02 17:53:22 +10:00
Skud
a5b856b506 Merge pull request #410 from maco/dev 
Harvest photos
 2014-10-02 17:45:59 +10:00
Mackenzie Morgan
48ad561b76 convert tabs to spaces 2014-10-01 23:58:54 -04:00
Wendy Smoak
557d07d2f1 Rename Sign in tests and add Sign up tests. 2014-10-01 20:24:15 -04:00
Skud
9a9eeecb46 Removing tests for migrations 
These were never run anyway (they don't have _spec.rb in their names)
and were obviously written when we had no idea what we were doing.
They're full of syntax errors and all sorts of stuff that just won't
work.  The best thing is to remove them so they don't confuse people!
 2014-10-02 10:09:21 +10:00
Skud
97699e5e6a Removed feature test that doesn't really test anything featurelike 2014-09-30 22:38:24 +10:00
Skud
65c46c334b Delete unused photos 
Make sure the models are setup so that if a photo is not used for
anything, it's removed from the system.

Also wrote a rake task (which should be run on deploy) to remove older
unused photos.
 2014-09-29 09:18:28 +10: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
Skud
d8b75eaa66 Fixed up db migration and tests for planting reminders 2014-09-28 15:55:55 +10:00
Skud
4a62add88e Merge branch 'dev' of https://github.com/Growstuff/growstuff into plantingreminder 
Conflicts:
	spec/models/planting_spec.rb
 2014-09-28 15:32:53 +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
8f14ffe560 catch up with dev 2014-09-20 23:01:35 +10:00
Taylor Griffin
659a68cf39 remove missing translations spec in favor of running dedicated task 2014-09-20 21:49:30 +10:00
Shiho Takagi
60354264d6 Included PT bug# to its test description. Test using the case from the bug 2014-09-19 16:00:25 +10:00
Taylor Griffin
16f4d2f80e fix spec to check href with newly added locale query param 2014-09-19 07:17:08 +10:00
Shiho Takagi
dd75f2aef9 updated regex for crop in markdown 2014-09-18 14:18:18 +10:00
Taylor Griffin
f8ee9d0589 don't scope routes to locale to make url prettier because it breaks tests like whoa 2014-09-18 07:14:35 +10:00
Skud
3cf2a50a34 modified Planting.interesting to have some options re: howmany and photos 2014-09-12 13:20:41 +10:00
Skud
2bbccfc44d Added tests for planting reminder email 2014-09-12 12:30:04 +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
85b5ac12ca added validation for finished_at (must be after planted_at) 2014-09-12 07:50:25 +10:00
Mackenzie Morgan
ed537e583b whitespace fixes and um oops no there shouldn't be a secret key in that config file 2014-09-09 20:31:14 -04:00
Mackenzie Morgan
512ccdbaa2 merging the schema changes from finished plantings and making the timestamp newer, then making the styling on harvest photos match the new styling (no li) on planting photos 2014-09-09 20:19:25 -04:00