Updated vendored Thor to 0.11.1 and update Rails::Generators.

18 files changed, 18 insertions, 18 deletions

diff --git a/railties/test/generators/actions_test.rb b/railties/test/generators/actions_test.rb
index 3313e92c31..e8b10522b9 100644
--- a/railties/test/generators/actions_test.rb
+++ b/railties/test/generators/actions_test.rb
@@ -178,7 +178,7 @@ class ActionsTest < GeneratorsTestCase
     end
 
     def generator(config={})
-      @generator ||= Rails::Generators::Base.new([], {}, { :root => destination_root }.merge!(config))
+      @generator ||= Rails::Generators::Base.new([], {}, { :destination_root => destination_root }.merge!(config))
     end
 
     def action(*args, &block)
diff --git a/railties/test/generators/app_generator_test.rb b/railties/test/generators/app_generator_test.rb
index 8955789087..c78b7d2f25 100644
--- a/railties/test/generators/app_generator_test.rb
+++ b/railties/test/generators/app_generator_test.rb
@@ -171,7 +171,7 @@ class AppGeneratorTest < GeneratorsTestCase
     end
 
     def generator(options={})
-      @generator ||= Rails::Generators::AppGenerator.new([destination_root], options, :root => destination_root)
+      @generator ||= Rails::Generators::AppGenerator.new([destination_root], options, :destination_root => destination_root)
     end
 
     def action(*args, &block)
diff --git a/railties/test/generators/controller_generator_test.rb b/railties/test/generators/controller_generator_test.rb
index 29169f225b..850b9e632d 100644
--- a/railties/test/generators/controller_generator_test.rb
+++ b/railties/test/generators/controller_generator_test.rb
@@ -74,7 +74,7 @@ class ControllerGeneratorTest < GeneratorsTestCase
   protected
 
     def run_generator(args=["Account", "foo", "bar"])
-      silence(:stdout) { Rails::Generators::ControllerGenerator.start args, :root => destination_root }
+      silence(:stdout) { Rails::Generators::ControllerGenerator.start args, :destination_root => destination_root }
     end
 
 end
diff --git a/railties/test/generators/generator_generator_test.rb b/railties/test/generators/generator_generator_test.rb
index e31f4eb4be..b1ebe5f1b5 100644
--- a/railties/test/generators/generator_generator_test.rb
+++ b/railties/test/generators/generator_generator_test.rb
@@ -20,7 +20,7 @@ class GeneratorGeneratorTest < GeneratorsTestCase
   protected
 
     def run_generator(args=["awesome"], config={})
-      silence(:stdout) { Rails::Generators::GeneratorGenerator.start args, config.merge(:root => destination_root) }
+      silence(:stdout) { Rails::Generators::GeneratorGenerator.start args, config.merge(:destination_root => destination_root) }
     end
 
 end
diff --git a/railties/test/generators/helper_generator_test.rb b/railties/test/generators/helper_generator_test.rb
index 02148ee1ce..3d655016f1 100644
--- a/railties/test/generators/helper_generator_test.rb
+++ b/railties/test/generators/helper_generator_test.rb
@@ -54,7 +54,7 @@ class HelperGeneratorTest < GeneratorsTestCase
   protected
 
     def run_generator(args=["admin"])
-      silence(:stdout) { Rails::Generators::HelperGenerator.start args, :root => destination_root }
+      silence(:stdout) { Rails::Generators::HelperGenerator.start args, :destination_root => destination_root }
     end
 
 end
diff --git a/railties/test/generators/integration_test_generator_test.rb b/railties/test/generators/integration_test_generator_test.rb
index 1961a102b9..190b28012c 100644
--- a/railties/test/generators/integration_test_generator_test.rb
+++ b/railties/test/generators/integration_test_generator_test.rb
@@ -12,7 +12,7 @@ class IntegrationTestGeneratorTest < GeneratorsTestCase
   protected
 
     def run_generator(args=["integration"])
-      silence(:stdout) { Rails::Generators::IntegrationTestGenerator.start args, :root => destination_root }
+      silence(:stdout) { Rails::Generators::IntegrationTestGenerator.start args, :destination_root => destination_root }
     end
 
 end
