mirror/growstuff
1
0
Fork 0
mirror of https://github.com/Growstuff/growstuff.git synced 2026-05-09 08:17:58 -04:00
Code Issues Packages Projects Releases Wiki Activity
2,065 Commits 59 Branches 82 Tags
a47328eed45b748e413bfb062e77eb76e2d8fdd2
Commit Graph

847 Commits

Author SHA1 Message Date
pozorvlak
751a66b49b Merge pull request #457 from Skud/multiple_scinames 
Multiple scientific and alternate names
 2014-12-01 10:33:46 +00:00
Skud
30c91eb23f Tidy up sidebar on crop detail page 2014-12-01 21:14:44 +11:00
Skud
593a20c0c5 Load alternate names from CSV 2014-11-30 16:06:43 +11:00
Yoong Kang Lim
b06d48091e Indentation problem 2014-11-30 15:50:13 +11:00
Skud
844791ead9 Allow multiple comma-separated scientific names 2014-11-30 15:48:58 +11:00
Yoong Kang Lim
73d6b5065b Use factorygirl aliases 2014-11-30 15:25:48 +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
13c98eac89 Wrapped tests around context blocks to clarify the purpose of the tests. 2014-11-30 15:14:56 +11:00
Skud
4e19da56a0 Rearrange fields in crop uploads (sci names last) 2014-11-30 14:51:33 +11:00
Skud
924efe6af5 Fixed a bug which only occurs in the few months before February 
This is the fundamental problem:

    2.1.2 :005 > Time.zone.now + 3.months
    => Sat, 28 Feb 2015 03:17:24 UTC +00:00
    2.1.2 :006 > Time.zone.now + 3.months + 3.months
    => Thu, 28 May 2015 03:17:32 UTC +00:00
    2.1.2 :007 > Time.zone.now + 6.months
    => Sat, 30 May 2015 03:17:37 UTC +00:00

I changed the test to use the "3.months + 3.months" formulation and it
now passes.
 2014-11-30 14:19:55 +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
8c55a6101d Formatting problem 2014-11-21 01:14:12 +11: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
0ba6562d79 Added more model tests for following behaviour 2014-11-20 01:46:04 +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
Yoong Kang Lim
0eb5ae58aa Renamed member_id column in Follow table to follower_id. Made necessary modifications to models and tests. 2014-11-20 00:42:46 +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
02994bd5cc Added a test for the validator to show it doesn't accept negative numbers for garden area. 2014-11-18 20:58:00 -05: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
e687bd43dc Added model tests for follows 2014-11-13 01:22:28 +11:00
Yoong Kang Lim
b5e1b6bc22 Delete unused views, add feature tests 2014-11-13 00:46:34 +11: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
a9fdab5d7c Basic follower relationship 2014-11-12 00:23:01 +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
1d071c197a Merge branch 'dev' of https://github.com/Growstuff/growstuff into finish-plantings-javascript 2014-11-11 19:53:00 +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
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
Skud
a25eb2d631 Deleted old view tests for crops 2014-10-19 16:52:45 +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
dc1afb8913 Added seeds_by_crop_path routes and stuff 2014-10-19 14:25:47 +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