mirror/growstuff
1
0
Fork 0
mirror of https://github.com/Growstuff/growstuff.git synced 2026-02-06 15:41:09 -05:00
Code Issues Packages Projects Releases Wiki Activity
1,993 Commits 65 Branches 76 Tags
2111cddaef1dfd0130f2f1f1a7f23402dc31739c
Commit Graph

1993 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kevin Rio
2111cddaef RSS feed tests 2014-11-23 21:02:56 -05:00
Kevin Rio
eb4fae463f Comments RSS tests 2014-11-23 11:47:48 -05:00
Kevin Rio
8d74fd52db Rearrange titles on RSS feeds 
https://www.pivotaltracker.com/n/projects/646869/stories/50492161
 2014-11-12 13:54:01 -05:00
Kevin Rio
43fa356670 Add edit button to seeds index page 
https://www.pivotaltracker.com/n/projects/646869/stories/53958137
 2014-11-12 09:56:05 -05:00
Kevin Rio
b6d2a078b1 Adding to contributors list 2014-11-11 23:28:22 -05:00
Kevin Rio
7023b4969b Update position of activity on member details page 
Switched activity and contact.
 2014-11-11 22:42:01 -05:00
pozorvlak
f233d502f7 Merge pull request #445 from yoongkang/plantingsfix 
Plantings index should display finished at date instead of planted at under the finished column
 2014-11-11 20:55:23 +00:00
Yoong Kang Lim
caad748d08 Plantings index should display finished at date instead of planted at under the finished column. 
Added feature test for plantings index page.
 2014-11-11 22:41:29 +11:00
Taylor Griffin
5b13e8c797 Merge pull request #444 from Skud/plantingreminder 
cweek not cw_week
 2014-11-11 20:55:37 +11:00
Skud
267c671259 cweek not cw_week 2014-11-11 20:55:04 +11:00
Taylor Griffin
3f23dd194d Merge pull request #443 from Skud/plantingreminder 
Planting reminder - only send to confirmed accounts
 2014-11-11 19:48:10 +11:00
Skud
98c07ff3f1 Merge branch 'dev' of https://github.com/Growstuff/growstuff into plantingreminder 2014-11-11 19:45:51 +11:00
Skud
eb98910bea Only send planting reminders to confirmed accounts 2014-11-11 19:45:07 +11:00
Taylor Griffin
954d5b8427 Merge pull request #442 from Skud/destroy_photo_destroyer 
Fixed bug in deleting unused photos
 2014-11-11 19:42:22 +11:00
Skud
2426c51951 Fixed bug in deleting unused photos 
... and wow, my tests were really not testing what I thought they were
testing :-/
 2014-11-11 19:29:32 +11:00
pozorvlak
24d276da37 Merge pull request #420 from Skud/plantingreminder 
Planting reminder
 2014-11-07 14:31:43 +00:00
Skud
7b80db9596 Merge pull request #5 from pozorvlak/plantingreminder 
Fix broken Capybara tests
 2014-11-07 09:28:46 +11:00
Miles Gould
b989168887 Fix "shared example group previously defined" warning 
We were getting the warning

```
WARNING: Shared example group 'crop suggest' has been previously defined
at:
  /Users/miles/src/growstuff/spec/features/shared_examples/crop_suggest_spec.rb:3
...and you are now defining it at:
  /Users/miles/src/growstuff/spec/features/shared_examples/crop_suggest_spec.rb:3
The new definition will overwrite the original one.
```

Following the suggestion at
https://github.com/rspec/rspec-core/issues/828#issuecomment-38789977,
I've renamed crop_suggest_spec.rb to crop_suggest.rb, which made the
error go away without reducing the number of tests run. RSpec must
have thought it was a spec file and loaded it directly, then loaded it
again when it was first required by an actual spec file.
 2014-11-02 22:57:29 +00:00
Miles Gould
6921119301 Make Capybara actually hit the server. 
Background:
http://talk.growstuff.org/t/mysteriously-broken-feature-tests/120

@oshiho3's suggested fix didn't work, so I tried all the suggestions at
http://stackoverflow.com/questions/6536503/capybara-with-subdomains-default-host
until I found one that fixed the problem.
 2014-11-02 22:21:32 +00:00
Skud
0d893470de Merge pull request #439 from tygriffin/I18n 
I18n
 2014-10-23 10:06:33 +11:00
Taylor Griffin
c244da8b73 make English fallback language 2014-10-21 07:24:08 +11:00
Taylor Griffin
0e11f20910 Merge branch 'dev' of https://github.com/Growstuff/growstuff into I18n 2014-10-20 21:27:59 +11:00
Taylor Griffin
ab449a65f8 remove 'to be translated' message from ja locale file 2014-10-20 21:27:39 +11:00
pozorvlak
4a8297360c Merge pull request #434 from Skud/memberprofile 
Member profile
 2014-10-19 17:32:27 +01:00
Skud
e8daba750d Merge pull request #433 from pozorvlak/feature_tests_for_scinames 
Feature tests for scientific names
 2014-10-19 16:54:31 +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
Skud
a25eb2d631 Deleted old view tests for crops 2014-10-19 16:52:45 +01:00
Skud
58f1bca683 removed spurious console.log calls 2014-10-19 16:51:08 +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
6de2112c4d Display note on successful sciname deletion. 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
de6d3589d1 Merge pull request #436 from pozorvlak/ruby212 
Upgrade Ruby to v2.1.2
 2014-10-19 16:18:33 +01:00
pozorvlak
9e9aa82099 Merge pull request #435 from emmawinston/album 
Changed set to album on photo page
 2014-10-19 15:24:24 +01:00
Miles Gould
ef8d552301 Update Ruby to 2.1.2 in .travis.yml 2014-10-19 15:06:34 +01:00
emmawinston
e5cd14cd45 Added myself to the contributors file 2014-10-19 14:56:44 +01:00
emmawinston
1daee9612c Changed set to album on photo page 2014-10-19 14:52:10 +01:00
Skud
dc1afb8913 Added seeds_by_crop_path routes and stuff 2014-10-19 14:25:47 +01:00
Skud
496c070efd Tweaked layout of crop page sidebar 2014-10-19 14:14:24 +01:00
Skud
f468a8b77b Changed all h1 to content_for :title 2014-10-19 14:04:55 +01:00
Skud
16677a3b86 Removed underline on header area 2014-10-19 14:04:32 +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
3a797d4434 Use content_for :title in scientific names index. 2014-10-19 11:42:49 +01:00
Miles Gould
1d3c24ae27 Use content_for :title on altname index page. 2014-10-19 11:28:51 +01:00
Miles Gould
006bc54f3f Oops, add the altname index HAML file. 2014-10-18 18:13:04 +01:00