aboutsummaryrefslogtreecommitdiffstats
path: root/railties
diff options
context:
space:
mode:
authorBenjamin Fleischer <github@benjaminfleischer.com>2014-10-27 16:03:47 -0500
committerBenjamin Fleischer <github@benjaminfleischer.com>2014-10-27 16:03:53 -0500
commita7fd386b63752df861398ec74ae2ad945ec33741 (patch)
tree1dc14dd32433198d5c43aabf99df3cb0d96ad8fe /railties
parentd616fec8117ac25753ee23e15ac14261d298ee51 (diff)
downloadrails-a7fd386b63752df861398ec74ae2ad945ec33741.tar.gz
rails-a7fd386b63752df861398ec74ae2ad945ec33741.tar.bz2
rails-a7fd386b63752df861398ec74ae2ad945ec33741.zip
Fix rbx generated Gemfile regex
https://travis-ci.org/rails/rails/jobs/39190983#L460 1) Failure: AppGeneratorTest#test_psych_gem [test/generators/app_generator_test.rb:495]: Expected /gem 'psych',\s+'~> 2.0', \s+platforms: :rbx/ to match <snip> http://git.io/uuLVag)\ngem 'psych', '~> 2.0', platforms: :rbx\n\n
Diffstat (limited to 'railties')
-rw-r--r--railties/test/generators/app_generator_test.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/test/generators/app_generator_test.rb b/railties/test/generators/app_generator_test.rb
index 501b2e0811..b7cbe04003 100644
--- a/railties/test/generators/app_generator_test.rb
+++ b/railties/test/generators/app_generator_test.rb
@@ -490,7 +490,7 @@ class AppGeneratorTest < Rails::Generators::TestCase
def test_psych_gem
run_generator
- gem_regex = /gem 'psych',\s+'~> 2.0', \s+platforms: :rbx/
+ gem_regex = /gem 'psych',\s+'~> 2.0',\s+platforms: :rbx/
assert_file "Gemfile" do |content|
if defined?(Rubinius)