diff --git a/.rubocop.yml b/.rubocop.yml index b928840..4c8f323 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -18,15 +18,13 @@ AllCops: TargetRubyVersion: 3.2 TargetRailsVersion: 7.1 + SuggestExtensions: false NewCops: enable Exclude: - '**/vendor/**/*' -plugins: - - rubocop-performance - # Rules for CustomWorkflows Metrics/BlockLength: Enabled: false diff --git a/app/models/custom_workflow.rb b/app/models/custom_workflow.rb index ee51045..dffa851 100644 --- a/app/models/custom_workflow.rb +++ b/app/models/custom_workflow.rb @@ -71,7 +71,7 @@ class CustomWorkflow < ApplicationRecord Rails.logger.info "#{str} for #{object.class} (##{object.id}) \"#{object}\"" end - def self.run_shared_code(object) + def self.run_shared_code?(object) # Due to DB migration if CustomWorkflow.table_exists? && CustomWorkflow.active.exists?(observable: :shared) log_message '= Running shared code', object @@ -86,7 +86,7 @@ class CustomWorkflow < ApplicationRecord true end - def self.run_custom_workflows(observable, object, event) + def self.run_custom_workflows?(observable, object, event) if CustomWorkflow.table_exists? # Due to DB migration workflows = CustomWorkflow.active.where(observable: observable) if PROJECT_OBSERVABLES.include? observable @@ -153,12 +153,12 @@ class CustomWorkflow < ApplicationRecord def validate_syntax case observable.to_sym when :shared - CustomWorkflow.run_shared_code self + CustomWorkflow.run_shared_code? self validate_syntax_for self, :shared_code when *SINGLE_OBSERVABLES object = observable.camelize.constantize.new object.send :instance_variable_set, "@#{observable}", object # compatibility with 0.0.1 - CustomWorkflow.run_shared_code object + CustomWorkflow.run_shared_code? object %i[before_save after_save before_destroy after_destroy].each { |field| validate_syntax_for object, field } when *COLLECTION_OBSERVABLES object = nil @@ -180,7 +180,7 @@ class CustomWorkflow < ApplicationRecord object.send :instance_variable_set, :@attachment, Attachment.new object.send :instance_variable_set, :@page, object end - CustomWorkflow.run_shared_code object + CustomWorkflow.run_shared_code? object %i[before_add after_add before_remove after_remove].each { |field| validate_syntax_for object, field } end end diff --git a/lib/redmine_custom_workflows/patches/models/attachment_patch.rb b/lib/redmine_custom_workflows/patches/models/attachment_patch.rb index 7636e78..a044ca0 100644 --- a/lib/redmine_custom_workflows/patches/models/attachment_patch.rb +++ b/lib/redmine_custom_workflows/patches/models/attachment_patch.rb @@ -42,8 +42,8 @@ module RedmineCustomWorkflows def before_save_custom_workflows @attachment = self @saved_attributes = attributes.dup - CustomWorkflow.run_shared_code self - CustomWorkflow.run_custom_workflows :attachment, self, :before_save + CustomWorkflow.run_shared_code? self + CustomWorkflow.run_custom_workflows? :attachment, self, :before_save throw :abort if errors.any? errors.empty? && (@saved_attributes == attributes || valid?) @@ -52,16 +52,16 @@ module RedmineCustomWorkflows end def after_save_custom_workflows - CustomWorkflow.run_custom_workflows :attachment, self, :after_save + CustomWorkflow.run_custom_workflows? :attachment, self, :after_save end def before_destroy_custom_workflows - res = CustomWorkflow.run_custom_workflows :attachment, self, :before_destroy + res = CustomWorkflow.run_custom_workflows? :attachment, self, :before_destroy throw :abort if res == false end def after_destroy_custom_workflows - CustomWorkflow.run_custom_workflows :attachment, self, :after_destroy + CustomWorkflow.run_custom_workflows? :attachment, self, :after_destroy end end end diff --git a/lib/redmine_custom_workflows/patches/models/group_patch.rb b/lib/redmine_custom_workflows/patches/models/group_patch.rb index 82b6826..f7f6b8f 100644 --- a/lib/redmine_custom_workflows/patches/models/group_patch.rb +++ b/lib/redmine_custom_workflows/patches/models/group_patch.rb @@ -47,8 +47,8 @@ module RedmineCustomWorkflows def self.users_callback(event, group, user) group.instance_variable_set :@group, group group.instance_variable_set :@user, user - CustomWorkflow.run_shared_code(group) if event.to_s.starts_with? 'before_' - CustomWorkflow.run_custom_workflows :group_users, group, event + CustomWorkflow.run_shared_code?(group) if event.to_s.starts_with? 'before_' + CustomWorkflow.run_custom_workflows? :group_users, group, event end %i[before_add before_remove after_add after_remove].each do |observable| @@ -62,8 +62,8 @@ module RedmineCustomWorkflows def before_save_custom_workflows @group = self @saved_attributes = attributes.dup - CustomWorkflow.run_shared_code self - CustomWorkflow.run_custom_workflows :group, self, :before_save + CustomWorkflow.run_shared_code? self + CustomWorkflow.run_custom_workflows? :group, self, :before_save throw :abort if errors.any? errors.empty? && (@saved_attributes == attributes || valid?) @@ -72,16 +72,16 @@ module RedmineCustomWorkflows end def after_save_custom_workflows - CustomWorkflow.run_custom_workflows :group, self, :after_save + CustomWorkflow.run_custom_workflows? :group, self, :after_save end def before_destroy_custom_workflows - res = CustomWorkflow.run_custom_workflows :group, self, :before_destroy + res = CustomWorkflow.run_custom_workflows? :group, self, :before_destroy throw :abort if res == false end def after_destroy_custom_workflows - CustomWorkflow.run_custom_workflows :group, self, :after_destroy + CustomWorkflow.run_custom_workflows? :group, self, :after_destroy end end end diff --git a/lib/redmine_custom_workflows/patches/models/issue_patch.rb b/lib/redmine_custom_workflows/patches/models/issue_patch.rb index 5bd61bb..a1cda34 100644 --- a/lib/redmine_custom_workflows/patches/models/issue_patch.rb +++ b/lib/redmine_custom_workflows/patches/models/issue_patch.rb @@ -46,8 +46,8 @@ module RedmineCustomWorkflows def self.attachments_callback(event, issue, attachment) issue.instance_variable_set :@issue, issue issue.instance_variable_set :@attachment, attachment - CustomWorkflow.run_shared_code(issue) if event.to_s.starts_with? 'before_' - CustomWorkflow.run_custom_workflows :issue_attachments, issue, event + CustomWorkflow.run_shared_code?(issue) if event.to_s.starts_with? 'before_' + CustomWorkflow.run_custom_workflows? :issue_attachments, issue, event end %i[before_add before_remove after_add after_remove].each do |observable| @@ -76,8 +76,8 @@ module RedmineCustomWorkflows def before_save_custom_workflows @issue = self @saved_attributes = attributes.dup - CustomWorkflow.run_shared_code self - CustomWorkflow.run_custom_workflows :issue, self, :before_save + CustomWorkflow.run_shared_code? self + CustomWorkflow.run_custom_workflows? :issue, self, :before_save throw :abort if errors.any? errors.empty? && (@saved_attributes == attributes || valid?) @@ -86,16 +86,16 @@ module RedmineCustomWorkflows end def after_save_custom_workflows - CustomWorkflow.run_custom_workflows :issue, self, :after_save + CustomWorkflow.run_custom_workflows? :issue, self, :after_save end def before_destroy_custom_workflows - res = CustomWorkflow.run_custom_workflows(:issue, self, :before_destroy) + res = CustomWorkflow.run_custom_workflows?(:issue, self, :before_destroy) throw :abort if res == false end def after_destroy_custom_workflows - CustomWorkflow.run_custom_workflows :issue, self, :after_destroy + CustomWorkflow.run_custom_workflows? :issue, self, :after_destroy end end end diff --git a/lib/redmine_custom_workflows/patches/models/issue_relation_patch.rb b/lib/redmine_custom_workflows/patches/models/issue_relation_patch.rb index b73739f..2d53433 100644 --- a/lib/redmine_custom_workflows/patches/models/issue_relation_patch.rb +++ b/lib/redmine_custom_workflows/patches/models/issue_relation_patch.rb @@ -60,8 +60,8 @@ module RedmineCustomWorkflows def before_save_custom_workflows @issue_relation = self @saved_attributes = attributes.dup - CustomWorkflow.run_shared_code self - CustomWorkflow.run_custom_workflows :issue_relation, self, :before_save + CustomWorkflow.run_shared_code? self + CustomWorkflow.run_custom_workflows? :issue_relation, self, :before_save throw :abort if errors.any? errors.empty? && (@saved_attributes == attributes || valid?) ensure @@ -69,16 +69,16 @@ module RedmineCustomWorkflows end def after_save_custom_workflows - CustomWorkflow.run_custom_workflows :issue_relation, self, :after_save + CustomWorkflow.run_custom_workflows? :issue_relation, self, :after_save end def before_destroy_custom_workflows - res = CustomWorkflow.run_custom_workflows :issue_relation, self, :before_destroy + res = CustomWorkflow.run_custom_workflows? :issue_relation, self, :before_destroy throw :abort if res == false end def after_destroy_custom_workflows - CustomWorkflow.run_custom_workflows :issue_relation, self, :after_destroy + CustomWorkflow.run_custom_workflows? :issue_relation, self, :after_destroy end end end diff --git a/lib/redmine_custom_workflows/patches/models/member_patch.rb b/lib/redmine_custom_workflows/patches/models/member_patch.rb index 598affd..a05e7d7 100644 --- a/lib/redmine_custom_workflows/patches/models/member_patch.rb +++ b/lib/redmine_custom_workflows/patches/models/member_patch.rb @@ -42,8 +42,8 @@ module RedmineCustomWorkflows def before_save_custom_workflows @member = self @saved_attributes = attributes.dup - CustomWorkflow.run_shared_code self - CustomWorkflow.run_custom_workflows :member, self, :before_save + CustomWorkflow.run_shared_code? self + CustomWorkflow.run_custom_workflows? :member, self, :before_save throw :abort if errors.any? errors.empty? && (@saved_attributes == attributes || valid?) @@ -52,16 +52,16 @@ module RedmineCustomWorkflows end def after_save_custom_workflows - CustomWorkflow.run_custom_workflows :member, self, :after_save + CustomWorkflow.run_custom_workflows? :member, self, :after_save end def before_destroy_custom_workflows - res = CustomWorkflow.run_custom_workflows :member, self, :before_destroy + res = CustomWorkflow.run_custom_workflows? :member, self, :before_destroy throw :abort if res == false end def after_destroy_custom_workflows - CustomWorkflow.run_custom_workflows :member, self, :after_destroy + CustomWorkflow.run_custom_workflows? :member, self, :after_destroy end end end diff --git a/lib/redmine_custom_workflows/patches/models/project_patch.rb b/lib/redmine_custom_workflows/patches/models/project_patch.rb index 12ae4b1..9e82697 100644 --- a/lib/redmine_custom_workflows/patches/models/project_patch.rb +++ b/lib/redmine_custom_workflows/patches/models/project_patch.rb @@ -55,8 +55,8 @@ module RedmineCustomWorkflows def self.attachments_callback(event, project, attachment) project.instance_variable_set(:@project, project) project.instance_variable_set(:@attachment, attachment) - CustomWorkflow.run_shared_code(project) if event.to_s.starts_with? 'before_' - CustomWorkflow.run_custom_workflows(:project_attachments, project, event) + CustomWorkflow.run_shared_code?(project) if event.to_s.starts_with? 'before_' + CustomWorkflow.run_custom_workflows?(:project_attachments, project, event) end %i[before_add before_remove after_add after_remove].each do |observable| @@ -70,8 +70,8 @@ module RedmineCustomWorkflows def before_save_custom_workflows @project = self @saved_attributes = attributes.dup - CustomWorkflow.run_shared_code self - CustomWorkflow.run_custom_workflows :project, self, :before_save + CustomWorkflow.run_shared_code? self + CustomWorkflow.run_custom_workflows? :project, self, :before_save throw :abort if errors.any? errors.empty? && (@saved_attributes == attributes || valid?) @@ -80,16 +80,16 @@ module RedmineCustomWorkflows end def after_save_custom_workflows - CustomWorkflow.run_custom_workflows :project, self, :after_save + CustomWorkflow.run_custom_workflows? :project, self, :after_save end def before_destroy_custom_workflows - res = CustomWorkflow.run_custom_workflows :project, self, :before_destroy + res = CustomWorkflow.run_custom_workflows? :project, self, :before_destroy throw :abort if res == false end def after_destroy_custom_workflows - CustomWorkflow.run_custom_workflows :project, self, :after_destroy + CustomWorkflow.run_custom_workflows? :project, self, :after_destroy end end end diff --git a/lib/redmine_custom_workflows/patches/models/time_entry_patch.rb b/lib/redmine_custom_workflows/patches/models/time_entry_patch.rb index 22f150d..ae3b5cb 100644 --- a/lib/redmine_custom_workflows/patches/models/time_entry_patch.rb +++ b/lib/redmine_custom_workflows/patches/models/time_entry_patch.rb @@ -42,8 +42,8 @@ module RedmineCustomWorkflows def before_save_custom_workflows @time_entry = self @saved_attributes = attributes.dup - CustomWorkflow.run_shared_code(self) - CustomWorkflow.run_custom_workflows(:time_entry, self, :before_save) + CustomWorkflow.run_shared_code?(self) + CustomWorkflow.run_custom_workflows?(:time_entry, self, :before_save) throw :abort if errors.any? errors.empty? && (@saved_attributes == attributes || valid?) @@ -52,16 +52,16 @@ module RedmineCustomWorkflows end def after_save_custom_workflows - CustomWorkflow.run_custom_workflows :time_entry, self, :after_save + CustomWorkflow.run_custom_workflows? :time_entry, self, :after_save end def before_destroy_custom_workflows - res = CustomWorkflow.run_custom_workflows :time_entry, self, :before_destroy + res = CustomWorkflow.run_custom_workflows? :time_entry, self, :before_destroy throw :abort if res == false end def after_destroy_custom_workflows - CustomWorkflow.run_custom_workflows :time_entry, self, :after_destroy + CustomWorkflow.run_custom_workflows? :time_entry, self, :after_destroy end end end diff --git a/lib/redmine_custom_workflows/patches/models/user_patch.rb b/lib/redmine_custom_workflows/patches/models/user_patch.rb index 475273b..633d12f 100644 --- a/lib/redmine_custom_workflows/patches/models/user_patch.rb +++ b/lib/redmine_custom_workflows/patches/models/user_patch.rb @@ -42,8 +42,8 @@ module RedmineCustomWorkflows def before_save_custom_workflows @user = self @saved_attributes = attributes.dup - CustomWorkflow.run_shared_code self - CustomWorkflow.run_custom_workflows :user, self, :before_save + CustomWorkflow.run_shared_code? self + CustomWorkflow.run_custom_workflows? :user, self, :before_save throw :abort if errors.any? errors.empty? && (@saved_attributes == attributes || valid?) @@ -52,16 +52,16 @@ module RedmineCustomWorkflows end def after_save_custom_workflows - CustomWorkflow.run_custom_workflows :user, self, :after_save + CustomWorkflow.run_custom_workflows? :user, self, :after_save end def before_destroy_custom_workflows - res = CustomWorkflow.run_custom_workflows :user, self, :before_destroy + res = CustomWorkflow.run_custom_workflows? :user, self, :before_destroy throw :abort if res == false end def after_destroy_custom_workflows - CustomWorkflow.run_custom_workflows :user, self, :after_destroy + CustomWorkflow.run_custom_workflows? :user, self, :after_destroy end end end diff --git a/lib/redmine_custom_workflows/patches/models/version_patch.rb b/lib/redmine_custom_workflows/patches/models/version_patch.rb index bfe091f..cabdffd 100644 --- a/lib/redmine_custom_workflows/patches/models/version_patch.rb +++ b/lib/redmine_custom_workflows/patches/models/version_patch.rb @@ -42,8 +42,8 @@ module RedmineCustomWorkflows def before_save_custom_workflows @version = self @saved_attributes = attributes.dup - CustomWorkflow.run_shared_code self - CustomWorkflow.run_custom_workflows :version, self, :before_save + CustomWorkflow.run_shared_code? self + CustomWorkflow.run_custom_workflows? :version, self, :before_save throw :abort if errors.any? errors.empty? && (@saved_attributes == attributes || valid?) @@ -52,16 +52,16 @@ module RedmineCustomWorkflows end def after_save_custom_workflows - CustomWorkflow.run_custom_workflows :version, self, :after_save + CustomWorkflow.run_custom_workflows? :version, self, :after_save end def before_destroy_custom_workflows - res = CustomWorkflow.run_custom_workflows :version, self, :before_destroy + res = CustomWorkflow.run_custom_workflows? :version, self, :before_destroy throw :abort if res == false end def after_destroy_custom_workflows - CustomWorkflow.run_custom_workflows :version, self, :after_destroy + CustomWorkflow.run_custom_workflows? :version, self, :after_destroy end end end diff --git a/lib/redmine_custom_workflows/patches/models/wiki_content_patch.rb b/lib/redmine_custom_workflows/patches/models/wiki_content_patch.rb index c4bc3d6..af33574 100644 --- a/lib/redmine_custom_workflows/patches/models/wiki_content_patch.rb +++ b/lib/redmine_custom_workflows/patches/models/wiki_content_patch.rb @@ -42,8 +42,8 @@ module RedmineCustomWorkflows def before_save_custom_workflows @content = self @saved_attributes = attributes.dup - CustomWorkflow.run_shared_code self - CustomWorkflow.run_custom_workflows :wiki_content, self, :before_save + CustomWorkflow.run_shared_code? self + CustomWorkflow.run_custom_workflows? :wiki_content, self, :before_save throw :abort if errors.any? errors.empty? && (@saved_attributes == attributes || valid?) @@ -52,16 +52,16 @@ module RedmineCustomWorkflows end def after_save_custom_workflows - CustomWorkflow.run_custom_workflows :wiki_content, self, :after_save + CustomWorkflow.run_custom_workflows? :wiki_content, self, :after_save end def before_destroy_custom_workflows - res = CustomWorkflow.run_custom_workflows :wiki_content, self, :before_destroy + res = CustomWorkflow.run_custom_workflows? :wiki_content, self, :before_destroy throw :abort if res == false end def after_destroy_custom_workflows - CustomWorkflow.run_custom_workflows :wiki_content, self, :after_destroy + CustomWorkflow.run_custom_workflows? :wiki_content, self, :after_destroy end end end diff --git a/lib/redmine_custom_workflows/patches/models/wiki_page_patch.rb b/lib/redmine_custom_workflows/patches/models/wiki_page_patch.rb index 8d7921c..4235460 100644 --- a/lib/redmine_custom_workflows/patches/models/wiki_page_patch.rb +++ b/lib/redmine_custom_workflows/patches/models/wiki_page_patch.rb @@ -41,8 +41,8 @@ module RedmineCustomWorkflows def self.attachments_callback(event, page, attachment) page.instance_variable_set :@page, page page.instance_variable_set :@attachment, attachment - CustomWorkflow.run_shared_code(page) if event.to_s.starts_with? 'before_' - CustomWorkflow.run_custom_workflows :wiki_page_attachments, page, event + CustomWorkflow.run_shared_code?(page) if event.to_s.starts_with? 'before_' + CustomWorkflow.run_custom_workflows? :wiki_page_attachments, page, event end %i[before_add before_remove after_add after_remove].each do |observable| diff --git a/test/functional/attachments_controller_patch_test.rb b/test/functional/attachments_controller_patch_test.rb index 8da9256..08fa41f 100644 --- a/test/functional/attachments_controller_patch_test.rb +++ b/test/functional/attachments_controller_patch_test.rb @@ -21,7 +21,6 @@ require File.expand_path('../../test_helper', __FILE__) # Attachment controller patch test class AttachmentsControllerPatchTest < RedmineCustomWorkflows::Test::TestCase - def setup super @attachment8 = Attachment.find 8 diff --git a/test/functional/custom_workflows_controller_test.rb b/test/functional/custom_workflows_controller_test.rb index 29e32f8..0204024 100644 --- a/test/functional/custom_workflows_controller_test.rb +++ b/test/functional/custom_workflows_controller_test.rb @@ -21,7 +21,6 @@ require File.expand_path('../../test_helper', __FILE__) # Custom workflows controller test class CustomWorkflowsControllerTest < RedmineCustomWorkflows::Test::TestCase - def setup super @cw1 = CustomWorkflow.find 1 diff --git a/test/functional/issue_relations_controller_patch_test.rb b/test/functional/issue_relations_controller_patch_test.rb index 78c0149..ac04133 100644 --- a/test/functional/issue_relations_controller_patch_test.rb +++ b/test/functional/issue_relations_controller_patch_test.rb @@ -21,7 +21,6 @@ require File.expand_path('../../test_helper', __FILE__) # Issue relation controller patch test class IssueRelationsControllerPatchTest < RedmineCustomWorkflows::Test::TestCase - def setup super @ir1 = IssueRelation.find 1 diff --git a/test/functional/issues_controller_patch_test.rb b/test/functional/issues_controller_patch_test.rb index 1f6e5c7..3b9a3ee 100644 --- a/test/functional/issues_controller_patch_test.rb +++ b/test/functional/issues_controller_patch_test.rb @@ -21,7 +21,6 @@ require File.expand_path('../../test_helper', __FILE__) # Issue controller patch test class IssuesControllerPatchTest < RedmineCustomWorkflows::Test::TestCase - def setup super @issue1 = Issue.find 1 diff --git a/test/functional/members_controller_patch_test.rb b/test/functional/members_controller_patch_test.rb index 6bfc94b..fafac76 100644 --- a/test/functional/members_controller_patch_test.rb +++ b/test/functional/members_controller_patch_test.rb @@ -21,7 +21,6 @@ require File.expand_path('../../test_helper', __FILE__) # Users controller patch test class MembersControllerPatchTest < RedmineCustomWorkflows::Test::TestCase - def setup super @member1 = Member.find 1 diff --git a/test/functional/projects_controller_patch_test.rb b/test/functional/projects_controller_patch_test.rb index adc5733..fb29a8f 100644 --- a/test/functional/projects_controller_patch_test.rb +++ b/test/functional/projects_controller_patch_test.rb @@ -21,7 +21,6 @@ require File.expand_path('../../test_helper', __FILE__) # Project controller patch test class ProjectsControllerPatchTest < RedmineCustomWorkflows::Test::TestCase - def setup super post '/login', params: { username: 'jsmith', password: 'jsmith' } diff --git a/test/functional/timelog_controller_patch_test.rb b/test/functional/timelog_controller_patch_test.rb index 8e6df31..aeac602 100644 --- a/test/functional/timelog_controller_patch_test.rb +++ b/test/functional/timelog_controller_patch_test.rb @@ -21,7 +21,6 @@ require File.expand_path('../../test_helper', __FILE__) # Time controller patch test class TimelogControllerPatchTest < RedmineCustomWorkflows::Test::TestCase - def setup super @te1 = TimeEntry.find 1 diff --git a/test/functional/users_controller_patch_test.rb b/test/functional/users_controller_patch_test.rb index 1d8d4a1..de352be 100644 --- a/test/functional/users_controller_patch_test.rb +++ b/test/functional/users_controller_patch_test.rb @@ -21,7 +21,6 @@ require File.expand_path('../../test_helper', __FILE__) # Users controller patch test class UsersControllerPatchTest < RedmineCustomWorkflows::Test::TestCase - def setup super post '/login', params: { username: 'admin', password: 'admin' } diff --git a/test/functional/versions_controller_patch_test.rb b/test/functional/versions_controller_patch_test.rb index 43fbbf3..8d87124 100644 --- a/test/functional/versions_controller_patch_test.rb +++ b/test/functional/versions_controller_patch_test.rb @@ -21,7 +21,6 @@ require File.expand_path('../../test_helper', __FILE__) # Version controller patch test class VersionsControllerPatchTest < RedmineCustomWorkflows::Test::TestCase - def setup super @version1 = Version.find 1 diff --git a/test/functional/wiki_controller_patch_test.rb b/test/functional/wiki_controller_patch_test.rb index 2288c95..3a4121c 100644 --- a/test/functional/wiki_controller_patch_test.rb +++ b/test/functional/wiki_controller_patch_test.rb @@ -21,7 +21,6 @@ require File.expand_path('../../test_helper', __FILE__) # Wiki controller patch test class WikiControllerPatchTest < RedmineCustomWorkflows::Test::TestCase - def setup super @wp1 = WikiPage.find 1 diff --git a/test/test_case.rb b/test/test_case.rb index 69eeb9b..631380d 100644 --- a/test/test_case.rb +++ b/test/test_case.rb @@ -21,9 +21,8 @@ module RedmineCustomWorkflows module Test # Test case base class class TestCase < ActionDispatch::IntegrationTest - def initialize(name) - super(name) + super # Load all plugin's fixtures dir = File.join(File.dirname(__FILE__), 'fixtures') ext = '.yml' diff --git a/test/unit/attachment_patch_test.rb b/test/unit/attachment_patch_test.rb index a1f694b..ccceb13 100644 --- a/test/unit/attachment_patch_test.rb +++ b/test/unit/attachment_patch_test.rb @@ -21,7 +21,6 @@ require File.expand_path('../../test_helper', __FILE__) # Attachment patch test class class AttachmentPatchTest < RedmineCustomWorkflows::Test::UnitTest - def setup @attachment1 = Attachment.find 1 end diff --git a/test/unit/custom_workflow_test.rb b/test/unit/custom_workflow_test.rb index f8f0250..fa2572e 100644 --- a/test/unit/custom_workflow_test.rb +++ b/test/unit/custom_workflow_test.rb @@ -21,7 +21,6 @@ require File.expand_path('../../test_helper', __FILE__) # Custom workflow test class class CustomWorkflowTest < RedmineCustomWorkflows::Test::UnitTest - def setup @cw1 = CustomWorkflow.find 1 end diff --git a/test/unit/group_patch_test.rb b/test/unit/group_patch_test.rb index 9b29cf6..0409bf4 100644 --- a/test/unit/group_patch_test.rb +++ b/test/unit/group_patch_test.rb @@ -21,7 +21,6 @@ require File.expand_path('../../test_helper', __FILE__) # Group patch test class class GroupPatchTest < RedmineCustomWorkflows::Test::UnitTest - def setup @group10 = Group.find 10 end diff --git a/test/unit/issue_patch_test.rb b/test/unit/issue_patch_test.rb index d1ca580..3b7af2c 100644 --- a/test/unit/issue_patch_test.rb +++ b/test/unit/issue_patch_test.rb @@ -21,7 +21,6 @@ require File.expand_path('../../test_helper', __FILE__) # Issue patch test class class IssuePatchTest < RedmineCustomWorkflows::Test::UnitTest - def setup @issue1 = Issue.find 1 end diff --git a/test/unit/issue_relation_patch_test.rb b/test/unit/issue_relation_patch_test.rb index 8193ecf..bc8d4fc 100644 --- a/test/unit/issue_relation_patch_test.rb +++ b/test/unit/issue_relation_patch_test.rb @@ -21,7 +21,6 @@ require File.expand_path('../../test_helper', __FILE__) # Issue relation patch test class class IssueRelationPatchTest < RedmineCustomWorkflows::Test::UnitTest - def setup @issue_relation1 = IssueRelation.find 1 end diff --git a/test/unit/member_patch_test.rb b/test/unit/member_patch_test.rb index 4f38940..52eca21 100644 --- a/test/unit/member_patch_test.rb +++ b/test/unit/member_patch_test.rb @@ -21,7 +21,6 @@ require File.expand_path('../../test_helper', __FILE__) # Member patch test class class MemberPatchTest < RedmineCustomWorkflows::Test::UnitTest - def setup @member1 = Member.find 1 end diff --git a/test/unit/project_patch_test.rb b/test/unit/project_patch_test.rb index 269084c..897320f 100644 --- a/test/unit/project_patch_test.rb +++ b/test/unit/project_patch_test.rb @@ -21,7 +21,6 @@ require File.expand_path('../../test_helper', __FILE__) # Project patch test class class ProjectPatchTest < RedmineCustomWorkflows::Test::UnitTest - def setup @project1 = Project.find 1 end diff --git a/test/unit/time_entry_patch_test.rb b/test/unit/time_entry_patch_test.rb index b7663b8..d7ecfcf 100644 --- a/test/unit/time_entry_patch_test.rb +++ b/test/unit/time_entry_patch_test.rb @@ -21,7 +21,6 @@ require File.expand_path('../../test_helper', __FILE__) # Time entry patch test class class TimeEntryPatchTest < RedmineCustomWorkflows::Test::UnitTest - def setup @time_entry1 = TimeEntry.find 1 end diff --git a/test/unit/user_patch_test.rb b/test/unit/user_patch_test.rb index 7960d7f..eb46548 100644 --- a/test/unit/user_patch_test.rb +++ b/test/unit/user_patch_test.rb @@ -21,7 +21,6 @@ require File.expand_path('../../test_helper', __FILE__) # User patch test class class UserPatchTest < RedmineCustomWorkflows::Test::UnitTest - def setup @user1 = User.find 1 end diff --git a/test/unit/version_patch_test.rb b/test/unit/version_patch_test.rb index 77f1361..ec1edb4 100644 --- a/test/unit/version_patch_test.rb +++ b/test/unit/version_patch_test.rb @@ -21,7 +21,6 @@ require File.expand_path('../../test_helper', __FILE__) # Version patch test class class VersionPatchTest < RedmineCustomWorkflows::Test::UnitTest - def setup @version1 = Version.find 1 end diff --git a/test/unit/wiki_content_patch_test.rb b/test/unit/wiki_content_patch_test.rb index ced182d..b166609 100644 --- a/test/unit/wiki_content_patch_test.rb +++ b/test/unit/wiki_content_patch_test.rb @@ -21,7 +21,6 @@ require File.expand_path('../../test_helper', __FILE__) # Wiki content patch test class class WikiContentPatchTest < RedmineCustomWorkflows::Test::UnitTest - def setup @wiki_content1 = WikiContent.find 1 end diff --git a/test/unit/wiki_page_patch_test.rb b/test/unit/wiki_page_patch_test.rb index f3f8c08..268ac80 100644 --- a/test/unit/wiki_page_patch_test.rb +++ b/test/unit/wiki_page_patch_test.rb @@ -21,7 +21,6 @@ require File.expand_path('../../test_helper', __FILE__) # Wiki page test class class WikiPagePatchTest < RedmineCustomWorkflows::Test::UnitTest - def setup @wiki_page1 = WikiPage.find 1 end diff --git a/test/unit_test.rb b/test/unit_test.rb index e443f89..86b3d69 100644 --- a/test/unit_test.rb +++ b/test/unit_test.rb @@ -21,9 +21,8 @@ module RedmineCustomWorkflows module Test # Unit test base class class UnitTest < ActiveSupport::TestCase - def initialize(name) - super(name) + super # Load all plugin's fixtures dir = File.join(File.dirname(__FILE__), 'fixtures') ext = '.yml'