From 3b8e29fe5697d4aec99229abcbd04141d3e53b71 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Valim?= <jose.valim@gmail.com>
Date: Tue, 3 Nov 2009 22:02:24 -0200
Subject: Remove --freeze (since Rails will come bundled in all new apps) and
 update gem action to change Gemfile instead of config.environment.

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
---
 railties/test/generators/actions_test.rb           | 47 +++++++++++-----------
 railties/test/generators/app_generator_test.rb     | 14 -------
 railties/test/generators/generators_test_helper.rb |  2 +-
 3 files changed, 25 insertions(+), 38 deletions(-)

(limited to 'railties/test')

diff --git a/railties/test/generators/actions_test.rb b/railties/test/generators/actions_test.rb
index 199b5fa8b4..7d03a37f2a 100644
--- a/railties/test/generators/actions_test.rb
+++ b/railties/test/generators/actions_test.rb
@@ -54,37 +54,37 @@ class ActionsTest < GeneratorsTestCase
     action :plugin, 'rest_auth', {}
   end
 
-  def test_gem_should_put_gem_dependency_in_enviroment
+  def test_add_source_adds_source_to_gemfile
     run_generator
-    action :gem, 'will-paginate'
-    assert_file 'config/application.rb', /config\.gem 'will\-paginate'/
+    action :add_source, 'http://gems.github.com'
+    assert_file 'Gemfile', /source "http:\/\/gems\.github\.com"/
   end
 
-  def test_gem_with_options_should_include_options_in_gem_dependency_in_environment
+  def test_gem_should_put_gem_dependency_in_gemfile
     run_generator
-    action :gem, 'mislav-will-paginate', :lib => 'will-paginate', :source => 'http://gems.github.com'
-
-    regexp = /#{Regexp.escape("config.gem 'mislav-will-paginate', :lib => 'will-paginate', :source => 'http://gems.github.com'")}/
-    assert_file 'config/application.rb', regexp
+    action :gem, 'will-paginate'
+    assert_file 'Gemfile', /gem "will\-paginate"/
   end
 
-  def test_gem_with_env_string_should_put_gem_dependency_in_specified_environment
+  def test_gem_with_options_should_include_all_options_in_gemfile
     run_generator
-    action :gem, 'rspec', :env => 'test'
-    assert_file 'config/environments/test.rb', /config\.gem 'rspec'/
-  end
 
-  def test_gem_with_env_array_should_put_gem_dependency_in_specified_environments
-    run_generator
-    action :gem, 'quietbacktrace', :env => %w[ development test ]
-    assert_file 'config/environments/development.rb', /config\.gem 'quietbacktrace'/
-    assert_file 'config/environments/test.rb', /config\.gem 'quietbacktrace'/
+    assert_deprecated do
+      action :gem, 'mislav-will-paginate', :lib => 'will-paginate', :source => 'http://gems.github.com'
+    end
+
+    assert_file 'Gemfile', /gem "mislav\-will\-paginate", :require_as => "will\-paginate"/
+    assert_file 'Gemfile', /source "http:\/\/gems\.github\.com"/
   end
 
-  def test_gem_with_lib_option_set_to_false_should_put_gem_dependency_in_enviroment_correctly
+  def test_gem_with_env_should_include_all_dependencies_in_gemfile
     run_generator
-    action :gem, 'mislav-will-paginate', :lib => false
-    assert_file 'config/application.rb', /config\.gem 'mislav\-will\-paginate'\, :lib => false/
+
+    assert_deprecated do
+      action :gem, 'rspec', :env => %w(development test)
+    end
+
+    assert_file 'Gemfile', /gem "rspec", :only => \["development", "test"\]/
   end
 
   def test_environment_should_include_data_in_environment_initializer_block
@@ -163,9 +163,10 @@ class ActionsTest < GeneratorsTestCase
     action :capify!
   end
 
-  def test_freeze_should_freeze_rails_edge
-    generator.expects(:run).once.with('rake rails:freeze:edge', :verbose => false)
-    action :freeze!
+  def test_freeze_is_deprecated
+    assert_deprecated do
+      action :freeze!
+    end
   end
 
   def test_route_should_add_data_to_the_routes_block_in_config_routes
diff --git a/railties/test/generators/app_generator_test.rb b/railties/test/generators/app_generator_test.rb
index 20f2a24e6d..10d0bc6bc2 100644
--- a/railties/test/generators/app_generator_test.rb
+++ b/railties/test/generators/app_generator_test.rb
@@ -110,20 +110,6 @@ class AppGeneratorTest < GeneratorsTestCase
     ).each { |path| assert_file "script/#{path}", /#!\/usr\/bin\/env/ }
   end
 
-  def test_rails_is_frozen
-    generator(:freeze => true, :database => "sqlite3").expects(:run).
-              with("rake rails:freeze:edge", :verbose => false)
-    silence(:stdout){ generator.invoke }
-
-    assert_file 'Gemfile' do |content|
-      flag = %(gem "rails", "#{Rails::VERSION::STRING}", :git => "git://github.com/rails/rails.git")
-      assert_match /^#{Regexp.escape(flag)}$/, content
-
-      flag = %(# gem "rails", "#{Rails::VERSION::STRING}")
-      assert_match /^#{Regexp.escape(flag)}$/, content
-    end
-  end
-
   def test_template_from_dir_pwd
     FileUtils.cd(Rails.root)
     assert_match /It works from file!/, run_generator(["-m", "lib/template.rb"])
diff --git a/railties/test/generators/generators_test_helper.rb b/railties/test/generators/generators_test_helper.rb
index fdf6b4041f..4ce48a453b 100644
--- a/railties/test/generators/generators_test_helper.rb
+++ b/railties/test/generators/generators_test_helper.rb
@@ -17,7 +17,7 @@ require 'action_dispatch'
 CURRENT_PATH = File.expand_path(Dir.pwd)
 Rails::Generators.no_color!
 
-class GeneratorsTestCase < Test::Unit::TestCase
+class GeneratorsTestCase < ActiveSupport::TestCase
   include FileUtils
 
   def destination_root
-- 
cgit v1.2.3