mirror/growstuff
1
0
Fork 0
mirror of https://github.com/Growstuff/growstuff.git synced 2026-02-22 02:23:06 -05:00
Code Issues Packages Projects Releases Wiki Activity
5,603 Commits 70 Branches 76 Tags
c2b64ffbc0fbcc666de77fa91b4ee4bb13656751
Commit Graph

576 Commits

Author SHA1 Message Date
Brenda Wallace
0c78791d01 Remove unnecesary whitesapce in specs 2018-12-30 13:22:42 +13:00
Brenda Wallace
cf11cbd7d2 Update seeds specs 2018-10-16 15:11:46 +13:00
Brenda Wallace
ac8dff2a28 Update new post spec 2018-10-16 14:29:44 +13:00
Brenda Wallace
918f73d0f0 Update crop edit spec 2018-10-16 14:29:01 +13:00
Brenda Wallace
92939ca204 Spec updates 2018-10-16 14:08:37 +13:00
Brenda Wallace
ec4c6f13aa Updating new seed view specs 2018-10-16 13:56:10 +13:00
Brenda Wallace
aded3c00fc More spec updates 2018-10-08 14:17:28 +13:00
Brenda Wallace
ae48bd0564 Merge remote-tracking branch 'upstream/dev' into upgrade/rails-5 2018-09-11 16:08:15 +12:00
Brenda Wallace
550860178e Merge remote-tracking branch 'upstream/dev' into upgrade/rails-5 2018-09-11 16:07:30 +12:00
Brenda Wallace
ef60f74624 Removed extra blank lines 2018-09-11 15:57:09 +12:00
Awesome Code
90f4db4853 Auto corrected by following Ruby rspec layout 2018-09-10 22:20:12 +00:00
robotscissors
82b83ca7a4 Fix linter issues 2018-06-12 10:00:45 -07:00
robotscissors
e784790e19 add .to_s to accomodate hound 2018-06-11 11:16:47 -07:00
robotscissors
f9bdae77d3 add tests for harvests/index.rss 2018-06-11 10:38:26 -07:00
robotscissors
dff6827761 create rss feed for harvests 2018-06-10 20:38:43 -07: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
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
Brenda Wallace
b2cf022522 Removed extra blank lines 2018-01-29 13:01:49 +13:00
Awesome Code
767477df66 Auto corrected by following RSpec/LeadingSubject 2018-01-28 23:47:27 +00:00
Brenda Wallace
92e56cfc1e Fixed up a spec, use sign_in member instead of stubing 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
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
482d15e36d Fixed spec to specify login name before checking 2018-01-06 16:48:28 +13:00
Brenda Wallace
ca40d07148 Fixed up crops view spec 2018-01-06 16:42:18 +13:00
Brenda Wallace
a9043b8f5a specify login name and post body in spec 
don't rely on factory to produce predictable results, specify what we're
gonna be looking for in spec
 2018-01-06 15:10:25 +13:00
Brenda Wallace
f4af682d45 Updated code for Rail 5 2018-01-03 17:12:17 +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
3cc637017d Avoid {} for multiline 2017-12-06 14:29:21 +13:00
Brenda Wallace
2d00206abf Converted sprintf to format 2017-12-06 14:10:26 +13:00
Brenda Wallace
09f82d5995 Tidy up home/crops partial view 2017-11-29 20:59:37 +13:00
Logan Gingerich
ede5187369 Whitespace fix, spec fix, and spec addition 2017-11-19 11:13:41 +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
f2fac9db1b Time.zone.local 2017-11-04 11:39:53 +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
0e0af44d9f post show specs, use expect syntax, and more tests for js injection 2017-10-23 10:44:37 +01:00
Brenda Wallace
45af8d5f4f Converting to expect syntax 2017-10-23 10:44:37 +01:00
Brenda Wallace
6fef56ebb7 DRY the crops controller 2017-05-29 16:17:43 +12:00
Brenda Wallace
4726b57c47 Inactive plantings show as tiny thumbnails 2017-05-28 17:13:04 +12:00
Brenda Wallace
6c0b1018bc Updated spec for homepage seeds 2017-05-20 17:16:03 +12:00
Brenda Wallace
d57c46066a updated view spec to find glypicon 2017-05-06 13:27:23 +12:00
Brenda Wallace
cff1d8bfb9 Photo#show for signed in and not signed in, and other members 2017-04-18 07:09:47 +00:00
Brenda Wallace
bbdc54cb69 Photos#show links to items 2017-04-18 07:09:47 +00:00
Brenda Wallace
36f1f7b71a updating view spec - link to delete photo has changed 2017-04-18 07:09:47 +00:00