aboutsummaryrefslogtreecommitdiffstats
path: root/railties
diff options
context:
space:
mode:
authorJosé Valim <jose.valim@gmail.com>2010-02-10 08:33:41 +0100
committerJosé Valim <jose.valim@gmail.com>2010-02-10 08:33:41 +0100
commit97650bf54a8c50cd7ee9e41a500503d9be5b5b5d (patch)
tree702c67a12a81cea4b3f84c73855f4abeafbd5862 /railties
parent9c654744fbc5f3035e07f741997d37f287729103 (diff)
downloadrails-97650bf54a8c50cd7ee9e41a500503d9be5b5b5d.tar.gz
rails-97650bf54a8c50cd7ee9e41a500503d9be5b5b5d.tar.bz2
rails-97650bf54a8c50cd7ee9e41a500503d9be5b5b5d.zip
Fix a couple failing tests.
Diffstat (limited to 'railties')
-rw-r--r--railties/test/generators/app_generator_test.rb6
1 files changed, 2 insertions, 4 deletions
diff --git a/railties/test/generators/app_generator_test.rb b/railties/test/generators/app_generator_test.rb
index d0cd72a47b..0a746b200f 100644
--- a/railties/test/generators/app_generator_test.rb
+++ b/railties/test/generators/app_generator_test.rb
@@ -158,15 +158,13 @@ class AppGeneratorTest < Rails::Generators::TestCase
generator([destination_root], :dev => true).expects(:run).with("bundle install")
silence(:stdout){ generator.invoke }
rails_path = File.expand_path('../../..', Rails.root)
- dev_gem = %(gem "rails", :path => #{rails_path.inspect})
- assert_file 'Gemfile', /^gem\s+["']rails["'],\s+:path\s+=>\s+["']\/Users\/mikel\/rails_programs\/rails["']$/
+ assert_file 'Gemfile', /^gem\s+["']rails["'],\s+:path\s+=>\s+["']#{Regexp.escape(rails_path)}["']$/
end
def test_edge_option
generator([destination_root], :edge => true).expects(:run).with("bundle install")
silence(:stdout){ generator.invoke }
- edge_gem = %(gem "rails", :git => "git://github.com/rails/rails.git")
- assert_file 'Gemfile', /^gem\s+["']rails["'],\s+:git\s+=>\s+["']git:\/\/github\.com\/rails\/rails\.git["']$/
+ assert_file 'Gemfile', /^gem\s+["']rails["'],\s+:git\s+=>\s+["']#{Regexp.escape("git://github.com/rails/rails.git")}["']$/
end
protected