mirror/growstuff
1
0
Fork 0
mirror of https://github.com/Growstuff/growstuff.git synced 2026-05-12 01:36:26 -04:00
Code Issues Packages Projects Releases Wiki Activity
2,065 Commits 61 Branches 82 Tags
a47328eed45b748e413bfb062e77eb76e2d8fdd2
Commit Graph

102 Commits

Author SHA1 Message Date
Yoong Kang Lim
27ad791f67 Merge remote-tracking branch 'upstream/dev' into followerdev 2014-11-30 15:16:48 +11:00
Skud
39b47b0d08 Merge pull request #454 from krio/rearrange-rss-titles 
Rearrange titles on RSS feeds
 2014-11-30 13:37:30 +11:00
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
Yoong Kang Lim
aeb7192f48 Break up tests into different scenarios. Defined cancan ability for follows and updated member profile view 2014-11-20 23:46:15 +11:00
Yoong Kang Lim
996043d8fb Renamed get_follow_id to get_follow as it does not return id. Also added unit tests for the new methods in the member model. 2014-11-20 01:10:28 +11:00
Skud
6aea16028e Merge pull request #452 from wsmoak/negative-area 
Prevent the creation of a garden with a negative number for the area.
 2014-11-19 17:18:09 +11:00
Skud
9861f8cf51 Merge pull request #447 from krio/add-edit-button-seeds-index 
Add edit button to seeds index page
 2014-11-19 17:17:52 +11:00
Wendy Smoak
53d782bc83 Prevent the creation of a garden with a negative number for the area. If entered, the area must be greater than or equal to zero. 2014-11-18 20:33:44 -05:00
Kevin Rio
65706f560b Add test to new edit seed link 2014-11-14 16:37:55 -05:00
Yoong Kang Lim
bd8be01ec7 Merge branch 'dev' into editprofile 
Conflicts:
	CONTRIBUTORS.md
 2014-11-13 21:38:05 +11:00
Yoong Kang Lim
3dbb585467 Removed edit profile button from home page 
Added yoongkang to the contributors list

Feature test for edit profile button on homepage
 2014-11-13 21:28:15 +11:00
Skud
68dfdbeba1 Merge branch 'finish-plantings-javascript' of github.com:tygriffin/growstuff into tygriffin-finish-plantings-javascript 
Conflicts:
	Gemfile
	Gemfile.lock
 2014-11-13 10:57:55 +11:00
Yoong Kang Lim
b5e1b6bc22 Delete unused views, add feature tests 2014-11-13 00:46:34 +11: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
af9aa690ba Merge branch 'dev' of https://github.com/Growstuff/growstuff into finish-plantings-javascript 2014-11-11 18:37:30 +11:00
pozorvlak
24d276da37 Merge pull request #420 from Skud/plantingreminder 
Planting reminder
 2014-11-07 14:31:43 +00: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
Taylor Griffin
0ccd6e843a implement confirm without date functionality on appty on append date js 2014-10-23 22:43:38 +11:00
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