Shiny
bf2b32ffaa
Merge branch 'dev' into awesomecode-factorybot/dynamicattributedefinedstatically-7220
2018-01-11 16:13:34 +13:00
Shiny
01d6232bcf
Merge branch 'dev' into charts
2018-01-11 13:11:32 +13:00
Brenda Wallace
7dab57f9ba
Removed d3 graph tests
2018-01-11 09:31:59 +13:00
Awesome Code
1a4e0bd48a
Auto corrected by following Style/RescueStandardError
2018-01-10 20:18:17 +00:00
Shiny
a931f26b00
Merge branch 'dev' into awesomecode-factorybot/dynamicattributedefinedstatically-7220
2018-01-11 09:15:00 +13:00
Shiny
34715b5a2a
Merge branch 'dev' into charts
2018-01-10 16:37:32 +13:00
Awesome Code
e46f530dc3
Auto corrected by following RSpec/EmptyLineAfterFinalLet
2018-01-09 02:00:40 +00:00
Awesome Code
3ece584390
Auto corrected by following FactoryBot/DynamicAttributeDefinedStatically
2018-01-09 01:59:43 +00:00
Brenda Wallace
a2e4863f00
Fixing up prediction specs
2018-01-09 14:37:21 +13:00
Brenda Wallace
2c3fe3c204
updated prediction spec
2018-01-09 13:18:58 +13:00
Brenda Wallace
ee1617c7c3
Added new line at end of file
2018-01-03 14:43:29 +13:00
Brenda Wallace
56b0562785
Removed unused variables in js
2018-01-03 14:24:08 +13:00
Brenda Wallace
2d98a7e793
Wrapped a long line
2018-01-03 14:21:29 +13:00
Brenda Wallace
29dcc01cde
Merge remote-tracking branch 'upstream/dev' into js/cleanup
2018-01-03 11:54:09 +13:00
Brenda Wallace
a836d6432f
Updating javascript style
2018-01-03 11:52:47 +13:00
Shiny
9d47b2b029
Merge branch 'dev' into feature/admin-nicer
2017-12-18 15:10:36 +13:00
Brenda Wallace
99828c7c01
Updated spec for new admin#index
2017-12-17 17:54:13 +13:00
Brenda Wallace
2394f4d237
One view for showing photos on an item
2017-12-17 11:40:55 +13:00
Brenda Wallace
970da53873
Merge remote-tracking branch 'origin/feature/photos-1457' into feature/photos-1457
2017-12-17 09:15:24 +13:00
Brenda Wallace
3aa2f0bd3b
Paginate photos on seeds#show (inc feature specs)
2017-12-17 08:55:08 +13:00
Brenda Wallace
14551b6ec8
Merge remote-tracking branch 'upstream/dev' into feature/photos-1457
...
Conflicts:
spec/models/crop_spec.rb
2017-12-09 20:59:20 +13:00
Brenda Wallace
2b0f199329
change string replacement for performance reasons
2017-12-06 15:19:34 +13:00
Brenda Wallace
24f18f78da
use bare percent literals
2017-12-06 14:33:51 +13:00
Brenda Wallace
3cc637017d
Avoid {} for multiline
2017-12-06 14:29:21 +13:00
Brenda Wallace
37f9dcd7dd
for simple loops, use Integer.times
2017-12-06 14:26:58 +13:00
Brenda Wallace
f516ef2e57
Don't use :: for method calls
2017-12-06 14:24:17 +13:00
Brenda Wallace
515325c44e
Fixed up % delimiters
2017-12-06 14:14:31 +13:00
Brenda Wallace
2d00206abf
Converted sprintf to format
2017-12-06 14:10:26 +13:00
Brenda Wallace
f499f245de
Added new line after block end, for rubocpo
2017-12-06 14:08:05 +13:00
Brenda Wallace
35414391c3
modified spec to please rubocop
2017-12-06 14:07:18 +13:00
Brenda Wallace
1f7f4f52d1
Updated ability_spec.rb to use block end new lines
2017-12-06 14:02:48 +13:00
Brenda Wallace
a6a7f789a3
Rubocop upgrade (and some style fixes)
2017-12-01 21:07:39 +13:00
Brenda Wallace
c4c659f159
DRY specs, and use create_list in crops model spec
2017-11-30 13:37:47 +13:00
Brenda Wallace
ccbdfe51f6
Modified a spec to avoid a chicken and an egg
2017-11-29 22:30:11 +13:00
Brenda Wallace
6ed7376c58
Name garden in spec to ensure it's ordered first
2017-11-29 20:59:37 +13:00
Brenda Wallace
c8a200bf19
Changed selector in view spec
...
it was having trouble finding the link
2017-11-29 20:59:37 +13:00
Brenda Wallace
a62b668781
Fix up duplicate order item in controller spec, and DRY
2017-11-29 20:59:37 +13:00
Brenda Wallace
09f82d5995
Tidy up home/crops partial view
2017-11-29 20:59:37 +13:00
Brenda Wallace
8d0bec34a6
Crops controller spec, use let, other cleanup
2017-11-29 20:59:37 +13:00
Brenda Wallace
3058160a59
Removed an orderng spec for gardens
2017-11-29 20:59:37 +13:00
Brenda Wallace
b813669d71
Updated shop controller specs
2017-11-29 20:59:37 +13:00
Brenda Wallace
9c993e9f47
Plantings controller ordering and specs
2017-11-29 20:59:37 +13:00
Brenda Wallace
d5fece87d0
Tests for comments#index (and bugfix)
2017-11-29 20:59:37 +13:00
Brenda Wallace
33816d4312
Use faker gem, in account types - and add controller specs
2017-11-29 20:59:37 +13:00
Brenda Wallace
6aa689b0d8
Removed some model ordering specs
2017-11-29 20:59:37 +13:00
Brenda Wallace
962b3b574d
Fixed up planting spec to not care about ordering
2017-11-29 20:59:37 +13:00
Brenda Wallace
d77d1d9a77
spec for notifications needs to be agnostic about the order
2017-11-29 20:59:37 +13:00
Brenda Wallace
bd063be3a9
Fix gardens actions, and add specs
...
A bug slipped into all garden display pages - and there were no tests that caught it.
This adds feature specs for gardens#index, which would have detected the un-initialised
variable in haml
2017-11-19 16:31:17 +13:00
Logan Gingerich
ede5187369
Whitespace fix, spec fix, and spec addition
2017-11-19 11:13:41 +13:00
Brenda Wallace
dafaffcd73
Path remains same after sign out for our test cases
2017-11-18 22:25:58 +13:00