Skip to content

Loading…

Fix plugin_new test failure from c8c84397 #4827

Merged
merged 1 commit into from

2 participants

@sikachu
Ruby on Rails member

plugin_new generator doesn't generate sass-rails in the Gemfile, so
you can't check for that.

@sikachu sikachu Fix plugin_new test failure from c8c8439
`plugin_new` generator doesn't generate `sass-rails` in the Gemfile, so
you can't check for that.
b673ca6
@josevalim josevalim merged commit 780bf52 into rails:3-2-stable
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on Feb 1, 2012
  1. @sikachu

    Fix plugin_new test failure from c8c8439

    sikachu committed
    `plugin_new` generator doesn't generate `sass-rails` in the Gemfile, so
    you can't check for that.
This page is out of date. Refresh to see the latest.
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
Something went wrong with that request. Please try again.