From 0bafcadc75576b0589f912f6c86d7afac870fbde Mon Sep 17 00:00:00 2001 From: Steve Klebanoff Date: Mon, 5 Jun 2017 15:45:47 -0700 Subject: [PATCH 1/2] add show_complete_foreign_keys as setting --- lib/annotate.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/annotate.rb b/lib/annotate.rb index a17b14215..9f4daf4c2 100644 --- a/lib/annotate.rb +++ b/lib/annotate.rb @@ -30,7 +30,8 @@ module Annotate :show_indexes, :simple_indexes, :include_version, :exclude_tests, :exclude_fixtures, :exclude_factories, :ignore_model_sub_dir, :format_bare, :format_rdoc, :format_markdown, :sort, :force, :trace, - :timestamp, :exclude_serializers, :classified_sort, :show_foreign_keys, + :timestamp, :exclude_serializers, :classified_sort, + :show_foreign_keys, :show_complete_foreign_keys, :exclude_scaffolds, :exclude_controllers, :exclude_helpers, :exclude_sti_subclasses, :ignore_unknown_models ].freeze From b284df1002b3faa9694d7d46a0a6941071095940 Mon Sep 17 00:00:00 2001 From: Steve Klebanoff Date: Mon, 5 Jun 2017 16:22:25 -0700 Subject: [PATCH 2/2] test for show_complete_foreign_keys setting --- spec/annotate/annotate_models_spec.rb | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/spec/annotate/annotate_models_spec.rb b/spec/annotate/annotate_models_spec.rb index ccbc53a46..0ef008fef 100644 --- a/spec/annotate/annotate_models_spec.rb +++ b/spec/annotate/annotate_models_spec.rb @@ -484,6 +484,21 @@ def mock_column(name, type, options = {}) EOS end + describe '#set_defaults' do + it 'should default show_complete_foreign_keys to false' do + expect(Annotate.true?(ENV['show_complete_foreign_keys'])).to be(false) + end + + it 'should be able to set show_complete_foreign_keys to true' do + Annotate.set_defaults('show_complete_foreign_keys' => 'true') + expect(Annotate.true?(ENV['show_complete_foreign_keys'])).to be(true) + end + + after :each do + ENV.delete('show_complete_foreign_keys') + end + end + describe '#get_schema_info with custom options' do def self.when_called_with(options = {}) expected = options.delete(:returns)