aboutsummaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorDino Maric <dino.onex@gmail.com>2018-12-15 13:41:23 +0100
committerDino Maric <dino.onex@gmail.com>2018-12-15 16:33:39 +0100
commit8415a6c5cf883f7ce6fe93b80ec99072fb04be83 (patch)
tree17a4e88934c3f9dee74ef9ce880acb3d8869645e /test
parent749e923539075eef407e5d9b8c7c151a3b3171d4 (diff)
downloadrails-8415a6c5cf883f7ce6fe93b80ec99072fb04be83.tar.gz
rails-8415a6c5cf883f7ce6fe93b80ec99072fb04be83.tar.bz2
rails-8415a6c5cf883f7ce6fe93b80ec99072fb04be83.zip
Fix Rails generators
1.Don't generate ApplicationMailboxTest when executing installer 2. Hookup test_unit, so console doesn't throw errors
Diffstat (limited to 'test')
-rw-r--r--test/generators/mailbox_generator_test.rb15
1 files changed, 4 insertions, 11 deletions
diff --git a/test/generators/mailbox_generator_test.rb b/test/generators/mailbox_generator_test.rb
index 9295c2d8c8..46f1dc6ea0 100644
--- a/test/generators/mailbox_generator_test.rb
+++ b/test/generators/mailbox_generator_test.rb
@@ -1,6 +1,7 @@
# frozen_string_literal: true
+
require "test_helper"
-require "rails/generators/mailbox/mailbox_generator"
+require "generators/rails/mailbox_generator"
class MailboxGeneratorTest < Rails::Generators::TestCase
destination File.expand_path("../../tmp", File.dirname(__FILE__))
@@ -33,7 +34,7 @@ class MailboxGeneratorTest < Rails::Generators::TestCase
end
def test_invokes_default_test_framework
- run_generator %w(inbox foo bar)
+ run_generator %w(inbox foo bar -t=test_unit)
assert_file "test/mailboxes/inbox_mailbox_test.rb" do |test|
assert_match(/class InboxMailboxTest < ActionMailbox::TestCase/, test)
assert_match(/# test "receive mail" do/, test)
@@ -41,14 +42,6 @@ class MailboxGeneratorTest < Rails::Generators::TestCase
end
end
- def test_check_test_class_collision
- Object.send :const_set, :InboxMailboxTest, Class.new
- content = capture(:stderr) { run_generator }
- assert_match(/The name 'InboxMailboxTest' is either already used in your application or reserved/, content)
- ensure
- Object.send :remove_const, :InboxMailboxTest
- end
-
def test_actions_are_turned_into_methods
run_generator %w(inbox foo bar)
@@ -66,7 +59,7 @@ class MailboxGeneratorTest < Rails::Generators::TestCase
end
def test_mailbox_suffix_is_not_duplicated
- run_generator ["inbox_mailbox"]
+ run_generator %w(inbox_mailbox -t=test_unit)
assert_no_file "app/mailboxes/inbox_mailbox_mailbox.rb"
assert_file "app/mailboxes/inbox_mailbox.rb"