Merge branch 'master' into master

Author: tommygonzaleza

.github/workflows/learnpack-audit.yml

@@ -25,5 +25,5 @@ jobs:
       uses: actions/setup-node@v2
       with:
         node-version: ${{ matrix.node-version }}
-    - run: npm install learnpack -g
+    - run: npm install @learnpack/learnpack@latest -g
     - run: learnpack audit

.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.20 -g && learnpack plugins:install @learnpack/python@1.0.0

.gitpod.yml

@@ -7,7 +7,8 @@ ports:
 
 vscode:
   extensions:
-    - learnpack.learnpack-vscode
+    - learn-pack.learnpack-vscode
+
 
 github:
     prebuilds:

exercises/02-Declare-Variables/test.py

@@ -29,3 +29,4 @@ def test_for_file_output(capsys):
     captured = buffer.getvalue()
     assert captured == "Yellow\n" #add \n because the console jumps the line on every print
 
+    

exercises/03-Print-Variables-In-The-Console/test.py

@@ -18,7 +18,7 @@ def test_for_printing_variable():
 
     with open(path, 'r') as content_file:
         content = content_file.read()
-        regex = re.compile(r"print(\s*)\(\s*color\s*\)")
+        regex = re.compile(r"print\s*\(\s*color\s*\)")
         assert bool(regex.search(content)) == True
 
 @pytest.mark.it('The printed value on the console should be "red"')

exercises/04-Multiply-Two-Values/test.py

@@ -23,4 +23,12 @@ def test_use_variable_name():
 @pytest.mark.it('Print on the console the variables_are_cool value ')
 def test_for_file_output(capsys):
     captured = buffer.getvalue()
-    assert captured == '17172435\n'
+    assert captured == '17172435\n'
+
+@pytest.mark.it('Print on the console the variables_are_cool variable')
+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 value
+        regex = re.compile(r"print\s*\(\s*variables_are_cool\s*\)")
+        assert bool(regex.search(content)) == True

exercises/05-User-Inputed-Values/test.py

@@ -9,7 +9,6 @@ def test_for_file_output(capsys):
         regex = re.compile(pattern)
         assert bool(regex.search(content)) == True
 
-
 @pytest.mark.it("We tried with age 50 and it was supposed to return 60")
 @mock.patch('builtins.input', lambda x: 50)
 def test_plus_ten(stdin):
@@ -18,3 +17,4 @@ def test_plus_ten(stdin):
     import app
     captured = buffer.getvalue()
     assert captured == "Your age is: 60\n"
+    

exercises/06-String-Concatenation/test.py

@@ -10,7 +10,6 @@ def test_my_var1_exists():
     except ImportError:
         raise ImportError("The variable 'my_var1' should exist on app.py")
 
-    
 @pytest.mark.it("Create a variable named my_var2")
 def test_my_var2_exists():
     try:
@@ -24,10 +23,18 @@ def test_my_var1_value():
     assert my_var1 == "Hello"
 
 @pytest.mark.it("Variable my_var2 value should be 'World'")
-def test_my_var1_value():
+def test_my_var2_value():
     from app import my_var2
     assert my_var2 == "World"
 
+@pytest.mark.it("Variable my_var2 value should be 'World'")
+def test_the_new_string_exists():
+    import app
+    try:
+        app.the_new_string
+    except AttributeError:
+        raise AttributeError('The variable "the_new_string" should exist on app.py')
+
 @pytest.mark.it('Print "Hello World" on the console')
 def test_for_file_output():
     captured = buffer.getvalue()

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

exercises/08-Your-First-If/README.es.md exercises/08.1-Your-First-If/README.es.mdexercises/08-Your-First-If/README.es.md renamed to exercises/08.1-Your-First-If/README.es.md

@@ -1,4 +1,4 @@
-# `08` Your First If...
+# `08.1` Your First If...
 
 La aplicación actual está preguntando cuánto dinero tiene el usuario. Una vez el usuario ingresa la cantidad, debemos 'imprimir' usando **print** una de las siguientes respuestas: