diff --git a/.gitignore b/.gitignore index cc891ab8..a10649a6 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,5 @@ venv/ __pycache__ *.pyc db.sqlite3 +setup.md +env \ No newline at end of file diff --git a/hello_app/math.py b/hello_app/math.py index 4dda51a0..aec6c3ce 100644 --- a/hello_app/math.py +++ b/hello_app/math.py @@ -1,3 +1,3 @@ def addition(number1, number2): # there seems to be a bug in this code - return number1 + 9999999997 \ No newline at end of file + return number1 + number2 \ No newline at end of file diff --git a/hello_app/tests.py b/hello_app/tests.py index 352c53ad..94456d0b 100644 --- a/hello_app/tests.py +++ b/hello_app/tests.py @@ -7,7 +7,7 @@ class TestHelloMessage(SimpleTestCase): def test_hello_message(self): page = self.client.get('') # get the home page - self.assertContains(page, 'Hello everyone!') + self.assertContains(page, 'Hello everyone! Try Two') class TestTwoPlusTwo(SimpleTestCase): diff --git a/hello_app/views.py b/hello_app/views.py index 27c91079..eff2fb7b 100644 --- a/hello_app/views.py +++ b/hello_app/views.py @@ -3,7 +3,7 @@ def hello(request): - return HttpResponse('Go away!') + return HttpResponse('Hello everyone!') def two_plus_two(request):