diff --git a/railties/test/generators/mailer_generator_test.rb b/railties/test/generators/mailer_generator_test.rb
index d3bb1cd13f..9e74859c3a 100644
--- a/railties/test/generators/mailer_generator_test.rb
+++ b/railties/test/generators/mailer_generator_test.rb
@@ -46,7 +46,7 @@ class MailerGeneratorTest < GeneratorsTestCase
   protected
 
     def run_generator(args=["notifier", "foo", "bar"])
-      silence(:stdout) { Rails::Generators::MailerGenerator.start args, :root => destination_root }
+      silence(:stdout) { Rails::Generators::MailerGenerator.start args, :destination_root => destination_root }
     end
 
 end
diff --git a/railties/test/generators/metal_generator_test.rb b/railties/test/generators/metal_generator_test.rb
index 4e73883feb..97e892cefb 100644
--- a/railties/test/generators/metal_generator_test.rb
+++ b/railties/test/generators/metal_generator_test.rb
@@ -17,7 +17,7 @@ class MetalGeneratorTest < GeneratorsTestCase
   protected
 
     def run_generator(args=["foo"])
-      silence(:stdout) { Rails::Generators::MetalGenerator.start args, :root => destination_root }
+      silence(:stdout) { Rails::Generators::MetalGenerator.start args, :destination_root => destination_root }
     end
 
 end
diff --git a/railties/test/generators/migration_generator_test.rb b/railties/test/generators/migration_generator_test.rb
index e756d0a9fa..a4335068e6 100644
--- a/railties/test/generators/migration_generator_test.rb
+++ b/railties/test/generators/migration_generator_test.rb
@@ -53,7 +53,7 @@ class MigrationGeneratorTest < GeneratorsTestCase
   protected
 
     def run_generator(args=[@migration])
-      silence(:stdout) { Rails::Generators::MigrationGenerator.start args, :root => destination_root }
+      silence(:stdout) { Rails::Generators::MigrationGenerator.start args, :destination_root => destination_root }
     end
 
 end
diff --git a/railties/test/generators/model_generator_test.rb b/railties/test/generators/model_generator_test.rb
index 85aa2cc145..a9b772d67b 100644
--- a/railties/test/generators/model_generator_test.rb
+++ b/railties/test/generators/model_generator_test.rb
@@ -131,7 +131,7 @@ class ModelGeneratorTest < GeneratorsTestCase
   protected
 
     def run_generator(args=["Account", "name:string", "age:integer"], config={})
-      silence(:stdout) { Rails::Generators::ModelGenerator.start args, config.merge(:root => destination_root) }
+      silence(:stdout) { Rails::Generators::ModelGenerator.start args, config.merge(:destination_root => destination_root) }
     end
 
 end
diff --git a/railties/test/generators/observer_generator_test.rb b/railties/test/generators/observer_generator_test.rb
index 65e18eb942..a556731e16 100644
--- a/railties/test/generators/observer_generator_test.rb
+++ b/railties/test/generators/observer_generator_test.rb
@@ -27,7 +27,7 @@ class ObserverGeneratorTest < GeneratorsTestCase
   protected
 
     def run_generator(args=["account"])
-      silence(:stdout) { Rails::Generators::ObserverGenerator.start args, :root => destination_root }
+      silence(:stdout) { Rails::Generators::ObserverGenerator.start args, :destination_root => destination_root }
     end
 
 end
diff --git a/railties/test/generators/performance_test_generator_test.rb b/railties/test/generators/performance_test_generator_test.rb
index fdfbf9031c..74c9c20c4c 100644
--- a/railties/test/generators/performance_test_generator_test.rb
+++ b/railties/test/generators/performance_test_generator_test.rb
@@ -12,7 +12,7 @@ class PerformanceTestGeneratorTest < GeneratorsTestCase
   protected
 
     def run_generator(args=["performance"])
-      silence(:stdout) { Rails::Generators::PerformanceTestGenerator.start args, :root => destination_root }
+      silence(:stdout) { Rails::Generators::PerformanceTestGenerator.start args, :destination_root => destination_root }
     end
 
 end
