Commit Graph

269 Commits

Author SHA1 Message Date
Daniel O'Connor
4e2311e8d7 Indent 2016-08-22 16:36:30 +09:30
Daniel O'Connor
7f6a1a424d Merge remote-tracking branch 'upstream/dev' into add_facebook_signup 2016-08-15 23:13:55 +09:30
Daniel O'Connor
e4c0ecfb5a Add basic test 2016-08-15 21:30:40 +09:30
Daniel O'Connor
43e7d6f7c2 Merge remote-tracking branch 'upstream/dev' into add_facebook_signup 2016-07-05 03:09:36 +09:30
Daniel O'Connor
0620646c6d Fix failing specs
- Updated assert_select behaviour given this is now based on nokogiri
 - Adjust some specs not to look for a specific asset name, but a behaviour
 - Adjust some specs for HTML5 style attributes instead of xhtml style
 - Fix tests that did not render before
2016-06-10 16:01:30 +09:30
Daniel O'Connor
7fe75ee52a Fix DEPRECATION WARNING: #deliver is deprecated. 2016-06-10 15:45:01 +09:30
Cesy Avon
fc38e1edea Issue #476 test update 2016-06-02 14:58:10 +00:00
Eric Tillberg
2ac901c891 feature test for issue 910 2016-05-30 09:06:09 -04:00
Mackenzie Morgan
13dc87f368 Optional field improvements
* Added custom matcher `have_optional(field id name goes here)`
* Fix partial
* Add tests
2016-05-27 11:26:36 -04:00
Mackenzie Morgan
fc0116182f Merge branch 'dev' of gitmaco:Growstuff/growstuff into bug-#848 2016-05-27 11:24:37 -04:00
Miles Gould
1009570102 Check href attribute of links in planting reminder
To check the target of a link, you need to pass it to `has_link` as an
`href` keyword argument. We were passing it as a positional argument,
which meant that

 - it was ignored, weakening the tests
 - the output of rspec filled up with annoying warnings.

