aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
Diffstat (limited to 'lib')
-rw-r--r--lib/generators/rails/USAGE (renamed from lib/rails/generators/mailbox/USAGE)0
-rw-r--r--lib/generators/rails/mailbox_generator.rb (renamed from lib/rails/generators/mailbox/mailbox_generator.rb)6
-rw-r--r--lib/generators/rails/templates/application_mailbox.rb.tt (renamed from lib/rails/generators/mailbox/templates/application_mailbox.rb.tt)0
-rw-r--r--lib/generators/rails/templates/mailbox.rb.tt (renamed from lib/rails/generators/mailbox/templates/mailbox.rb.tt)0
-rw-r--r--lib/generators/test_unit/mailbox_generator.rb20
-rw-r--r--lib/generators/test_unit/templates/mailbox_test.rb.tt (renamed from lib/rails/generators/mailbox/templates/mailbox_test.rb.tt)0
-rw-r--r--lib/tasks/install.rake2
7 files changed, 22 insertions, 6 deletions
diff --git a/lib/rails/generators/mailbox/USAGE b/lib/generators/rails/USAGE
index d679dd63ae..d679dd63ae 100644
--- a/lib/rails/generators/mailbox/USAGE
+++ b/lib/generators/rails/USAGE
diff --git a/lib/rails/generators/mailbox/mailbox_generator.rb b/lib/generators/rails/mailbox_generator.rb
index 5511545a98..7b43173480 100644
--- a/lib/rails/generators/mailbox/mailbox_generator.rb
+++ b/lib/generators/rails/mailbox_generator.rb
@@ -7,9 +7,7 @@ module Rails
argument :actions, type: :array, default: [:process], banner: "method method"
- def check_class_collision
- class_collisions "#{class_name}Mailbox", "#{class_name}MailboxTest"
- end
+ check_class_collision suffix: "Mailbox"
def create_mailbox_file
template "mailbox.rb", File.join("app/mailboxes", class_path, "#{file_name}_mailbox.rb")
@@ -19,8 +17,6 @@ module Rails
template "application_mailbox.rb", application_mailbox_file_name
end
end
-
- template "mailbox_test.rb", File.join('test/mailboxes', class_path, "#{file_name}_mailbox_test.rb")
end
hook_for :test_framework
diff --git a/lib/rails/generators/mailbox/templates/application_mailbox.rb.tt b/lib/generators/rails/templates/application_mailbox.rb.tt
index be51eb3639..be51eb3639 100644
--- a/lib/rails/generators/mailbox/templates/application_mailbox.rb.tt
+++ b/lib/generators/rails/templates/application_mailbox.rb.tt
diff --git a/lib/rails/generators/mailbox/templates/mailbox.rb.tt b/lib/generators/rails/templates/mailbox.rb.tt
index 9788bd9bb4..9788bd9bb4 100644
--- a/lib/rails/generators/mailbox/templates/mailbox.rb.tt
+++ b/lib/generators/rails/templates/mailbox.rb.tt
diff --git a/lib/generators/test_unit/mailbox_generator.rb b/lib/generators/test_unit/mailbox_generator.rb
new file mode 100644
index 0000000000..2ec7d11a2f
--- /dev/null
+++ b/lib/generators/test_unit/mailbox_generator.rb
@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+module TestUnit
+ module Generators
+ class MailboxGenerator < ::Rails::Generators::NamedBase
+ source_root File.expand_path("templates", __dir__)
+
+ check_class_collision suffix: "MailboxTest"
+
+ def create_test_files
+ template "mailbox_test.rb", File.join("test/mailboxes", class_path, "#{file_name}_mailbox_test.rb")
+ end
+
+ private
+ def file_name # :doc:
+ @_file_name ||= super.sub(/_mailbox\z/i, "")
+ end
+ end
+ end
+end
diff --git a/lib/rails/generators/mailbox/templates/mailbox_test.rb.tt b/lib/generators/test_unit/templates/mailbox_test.rb.tt
index 41749808e3..41749808e3 100644
--- a/lib/rails/generators/mailbox/templates/mailbox_test.rb.tt
+++ b/lib/generators/test_unit/templates/mailbox_test.rb.tt
diff --git a/lib/tasks/install.rake b/lib/tasks/install.rake
index 1f4c071494..598e30c2d4 100644
--- a/lib/tasks/install.rake
+++ b/lib/tasks/install.rake
@@ -8,7 +8,7 @@ namespace :action_mailbox do
task install: %w[ environment run_generator copy_migrations ]
task :run_generator do
- system "#{RbConfig.ruby} ./bin/rails generate mailbox application"
+ system "#{RbConfig.ruby} ./bin/rails generate mailbox application --no-test-framework"
end
task :copy_migrations do