Merge pull request #5 from Accruent/begin_unit_testing

Begin unit testing

Author: neiljhowell

dockerfile

@@ -1,14 +1,25 @@
 FROM python:3.6
 
+# Copy the current directory contents into the container at /app
+COPY . /app
+
+# Set the working directory to /automation-framework-mock-api
+WORKDIR /app
+
 # Install any needed packages
 RUN apt-get update \
-&&  rm -rf /var/lib/apt/lists/*
-RUN pip install git+https://github.com/accruent/owasp-zap-historic
+&&  rm -rf /var/lib/apt/lists/* \
+&& pip install .
 
 # Make port 5000 available to the world outside this container
 EXPOSE 5000
 
+# Unit tests
+RUN pytest --cov owasp_zap_historic --cov-report term-missing --cov-config=test/.coveragerc -v test/function_test.py
+
 # Run the owasp-zap-historic flask with argument to connect to db
-# Below command is to run on local
-# docker run -it -p 5000:5000 proget.accruentsystems.com/qe_docker/library/owaspzaphistoric owaspzaphistoric -s "localhost" -t 3306 -u "root" -p "password" -a "0.0.0.0"
+# Below command is to run in docker container pointed to local mysql
+# CMD owaspzaphistoric -s '192.168.86.248'
+# Then in CMD window docker run -p 5000:5000 owaspzaphistoric
+# Below command is to run on Rancher and connect to mysql db shared with RFH
 CMD owaspzaphistoric -s "${SQLHOST}" -t "${PORT}" -u "${USERNAME}" -p "${PASSWORD}" -a "${FLASKHOST}"

requirements.txt

@@ -1,4 +1,7 @@
 bcrypt~=3.1.7
 pytz~=2020.1
 Flask~=1.1.2
-setuptools~=41.2.0
+setuptools~=41.2.0
+pytest-cov
+flask_mysqldb
+config

setup.py

@@ -1,15 +1,18 @@
 """Setup file for owaspzaphistoric."""
 from setuptools import find_packages, setup
+import version
 
 
 with open("README.md", "r") as fh:
     LONG_DESCRIPTION = fh.read()
     print(LONG_DESCRIPTION)
 
+with open('requirements.txt') as f:
+    REQUIREMENTS = f.read().splitlines()
 
 setup(
     name='owasp-zap-historic',
-    version="0.1.1",
+    version=version.VERSION,
     description='Custom report to display owasp zap historical execution records',
     long_description=LONG_DESCRIPTION,
     long_description_content_type='text/markdown',
@@ -28,13 +31,7 @@
     include_package_data=True,
     zip_safe=False,
 
-    install_requires=[
-        'config',
-        'flask',
-        'bcrypt',
-        'flask-mysqldb',
-        'pytz'
-    ],
+    install_requires=REQUIREMENTS,
     entry_points={
         'console_scripts': [
             'owaspzaphistoric=owasp_zap_historic.app:main',

test/.coveragerc

@@ -0,0 +1,9 @@
+[run]
+
+[paths]
+source = owasp_zap_historic/
+
+[report]
+exclude_lines =
+    if __name__ == .__main__.:
+    model.password =

version.py

@@ -0,0 +1,2 @@
+"""Pypi version goes here. Update with releases."""
+VERSION = "0.1.1"