Fixes #928.
2016-05-27 15:46:21 +01:00
Mackenzie Morgan
47f42d0ffa Merge branch 'dev' of gitmaco:Growstuff/growstuff into bug-#848 2016-05-27 10:22:35 -04:00
Miles Gould
23d21be73f Delete debugging puts statement from spec
Fixes the "rspec output includes an HTML page dump" issue noted at
2089866756 (diff-6464240396bc745d7e89a408c200fd3aR15)
2016-05-27 14:04:30 +01:00
Mackenzie Morgan
2089866756 Display one line of description in harvest card, then go to ellipsis and put read more on next line
Fixes #854
2016-05-26 23:08:23 -04:00
Mackenzie Morgan
079cecc529 Swap over to having "(Optional)" (or translation) after optional form elements rather than using placeholder text
Fixes #848
2016-05-26 16:53:46 -04:00
Mackenzie Morgan
58f4ae32d0 test update 2016-05-26 12:28:58 -04:00
Daniel O'Connor
083035c924 Merge branch 'dev' of github.com:Growstuff/growstuff into add_facebook_signup 2016-05-23 16:58:22 +09:30
Daniel O'Connor
dc9ee18e96 Update stale test expectation 2016-05-23 12:56:37 +09:30
Daniel O'Connor
b4060b7903 Update stale test expectation 2016-05-23 12:55:50 +09:30
Daniel O'Connor
4b4e0cf69a $ rubocop --only HashSyntax --auto-correct
483 files inspected, 2018 offenses detected, 2018 offenses corrected
2016-05-19 15:53:11 -04:00
Cesy
260b16da11 Merge pull request #865 from CloCkWeRX/fix_progress
Fix progress calculations
2016-04-21 08:02:37 +01:00
Daniel O'Connor
82553d6e0a Avoid time travel in favour of calculating a number of past/future dates 2016-04-11 09:29:06 +09:30
Daniel O'Connor
5cfa051d75 Update expectations 2016-04-09 22:43:17 +09:30
Daniel O'Connor
da588b7fdb Create the plant part instead of assuming it's seeded 2016-04-07 10:08:21 +09:30
Daniel O'Connor
a7f9e113d6 Target the name attribute 2016-04-07 09:59:06 +09:30
Daniel O'Connor
aa2a761a58 Ensure we choose a plant part 2016-04-07 09:46:29 +09:30
Daniel O'Connor
a800630b01 Ensure we choose a plant part 2016-04-07 09:43:45 +09:30
Daniel O'Connor
f81666da5e And cleanup authentications 2015-09-15 12:58:35 +09:30
Daniel O'Connor
4a1bc9f6c0 Avoid test data conflicts and update expectations 2015-09-15 12:44:12 +09:30
Daniel O'Connor
021cb4f93b Use #{ENV['GROWSTUFF_SITE_NAME']} 2015-09-15 11:38:20 +09:30
Daniel O'Connor
00ca01dc33 Add coverage of the most basic scenarios around sign up and login 2015-09-15 11:20:33 +09:30
pozorvlak
ef6dd88b1e Merge pull request #820 from CloCkWeRX/fix_popover_better
Fix #819 by removing the popover behaviour for a standard avatar
2015-09-09 20:04:55 +00:00
Daniel O'Connor
f357916779 For more accurate specs, explicitly target the login-name container 2015-08-29 07:49:55 +09:30
Cesy
fbb442dfee Adding commentary to test for clarification of non-JS version 2015-08-28 13:00:38 +00:00
Cesy
b87194336f Wrangler has different name in tests, fixing failing test 2015-08-20 14:16:39 +00:00
Cesy
0e98f84da7 Fixing admin tests where you need to click on navmenu with JS 2015-08-20 14:06:21 +00:00
Cesy
65e0752376 RSS feeds don't need JS 2015-08-20 13:07:25 +00:00
Cesy
3251dd1c54 Merge branch 'js_all_the_features' of github.com:pozorvlak/growstuff into phantomjs
Conflicts:
	spec/features/admin/forums_spec.rb
	spec/features/crops/alternate_name_spec.rb
	spec/features/crops/crop_detail_page_spec.rb
	spec/features/member_profile_spec.rb
	spec/features/rss/members_spec.rb
	spec/features/scientific_name_spec.rb
	spec/features/signin_spec.rb
	spec/features/signup_spec.rb
2015-08-20 12:09:18 +00:00
twconquest
c2e4686a23 Add negative tests for roles on profiles 2015-08-17 18:29:00 +00:00
twconquest
24df32ba7f Merge upstream/dev into show-roles and re-add myself to CONTRIBUTORS.md
Conflicts:
	CONTRIBUTORS.md
2015-08-17 17:48:50 +00:00
Anthony Atkinson
29f3cc3238 Updating new test additions and edits to features/harvests with Rspec3 Ruby2 syntax. 2015-08-01 11:39:51 -04:00
Anthony Atkinson
bc9a025788 Merge branch 'dev' into notification_pagination 2015-08-01 11:38:01 -04:00
pozorvlak
de63fdc952 Merge pull request #786 from sha1sum/open_service_in_footer
Resolves #617 - Open Service graphic link in footer
2015-07-28 22:00:19 +01:00
twconquest
1019834c41 Merge branch 'dev' into show-roles
Conflicts:
	spec/features/member_profile_spec.rb
2015-07-28 19:42:55 +00:00
twconquest
362f7a78b1 Add feature test for showing roles 2015-07-28 19:33:05 +00:00
Anthony Atkinson
9d62c012f1 Resolves #617 - Open Service graphic link in footer 2015-07-25 13:34:16 -04:00
Anthony Atkinson
cbb50df8d0 Resolved #562 - Pagination of notifications. 2015-07-25 13:18:30 -04:00
Miles Gould
8873986562 Merge branch 'pr/779' into dev 2015-07-24 11:05:21 +01:00
Miles Gould
48649d1986 Clarify comment on an order-dependent feature test 2015-07-23 22:00:06 +01:00
Miles Gould
9e2e93b544 Remove the last few .shoulds from spec/features 2015-07-23 21:57:22 +01:00