Commit Graph
726 Commits
Author SHA1 Message Date
Awesome Code e8d9314cff Auto corrected by following Style/Lambda 2018-01-23 09:00:34 +13:00
Awesome Code 8c8d549cb1 Auto corrected by following RSpec/NotToNot 2018-01-23 09:00:34 +13:00
Awesome Code dea7ce241b Auto corrected by following RSpec/EmptyLineAfterFinalLet 2018-01-23 09:00:34 +13:00
Brenda Wallace d9bdc46099 Merge remote-tracking branch 'upstream/dev' into upgrade/rails-5
Conflicts:
	app/assets/javascripts/members.js.erb
2018-01-21 21:20:43 +13:00
Awesome Code 273e4c07d8 Auto corrected by following RSpec/NotToNot 2018-01-13 22:49:49 +00:00
Brenda Wallace 8e0b7d9ded Merge branch 'charts' into upgrade/rails-5
Conflicts:
	app/assets/javascripts/crops.js.erb
	spec/controllers/comments_controller_spec.rb
	spec/controllers/harvests_controller_spec.rb
	spec/controllers/photos_controller_spec.rb
	spec/controllers/plantings_controller_spec.rb
	spec/models/post_spec.rb
	spec/views/home/_crops.html.haml_spec.rb
2018-01-11 08:34:20 +13:00
Awesome Code e46f530dc3 Auto corrected by following RSpec/EmptyLineAfterFinalLet 2018-01-09 02:00:40 +00:00
Brenda Wallace 4800f405ea Two more fixes to tests for slug generation 2018-01-06 12:35:05 +13:00
Brenda Wallace 22fd422a6d Look for eq false in member spec 2018-01-06 11:49:35 +13:00
Brenda Wallace d642e7cf40 set login name on member so we know what to look for in slug spec 2018-01-06 11:48:45 +13:00
Brenda Wallace 5eae80bc6d Specify login name in spec, so we know what to look for
Becuase we're using the faker gem now
2018-01-06 11:38:47 +13:00
Brenda Wallace 7bb49f337f Fixing up member's account model creation, post rails 5 upgrade 2018-01-06 11:31:04 +13:00
Brenda Wallace f4af682d45 Updated code for Rail 5 2018-01-03 17:12:17 +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 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 f499f245de Added new line after block end, for rubocpo 2017-12-06 14:08:05 +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 3058160a59 Removed an orderng spec for gardens 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 2fbba52bc8 Updating specs to use same owner for garden and planting 2017-11-13 19:18:14 +13:00
Brenda Wallace 809dd81378 "Changed last_harvest" to "days_to_last_harvest" 2017-11-08 17:17:58 +13:00
Brenda Wallace 62beec23a1 "Changed first_harvest" to "days_to_first_harvest" 2017-11-08 17:17:15 +13:00
Brenda Wallace 470aacd1c9 Fixed %w for an array of words 2017-11-06 09:11:27 +13:00
Brenda Wallace eaa65fda9e update median_last_harvest too, with specs 2017-11-05 20:28:51 +13:00
Brenda Wallace 6c33c335d8 Default ordering for harvests are gone, so order it in spec 2017-11-05 19:26:50 +13:00
Brenda Wallace 26537943e3 Removed pending spec 2017-11-05 18:00:49 +13:00
Brenda Wallace 9b1b22afa8 Bugfix and specs for first and last harvest 2017-11-05 17:33:58 +13:00
Brenda Wallace 996706ee78 Tests for planting lifespan predictions when there's no crop data 2017-11-05 17:29:42 +13:00
Brenda Wallace eb585611fe Fixed spec to call update_lifespan_medians 2017-11-05 14:05:54 +13:00
Brenda Wallace f2fac9db1b Time.zone.local 2017-11-04 11:39:53 +13:00
Brenda Wallace 20fe9e4cc5 Merge remote-tracking branch 'upstream/dev' into feature/harvest-predictions 2017-11-04 10:09:53 +13:00
Logan Gingerich fa600bea9e changed spec to reflect factorybot change 2017-11-03 14:53:20 +13:00
Logan Gingerich 99e7fb1f7d Name added to contributors and spec added 2017-11-03 14:53:20 +13:00
Logan Gingerich 10a8df47a9 Factorygirl to factorybot - fixes #1413 (#1425)
* FactoryGirl Changed to FactoryBot

file fix

changes based on comments received

Bundle Update on 2017-10-29

style update to align hash literal

added package-lock

* indentation fixes with rubocop

* name added to contributors
2017-11-01 15:03:31 +00:00
Brenda Wallace 92fa09a1d3 Mark harvest predictions as pending 2017-11-01 13:57:49 +13:00
Brenda Wallace 9ef40532ad removed old percentage grow specs 2017-11-01 13:57:49 +13:00
Brenda Wallace 70ba8c8421 Updating planting model specs, for predictions 2017-11-01 13:57:49 +13:00
Brenda Wallace 7d6c49d8c3 Set harvest preductions on plantings 2017-11-01 13:57:49 +13:00
Brenda Wallace 78aa049502 Fixed comment model spec 2017-10-23 10:44:37 +01:00
Brenda Wallace 97c7277a73 fixed up ambigous regex and use of expect in specs 2017-10-23 10:44:37 +01:00
Brenda Wallace 46efcf3e61 Spec for Forum owners and Crop creators deleting their accounts 2017-06-09 23:25:40 +12:00
Brenda Wallace 910a9673dc Unsubscribes newsletter before member destroying 2017-06-09 22:39:07 +12:00
Brenda Wallace 582dd2c9fd Checks the deleted members are not found 2017-06-09 21:28:47 +12:00
Shiny 7621da7041 Merge branch 'dev' into issue-1044-account-deletion 2017-05-30 20:39:44 +12:00
Brenda Wallace ff1c835cda Moving the planting predictions to own service 2017-05-29 22:45:14 +12:00