Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix CI and rename 1 misleading test case. #2620

Merged
merged 2 commits into from Aug 21, 2011
Merged

Fix CI and rename 1 misleading test case. #2620

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f63a134
This is a test on --skip-sprockets, not --skip-active-record
franckverrot Aug 21, 2011
2173e04
Add a trailing space to the comment_if method
franckverrot Aug 21, 2011
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion railties/lib/rails/generators/app_base.rb
View file
Open in desktop
Expand Up @@ -131,7 +131,7 @@ def include_all_railties?
end end


def comment_if(value) def comment_if(value)
options[value] ? '#' : '' options[value] ? '# ' : ''
end end


def rails_gemfile_entry def rails_gemfile_entry
Expand Down
2 changes: 1 addition & 1 deletion railties/test/generators/app_generator_test.rb
View file
Open in desktop
Expand Up @@ -174,7 +174,7 @@ def test_generator_if_skip_active_record_is_given
assert_file "test/performance/browsing_test.rb" assert_file "test/performance/browsing_test.rb"
end end


def test_generator_if_skip_active_record_is_given def test_generator_if_skip_sprockets_is_given
run_generator [destination_root, "--skip-sprockets"] run_generator [destination_root, "--skip-sprockets"]
assert_file "config/application.rb" do |content| assert_file "config/application.rb" do |content|
assert_match(/#\s+require\s+["']sprockets\/railtie["']/, content) assert_match(/#\s+require\s+["']sprockets\/railtie["']/, content)
Expand Down