Conflict solved

tommygonzaleza · tommygonzaleza · commit d4006feb1ef5 · 2022-08-22T13:07:41.000Z
diff --git a/.gitpod.Dockerfile b/.gitpod.Dockerfile
@@ -3,4 +3,4 @@ FROM gitpod/workspace-full:latest
 USER gitpod
 
 RUN pip3 install pytest==4.6.0 pytest-testdox mock
-RUN npm i @learnpack/learnpack -g && learnpack plugins:install learnpack-python@0.0.35
+RUN npm i @learnpack/learnpack@2.1.18 -g && learnpack plugins:install @learnpack/python
diff --git a/exercises/02-Declare-Variables/test.py b/exercises/02-Declare-Variables/test.py
@@ -28,10 +28,5 @@ def test_for_variable():
 def test_for_file_output(capsys):
     captured = buffer.getvalue()
     assert captured == "Yellow\n" #add \n because the console jumps the line on every print
-def test_for_print():
+
     
-    with open(path, 'r') as content_file:
-        content = content_file.read()
-        # makes sure we are calling print function with a variable and not the hard coded string
-        regex = re.compile(r"print\s*\(\s*[^\d\W][_a-zA-Z0-9]*\s*\)\s*")
-        assert bool(regex.search(content)) == True
diff --git a/exercises/04-Multiply-Two-Values/test.py b/exercises/04-Multiply-Two-Values/test.py
@@ -31,4 +31,4 @@ def test_for_print():
         content = content_file.read()
         # makes sure we are calling print function with a variable and not the hard coded value
         regex = re.compile(r"print\s*\(\s*variables_are_cool\s*\)")
-        assert bool(regex.search(content)) == True
+        assert bool(regex.search(content)) == True
diff --git a/exercises/05-User-Inputed-Values/test.py b/exercises/05-User-Inputed-Values/test.py
@@ -1,4 +1,4 @@
-import pytest,os,re,io,sys,mock,json 
+import pytest,os,re,io,sys,mock,json
 path = os.path.dirname(os.path.abspath(__file__))+'/app.py'
 
 @pytest.mark.it('Use the function print()')
@@ -17,11 +17,4 @@ def test_plus_ten(stdin):
     import app
     captured = buffer.getvalue()
     assert captured == "Your age is: 60\n"
-
-@pytest.mark.it('There should be a variable named age')
-def test_variable_exists():
-    try:
-        import app
-        app.age
-    except AttributeError:
-        raise AttributeError('The variable "age" should exist on app.py')
+    
diff --git a/exercises/06-String-Concatenation/test.py b/exercises/06-String-Concatenation/test.py
@@ -1,6 +1,6 @@
 import io, sys, os, re, pytest
 sys.stdout = buffer = io.StringIO()
-path = os.path.dirname(os.path.abspath(__file__))+'/app.py'
+
 import app
 
 @pytest.mark.it("Create a variable named my_var1")
diff --git a/exercises/07-Create-a-Basic-HTML/test.py b/exercises/07-Create-a-Basic-HTML/test.py
@@ -2,21 +2,21 @@
 sys.stdout = buffer = io.StringIO()
 import app
 
-@pytest.mark.it('Use the function print()')
-def test_for_print():
-    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"print\s*\(.+\)")
-        assert bool(regex.search(content)) == True
-
 @pytest.mark.it("Create a variable named html_document")
 def test_html_document_exists():
     try:
         from app import html_document
     except ImportError:
         raise ImportError("The variable 'html_document' should exist on app.py")
 
+@pytest.mark.it("The value of html_document should be the expected")
+def test_html_document_exists():
+    try:
+        from app import html_document
+        assert html_document == '<html><head><title></title></head><body></body></html>'
+    except ImportError:
+        raise ImportError("The variable 'html_document' should exist on app.py")
+
 @pytest.mark.it('Concatenate all the variables together (in the right order) to set the value of html_document')
 def test_for_concat():
     path = os.path.dirname(os.path.abspath(__file__))+'/app.py'
@@ -30,4 +30,4 @@ def test_for_concat():
 @pytest.mark.it('Print a basic html layout on the console like this: <html><head><title></title></head><body></body></html>')
 def test_for_file_output():
     captured = buffer.getvalue()
