Add more tests for the user interface (#7)

* Add more tests for the user interface

* Add command line tests

* Add print statement

* Only write config if it does not exist

* black formating

* clean up two factor code

* fix test config

* try to include command line tests in coverage statistics

* Remove multiprocessing flag

* no need to combine

* test cmd separately

* Remove cmd

* black formating

* separate coverage calls

* separate coverage calls

* Update coverage.yml

* Update unittest.yml

* Update coverage.yml

* integrate in test

* multi flag

* Add period

Author: jan-janssen

.coveragerc

@@ -1,4 +1,5 @@
 # .coveragerc to control coverage.py
 [run]
 source = pyauthenticator
-omit = pyauthenticator/_version.py
+omit = pyauthenticator/_version.py
+concurrency = multiprocessing

.github/workflows/coverage.yml

@@ -26,8 +26,10 @@ jobs:
         pip install --no-deps .
     - name: Test
       shell: bash -l {0}
-      run: coverage run --omit pyauthenticator/_version.py -m unittest discover tests
+      run: |
+        coverage run -a -m unittest discover tests
+        coverage combine
     - name: Coverage
       shell: bash -l {0}
       run: |
-        coveralls
+        coveralls

.github/workflows/unittest.yml

@@ -32,4 +32,5 @@ jobs:
         pip install --no-deps .
     - name: Test
       shell: bash -l {0}
-      run: coverage run --omit pyauthenticator/_version.py -m unittest discover tests
+      run: |
+        coverage run -a -m unittest discover tests

pyauthenticator/cmd.py pyauthenticator/__main__.py

@@ -44,5 +44,4 @@ def main():
         print(get_two_factor_code(key=args.service, config_dict=load_config()))
 
 
-if __name__ == "__main__":
-    main()
+main()

setup.py

@@ -23,7 +23,7 @@
     cmdclass=versioneer.get_cmdclass(),
     entry_points={
         "console_scripts": [
-            'pyauthenticator=pyauthenticator.cmd:main'
+            'pyauthenticator=pyauthenticator:main'
         ]
     }
 )

tests/test_cmd.py

@@ -0,0 +1,43 @@
+import unittest
+import os
+import subprocess
+import json
+from pyauthenticator.share import expand_path, write_config, config_file
+
+
+class MyTestCase(unittest.TestCase):
+    @classmethod
+    def setUpClass(cls):
+        cls.config_dict = {
+            "test": "otpauth://totp/Test%3A%20root%40github.com?secret=6IQXETC4ADOSMMUN&issuer=Test"
+        }
+        cls.config_path = expand_path(config_file)
+        if not os.path.exists(cls.config_path):
+            write_config(
+                config_dict=cls.config_dict
+            )
+
+    def test_main_generate_two_factor(self):
+        code = subprocess.check_output(
+            ["coverage", "run", "-a", "pyauthenticator", "test"],
+            universal_newlines=True
+        )
+        self.assertEqual(len(code.replace("\n", "")), 6)
+
+    def test_main_generate_qr_code(self):
+        subprocess.check_output(
+            ["coverage", "run", "-a", "pyauthenticator", "-qr", "test"],
+            universal_newlines=True
+        )
+        self.assertTrue(os.path.exists("test.png"))
+        subprocess.check_output(
+            ["coverage", "run", "-a", "pyauthenticator", "-a", "test.png", "test2"],
+            universal_newlines=True
+        )
+        with open(self.config_path, "r") as f:
+            config_dict = json.load(f)
+        self.assertEqual(len(config_dict.keys()), 2)
+
+
+if __name__ == '__main__':
+    unittest.main()

tests/test_core.py

@@ -11,7 +11,7 @@ class TestCore(unittest.TestCase):
     def setUpClass(cls):
         cls.qr_code_png = "test.png"
         cls.config_dict = {
-            "test": "otpauth://totp/Test%3A%20root%40github.com?secret=6IQXETC4ADOSMMUN&issuer=Test"
+            "test": "otpauth://totp/Test%3A%20root%40github.com?secret=6IQXETC4ADOSMMUN&issuer=Test&period=60"
         }
         generate_qrcode(
             key="test",

tests/test_user_interface.py

@@ -0,0 +1,29 @@
+import unittest
+import os
+from pyauthenticator import get_two_factor_code, write_qrcode_to_file
+from pyauthenticator.share import expand_path, write_config, config_file
+
+
+class TestUserInterface(unittest.TestCase):
+    @classmethod
+    def setUpClass(cls):
+        cls.config_dict = {
+            "test": "otpauth://totp/Test%3A%20root%40github.com?secret=6IQXETC4ADOSMMUN&issuer=Test"
+        }
+        cls.config_path = expand_path(config_file)
+        if not os.path.exists(cls.config_path):
+            write_config(
+                config_dict=cls.config_dict
+            )
+
+    def test_get_two_factor_code(self):
+        code = get_two_factor_code(service="test")
+        self.assertEqual(len(code), 6)
+
+    def test_write_qrcode_to_file(self):
+        write_qrcode_to_file(service="test")
+        self.assertTrue(os.path.exists("test.png"))
+
+
+if __name__ == '__main__':
+    unittest.main()