Commit Graph

642 Commits

Author SHA1 Message Date
Brenda Wallace
1fe5f67aa1 Update garden_type model spec 2019-03-26 21:14:31 +13:00
Brenda Wallace
63edfa36df Gardens have garden_Types in specs 2019-03-26 21:13:12 +13:00
Brenda Wallace
5395aefa66 Rename containers to garden types 2019-03-26 20:56:11 +13:00
Brenda Wallace
02e0dd091a Merge remote-tracking branch 'upstream/dev' into bb-track-types-of-gardens 2019-03-26 19:35:16 +13:00
Awesome Code
ad470ede1d Auto corrected by following Lint Ruby RSpec/AlignRightLetBrace 2019-03-13 17:23:33 +13:00
Awesome Code
3bc1bba448 Auto corrected by following Lint Ruby RSpecEmptyLine 2019-03-12 22:51:12 +00:00
Awesome Code
f90cc792bb Auto corrected by following Lint Ruby RSpec/AlignLeftLetBrace 2019-03-13 11:42:27 +13:00
Brenda Wallace
3ed173ebcd Material design changes 2019-02-17 21:33:36 +13:00
Awesome Code
b7cfed1246 Auto corrected by following Lint Ruby Space 2019-02-16 13:42:20 +00:00
Brenda Wallace
cc218c367c Merge remote-tracking branch 'origin/photos/seeds' into photos/seeds 2019-02-15 08:48:51 +13:00
Brenda Wallace
c298a1763f Merge branch 'dev' into photos/seeds 2019-02-12 16:21:51 +13:00
Awesome Code
3efc0caaf7 Auto corrected by following Lint Ruby EmptyLine 2019-02-11 11:02:33 +13:00
Awesome Code
689baa85a3 Auto corrected by following Lint Ruby RSpec/ExampleWording 2019-02-11 10:17:54 +13:00
Awesome Code
490db7b342 Auto corrected by following Lint Ruby RSpec/HookArgument 2019-02-11 09:00:34 +13:00
Awesome Code
49eed9b208 Auto corrected by following Lint Ruby RSpec/LetBeforeExamples 2019-02-10 09:24:00 +00:00
Brenda Wallace
572af9d135 Merge branch 'dev' into photos/seeds 2019-02-09 17:00:58 +13:00
Awesome Code
284bb81bbf Auto corrected by following Lint Ruby RSpecEmptyLine 2019-02-09 03:05:40 +00:00
Brenda Wallace
e6de37c8ce Tests for crop.photos 2019-02-07 15:02:11 +13:00
Brenda Wallace
b7fe5e156e Fixed brackets, because ruby needs those sometimes 2019-02-05 17:18:36 +13:00
Brenda Wallace
c0fdf262f4 Fixed method name in spec 2019-02-05 17:11:59 +13:00
Brenda Wallace
f6ba22fb28 Fixed typo in spec 2019-02-05 17:10:34 +13:00
Brenda Wallace
9ff95506bd Spects for Photo.by_crop 2019-02-05 12:40:15 +13:00
Brenda Wallace
5c0e31721f tests for crops.by_model_type scope 2019-02-05 12:37:35 +13:00
Brenda Wallace
1ea19bee9d Not planted means the percent_grown is 0 2019-02-05 09:59:20 +13:00
Brenda Wallace
e1fdc729db Merge branch 'dev' into bb-track-types-of-gardens 2019-01-21 11:36:46 +13:00
Brenda Wallace
2539899934 Fix notification specs 2019-01-21 10:50:22 +13:00
Brandon Baker
a00ed5a176 Merge branch 'dev' into bb-track-types-of-gardens 2019-01-08 12:03:39 -05:00
Brenda Wallace
72be3e3a41 Merge branch 'dev' into UTFGardenNames 2019-01-04 23:06:43 +13:00
Brenda Wallace
0971f3b5f4 Updated notification specs for Rails 5.2 2019-01-03 12:50:58 +13:00
Brenda Wallace
5a73f57454 Merge branch 'dev' into UTFGardenNames 2019-01-03 08:46:15 +13:00
Brenda Wallace
7b01fcbd4b Align all the hashes 2018-12-30 15:22:29 +13:00
Brenda Wallace
22e456f3af Time stamps need a timezone 2018-12-30 15:06:24 +13:00
Brandon Baker
f35284c403 adds more basic specs 2018-12-01 14:08:11 -07:00
Brandon Baker
02174a0acb builds views for containers 2018-11-30 11:56:58 -07:00
Brandon Baker
f5abc592f1 cleans up rubocop violations 2018-11-29 14:30:02 -07:00
Brandon Baker
5f6852b45c adds basic specs for container and adds a plot spec for garden 2018-11-29 13:22:35 -07:00
Brandon Baker
45ba5ff48a creates containers, plots, and associations among gardens, plots, and containers 2018-11-29 10:54:04 -07:00
Brenda Wallace
6c2afb2804 Adding missing inverswe relationship alternatename.creator 2018-10-16 10:16:45 +13:00
Brenda Wallace
550860178e Merge remote-tracking branch 'upstream/dev' into upgrade/rails-5 2018-09-11 16:07:30 +12:00
Awesome Code
90f4db4853 Auto corrected by following Ruby rspec layout 2018-09-10 22:20:12 +00:00
Brenda Wallace
326e972e9b Merge remote-tracking branch 'upstream/dev' into upgrade/rails-5 2018-06-04 16:21:51 +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
jenkr55
9e182b07aa Dont allow any kind of newline 2018-05-28 12:46:08 -05:00
jenkr55
f1a4bd19aa New slug regex 2018-05-27 13:06:32 -05:00
jenkr55
8c5817f511 Still works with newline characters 2018-05-20 16:03:06 -05:00
jenkr55
1b1870095f Allow garden name macrons test description accurate 2018-05-20 15:15:58 -05:00
jenkr55
cc1aaeb5ce Updating test to allow numbers (description previously inaccurate) 2018-05-20 15:15:18 -05: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
6677f8641f If not crop lifespan data, use parent data 2018-04-21 17:40:22 +12:00