Skip to content

Commit

Permalink
README.rdoc -> README.md for newly generated applications
Browse files Browse the repository at this point in the history
README.rdoc was generated to support the doc:app task. Now that
this task is gone we can switch to Markdown, which is nowadays
a better default.
  • Loading branch information
fxn committed Feb 6, 2015
1 parent cd7cc52 commit 89a12c9
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 5 deletions.
4 changes: 4 additions & 0 deletions railties/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
* Newly generated applications get a `README.md` in Markdown.

*Xavier Noria*

* Remove the documentation tasks `doc:app`, `doc:rails`, and `doc:guides`.

*Xavier Noria*
Expand Down
2 changes: 1 addition & 1 deletion railties/lib/rails/generators/rails/app/app_generator.rb
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ def rakefile
end

def readme
copy_file "README.rdoc", "README.rdoc"
copy_file "README.md", "README.md"
end

def gemfile
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
== README
## README

This README would normally document whatever steps are necessary to get the
application up and running.
Expand Down
4 changes: 2 additions & 2 deletions railties/test/generators/actions_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -222,14 +222,14 @@ def test_route_should_add_data_to_the_routes_block_in_config_routes
def test_readme
run_generator
Rails::Generators::AppGenerator.expects(:source_root).times(2).returns(destination_root)
assert_match "application up and running", action(:readme, "README.rdoc")
assert_match "application up and running", action(:readme, "README.md")
end

def test_readme_with_quiet
generator(default_arguments, quiet: true)
run_generator
Rails::Generators::AppGenerator.expects(:source_root).times(2).returns(destination_root)
assert_no_match "application up and running", action(:readme, "README.rdoc")
assert_no_match "application up and running", action(:readme, "README.md")
end

def test_log
Expand Down
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 @@ -5,7 +5,7 @@

DEFAULT_APP_FILES = %w(
.gitignore
README.rdoc
README.md
Gemfile
Rakefile
config.ru
Expand Down

0 comments on commit 89a12c9

Please sign in to comment.