Merge commit 'mainstream/master'

Conflicts:
	railties/guides/source/active_support_overview.textile

1 files changed, 129 insertions, 0 deletions

diff --git a/railties/test/generators/scaffold_generator_test.rb b/railties/test/generators/scaffold_generator_test.rb
new file mode 100644
index 0000000000..05eadd3460
--- /dev/null
+++ b/railties/test/generators/scaffold_generator_test.rb
@@ -0,0 +1,129 @@
+require 'abstract_unit'
+require 'generators/generators_test_helper'
+require 'generators/rails/scaffold/scaffold_generator'
+
+class ScaffoldGeneratorTest < GeneratorsTestCase
+
+  def setup
+    super
+    routes = Rails::Generators::ResourceGenerator.source_root
+    routes = File.join(routes, "..", "..", "app", "templates", "config", "routes.rb")
+    destination = File.join(destination_root, "config")
+
+    FileUtils.mkdir_p(destination)
+    FileUtils.cp File.expand_path(routes), destination
+  end
+
+  def test_scaffold_on_invoke
+    run_generator
+
+    # Model
+    assert_file "app/models/product_line.rb", /class ProductLine < ActiveRecord::Base/
+    assert_file "test/unit/product_line_test.rb", /class ProductLineTest < ActiveSupport::TestCase/
+    assert_file "test/fixtures/product_lines.yml"
+    assert_migration "db/migrate/create_product_lines.rb"
+
+    # Route
+    assert_file "config/routes.rb" do |route|
+      assert_match /map\.resources :product_lines$/, route
+    end
+
+    # Controller
+    assert_file "app/controllers/product_lines_controller.rb" do |content|
+      assert_match /class ProductLinesController < ApplicationController/, content
+
+      assert_instance_method content, :index do |m|
+        assert_match /@product_lines = ProductLine\.all/, m
+      end
+
+      assert_instance_method content, :show do |m|
+        assert_match /@product_line = ProductLine\.find\(params\[:id\]\)/, m
+      end
+
+      assert_instance_method content, :new do |m|
+        assert_match /@product_line = ProductLine\.new/, m
+      end
+
+      assert_instance_method content, :edit do |m|
+        assert_match /@product_line = ProductLine\.find\(params\[:id\]\)/, m
+      end
+
+      assert_instance_method content, :create do |m|
+        assert_match /@product_line = ProductLine\.new\(params\[:product_line\]\)/, m
+        assert_match /@product_line\.save/, m
+        assert_match /@product_line\.errors/, m
+      end
+
+      assert_instance_method content, :update do |m|
+        assert_match /@product_line = ProductLine\.find\(params\[:id\]\)/, m
+        assert_match /@product_line\.update_attributes\(params\[:product_line\]\)/, m
+        assert_match /@product_line\.errors/, m
+      end
+
+      assert_instance_method content, :destroy do |m|
+        assert_match /@product_line = ProductLine\.find\(params\[:id\]\)/, m
+        assert_match /@product_line\.destroy/, m
+      end
+    end
+
+    assert_file "test/functional/product_lines_controller_test.rb",
+                /class ProductLinesControllerTest < ActionController::TestCase/
+
+    # Views
+    %w(
+      index
+      edit
+      new
+      show
+    ).each { |view| assert_file "app/views/product_lines/#{view}.html.erb" }
+    assert_file "app/views/layouts/product_lines.html.erb"
+
+    # Helpers
+    assert_file "app/helpers/product_lines_helper.rb"
+    assert_file "test/unit/helpers/product_lines_helper_test.rb"
+
+    # Stylesheets
+    assert_file "public/stylesheets/scaffold.css"
+  end
+
+  def test_scaffold_on_revoke
+    run_generator
+    run_generator :behavior => :revoke
+
+    # Model
+    assert_no_file "app/models/product_line.rb"
+    assert_no_file "test/unit/product_line_test.rb"
+    assert_no_file "test/fixtures/product_lines.yml"
+    assert_no_migration "db/migrate/create_product_lines.rb"
+
+    # Route
+    assert_file "config/routes.rb" do |route|
+      assert_no_match /map\.resources :product_lines$/, route
+    end
+
+    # Controller
+    assert_no_file "app/controllers/product_lines_controller.rb"
+    assert_no_file "test/functional/product_lines_controller_test.rb"
+
+    # Views
+    assert_no_file "app/views/product_lines"
+    assert_no_file "app/views/layouts/product_lines.html.erb"
+
+    # Helpers
+    assert_no_file "app/helpers/product_lines_helper.rb"
+    assert_no_file "test/unit/helpers/product_lines_helper_test.rb"
+
+    # Stylesheets (should not be removed)
+    assert_file "public/stylesheets/scaffold.css"
+  end
+
+  protected
+
+    def run_generator(config={})
+      silence(:stdout) do
+        Rails::Generators::ScaffoldGenerator.start ["product_line", "title:string", "price:integer"],
+                                                   config.merge(:destination_root => destination_root)
+      end
+    end
+
+end