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

433 Commits

Author SHA1 Message Date
Brenda Wallace
ac660e986c Wrap all action bar button groups in a div 
So we can find them in specs
 2018-12-30 16:14:00 +13:00
Brenda Wallace
7b01fcbd4b Align all the hashes 2018-12-30 15:22:29 +13:00
Brenda Wallace
ac6a308ea0 Update URL -> CGI 2018-12-30 15:05:41 +13:00
Brenda Wallace
0c78791d01 Remove unnecesary whitesapce in specs 2018-12-30 13:22:42 +13:00
Brenda Wallace
276accc314 Merge remote-tracking branch 'upstream/dev' into upgrade/rails-5 
Conflicts:
	Gemfile.lock
 2018-12-30 13:02:02 +13:00
Brandon Baker
7b15ae319d corrects more inflections 2018-12-12 09:37:31 +13:00
Brandon Baker
2c0746073e removes extra empty line detected at block body end 2018-12-12 09:37:31 +13:00
Brandon Baker
c0450477c6 adds plural form of words with māori origin 2018-12-12 09:37:31 +13:00
Brandon Baker
e6007dc094 adds inflections for irregular plural crop names 2018-12-12 09:37:31 +13:00
Awesome Code
a818a2ad45 Auto corrected by following Ruby Style/UnneededCondition 2018-10-20 06:57:51 +13:00
Brenda Wallace
fb156ec438 Updating edit seeds spec 2018-10-16 14:20:15 +13:00
Brenda Wallace
92939ca204 Spec updates 2018-10-16 14:08:37 +13:00
Brenda Wallace
0a65e57d53 Fixed up text in spec 2018-10-16 12:42:15 +13:00
Brenda Wallace
fe2536c864 More spec updates 2018-10-08 14:15:44 +13:00
Brenda Wallace
05da2de7e4 Fix up text in checking appended date 2018-10-08 09:48:49 +13:00
Brenda Wallace
fb2f5f464a Change scenario to description 2018-10-08 09:47:52 +13:00
Brenda Wallace
5031b37232 Adding \n into specs, because our output has it now 2018-09-29 15:51:35 +12:00
Brenda Wallace
ee49e8c5db Fixing unneeded condition 2018-09-13 23:09:13 +12: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
brenda
2b8aac19dd Revert "Auto corrected by following Ruby Capybara/FeatureMethods" 
This reverts commit b52763b7c2.
 2018-09-07 10:40:09 +12:00
Awesome Code
b52763b7c2 Auto corrected by following Ruby Capybara/FeatureMethods 2018-09-05 12:06:58 +00:00
Brenda Wallace
0f8747f03d Turn on the CMS specs again 2018-06-04 17:13:00 +12:00
Brenda Wallace
326e972e9b Merge remote-tracking branch 'upstream/dev' into upgrade/rails-5 2018-06-04 16:21:51 +12:00
Brenda Wallace
bcaf245e64 photos#new doesn't redirect, needs item 2018-06-04 16:10:24 +12:00
Brenda Wallace
748da6c3e6 Comments from deleted members need to show 2018-06-04 16:02:07 +12: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
b898d83d21 Fix up notification redirect spec 2018-06-04 11:49:30 +12:00
Brenda Wallace
6913233596 Use factorybot in more tests 2018-06-04 11:39:22 +12:00
Brenda Wallace
7a1499d854 Merge branch 'dev' into awesomecode-factorybot/createlist-12138 2018-05-01 13:47:44 +12:00
Brenda Wallace
f8a404a88b Merge remote-tracking branch 'upstream/dev' into upgrade/rails-5 
Conflicts:
	Gemfile
	Gemfile.lock
	app/models/crop.rb
	app/models/forum.rb
	app/models/photo.rb
	app/models/planting.rb
	app/models/seed.rb
	db/schema.rb
	spec/models/garden_spec.rb
	spec/models/planting_spec.rb
 2018-04-28 21:25:06 +12:00
Brenda Wallace
db0c60be0d Rename zombie to super_late 2018-04-23 13:33:38 +12:00
Brenda Wallace
91e851c802 Merge remote-tracking branch 'upstream/dev' into feature/status 2018-04-23 13:00:53 +12:00
jenkr55
eed0b257fa Fixing test because I removed this line 2018-04-21 22:03:31 -05:00
Brenda Wallace
6077d4da34 Fixed bug in garden spec 2018-04-21 15:01:33 +12:00
Brenda Wallace
548fb3d3fd Badges feature specs 2018-04-21 14:00:00 +12:00
Awesome Code
afc4441ce1 Auto corrected by following FactoryBot/CreateList 2018-04-20 22:19:04 +00:00
Brenda Wallace
934bd9adb8 Fixed bug in spec, wasn't really on member's garden#index 2018-04-16 22:11:36 +12:00
Brenda Wallace
5dbb3a1487 Mark cms specs as pending 2018-04-02 15:59:38 +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
Shiny
6f613635d2 Update crop_detail_page_spec.rb 2018-01-23 09:00:34 +13:00