提交 7d76474e 编写于 作者: M Mikel Lindsaar 提交者: José Valim

Debrittlize tests somewhat - fix for CI build

Signed-off-by: NJosé Valim <jose.valim@gmail.com>
上级 f84b4b4e
...@@ -74,13 +74,13 @@ def test_application_names_are_not_singularized ...@@ -74,13 +74,13 @@ def test_application_names_are_not_singularized
def test_config_database_is_added_by_default def test_config_database_is_added_by_default
run_generator run_generator
assert_file "config/database.yml", /sqlite3/ assert_file "config/database.yml", /sqlite3/
assert_file "Gemfile", /^gem "sqlite3-ruby", :require => "sqlite3"$/ assert_file "Gemfile", /^gem\s+["']sqlite3-ruby["'],\s+:require\s+=>\s+["']sqlite3["']$/
end end
def test_config_another_database def test_config_another_database
run_generator([destination_root, "-d", "mysql"]) run_generator([destination_root, "-d", "mysql"])
assert_file "config/database.yml", /mysql/ assert_file "config/database.yml", /mysql/
assert_file "Gemfile", /^gem "mysql"$/ assert_file "Gemfile", /^gem\s+["']mysql["']$/
end end
def test_config_database_is_not_added_if_skip_activerecord_is_given def test_config_database_is_not_added_if_skip_activerecord_is_given
...@@ -90,7 +90,7 @@ def test_config_database_is_not_added_if_skip_activerecord_is_given ...@@ -90,7 +90,7 @@ def test_config_database_is_not_added_if_skip_activerecord_is_given
def test_activerecord_is_removed_from_frameworks_if_skip_activerecord_is_given def test_activerecord_is_removed_from_frameworks_if_skip_activerecord_is_given
run_generator [destination_root, "--skip-activerecord"] run_generator [destination_root, "--skip-activerecord"]
assert_file "config/application.rb", /# require "active_record\/railtie"/ assert_file "config/application.rb", /#\s+require\s+["']active_record\/railtie["']/
end end
def test_prototype_and_test_unit_are_added_by_default def test_prototype_and_test_unit_are_added_by_default
...@@ -159,14 +159,14 @@ def test_dev_option ...@@ -159,14 +159,14 @@ def test_dev_option
silence(:stdout){ generator.invoke } silence(:stdout){ generator.invoke }
rails_path = File.expand_path('../../..', Rails.root) rails_path = File.expand_path('../../..', Rails.root)
dev_gem = %(gem "rails", :path => #{rails_path.inspect}) dev_gem = %(gem "rails", :path => #{rails_path.inspect})
assert_file 'Gemfile', /^#{Regexp.escape(dev_gem)}$/ assert_file 'Gemfile', /^gem\s+["']rails["'],\s+:path\s+=>\s+["']\/Users\/mikel\/rails_programs\/rails["']$/
end end
def test_edge_option def test_edge_option
generator([destination_root], :edge => true).expects(:run).with("bundle install") generator([destination_root], :edge => true).expects(:run).with("bundle install")
silence(:stdout){ generator.invoke } silence(:stdout){ generator.invoke }
edge_gem = %(gem "rails", :git => "git://github.com/rails/rails.git") edge_gem = %(gem "rails", :git => "git://github.com/rails/rails.git")
assert_file 'Gemfile', /^#{Regexp.escape(edge_gem)}$/ assert_file 'Gemfile', /^gem\s+["']rails["'],\s+:git\s+=>\s+["']git:\/\/github\.com\/rails\/rails\.git["']$/
end end
protected protected
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册