Anthony Atkinson
919c25ca67
Fixing notifications index view spec to be compatible with new Kaminari pagination.
2015-08-01 11:58:13 -04: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
Anthony Atkinson
a593aa2a4b
Merge remote-tracking branch 'upstream/dev' into dev
2015-08-01 11:37: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
e7d2ae2c40
Add myself to CONTRIBUTORS.md
2015-07-28 19:50:35 +00: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
a2eb568eac
Merge remote-tracking branch 'upstream/master' into dev
2015-07-25 14:09:06 -04: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
91a128ae7e
Check existence of secret token before using it.
...
People were forgetting to create config/environment.yml, which meant
that RAILS_SECRET_TOKEN wasn't being set, which meant that all tests
involving notifications failed. Unfortunately, the resulting wall of
error messages (https://gist.github.com/sha1sum/5debae6b700ff8fc0c76 )
did not make the root cause remotely clear, leading to much confusion
and head-scratching all round.
This commit checks for the existence of RAILS_SECRET_TOKEN and fails
with an informative error message if it's missing.
2015-07-24 15:16:31 +01:00
Miles Gould
d9dd797c33
Merge branch 'pr/782' into dev
2015-07-24 11:09:35 +01:00
Miles Gould
f970fc4db2
Fix another whitespace problem.
2015-07-24 11:09:22 +01:00
Miles Gould
8873986562
Merge branch 'pr/779' into dev
2015-07-24 11:05:21 +01:00
Miles Gould
40b5a47aae
Remove trailing whitespace
2015-07-23 23:22:45 +01:00
Miles Gould
f29c0ad085
Replace .length calls with .size
2015-07-23 23:21:55 +01:00
Miles Gould
96b0198d41
Replace remaining calls to count() with size()
...
The couple that aren't removed are required: for instance, there's a
Crop.count method, but no Crop.size method.
2015-07-23 23:05:39 +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
Miles Gould
1f0f55dc81
Merge branch 'pr/781' into dev
2015-07-23 19:55:57 +01:00
Mackenzie Morgan
e3738ca0c6
whitespace tab/space correction
2015-07-23 13:56:23 -04:00
Mackenzie Morgan
b0d4f9c731
switch homepage and members/ page member thumbnails to be a flexbox layout so it's more responsive. Fixes #780
2015-07-23 13:56:07 -04:00
Mackenzie
83b54365ba
Merge pull request #768 from GabrielSandoval/gab/harvests
...
Created card based template for harvests, seeds, gardens, etc. Fixes #518 , Fixes #517 , and Fixes #570
2015-07-23 13:40:30 -04:00
Anthony Atkinson
5a33b2b754
Creating a directory for gardens under spec/features (to stay consistent with other features) and moving the creation specs from spec/gardens_spec.rb to spec/gardens/adding_gardens_spec.rb.
...
Also added the required and optional field tests for Garden form.
2015-07-23 11:42:04 -04:00
Anthony Atkinson
69cb87fd0f
Test that required and optional fields are displaying properly on Seed form.
2015-07-23 11:36:54 -04:00
Anthony Atkinson
bc058b9152
Missed a few optional field placeholders on Seed form.
2015-07-23 11:36:40 -04:00
Anthony Atkinson
efd6328436
Test for required and optional field display on Harvest form.
2015-07-23 11:32:06 -04:00
Anthony Atkinson
19adabc55f
Test for required and optional field display on Planting form.
2015-07-23 11:27:17 -04:00
Anthony Atkinson
ccde5b230b
Comments for reasoning behind adding bangs to let statements.
2015-07-23 10:12:03 -04:00
Anthony Atkinson
33f28d1727
Two tests required bangs on let statements in order to pass after refactoring.
2015-07-23 10:07:10 -04:00
AELOGICA
aa3cf729c8
Added feature tests for on gardens, seeds and harvests for the card based thumbnails
2015-07-23 15:44:27 +08:00
AELOGICA
611adc0728
Fixed test errors for seeds and garden thumbnails.
2015-07-23 15:44:26 +08:00
AELOGICA
a97acfb1ca
Fixed display of edit glyphicon based on edit priviledge.
2015-07-23 15:44:26 +08:00
AELOGICA
7e03ef1687
Fixed display of plantings on gardens thumbnail.
2015-07-23 15:44:26 +08:00
AELOGICA
c12791e428
Created card-based thumbnails for Seeds and Gardens page.
2015-07-23 15:44:25 +08:00
AELOGICA
bbe7d967b4
Changed px to em and used truncate instead of srolling for long harvest descriptions.
2015-07-23 15:44:25 +08:00
AELOGICA
f5336bd8f8
Created card based template for harvests.
2015-07-23 15:44:25 +08:00
Anthony Atkinson
5a35a3da01
Initial rendition of feature test upgrade to Ruby 2.x and Rspec 3.x syntax.
2015-07-22 19:48:41 -04:00
Anthony Atkinson
fad9eddbc4
Addition of guard gem to assist in quicker testing.
2015-07-22 16:00:45 -04:00
Anthony Atkinson
044f62eae2
Rubymine .gitignore additions.
2015-07-22 15:54:09 -04:00
Anthony Atkinson
4786e3e087
Marking required and optional fields on Garden form.
2015-07-22 11:07:32 -04:00
Anthony Atkinson
715a004b13
Marking required and optional fields on Seed form. Purposefully marked required those select fields which have no blank option.
2015-07-22 11:05:21 -04:00
Anthony Atkinson
96a007ef3b
Marking required and optional fields on Harvest form.
2015-07-22 11:02:46 -04:00
Anthony Atkinson
a03d044049
Make a reusable helper for the "* denotes a required field" help text and change the Planting form to use the helper.
2015-07-22 10:59:47 -04:00
Anthony Atkinson
9a6c32fe6d
Planting form with required fields marked and optional fields with "optional" placeholders or select options.
2015-07-22 10:52:08 -04:00
Anthony Atkinson
fc33269f47
Reusable class for adding a 1em bottom margin to a block and .red class for red foreground color.
2015-07-22 10:51:37 -04:00
Anthony Atkinson
a80001ffe7
Schema update after migration.
2015-07-22 10:39:02 -04:00
Anthony Atkinson
30032f5527
Add a red asterisk via CSS after all .form-group labels with the .required class.
2015-07-22 10:38:41 -04:00
Anthony Atkinson
fa8b10af58
New contributor!
2015-07-22 10:37:54 -04:00
Anthony Atkinson