aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--README.md8
-rw-r--r--RELEASING_RAILS.md4
-rw-r--r--activestorage/Rakefile1
-rw-r--r--activesupport/test/test_case_test.rb2
-rw-r--r--railties/RDOC_MAIN.rdoc4
5 files changed, 10 insertions, 9 deletions
diff --git a/README.md b/README.md
index 030dd405cb..6801de5cd2 100644
--- a/README.md
+++ b/README.md
@@ -6,10 +6,10 @@ create database-backed web applications according to the
pattern.
Understanding the MVC pattern is key to understanding Rails. MVC divides your
-application into three layers, each with a specific responsibility.
+application into three layers: Model, View, and Controller, each with a specific responsibility.
-The _Model layer_ represents your domain model (such as Account, Product,
-Person, Post, etc.) and encapsulates the business logic that is specific to
+The _Model layer_ represents the domain model (such as Account, Product,
+Person, Post, etc.) and encapsulates the business logic specific to
your application. In Rails, database-backed model classes are derived from
`ActiveRecord::Base`. Active Record allows you to present the data from
database rows as objects and embellish these data objects with business logic
@@ -65,7 +65,7 @@ and may also be used independently outside Rails.
Run with `--help` or `-h` for options.
-4. Using a browser, go to `http://localhost:3000` and you'll see:
+4. Go to `http://localhost:3000` and you'll see:
"Yay! You’re on Rails!"
5. Follow the guidelines to start developing your application. You may find
diff --git a/RELEASING_RAILS.md b/RELEASING_RAILS.md
index c61fe7eb13..60434451fe 100644
--- a/RELEASING_RAILS.md
+++ b/RELEASING_RAILS.md
@@ -14,14 +14,14 @@ Today is mostly coordination tasks. Here are the things you must do today:
Do not release with a Red CI. You can find the CI status here:
```
-http://travis-ci.org/rails/rails
+https://travis-ci.org/rails/rails
```
### Is Sam Ruby happy? If not, make him happy.
Sam Ruby keeps a [test suite](https://github.com/rubys/awdwr) that makes
sure the code samples in his book
-([Agile Web Development with Rails](https://pragprog.com/titles/rails5/agile-web-development-with-rails-5th-edition))
+([Agile Web Development with Rails](https://pragprog.com/book/rails51/agile-web-development-with-rails-51))
all work. These are valuable system tests
for Rails. You can check the status of these tests here:
diff --git a/activestorage/Rakefile b/activestorage/Rakefile
index 2aa4d2a76f..7dc69e04ea 100644
--- a/activestorage/Rakefile
+++ b/activestorage/Rakefile
@@ -8,6 +8,7 @@ Rake::TestTask.new do |test|
test.libs << "app/controllers"
test.libs << "test"
test.test_files = FileList["test/**/*_test.rb"]
+ test.verbose = true
test.warning = false
end
diff --git a/activesupport/test/test_case_test.rb b/activesupport/test/test_case_test.rb
index eced622137..8a1ecb6b33 100644
--- a/activesupport/test/test_case_test.rb
+++ b/activesupport/test/test_case_test.rb
@@ -2,7 +2,7 @@
require "abstract_unit"
-class AssertDifferenceTest < ActiveSupport::TestCase
+class AssertionsTest < ActiveSupport::TestCase
def setup
@object = Class.new do
attr_accessor :num
diff --git a/railties/RDOC_MAIN.rdoc b/railties/RDOC_MAIN.rdoc
index c70a9f0ba0..5b4f23521e 100644
--- a/railties/RDOC_MAIN.rdoc
+++ b/railties/RDOC_MAIN.rdoc
@@ -6,9 +6,9 @@ create database-backed web applications according to the
pattern.
Understanding the MVC pattern is key to understanding \Rails. MVC divides your
-application into three layers, each with a specific responsibility.
+application into three layers: Model, View, and Controller, each with a specific responsibility.
-The <em>Model layer</em> represents your domain model (such as Account, Product,
+The <em>Model layer</em> represents the domain model (such as Account, Product,
Person, Post, etc.) and encapsulates the business logic that is specific to
your application. In \Rails, database-backed model classes are derived from
ActiveRecord::Base. Active Record allows you to present the data from