mirror/growstuff
1
0
Fork 0
mirror of https://github.com/Growstuff/growstuff.git synced 2026-03-28 19:51:57 -04:00
Code Issues Packages Projects Releases Wiki Activity
5,700 Commits 54 Branches 76 Tags
ea2653ecfc1910ec68462d5c0ccbeea488d46aad
Commit Graph

284 Commits

Author SHA1 Message Date
Brenda Wallace
c7ad7bcc70 Fixed redundant begin block 2019-01-01 13:38:37 +13:00
Brenda Wallace
7b01fcbd4b Align all the hashes 2018-12-30 15:22:29 +13:00
Brenda Wallace
d5676338d6 Use the expect syntax 2018-12-30 15:06:14 +13:00
Brenda Wallace
9694696570 Code style fix ups 2018-09-29 15:52:42 +12:00
Brenda Wallace
550860178e Merge remote-tracking branch 'upstream/dev' into upgrade/rails-5 2018-09-11 16:07:30 +12:00
Awesome Code
d248f99209 Auto corrected by following Ruby rspec layout 2018-09-11 03:29:48 +00:00
Awesome Code
7301c6cd6c Auto corrected by following Ruby RSpec/HooksBeforeExamples 2018-09-11 03:02:54 +00:00
Awesome Code
90f4db4853 Auto corrected by following Ruby rspec layout 2018-09-10 22:20:12 +00:00
Brenda Wallace
517cfa3acd spec fixes 2018-06-04 15:34:50 +12:00
Brenda Wallace
a590b89302 Photos in spec needs to have same owner as item they link to 2018-06-04 15:29:59 +12:00
Brenda Wallace
127b72b279 Updated spec to look for 404 page instead of exception 2018-06-04 12:09:31 +12:00
Brenda Wallace
a221f10113 Move photos owner validation to models 2018-06-04 12:03:11 +12:00
Brenda Wallace
59cca1b8cb Upgraded controller specs for rails 5 2018-04-02 16:18:46 +12:00
Brenda Wallace
49d3f24ac8 [Corrected] Use the -> { ... } lambda literal syntax for single line lambdas. 2018-04-02 11:19:40 +12:00
Brenda Wallace
fa32537c3b Merge remote-tracking branch 'upstream/dev' into upgrade/rails-5 
Conflicts:
	.rubocop_todo.yml
	Gemfile.lock
	app/assets/javascripts/application.js
	app/assets/javascripts/members.js.erb
	app/assets/stylesheets/predictions.sass
	app/controllers/crops_controller.rb
	app/controllers/orders_controller.rb
	app/controllers/plantings_controller.rb
	app/models/account.rb
	app/models/account_type.rb
	app/models/member.rb
	app/models/order.rb
	app/models/order_item.rb
	app/models/product.rb
	app/views/gardens/show.html.haml
	app/views/layouts/application.html.haml
	config/initializers/assets.rb
	config/routes.rb
	db/schema.rb
	package-lock.json
	spec/controllers/account_types_controller_spec.rb
	spec/controllers/admin/orders_controller_spec.rb
	spec/controllers/comments_controller_spec.rb
	spec/controllers/gardens_controller_spec.rb
	spec/controllers/harvests_controller_spec.rb
	spec/controllers/member_controller_spec.rb
	spec/controllers/order_items_controller_spec.rb
	spec/controllers/orders_controller_spec.rb
	spec/controllers/photo_associations_controller_spec.rb
	spec/controllers/photos_controller_spec.rb
	spec/controllers/plantings_controller_spec.rb
	spec/controllers/seeds_controller_spec.rb
	spec/controllers/shop_controller_spec.rb
	spec/features/crops/crop_detail_page_spec.rb
	spec/models/member_spec.rb
	spec/models/post_spec.rb
	spec/views/crops/_planting_advice.html.haml_spec.rb
	spec/views/home/_crops.html.haml_spec.rb
	spec/views/orders/show.html.haml_spec.rb
	spec/views/posts/show.html.haml_spec.rb
	spec/views/shop/index_spec.rb
 2018-04-02 10:59:13 +12:00
Brenda Wallace
f9d4e1d6ae Ancestry of food. Seeds -> Planting -> Seeds -> Planting (#1550) 
* Add seed ancestry, and seeds.finished_at
* Plantings and seeds produce each other
* Permissions for seeds actions
* View update, for seed actions, and planting ancestry
* Routes for seeds
* Scopes for harvests
* Spec updates for seeds
* Removed in-line style
* Add seed ancestry, and seeds.finished_at
* Plantings and seeds produce each other
* Permissions for seeds actions
* View update, for seed actions, and planting ancestry
* Routes for seeds
* Scopes for harvests
* Spec updates for seeds
* Moved finishable to a concern
* Seeds.finished_at
* rubocop fixes
* Made seeds sown migration the most recent
* Specs for home page
* Only show current seeds on home page
* Seeds appear for logged in or not
* Buttons to mark seeds finished
* JS for marking seeds finished
* Some actions only appear if seed or planting is active
* Fixed up display of home page
* Fixed typo in admin members#index
* Tidying up actions on all the things
* Harvest description in #index
* Truncate garden description if long
* Updated link label in view spec
* Show planted_from always, becuase it might be a parent seed
* find correct link in spec adding photos to garden
* fixed spec finding link to edit garden
* Better harvest description truncation
* Helping spec find the edit button
* specs for the home page
* Re-instate crops js, but in the correct file now
* Fixed link to garden in actions
* Tweaking mobile view
 2018-03-12 08:39:32 +13:00
Brenda Wallace
42de726405 Removing shop, products, accounts, orders 2018-02-09 10:53:05 +13:00
Brenda Wallace
65b4c7dbc1 Revert "Auto corrected by following Style/StringLiterals" 
This reverts commit ab56a3c6b3.
 2018-02-09 07:58:47 +13:00
Awesome Code
ab56a3c6b3 Auto corrected by following Style/StringLiterals 2018-02-07 10:20:26 +13:00
Awesome Code
e8d9314cff Auto corrected by following Style/Lambda 2018-01-23 09:00:34 +13:00
Brenda Wallace
16ad5384d1 Moved gardens chart to dedicated controller 2018-01-23 09:00:34 +13:00
Brenda Wallace
9db4736229 Permissions (and specs) for charts json 2018-01-23 09:00:34 +13:00
Awesome Code
3391f6c392 Auto corrected by following Style/RescueStandardError 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
Brenda Wallace
3a4443a4fe Permissions (and specs) for charts json 2018-01-13 22:15:27 +13:00
Daniel O'Connor
609b468675 Merge branch 'dev' into upgrade/rails-5 2018-01-11 10:04:21 +10:30
Awesome Code
1a4e0bd48a Auto corrected by following Style/RescueStandardError 2018-01-10 20:18:17 +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
a2190dc984 Fixed a matcher in posts controller spec 2018-01-06 08:54:44 +13:00
Brenda Wallace
462654f26e Fixed gardens controller specs 2018-01-06 08:51:11 +13:00
Brenda Wallace
a0cc9c0a00 fixed photo controller specs 2018-01-06 08:41:34 +13:00
Brenda Wallace
4e5aa8077c Re-wrote harvests#update controller spec 2018-01-05 21:34:11 +13:00
Brenda Wallace
2f9610a60f Http positional arguments in rails 5 2018-01-04 21:28:48 +13:00
Brenda Wallace
35414391c3 modified spec to please rubocop 2017-12-06 14:07:18 +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
8d0bec34a6 Crops controller spec, use let, other cleanup 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
7906d50d13 Shaved some yaks to remove a rescue from a controller 2017-11-18 22:25:58 +13:00
Brenda Wallace
3969f410f1 Tidy up photos logic, and test of signin/out on photos#new 2017-11-18 22:25:58 +13:00
Logan Gingerich
6304f230a5 Refactored and specs updated 2017-11-18 22:25:58 +13:00
milesgould
d8bf8ae4df De-deprecate controller and view specs 
We deprecated controller and view specs on the grounds that they were
brittle, and were a poorer measure of user experience than feature
specs. However, feature specs have their own problems: they're much
slower to run, and flakier (see #901). We also ran into a few cases
where feature specs erroneously passed because they were checking for
the presence of a string that occurred in the error page!

Hence, we're cautiously un-deprecating controller and view specs.

Fixes #1132
 2017-11-17 16:51:24 +00:00
Brenda Wallace
2fbba52bc8 Updating specs to use same owner for garden and planting 2017-11-13 19:18:14 +13:00
Brenda Wallace
b3fd8e32d0 Fixed ordering of Harvests - don't order in scope. 2017-11-05 17:42:59 +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
97c7277a73 fixed up ambigous regex and use of expect in specs 2017-10-23 10:44:37 +01:00