summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
Diffstat (limited to 'tests')
-rw-r--r--tests/custom_columns/tests.py4
-rw-r--r--tests/file_storage/tests.py2
-rw-r--r--tests/many_to_many/tests.py14
-rw-r--r--tests/middleware/tests.py8
-rw-r--r--tests/model_inheritance/tests.py2
-rw-r--r--tests/utils_tests/files/strip_tags1.html4
-rw-r--r--tests/view_tests/tests/test_csrf.py2
7 files changed, 18 insertions, 18 deletions
diff --git a/tests/custom_columns/tests.py b/tests/custom_columns/tests.py
index b389a7e02f..20e649de03 100644
--- a/tests/custom_columns/tests.py
+++ b/tests/custom_columns/tests.py
@@ -12,7 +12,7 @@ class CustomColumnsTests(TestCase):
cls.a2 = Author.objects.create(first_name="Peter", last_name="Jones")
cls.authors = [cls.a1, cls.a2]
- cls.article = Article.objects.create(headline="Django lets you build Web apps easily", primary_author=cls.a1)
+ cls.article = Article.objects.create(headline="Django lets you build web apps easily", primary_author=cls.a1)
cls.article.authors.set(cls.authors)
def test_query_all_available_authors(self):
@@ -64,7 +64,7 @@ class CustomColumnsTests(TestCase):
def test_get_all_articles_for_an_author(self):
self.assertQuerysetEqual(
self.a1.article_set.all(), [
- "Django lets you build Web apps easily",
+ "Django lets you build web apps easily",
],
lambda a: a.headline
)
diff --git a/tests/file_storage/tests.py b/tests/file_storage/tests.py
index 8b69617752..8969253e2b 100644
--- a/tests/file_storage/tests.py
+++ b/tests/file_storage/tests.py
@@ -339,7 +339,7 @@ class FileStorageTests(SimpleTestCase):
def test_file_url(self):
"""
- File storage returns a url to access a given file from the Web.
+ File storage returns a url to access a given file from the web.
"""
self.assertEqual(self.storage.url('test.file'), self.storage.base_url + 'test.file')
diff --git a/tests/many_to_many/tests.py b/tests/many_to_many/tests.py
index 9242be9a9f..a20015b6d4 100644
--- a/tests/many_to_many/tests.py
+++ b/tests/many_to_many/tests.py
@@ -18,7 +18,7 @@ class ManyToManyTests(TestCase):
cls.p3 = Publication.objects.create(title='Science Weekly')
cls.p4 = Publication.objects.create(title='Highlights for Children')
- cls.a1 = Article.objects.create(headline='Django lets you build Web apps easily')
+ cls.a1 = Article.objects.create(headline='Django lets you build web apps easily')
cls.a1.publications.add(cls.p1)
cls.a2 = Article.objects.create(headline='NASA uses Python')
@@ -32,10 +32,10 @@ class ManyToManyTests(TestCase):
def test_add(self):
# Create an Article.
- a5 = Article(headline='Django lets you create Web apps easily')
+ a5 = Article(headline='Django lets you create web apps easily')
# You can't associate it with a Publication until it's been saved.
msg = (
- '"<Article: Django lets you create Web apps easily>" needs to have '
+ '"<Article: Django lets you create web apps easily>" needs to have '
'a value for field "id" before this many-to-many relationship can be used.'
)
with self.assertRaisesMessage(ValueError, msg):
@@ -58,7 +58,7 @@ class ManyToManyTests(TestCase):
)
# Adding an object of the wrong type raises TypeError
- msg = "'Publication' instance expected, got <Article: Django lets you create Web apps easily>"
+ msg = "'Publication' instance expected, got <Article: Django lets you create web apps easily>"
with self.assertRaisesMessage(TypeError, msg):
with transaction.atomic():
a6.publications.add(a5)
@@ -71,7 +71,7 @@ class ManyToManyTests(TestCase):
)
def test_add_remove_set_by_pk(self):
- a5 = Article.objects.create(headline='Django lets you create Web apps easily')
+ a5 = Article.objects.create(headline='Django lets you create web apps easily')
a5.publications.add(self.p1.pk)
self.assertSequenceEqual(a5.publications.all(), [self.p1])
a5.publications.set([self.p2.pk])
@@ -82,7 +82,7 @@ class ManyToManyTests(TestCase):
def test_add_remove_set_by_to_field(self):
user_1 = User.objects.create(username='Jean')
user_2 = User.objects.create(username='Joe')
- a5 = Article.objects.create(headline='Django lets you create Web apps easily')
+ a5 = Article.objects.create(headline='Django lets you create web apps easily')
a5.authors.add(user_1.username)
self.assertSequenceEqual(a5.authors.all(), [user_1])
a5.authors.set([user_2.username])
@@ -419,7 +419,7 @@ class ManyToManyTests(TestCase):
# (#19816).
self.p1.article_set.set([self.a1, self.a2])
- qs = self.p1.article_set.filter(headline='Django lets you build Web apps easily')
+ qs = self.p1.article_set.filter(headline='Django lets you build web apps easily')
self.p1.article_set.set(qs)
self.assertEqual(1, self.p1.article_set.count())
diff --git a/tests/middleware/tests.py b/tests/middleware/tests.py
index c7a007b821..8842552f77 100644
--- a/tests/middleware/tests.py
+++ b/tests/middleware/tests.py
@@ -51,13 +51,13 @@ class CommonMiddlewareTest(SimpleTestCase):
Matches to explicit slashless URLs should go unmolested.
"""
def get_response(req):
- return HttpResponse("Here's the text of the Web page.")
+ return HttpResponse("Here's the text of the web page.")
request = self.rf.get('/noslash')
self.assertIsNone(CommonMiddleware(get_response).process_request(request))
self.assertEqual(
CommonMiddleware(get_response)(request).content,
- b"Here's the text of the Web page.",
+ b"Here's the text of the web page.",
)
@override_settings(APPEND_SLASH=True)
@@ -206,12 +206,12 @@ class CommonMiddlewareTest(SimpleTestCase):
Matches to explicit slashless URLs should go unmolested.
"""
def get_response(req):
- return HttpResponse("Web content")
+ return HttpResponse("web content")
request = self.rf.get('/customurlconf/noslash')
request.urlconf = 'middleware.extra_urls'
self.assertIsNone(CommonMiddleware(get_response).process_request(request))
- self.assertEqual(CommonMiddleware(get_response)(request).content, b'Web content')
+ self.assertEqual(CommonMiddleware(get_response)(request).content, b'web content')
@override_settings(APPEND_SLASH=True)
def test_append_slash_slashless_unknown_custom_urlconf(self):
diff --git a/tests/model_inheritance/tests.py b/tests/model_inheritance/tests.py
index d3508c23af..550a297fb3 100644
--- a/tests/model_inheritance/tests.py
+++ b/tests/model_inheritance/tests.py
@@ -65,7 +65,7 @@ class ModelInheritanceTests(TestCase):
post = Post.objects.create(title="Lorem Ipsum")
post.attached_comment_set.create(content="Save $ on V1agr@", is_spam=True)
post.attached_link_set.create(
- content="The Web framework for perfections with deadlines.",
+ content="The web framework for perfections with deadlines.",
url="http://www.djangoproject.com/"
)
diff --git a/tests/utils_tests/files/strip_tags1.html b/tests/utils_tests/files/strip_tags1.html
index a533fa90d3..606e134ce1 100644
--- a/tests/utils_tests/files/strip_tags1.html
+++ b/tests/utils_tests/files/strip_tags1.html
@@ -37,12 +37,12 @@
<meta property="og:url" content="https://github.com/django/django"/>
<meta property="og:image" content="https://secure.gravatar.com/avatar/fd542381031aa84dca86628ece84fc07?s=420&amp;d=https://a248.e.akamai.net/assets.github.com%2Fimages%2Fgravatars%2Fgravatar-user-420.png"/>
<meta property="og:site_name" content="GitHub"/>
- <meta property="og:description" content="django - The Web framework for perfectionists with deadlines."/>
+ <meta property="og:description" content="django - The web framework for perfectionists with deadlines."/>
<meta property="twitter:card" content="summary"/>
<meta property="twitter:site" content="@GitHub">
<meta property="twitter:title" content="django/django"/>
- <meta name="description" content="django - The Web framework for perfectionists with deadlines." />
+ <meta name="description" content="django - The web framework for perfectionists with deadlines." />
<link href="https://github.com/django/django/commits/d7504a3d7b8645bdb979bab7ded0e9a9b6dccd0e.atom" rel="alternate" title="Recent Commits to django:d7504a3d7b8645bdb979bab7ded0e9a9b6dccd0e" type="application/atom+xml" />
diff --git a/tests/view_tests/tests/test_csrf.py b/tests/view_tests/tests/test_csrf.py
index 23eb87ba05..7afed336ea 100644
--- a/tests/view_tests/tests/test_csrf.py
+++ b/tests/view_tests/tests/test_csrf.py
@@ -44,7 +44,7 @@ class CsrfViewTests(SimpleTestCase):
self.assertContains(
response,
'You are seeing this message because this HTTPS site requires a '
- '“Referer header” to be sent by your Web browser, but '
+ '“Referer header” to be sent by your web browser, but '
'none was sent.',
status_code=403,
)
View Lorry Controller Status