mirror/growstuff
1
0
Fork 0
mirror of https://github.com/Growstuff/growstuff.git synced 2026-03-24 09:43:24 -04:00
Code Issues Packages Projects Releases Wiki Activity
2,215 Commits 64 Branches 76 Tags
2c4e768a3afddd2d78fb7233cd9207c1d885d65f
Commit Graph

120 Commits

Author SHA1 Message Date
Shiho Takagi
018b2b4711 elasticsearch to be turned off as a default in dev and test 2015-01-21 16:47:22 +11:00
Taylor Griffin
a510489570 Merge pull request #631 from Skud/newfooter 
New footer
 2015-01-14 22:45:41 +11:00
Taylor Griffin
fcbc6002d1 Merge pull request #623 from pozorvlak/seo_crop_detail_page 
Add SEO-friendly language to the crop detail page
 2015-01-14 22:40:25 +11:00
Skud
b114ed2414 Improved sitewide footer (fixes #526) 2015-01-13 20:07:59 +11:00
Miles Gould
c244ca672f Add tests for SEO of crop detail page 2015-01-11 12:08:57 +00:00
Miles Gould
7ef8afb1ba Tests for crop inflections 2015-01-11 12:02:02 +00:00
Taylor Griffin
f62fd8484a get rid of annoying warning about doubly loaded files when running tests 2014-12-15 21:13:22 +11:00
Taylor Griffin
a35a573b2b update follow member code to be rails 4 compatible 2014-12-14 14:51:18 +11:00
Yoong Kang Lim
a69210ae6b Explicitly add spec for notification 2014-12-09 22:07:41 +11:00
Yoong Kang Lim
de26dd3708 to_s not needed 2014-12-09 21:42:17 +11:00
Yoong Kang Lim
2fc6bfb77f Merge remote-tracking branch 'upstream/dev' into cancanredirect 2014-12-09 21:32:01 +11:00
Yoong Kang Lim
837121265a Reversed order of authorization and authentication. Also added tests 2014-12-09 21:27:16 +11:00
Skud
7227c1f330 Merge pull request #455 from yoongkang/cancanredirect 
Redirect to sign-in page for any action that requires authentication
 2014-12-09 20:17:58 +11:00
Yoong Kang Lim
27ad791f67 Merge remote-tracking branch 'upstream/dev' into followerdev 2014-11-30 15:16:48 +11:00
Yoong Kang Lim
969f7e7c23 Merge remote-tracking branch 'upstream/dev' into cancanredirect 2014-11-30 14:25:08 +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
Yoong Kang Lim
81d1189203 Added a before_filter for any action that requires authentication. Will redirect to login page if not logged in 2014-11-24 22:12:42 +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
Taylor Griffin
c83b01bbb7 catch up with dev 2014-11-18 22:59:43 +11:00
Taylor Griffin
0ffe9adc86 tests are green 2014-11-16 21:40:43 +11:00
Taylor Griffin
7fc886f43c implement custom Sweeper class as stop gap against errors when running specs 2014-11-16 12:01:27 +11: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