Commit Graph

1666 Commits

Author SHA1 Message Date
Brenda Wallace
e2874404e4 Layout linter fix 2018-09-13 23:15:01 +12:00
Brenda Wallace
7c7d261e7e Fixed last static factorybot attribtue 2018-09-13 23:13:03 +12:00
Brenda Wallace
3ad048b7e8 Fixed linter issue, empty line after guard clause 2018-09-13 23:10:43 +12:00
Brenda Wallace
ee49e8c5db Fixing unneeded condition 2018-09-13 23:09:13 +12:00
Brenda Wallace
aad7128a31 Fixed user name generation in member factorybot 2018-09-13 22:44:46 +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
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
Awesome Code
31744491ea Auto corrected by following Ruby FactoryBot/AttributeDefinedStatically 2018-09-09 21:53:57 +00:00
Brenda Wallace
f69f0861d2 Style fix up 2018-09-09 10:04:02 +12: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
Awesome Code
345fac4358 Auto corrected by following Ruby FactoryBot/StaticAttributeDefinedDynamically 2018-07-21 04:04:00 +00:00
Brenda Wallace
9b6db4cde7 Merge branch 'dev' into upgrade/rails-5 2018-06-17 20:59:49 +12:00
Brenda Wallace
77d2dc6144 Merge branch 'dev' into issue-565-create-harvests-rss 2018-06-17 20:58:32 +12: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
d7e71c8fc3 Use factory bot to make a harvest.plant_part 2018-06-07 11:46:29 +12:00
Brenda Wallace
47ddc915ef Generate random number in plant_part.name in factorybot 2018-06-07 11:44:29 +12:00
Brenda Wallace
0d303ee6df Don't allow duplicate plant parts names
Make factort's plant_part.name unique
Setting plant_part.name in specs
Unique names for plant parts
2018-06-04 17:42:41 +12:00
Brenda Wallace
0f8747f03d Turn on the CMS specs again 2018-06-04 17:13:00 +12:00
Brenda Wallace
7737f41b7f Code style fixup 2018-06-04 16:39:51 +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
d7cc219569 Unique login_name in member factory 2018-06-04 16:16:55 +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
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
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
02c5571a9a Notifications need sender and reciever in factory 2018-06-04 11:38:15 +12:00
Daniel O'Connor
a772bdaa8d Merge branch 'dev' into awesomecode-factorybot/createlist-12138 2018-05-10 21:35:39 +09:30
Brenda Wallace
7a1499d854 Merge branch 'dev' into awesomecode-factorybot/createlist-12138 2018-05-01 13:47:44 +12:00
Brenda Wallace
152cdace75 Removed spec for currency helpers 2018-05-01 13:47:25 +12:00
Brenda Wallace
4e6ffc1a63 Removed spec for currency helpers 2018-04-28 22:21:35 +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
6677f8641f If not crop lifespan data, use parent data 2018-04-21 17:40:22 +12:00
Brenda Wallace
e5cf8b6091 added spec for finished_predicted_at 2018-04-21 17:25:04 +12:00
Brenda Wallace
6077d4da34 Fixed bug in garden spec 2018-04-21 15:01:33 +12:00
Brenda Wallace
34b6b54616 Name goes on garden, not planting 2018-04-21 14:33:39 +12:00