Skip to content

Commit

Permalink
Fix build for railties generators
Browse files Browse the repository at this point in the history
  • Loading branch information
arunagw committed May 2, 2012
1 parent a03da41 commit 1cfa34f
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion railties/test/generators/app_generator_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -246,7 +246,7 @@ def test_inclusion_of_javascript_runtime
if defined?(JRUBY_VERSION)
assert_file "Gemfile", /gem\s+["']therubyrhino["']$/
else
assert_file "Gemfile", /# gem\s+["']therubyracer["']+, :platform => :ruby$/
assert_file "Gemfile", /# gem\s+["']therubyracer["']+, platform: :ruby$/
end
end

Expand Down
4 changes: 2 additions & 2 deletions railties/test/generators/shared_generator_tests.rb
Original file line number Diff line number Diff line change
Expand Up @@ -104,13 +104,13 @@ def test_dev_option
generator([destination_root], :dev => true).expects(:bundle_command).with('install').once
quietly { generator.invoke_all }
rails_path = File.expand_path('../../..', Rails.root)
assert_file 'Gemfile', /^gem\s+["']rails["'],\s+:path\s+:\s+["']#{Regexp.escape(rails_path)}["']$/
assert_file 'Gemfile', /^gem\s+["']rails["'],\s+path:\s+["']#{Regexp.escape(rails_path)}["']$/
end

def test_edge_option
generator([destination_root], :edge => true).expects(:bundle_command).with('install').once
quietly { generator.invoke_all }
assert_file 'Gemfile', %r{^gem\s+["']rails["'],\s+:github\s+:\s+["']#{Regexp.escape("rails/rails")}["']$}
assert_file 'Gemfile', %r{^gem\s+["']rails["'],\s+github:\s+["']#{Regexp.escape("rails/rails")}["']$}
end

def test_skip_gemfile
Expand Down

0 comments on commit 1cfa34f

Please sign in to comment.