From bef905a90965f491e9f2390af45c749902cd6098 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kamil=20Trzci=C5=84ski?= Date: Thu, 15 Nov 2018 12:57:13 +0100 Subject: Backport EE changes --- spec/db/schema_spec.rb | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/spec/db/schema_spec.rb b/spec/db/schema_spec.rb index 43e23ee389e..e8584846b56 100644 --- a/spec/db/schema_spec.rb +++ b/spec/db/schema_spec.rb @@ -78,7 +78,7 @@ describe 'Database schema' do let(:column_names) { columns.map(&:name) } let(:column_names_with_id) { column_names.select { |column_name| column_name.ends_with?('_id') } } let(:foreign_keys_columns) { foreign_keys.map(&:column) } - let(:ignored_columns) { IGNORED_FK_COLUMNS[table] || [] } + let(:ignored_columns) { ignored_fk_columns(table) } it 'do have the foreign keys' do expect(column_names_with_id - ignored_columns).to contain_exactly(*foreign_keys_columns) @@ -87,4 +87,10 @@ describe 'Database schema' do end end end + + private + + def ignored_fk_columns(column) + IGNORED_FK_COLUMNS.fetch(column, []) + end end -- cgit v1.2.1