aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXavier Noria <fxn@hashref.com>2019-03-09 09:16:54 +0100
committerGitHub <noreply@github.com>2019-03-09 09:16:54 +0100
commit9c9f281da29e02d5c32b7b0445beab0de6106a5e (patch)
tree6b55b39195a0fb90436d81701761806f6a34f03c
parent0771bd3ee891f8eaf822bb47f68f4d0266763728 (diff)
parent70192cec42c0133791010537fd602089c81986a4 (diff)
downloadrails-9c9f281da29e02d5c32b7b0445beab0de6106a5e.tar.gz
rails-9c9f281da29e02d5c32b7b0445beab0de6106a5e.tar.bz2
rails-9c9f281da29e02d5c32b7b0445beab0de6106a5e.zip
Merge pull request #35550 from shailesh-kalamkar/minor-documentation-fixes
[ci skip] Minor documentation fixes for consistency
-rw-r--r--actionview/test/ujs/public/vendor/jquery-2.2.0.js2
-rw-r--r--guides/source/autoloading_and_reloading_constants.md2
-rw-r--r--guides/source/testing.md2
-rw-r--r--railties/test/application/test_test.rb2
4 files changed, 4 insertions, 4 deletions
diff --git a/actionview/test/ujs/public/vendor/jquery-2.2.0.js b/actionview/test/ujs/public/vendor/jquery-2.2.0.js
index 2c545b8ff3..a83c4faa16 100644
--- a/actionview/test/ujs/public/vendor/jquery-2.2.0.js
+++ b/actionview/test/ujs/public/vendor/jquery-2.2.0.js
@@ -9639,7 +9639,7 @@ jQuery.fn.extend( {
// 2) For the hidden or detached element
// 3) For body or html element, i.e. in case of the html node - it will return itself
//
- // but those exceptions were never presented as a real life use-cases
+ // but those exceptions were never presented as a real life use cases
// and might be considered as more preferable results.
//
// This logic, however, is not guaranteed and can change at any point in the future
diff --git a/guides/source/autoloading_and_reloading_constants.md b/guides/source/autoloading_and_reloading_constants.md
index b3f923a017..7dfc39e192 100644
--- a/guides/source/autoloading_and_reloading_constants.md
+++ b/guides/source/autoloading_and_reloading_constants.md
@@ -798,7 +798,7 @@ to load a file using the current [loading mechanism](#loading-mechanism), and
keeping track of constants defined in that file as if they were autoloaded to
have them reloaded as needed.
-`require_dependency` is rarely needed, but see a couple of use-cases in
+`require_dependency` is rarely needed, but see a couple of use cases in
[Autoloading and STI](#autoloading-and-sti) and [When Constants aren't
Triggered](#when-constants-aren-t-missed).
diff --git a/guides/source/testing.md b/guides/source/testing.md
index 8f3a7f67c0..93372b5c26 100644
--- a/guides/source/testing.md
+++ b/guides/source/testing.md
@@ -1012,7 +1012,7 @@ Finally we can assert that our response was successful and our new article is re
#### Taking it further
-We were able to successfully test a very small workflow for visiting our blog and creating a new article. If we wanted to take this further we could add tests for commenting, removing articles, or editing comments. Integration tests are a great place to experiment with all kinds of use-cases for our applications.
+We were able to successfully test a very small workflow for visiting our blog and creating a new article. If we wanted to take this further we could add tests for commenting, removing articles, or editing comments. Integration tests are a great place to experiment with all kinds of use cases for our applications.
Functional Tests for Your Controllers
diff --git a/railties/test/application/test_test.rb b/railties/test/application/test_test.rb
index fb43bebfbe..83e63718df 100644
--- a/railties/test/application/test_test.rb
+++ b/railties/test/application/test_test.rb
@@ -234,7 +234,7 @@ module ApplicationTests
# TODO: would be nice if we could detect the schema change automatically.
# For now, the user has to synchronize the schema manually.
- # This test-case serves as a reminder for this use-case.
+ # This test case serves as a reminder for this use case.
test "manually synchronize test schema after rollback" do
output = rails("generate", "model", "user", "name:string")
version = output.match(/(\d+)_create_users\.rb/)[1]