diff --git a/db/migrate/20160506000001_update_setting_placeholder.rb b/db/migrate/20160506000001_update_setting_placeholder.rb index a5f52ea03..8ce5fe938 100644 --- a/db/migrate/20160506000001_update_setting_placeholder.rb +++ b/db/migrate/20160506000001_update_setting_placeholder.rb @@ -9,7 +9,8 @@ class UpdateSettingPlaceholder < ActiveRecord::Migration system_id fqdn http_type - ticket_hook) + ticket_hook + ) names.each {|name| setting = Setting.find_by(name: name) next if !setting diff --git a/test/integration/zendesk_import_test.rb b/test/integration/zendesk_import_test.rb index 2e2648b6a..0f549187e 100644 --- a/test/integration/zendesk_import_test.rb +++ b/test/integration/zendesk_import_test.rb @@ -178,7 +178,8 @@ class ZendeskImportTest < ActiveSupport::TestCase created_at updated_at lieblingstier - custom_dropdown) + custom_dropdown + ) assert_equal(copmare_fields, local_fields, 'user fields') end @@ -264,7 +265,8 @@ class ZendeskImportTest < ActiveSupport::TestCase created_at updated_at api_key - custom_dropdown) + custom_dropdown + ) assert_equal(copmare_fields, local_fields, 'organization fields') end @@ -468,7 +470,8 @@ If you\'re reading this message in your email, click the ticket number link that custom_date custom_integer custom_regex - custom_dropdown) + custom_dropdown + ) assert_equal(copmare_fields, local_fields, 'ticket fields') end