Permalink
Browse files

Merge pull request #4827 from sikachu/3-2-stable-fix-plugin-new

Fix plugin_new test failure from c8c8439
  • Loading branch information...
2 parents 0696a51 + b673ca6 commit 780bf52085bf64f4d55b5e992fce3474f8f7ad70 @josevalim josevalim committed Feb 1, 2012
View
7 railties/test/generators/app_generator_test.rb
@@ -133,6 +133,13 @@ def test_gemfile_has_no_whitespace_errors
end
end
+ def test_edge_gemfile_option
+ generator([destination_root], :edge => true).expects(:bundle_command).with('install').once
+ quietly { generator.invoke_all }
+ assert_file 'Gemfile', %r{^\s+gem\s+["']sass-rails["'],\s+:git\s+=>\s+["']#{Regexp.escape("git://github.com/rails/sass-rails.git")}["']$}
+ assert_file 'Gemfile', %r{^\s+gem\s+["']coffee-rails["'],\s+:git\s+=>\s+["']#{Regexp.escape("git://github.com/rails/coffee-rails.git")}["']$}
+ end
+
def test_config_database_is_added_by_default
run_generator
assert_file "config/database.yml", /sqlite3/
View
3 railties/test/generators/shared_generator_tests.rb
@@ -128,9 +128,6 @@ def test_edge_option
assert_file 'Gemfile', %r{^gem\s+["']rails["'],\s+:git\s+=>\s+["']#{Regexp.escape("git://github.com/rails/rails.git")}["']$}
assert_file 'Gemfile', %r{^gem\s+["']journey["'],\s+:git\s+=>\s+["']#{Regexp.escape("git://github.com/rails/journey.git")}["']$}
assert_file 'Gemfile', %r{^gem\s+["']arel["'],\s+:git\s+=>\s+["']#{Regexp.escape("git://github.com/rails/arel.git")}["']$}
-
- assert_file 'Gemfile', %r{^\s+gem\s+["']sass-rails["'],\s+:git\s+=>\s+["']#{Regexp.escape("git://github.com/rails/sass-rails.git")}["']$}
- assert_file 'Gemfile', %r{^\s+gem\s+["']coffee-rails["'],\s+:git\s+=>\s+["']#{Regexp.escape("git://github.com/rails/coffee-rails.git")}["']$}
end
def test_skip_gemfile

0 comments on commit 780bf52

Please sign in to comment.