mirror/growstuff
1
0
Fork 0
mirror of https://github.com/Growstuff/growstuff.git synced 2026-03-30 20:51:23 -04:00
Code Issues Packages Projects Releases Wiki Activity
4,973 Commits 54 Branches 76 Tags
f2b88a94ef56e516cd7ac622644b2c8aec552fab
Commit Graph

1553 Commits

Author SHA1 Message Date
Brenda Wallace
f2b88a94ef Merge branch 'charts' into upgrade/rails-5 2018-01-11 09:32:31 +13:00
Brenda Wallace
7dab57f9ba Removed d3 graph tests 2018-01-11 09:31:59 +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
Shiny
34715b5a2a Merge branch 'dev' into charts 2018-01-10 16:37:32 +13:00
Brenda Wallace
6d56f3f655 Merge branch 'charts' into upgrade/rails-5 
Conflicts:
	app/views/layouts/application.html.haml
 2018-01-09 15:55:28 +13:00
Awesome Code
e46f530dc3 Auto corrected by following RSpec/EmptyLineAfterFinalLet 2018-01-09 02:00:40 +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
865fe106ad Unique member name on notifications spec 2018-01-07 22:10:27 +13:00
Brenda Wallace
386dc5ad7f Use factory bot in specs 2018-01-07 19:37:03 +13:00
Brenda Wallace
8e59e68dd7 Add valid DNS entry to feature spec, so it doesn't fail 2018-01-07 19:30:52 +13:00
Brenda Wallace
9e5aba75d8 Added full path to jpeg in spec, so does'nt throw asset pipeline errors 2018-01-07 18:35:28 +13: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
4800f405ea Two more fixes to tests for slug generation 2018-01-06 12:35:05 +13:00
Brenda Wallace
c95630e249 Fixed api request specs after rails 5 upgrade 2018-01-06 12:19:42 +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
19382a8a36 Random login name generator was running out of names 
So here's a name plus a random number instead
It might collide sometimes alas
 2018-01-06 09:23:34 +13: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
641d227a87 Merge remote-tracking branch 'upstream/dev' into upgrade/rails-5 
Conflicts:
	app/assets/javascripts/application.js
	package-lock.json
 2018-01-06 08:46:52 +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
2b69db77bf Use faker gem for Member factorybot 2018-01-05 21:33:21 +13:00
Brenda Wallace
2f9610a60f Http positional arguments in rails 5 2018-01-04 21:28:48 +13:00
Brenda Wallace
f4af682d45 Updated code for Rail 5 2018-01-03 17:12:17 +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