-    assert captured == "<html><head><title></title></head><body></body></html>\n" #add \n because the console jumps the line on every print
+    assert captured == "<html><head><title></title></head><body></body></html>\n" #add \n because the console jumps the line on every print
diff --git a/exercises/08.2-How-Much-The-Wedding-Costs/test.py b/exercises/08.2-How-Much-The-Wedding-Costs/test.py
@@ -39,12 +39,12 @@ def test_less_than_50(capsys, app):
         app()
         captured = capsys.readouterr()
         price = 4000
-        assert "Your wedding will cost "+str(price)+" dollars\n" == captured.out
+        "Your wedding will cost "+str(price)+" dollars\n" == captured.out
 
 @pytest.mark.it("More than 200 should be priced 20,000")
 def test_t(capsys, app):
     with mock.patch('builtins.input', lambda x: 201):
         app()
         captured = capsys.readouterr()
         price = 20000
-        assert "Your wedding will cost "+str(price)+" dollars\n" == captured.out
+        "Your wedding will cost "+str(price)+" dollars\n" == captured.out
diff --git a/exercises/10-Calling-Your-First-Function/test.py b/exercises/10-Calling-Your-First-Function/test.py
@@ -36,10 +36,3 @@ def test_for_file_output(capsys):
     captured = capsys.readouterr()
     assert captured.out == "True\n"
     
-@pytest.mark.it('You should not hardcode the expected output value on print() function')
-def test_for_hardcode_on_print():
-    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"print\s*\(\s*\bTrue\b\s*\)")
-        assert bool(regex.search(content)) == False
diff --git a/exercises/17-Russian-Roulette/test.py b/exercises/17-Russian-Roulette/test.py
@@ -19,9 +19,9 @@ def test_function_fire_gun(capsys, app):
 @pytest.mark.it('The function fire_gun should return the expected output in both cases')
 def test_function_output(capsys, app):
     if(app.spin_chamber() == app.bullet_position):
-        assert "You're dead!"
+        assert app.fire_gun() == "You are dead!"
     else:
-        assert "Keep playing!"
+        assert app.fire_gun() == "Keep playing!"
 
 @pytest.mark.it('Your code needs to print the correct output on the console')
 def test_for_file_output(capsys):
diff --git a/exercises/18-The-Beatles/test.py b/exercises/18-The-Beatles/test.py
@@ -15,6 +15,14 @@ def test_function_sing_exists(app):
     except AttributeError:
         raise AttributeError("The function 'sing' should exist on app.py")
 
+@pytest.mark.it("You should not be hard coding the output")
+def test_function_hardcode_output():
+    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"\breturn\s*[^\"][a-zA-Z0-9]*\b\s*")
+        assert bool(regex.search(content)) == True
+
 @pytest.mark.it("The function sing should return astring with the song lyrics")
 def test_function_sing_exists(app):
     try:
diff --git a/exercises/19-Bottles-Of-Milk/README.es.md b/exercises/19-Bottles-Of-Milk/README.es.md
@@ -33,4 +33,4 @@ Go to the store and buy some more, 99 bottles of milk on the wall.
 
 + Al final de la canción, la letra cambia porque es solo una botella (singular en lugar del plural).
 
-+ Lee la última parte de la letra y verás como cambia la última línea a "go to the store and by some more".
++ Lee la última parte de la letra y verás como cambia la última línea a `"go to the store and by some more"`.
diff --git a/exercises/19-Bottles-Of-Milk/README.md b/exercises/19-Bottles-Of-Milk/README.md
@@ -37,4 +37,4 @@ Go to the store and buy some more, 99 bottles of milk on the wall.
 
 + At the end of the song, the lyrics change because is only one bottle (singular instead of plural).
 
-+ Read the last lyrics and you will see how the last line changes to `"go to the store and by some more"`.
++ Read the last lyrics and you will see how the last line changes to `"go to the store and buy some more"`.
diff --git a/exercises/19-Bottles-Of-Milk/app.py b/exercises/19-Bottles-Of-Milk/app.py
@@ -0,0 +1 @@
+# Your code here!
diff --git a/exercises/19-Bottles-Of-Milk/test.py b/exercises/19-Bottles-Of-Milk/test.py
@@ -9,7 +9,10 @@
 
 @pytest.mark.it('The function number_of_bottles must exist')
 def test_function_spin_chamber(capsys, app):
-    assert app.number_of_bottles
+    try:
+        app.number_of_bottles
+    except AttributeError:
+        raise AttributeError("The function number_of_bottles should exist")
 
 @pytest.mark.it('The function must return the expected output')
 def test_for_function_output(capsys):