diff --git a/railties/test/generators/plugin_generator_test.rb b/railties/test/generators/plugin_generator_test.rb
index bfec671d31..3982586bc3 100644
--- a/railties/test/generators/plugin_generator_test.rb
+++ b/railties/test/generators/plugin_generator_test.rb
@@ -50,7 +50,7 @@ class PluginGeneratorTest < GeneratorsTestCase
   protected
 
     def run_generator(args=["plugin_fu"], config={})
-      silence(:stdout) { Rails::Generators::PluginGenerator.start args, config.merge(:root => destination_root) }
+      silence(:stdout) { Rails::Generators::PluginGenerator.start args, config.merge(:destination_root => destination_root) }
     end
 
 end
diff --git a/railties/test/generators/resource_generator_test.rb b/railties/test/generators/resource_generator_test.rb
index 7b03ca31ec..876ddbf84e 100644
--- a/railties/test/generators/resource_generator_test.rb
+++ b/railties/test/generators/resource_generator_test.rb
@@ -100,7 +100,7 @@ class ResourceGeneratorTest < GeneratorsTestCase
   protected
 
     def run_generator(args=["account"], config={})
-      silence(:stdout) { Rails::Generators::ResourceGenerator.start args, config.merge(:root => destination_root) }
+      silence(:stdout) { Rails::Generators::ResourceGenerator.start args, config.merge(:destination_root => destination_root) }
     end
 
 end
diff --git a/railties/test/generators/scaffold_controller_generator_test.rb b/railties/test/generators/scaffold_controller_generator_test.rb
index 1f0060d11e..024ea439ef 100644
--- a/railties/test/generators/scaffold_controller_generator_test.rb
+++ b/railties/test/generators/scaffold_controller_generator_test.rb
@@ -106,7 +106,7 @@ class ScaffoldControllerGeneratorTest < GeneratorsTestCase
   protected
 
     def run_generator(args=["User", "name:string", "age:integer"])
-      silence(:stdout) { Rails::Generators::ScaffoldControllerGenerator.start args, :root => destination_root }
+      silence(:stdout) { Rails::Generators::ScaffoldControllerGenerator.start args, :destination_root => destination_root }
     end
 
 end
diff --git a/railties/test/generators/scaffold_generator_test.rb b/railties/test/generators/scaffold_generator_test.rb
index 2e5d4b609e..9560cf7ba7 100644
--- a/railties/test/generators/scaffold_generator_test.rb
+++ b/railties/test/generators/scaffold_generator_test.rb
@@ -128,7 +128,7 @@ class ScaffoldGeneratorTest < GeneratorsTestCase
     def run_generator(config={})
       silence(:stdout) do
         Rails::Generators::ScaffoldGenerator.start ["product_line", "title:string", "price:integer"],
-                                                   config.merge(:root => destination_root)
+                                                   config.merge(:destination_root => destination_root)
       end
     end
 
diff --git a/railties/test/generators/session_migration_generator_test.rb b/railties/test/generators/session_migration_generator_test.rb
index 7eefbe51e6..f83109800b 100644
--- a/railties/test/generators/session_migration_generator_test.rb
+++ b/railties/test/generators/session_migration_generator_test.rb
@@ -17,7 +17,7 @@ class SessionMigrationGeneratorTest < GeneratorsTestCase
   protected
 
     def run_generator(args=[])
-      silence(:stdout) { Rails::Generators::SessionMigrationGenerator.start args, :root => destination_root }
+      silence(:stdout) { Rails::Generators::SessionMigrationGenerator.start args, :destination_root => destination_root }
     end
 
 end
diff --git a/railties/test/generators/stylesheets_generator_test.rb b/railties/test/generators/stylesheets_generator_test.rb
index e2cddedf1a..02082d5cc8 100644
--- a/railties/test/generators/stylesheets_generator_test.rb
+++ b/railties/test/generators/stylesheets_generator_test.rb
@@ -18,7 +18,7 @@ class StylesheetsGeneratorTest < GeneratorsTestCase
   protected
 
     def run_generator(config={})
-      silence(:stdout) { Rails::Generators::StylesheetsGenerator.start [], config.merge(:root => destination_root) }
+      silence(:stdout) { Rails::Generators::StylesheetsGenerator.start [], config.merge(:destination_root => destination_root) }
     end
 
 end