From 32fe702e56131b5e3817570fc5aabee08d17c2a6 Mon Sep 17 00:00:00 2001 From: Thorsten Eckel Date: Wed, 8 Mar 2017 15:59:48 +0100 Subject: [PATCH] - Minor refactoring of Package::Migration. - Added Package::Migration.linked to execute migrations of linked addons. - Added Package::Migration.linked to spec_helper to ensure that addon migrations are executed. --- app/models/package.rb | 23 +++++++++++++++++++---- spec/spec_helper.rb | 5 +++++ 2 files changed, 24 insertions(+), 4 deletions(-) diff --git a/app/models/package.rb b/app/models/package.rb index 4d144ced8..cf8253384 100644 --- a/app/models/package.rb +++ b/app/models/package.rb @@ -480,10 +480,21 @@ execute all pending package migrations at once end class Migration < ApplicationModel - @@root = Rails.root.to_s # rubocop:disable Style/ClassVars + + def self.linked + szpm_files = [] + Dir.chdir(root) do + szpm_files = Dir['*.szpm'] + end + + szpm_files.each do |szpm_file| + package = szpm_file.sub('.szpm', '') + migrate(package) + end + end def self.migrate(package, direction = 'normal') - location = "#{@@root}/db/addon/#{package.underscore}" + location = "#{root}/db/addon/#{package.underscore}" return true if !File.exist?(location) migrations_done = Package::Migration.where(name: package.underscore) @@ -523,7 +534,7 @@ execute all pending package migrations at once logger.info "NOTICE: down package migration '#{migration}'" load "#{location}/#{migration}" classname = name.camelcase - Kernel.const_get(classname).down + classname.constantize.down record = Package::Migration.find_by(name: package.underscore, version: version) if record record.destroy @@ -536,10 +547,14 @@ execute all pending package migrations at once logger.info "NOTICE: up package migration '#{migration}'" load "#{location}/#{migration}" classname = name.camelcase - Kernel.const_get(classname).up + classname.constantize.up Package::Migration.create(name: package.underscore, version: version) end } end + + def self.root + Rails.root + end end end diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 1563cc98a..db404e9bf 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -22,6 +22,11 @@ RSpec.configure do |config| # Zammad specific helpers config.include ZammadHelper + config.before(:suite) do + # make sure that all migrations of linked packages are executed + Package::Migration.linked + end + # skip Zammad helper functions in the stacktrace to lower noise config.backtrace_exclusion_patterns << %r{/spec/spec_helper/}