Merge pull request 4GeeksAcademy#1 from plucodev/master

Updated all the exercises

Author: alesanchezr

.gitpod.Dockerfile

@@ -1,3 +1,3 @@
 FROM gitpod/workspace-full:latest
 USER gitpod
-RUN pip3 install pytest pytest-testdox mock && npm i [email protected] -g
+RUN pip3 install pytest==4.4.2 pytest-testdox mock && npm i [email protected] -g

exercises/02-Hello-World/test.py

@@ -6,7 +6,7 @@ def test_output():
     content = f.read()
     assert content.find("print(") > 0
 
-@pytest.mark.it('The printed value on the console should be "red"')
+@pytest.mark.it('The printed value on the console should be "Hello World"')
 def test_for_file_output(capsys, app):
     app()
     captured = capsys.readouterr()

exercises/03-What-is-a-function/tests.py

@@ -1,14 +1,6 @@
 import io, sys, pytest, os, re, mock
 
 
-@pytest.mark.it("Create a function 'sum'")
-def test_declare_variable():
-    path = os.path.dirname(os.path.abspath(__file__))+'/app.py'
-    with open(path, 'r') as content_file:
-        content = content_file.read()
-        regex = re.compile(r"def(\s*)sum\(")
-        assert bool(regex.search(content)) == True
-
 @pytest.mark.it('The function sum must exist')
 def test_for_callable(capsys, app):
     assert callable(app.sum)
@@ -21,10 +13,11 @@ def test_for_integer(capsys, app):
 def test_for_return(capsys, app):
     assert app.sum(3,4) == 7
 
-@pytest.mark.it('The variable super_duper needs to be declared')
+@pytest.mark.it('You need to define the variable super_duper')
 def test_for_existence(capsys, app):
     app.super_duper
 
 @pytest.mark.it('The variable super_duper needs to have as value the result of the sum of the two numbers')
 def test_for_file_output(capsys, app):
-    assert app.super_duper == (3445324+53454423)
+    assert app.super_duper == (3445324+53454423)
+

exercises/04-Call-a-function/README.md

@@ -1,6 +1,6 @@
 # `04` Calling a function  
 
-A function could receive 0 no parameters, and you can it always returns something, event if you don't explicitly add the `return` statement.
+A function could receive 0 parameters, and you can it always returns something, event if you don't explicitly add the `return` statement.
 
 :point_up: [Click here to read more about functions](https://content.breatheco.de/lesson/working-with-functions-python)
 

exercises/04-Call-a-function/tests.py

@@ -37,14 +37,14 @@ def test_for_square_area_value1(capsys, app):
 
 @pytest.mark.it('square_area2 needs to have as value the area of the second square')
 def test_for_square_area_value2(capsys, app):
-    assert app.square_area2 == 3
+    assert app.square_area2 == 4
 
 @pytest.mark.it('square_area3 needs to have as value the area of the third square')
 def test_for_square_area_value3(capsys, app):
     assert app.square_area3 == 25
 
 @pytest.mark.it("Create a function calculate_area must be called 3 times, one for each figure")
-def test_declare_variable():
+def test_call_calculate_area():
     path = os.path.dirname(os.path.abspath(__file__))+'/app.py'
     with open(path, 'r') as content_file:
         content = content_file.read()

exercises/05-Defining-vs-Calling-a-function/tests.py

@@ -8,7 +8,7 @@ def test_declare_variable():
         regex = re.compile(r"def(\s*)multi\(")
         assert bool(regex.search(content)) == True
 
-@pytest.mark.it('The function calculate_area must exist')
+@pytest.mark.it('The function multi must exist')
 def test_for_callable(capsys, app):
     assert callable(app.multi)
 

exercises/06-lambda-functions/README.md

@@ -1,6 +1,6 @@
 # `06` Lambda functions in Python
 
-An lambda function is a function with just one line of code and no name.
+A lambda function is a function with just one line of code and no name.
 It is a very special type of funcion in the world of python because you can use it as a small utility for very agile coding:
 
 ```python

exercises/06-lambda-functions/tests.py

@@ -1,6 +1,6 @@
 import io, sys, pytest, os, re, mock
 
-@pytest.mark.it("Declar a function 'is_odd' as lambda")
+@pytest.mark.it("Declare a function 'is_odd' as lambda")
 def test_declare_variable():
     path = os.path.dirname(os.path.abspath(__file__))+'/app.py'
     with open(path, 'r') as content_file:
@@ -13,7 +13,7 @@ def test_for_callable(capsys):
     import app as app
     assert callable(app.is_odd)
 
-@pytest.mark.it('The function is_odd must receive one number and return true is odd or false otherwise')
+@pytest.mark.it('The function is_odd must receive one number and return true if is odd or false otherwise')
 def test_for_integer(capsys):
     import app as app
     assert app.is_odd(3) == True

exercises/07-lambda-function-two/README.md

@@ -10,9 +10,9 @@ print(multy(2,2))
 
 # 📝 Instructions:
 
-1. Create an lambda function called `rapid` it will take one string parameter
+1. Create a lambda function called `rapid` it will take one string parameter
 2. Return the same string but removing the last letter form it
 
 # 💡 Hint
 
-Google how to "remove las letter form string python" (you can use the square brackets)
+Google how to "remove last letter form string python" (you can use the square brackets)

exercises/07-lambda-function-two/app.py

@@ -2,4 +2,4 @@
 
 
 # From this line above, plese do not change code below
-print(rapid("bob")) #should print JOH
+print(rapid("bob")) #should print bo