Remove integration tests and ActionModel/ActiveRecord calls from 'rake plugin new' generator, it shouldn't be available as default option

8 files changed, 7 insertions, 43 deletions

diff --git a/railties/lib/rails/generators/rails/plugin_new/plugin_new_generator.rb b/railties/lib/rails/generators/rails/plugin_new/plugin_new_generator.rb
index 2fdd67944e..67b9c968d7 100644
--- a/railties/lib/rails/generators/rails/plugin_new/plugin_new_generator.rb
+++ b/railties/lib/rails/generators/rails/plugin_new/plugin_new_generator.rb
@@ -215,8 +215,9 @@ end
 
       def application_definition
         @application_definition ||= begin
-          unless options[:pretend]
-            contents = File.read(File.expand_path("#{dummy_path}/config/application.rb", destination_root))
+          dummy_application_path = File.expand_path("#{dummy_path}/config/application.rb", destination_root)
+          unless options[:pretend] || !File.exists?(dummy_application_path)
+            contents = File.read(dummy_application_path)
             contents[(contents.index("module Dummy"))..-1]
           end
         end
diff --git a/railties/lib/rails/generators/rails/plugin_new/templates/Gemfile b/railties/lib/rails/generators/rails/plugin_new/templates/Gemfile
index 899a9366d3..53a925d976 100644
--- a/railties/lib/rails/generators/rails/plugin_new/templates/Gemfile
+++ b/railties/lib/rails/generators/rails/plugin_new/templates/Gemfile
@@ -2,9 +2,6 @@ source "http://rubygems.org"
 
 <%= rails_gemfile_entry -%>
 
-gem "capybara", ">= 0.3.9"
-gem "sqlite3-ruby", :require => "sqlite3"
-
 if RUBY_VERSION < '1.9'
   gem "ruby-debug", ">= 0.10.3"
 end
diff --git a/railties/lib/rails/generators/rails/plugin_new/templates/rails/application.rb b/railties/lib/rails/generators/rails/plugin_new/templates/rails/application.rb
index fee63ea83e..ce655ba7e5 100644
--- a/railties/lib/rails/generators/rails/plugin_new/templates/rails/application.rb
+++ b/railties/lib/rails/generators/rails/plugin_new/templates/rails/application.rb
@@ -1,10 +1,6 @@
 require File.expand_path('../boot', __FILE__)
 
-require "active_model/railtie"
-require "active_record/railtie"
-require "action_controller/railtie"
-require "action_view/railtie"
-require "action_mailer/railtie"
+require 'rails/all'
 
 Bundler.require
 require "<%= name %>"
diff --git a/railties/lib/rails/generators/rails/plugin_new/templates/test/integration/navigation_test.rb.tt b/railties/lib/rails/generators/rails/plugin_new/templates/test/integration/navigation_test.rb.tt
deleted file mode 100644
index 42721899c8..0000000000
--- a/railties/lib/rails/generators/rails/plugin_new/templates/test/integration/navigation_test.rb.tt
+++ /dev/null
@@ -1,7 +0,0 @@
-require 'test_helper'
-
-class NagivationTest < ActiveSupport::IntegrationCase
-  test "truth" do
-    assert_kind_of Dummy::Application, Rails.application
-  end
-end
diff --git a/railties/lib/rails/generators/rails/plugin_new/templates/test/support/integration_case.rb b/railties/lib/rails/generators/rails/plugin_new/templates/test/support/integration_case.rb
deleted file mode 100644
index 4cfe3f0e71..0000000000
--- a/railties/lib/rails/generators/rails/plugin_new/templates/test/support/integration_case.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-# Define a bare test case to use with Capybara
-class ActiveSupport::IntegrationCase < ActiveSupport::TestCase
-  include Capybara
-  include Rails.application.routes.url_helpers
-end
\ No newline at end of file
diff --git a/railties/lib/rails/generators/rails/plugin_new/templates/test/test_helper.rb b/railties/lib/rails/generators/rails/plugin_new/templates/test/test_helper.rb
index 5c39780a23..791b901593 100644
--- a/railties/lib/rails/generators/rails/plugin_new/templates/test/test_helper.rb
+++ b/railties/lib/rails/generators/rails/plugin_new/templates/test/test_helper.rb
@@ -4,19 +4,7 @@ ENV["RAILS_ENV"] = "test"
 require File.expand_path("../dummy/config/environment.rb",  __FILE__)
 require "rails/test_help"
 
-ActionMailer::Base.delivery_method = :test
-ActionMailer::Base.perform_deliveries = true
-ActionMailer::Base.default_url_options[:host] = "test.com"
-
 Rails.backtrace_cleaner.remove_silencers!
 
-# Configure capybara for integration testing
-require "capybara/rails"
-Capybara.default_driver   = :rack_test
-Capybara.default_selector = :css
-
-# Run any available migration
-ActiveRecord::Migrator.migrate File.expand_path("../dummy/db/migrate/", __FILE__)
-
 # Load support files
-Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }
\ No newline at end of file
+Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }
diff --git a/railties/test/generators/app_generator_test.rb b/railties/test/generators/app_generator_test.rb
index 1f0ef922cd..42a49eb03c 100644
--- a/railties/test/generators/app_generator_test.rb
+++ b/railties/test/generators/app_generator_test.rb
@@ -145,7 +145,7 @@ class AppGeneratorTest < Rails::Generators::TestCase
   
   def test_test_unit_is_skipped_if_required
     run_generator [destination_root, "--skip-test-unit"]
-    assert_no_file "test"    
+    assert_no_file "test"
   end
   
   def test_javascript_is_skipped_if_required
diff --git a/railties/test/generators/plugin_new_generator_test.rb b/railties/test/generators/plugin_new_generator_test.rb
index e8a9c8ff51..2049d31b18 100644
--- a/railties/test/generators/plugin_new_generator_test.rb
+++ b/railties/test/generators/plugin_new_generator_test.rb
@@ -13,8 +13,6 @@ DEFAULT_PLUGIN_FILES = %w(
   lib/bukkits.rb
   script/rails
   test/bukkits_test.rb
-  test/integration/navigation_test.rb
-  test/support/integration_case.rb
   test/test_helper.rb
   test/dummy
 )
@@ -43,12 +41,8 @@ class PluginNewGeneratorTest < Rails::Generators::TestCase
   def test_generating_test_files
     run_generator
     assert_file "test/test_helper.rb"
-    assert_directory "test/support/"
-    assert_directory "test/integration/"
 
     assert_file "test/bukkits_test.rb", /assert_kind_of Module, Bukkits/
-    assert_file "test/integration/navigation_test.rb", /assert_kind_of Dummy::Application, Rails.application/
-    assert_file "test/support/integration_case.rb", /class ActiveSupport::IntegrationCase/
   end
 
   def test_ensure_that_plugin_options_are_not_passed_app_generator
@@ -66,7 +60,7 @@ class PluginNewGeneratorTest < Rails::Generators::TestCase
     run_generator
     FileUtils.cd destination_root
     `bundle install`
-    assert_match /2 tests, 2 assertions, 0 failures, 0 errors/, `bundle exec rake test`
+    assert_match /1 tests, 1 assertions, 0 failures, 0 errors/, `bundle exec rake test`
   end
 
 protected