From b71adb136f8b74659b5893b3b399c336ddb3a463 Mon Sep 17 00:00:00 2001 From: Tim Fischbach Date: Fri, 29 Sep 2023 12:02:22 +0200 Subject: [PATCH] Require pageflow/rails_vesion in engines Required for plugin test suites. REDMINE-19438 --- entry_types/paged/lib/pageflow_paged/engine.rb | 2 ++ entry_types/scrolled/lib/pageflow_scrolled/engine.rb | 1 + lib/pageflow/engine.rb | 2 ++ spec/support/pageflow/dummy/app.rb | 1 + spec/support/pageflow/dummy/rails_template.rb | 2 ++ 5 files changed, 8 insertions(+) diff --git a/entry_types/paged/lib/pageflow_paged/engine.rb b/entry_types/paged/lib/pageflow_paged/engine.rb index 0c1cfa4ef..839b2e42a 100644 --- a/entry_types/paged/lib/pageflow_paged/engine.rb +++ b/entry_types/paged/lib/pageflow_paged/engine.rb @@ -1,3 +1,5 @@ +require 'pageflow/rails_version' + module PageflowPaged # Rails integration class Engine < ::Rails::Engine diff --git a/entry_types/scrolled/lib/pageflow_scrolled/engine.rb b/entry_types/scrolled/lib/pageflow_scrolled/engine.rb index 77db3f8c1..25f49ddad 100644 --- a/entry_types/scrolled/lib/pageflow_scrolled/engine.rb +++ b/entry_types/scrolled/lib/pageflow_scrolled/engine.rb @@ -1,4 +1,5 @@ require 'rails' +require 'pageflow/rails_version' module PageflowScrolled # Rails integration diff --git a/lib/pageflow/engine.rb b/lib/pageflow/engine.rb index 1290ed38b..01dc40cbe 100644 --- a/lib/pageflow/engine.rb +++ b/lib/pageflow/engine.rb @@ -31,6 +31,8 @@ require 'pageflow_scrolled' require 'symmetric-encryption' +require 'pageflow/rails_version' + if Gem::Specification.find_all_by_name('pageflow-react', '>= 0.0').any? fail('The pageflow-react gem has been merged into the pageflow gem. ' \ 'See the pageflow changelog for update instructions.') diff --git a/spec/support/pageflow/dummy/app.rb b/spec/support/pageflow/dummy/app.rb index a60661939..91331df8e 100644 --- a/spec/support/pageflow/dummy/app.rb +++ b/spec/support/pageflow/dummy/app.rb @@ -1,5 +1,6 @@ require 'pageflow/version' require 'pageflow/dummy/exit_on_failure_patch' +require 'pageflow/rails_version' module Pageflow module Dummy diff --git a/spec/support/pageflow/dummy/rails_template.rb b/spec/support/pageflow/dummy/rails_template.rb index 84eb7acf5..c41586daa 100644 --- a/spec/support/pageflow/dummy/rails_template.rb +++ b/spec/support/pageflow/dummy/rails_template.rb @@ -1,3 +1,5 @@ +require 'pageflow/rails_version' + def source_paths [File.join(File.expand_path(File.dirname(__FILE__)), 'templates')] end