Feature/scan lang (#6)

* delete unnused test module mock db * refactor tests structure and commands * do not hardcode the lang when a webhook is received * upgrade core version * Bump version: 0.0.5 → 0.0.6 * change background scenario for tests
BBVA · Oct 26, 2017 · 7845434 · 7845434
1 parent 16eeff7
commit 7845434
Show file tree

Hide file tree

Showing 33 changed files with 171 additions and 212 deletions.
diff --git a/.env.required b/.env.required
@@ -1,5 +1,4 @@
 BROKER_URI
 DATABASE_URI
-SCAN_PATH
 SERVER_ADDRESS
 GUNICORN_WORKERS
diff --git a/Makefile b/Makefile
@@ -36,7 +36,7 @@ clean: ## remove all build, test, coverage and Python artifacts
 
 .PHONY: test
 test: ## run tests quickly with the default Python
-	python -m unittest discover -s tests/unit
+	py.test tests
 
 .PHONY: test-all
 test-all: ## run tests on every Python version with tox
@@ -51,9 +51,7 @@ lint: ## check style with flake8
 
 .PHONY: coverage
 coverage: ## check code coverage
-	coverage run --source=deeptracy_api -m unittest  discover -s tests/unit
-	coverage report -m --fail-under 80
-	coverage xml -o coverage-reports/report.xml
+	py.test --cov=deeptracy_api tests --cov-fail-under 50
 
 .PHONY: docs
 docs: ## generate and shows documentation

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-0.0.5
+0.0.6
diff --git a/deeptracy_api/__init__.py b/deeptracy_api/__init__.py
@@ -14,7 +14,7 @@
 
 import logging
 
-__version__ = '0.0.5'
+__version__ = '0.0.6'
 
 root_log = logging.getLogger()
 root_log.setLevel(logging.DEBUG)

diff --git a/deeptracy_api/api/scan_blueprint.py b/deeptracy_api/api/scan_blueprint.py
@@ -48,9 +48,9 @@ def post_scan():
             return api_error_response('invalid payload'), 400
 
         project_id = get_required_field(data, 'project_id')
-        lang = get_required_field(data, 'lang')
+        lang = data.get('lang', None)
 
-        scan = add_scan(project_id, lang, session)
+        scan = add_scan(project_id, session, lang=lang)
         session.commit()
 
         # when the scan is added to the database, a celery task is inserted for that scan to start the process

diff --git a/deeptracy_api/webhook/parse.py b/deeptracy_api/webhook/parse.py
@@ -139,10 +139,7 @@ def add_scan_for_project_with_repo(repo_url: str):
 
         project = get_project_by_repo(repo_url, session)
 
-        # TODO: Do not hardcode the language, extract it from the project default_language
-        # https://github.com/BBVA/deeptracy/issues/8
-        lang = 'nodejs'
-        scan = add_scan(project.id, lang, session)
+        scan = add_scan(project.id, session)
         session.commit()
 
         celery = Celery('deeptracy', broker=BROKER_URI)

diff --git a/requirements.txt b/requirements.txt
@@ -3,6 +3,6 @@ celery==4.1.0
 Flask==0.12.2
 Flask-Cors==3.0.3
 gunicorn==19.7.1
-deeptracy_core==0.0.20
+deeptracy_core==0.0.23
 psycopg2==2.7.3.1
 redis==2.10.6
diff --git a/requirements_test.txt b/requirements_test.txt
@@ -3,7 +3,7 @@ requests==2.18.4
 flake8==2.6.0
 tox==2.3.1
 pytest==3.2.1
-coverage==4.4.1
+pytest-cov==2.5.1
 behave==1.2.5
 redis==2.10.6
 SQLAlchemy==1.1.14
diff --git a/setup.cfg b/setup.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.0.5
+current_version = 0.0.6
 commit = True
 tag = False
 

diff --git a/tests/__init__.py b/tests/__init__.py
diff --git a/tests/acceptance/features/project-create.feature b/tests/acceptance/features/project-create.feature
@@ -3,7 +3,7 @@ Feature: Create new projects
   The API should be able to create new projects
 
   Background: Database setup
-    Given an empty project table in database
+    Given an empty system
 
   @only
   Scenario Outline: Add a new project

diff --git a/tests/acceptance/features/project-delete.feature b/tests/acceptance/features/project-delete.feature
@@ -3,7 +3,7 @@ Feature: Delete projects
   The API should be able to delete existing projects
 
   Background: Database setup
-    Given an empty project table in database
+    Given an empty system
 
   Scenario: Delete project by id
     When a project with id "0000001" exists in the database

diff --git a/tests/acceptance/features/project-read.feature b/tests/acceptance/features/project-read.feature
@@ -3,7 +3,7 @@ Feature: Read projects
   The API should be able to read existing projects
 
   Background: Database setup
-    Given an empty project table in database
+    Given an empty system
 
 
   Scenario Outline: Get a project by id

diff --git a/tests/acceptance/features/project-update.feature b/tests/acceptance/features/project-update.feature
@@ -2,7 +2,7 @@ Feature: Update projects
   The API should be able to update existing projects
 
   Background: Database setup
-    Given an empty project table in database
+    Given an empty system
 
   Scenario Outline: Updates an existing project
     When a project with id "0000001" exists in the database

diff --git a/tests/acceptance/features/scan.feature b/tests/acceptance/features/scan.feature
@@ -3,7 +3,8 @@ Feature: Create new scans
   The API should be able to create new scans
 
   Background: Database setup
-    Given a database ready to receive scans
+    Given an empty system
+    And a database ready to receive scans
 
   Scenario Outline: Create scan endpoint
     When the user makes a "POST" request to "/api/1/scan/" endpoint with <payload>
@@ -15,6 +16,6 @@ Feature: Create new scans
     Examples:
       | payload                              | response_code | response                                                                                                                | created |
       | {"project_id":"123", "lang": "lang"} | 201           | {"project_id": "123", "lang": "lang", "state": "PENDING", "scan_analysis": [], "analysis_count": 0, "analysis_done": 0} | 1       |
-      | {"project_id":"123"}                 | 400           | {"error": {"msg": "missing lang"}}                                                                                      | 0       |
+      | {"project_id":"123"}                 | 201           | {"project_id": "123", "lang": null, "state": "PENDING", "scan_analysis": [], "analysis_count": 0, "analysis_done": 0}   | 1       |
       | {"lang": "lang"}                     | 400           | {"error": {"msg": "missing project_id"}}                                                                                | 0       |
       | {}                                   | 400           | {"error": {"msg": "invalid payload"}}                                                                                   | 0       |
diff --git a/tests/acceptance/steps/project.py b/tests/acceptance/steps/project.py
@@ -15,13 +15,6 @@
 from sqlalchemy import text
 from behave import given, then, when
 
-from tests.acceptance.utils import clean_db
-
-
-@given(u'an empty project table in database')
-def step_impl(context):
-    clean_db(context)
-
 
 @then(u'{created} projects are in the database')
 def step_impl(context, created):

diff --git a/tests/acceptance/steps/scan.py b/tests/acceptance/steps/scan.py
@@ -14,16 +14,13 @@
 
 from sqlalchemy import text
 from behave import given, then
-from tests.acceptance.utils import clean_db
 
 
 @given(u'a database ready to receive scans')
 def step_impl(context):
     project_id = '123'
     plugin_lang = 'lang'
 
-    clean_db(context)
-
     sql = text('INSERT INTO project (id, repo) VALUES (:id, :repo)')
     context.engine.execute(sql, id=project_id, repo='http://test.com')
 

diff --git a/tests/acceptance/utils.py → tests/acceptance/steps/system.py b/tests/acceptance/utils.py → tests/acceptance/steps/system.py
@@ -13,9 +13,11 @@
 # limitations under the License.
 
 from sqlalchemy import text
+from behave import given
 
 
-def clean_db(context):
+@given(u'an empty system')
+def step_impl(context):
     sql = text('DELETE FROM scan')
     context.engine.execute(sql)
 

diff --git a/tests/unit/api/__init__.py b/tests/unit/api/__init__.py
diff --git a/tests/unit/api/exc/__init__.py b/tests/unit/api/exc/__init__.py
diff --git a/tests/unit/api/exc/test_exceptions.py b/tests/unit/api/exc/test_exceptions.py
diff --git a/tests/unit/base_test.py b/tests/unit/base_test.py
diff --git a/tests/unit/mock_db.py b/tests/unit/mock_db.py
diff --git a/.../unit/bitbucket_push_webhook_payload.json → ...urces/bitbucket_push_webhook_payload.json b/.../unit/bitbucket_push_webhook_payload.json → ...urces/bitbucket_push_webhook_payload.json
diff --git a/tests/unit/github_push_webhook_payload.json → ...esources/github_push_webhook_payload.json b/tests/unit/github_push_webhook_payload.json → ...esources/github_push_webhook_payload.json
diff --git a/tests/unit/test_exceptions.py b/tests/unit/test_exceptions.py
@@ -0,0 +1,39 @@
+# Copyright 2017 BBVA
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+"""tests for DeeptracyException class"""
+
+from unittest import TestCase
+
+from deeptracy_api.api.exc.exceptions import APIError
+
+
+class ScanBlueprintTestCase(TestCase):
+
+    def test_deeptracy_exception_holds_an_api_status_code(self):
+        """Deeptracy exception class should holds an attribute
+        to save the api status code to return in case of that exception"""
+        status_code = 201
+        with self.assertRaises(APIError) as exc:
+            raise APIError('custom message', status_code=status_code)
+
+        self.assertEqual(exc.exception.status_code, status_code)
+
+    def test_deeptracy_exception_holds_a_message(self):
+        """Deeptracy exception class should holds a message"""
+        msg = 'custom message'
+        with self.assertRaises(APIError) as exc:
+            raise APIError(msg)
+
+        self.assertTrue(msg in exc.exception.message)