pr

Author: marter11

src/tests/__init__.py

@@ -1,3 +1,10 @@
+import sys
+import os
+
+# sys.path.insert(0, os.getcwd()+'/src')
+
 from api import app
 from api.models import db
-from api.models import User, Project
+from api.models import User, Project, UserFeedback, ProjectFeedback, UserLink, ProjectLink
+
+# sys.path.insert(0, os.getcwd()+'/tests')

src/tests/api/__init__.py

@@ -0,0 +1,40 @@
+
+"""
+
+  Creates valid model objects for testing purposes:
+
+    - these functions will give back the object's id
+
+    - if you want to access the object properties, then run a query on the model with the given id
+      example: User.query.filter_by(id=returned_id)
+
+
+  -Call these function form any test case.
+
+"""
+
+from tests import db, Project, User, UserLink, ProjectLink
+
+def create_project_for_test_cases(data):
+    new_project = Project(**data)
+    db.session.add(new_project)
+    db.session.commit()
+    return new_project.id
+
+def create_user_for_test_cases(data):
+    new_user = User(**data)
+    db.session.add(new_user)
+    db.session.commit()
+    return new_user.id
+
+def create_user_link_for_test_cases(data):
+    new_user_link = UserLink(**data)
+    db.session.add(new_user)
+    db.session.commit()
+    return new_user_link.id
+
+def create_project_for_test_cases(data):
+    new_project_link = ProjectLink(**data)
+    db.session.add(new_project_link)
+    db.session.commit()
+    return new_project_link.id

src/tests/api/models/test_FeedbackFlow.py

@@ -0,0 +1,17 @@
+from tests.conftest import client
+from tests import User, Project, UserFeedback, ProjectFeedback
+from tests.api import create_user_for_test_cases, create_project_for_test_cases
+
+class TestFeedbackFlow(object):
+
+    valid_data_1 = {
+        "name": "Foe Joe",
+    }
+
+    valid_data_2 = {
+        "name": "Jimmy Joe"
+    }
+
+    def test_user_to_user_feedback_creation(self, client):
+        user1_id = create_user_for_test_cases(self.valid_data_2)
+        user2_id = create_user_for_test_cases(self.valid_data_2)

src/tests/api/views/test_projectView.py

@@ -1,21 +1,15 @@
 from tests.conftest import client
 from tests import db, Project
-from datetime import datetime
+from tests.api import create_project_for_test_cases
 
-class TestPorjectView(object):
+class TestProjectView(object):
 
     valid_data = {
         'name': 'PB api',
         'description': 'A cool project',
         'repository': 'http://github.xy.com'
     }
 
-    def create_project_for_test_cases(self):
-        new_project = Project(**self.valid_data)
-        db.session.add(new_project)
-        db.session.commit()
-        return new_project.id
-
     def test_create_project(self, client):
         response = client.post('/projects', json={"name": "Project"})
         assert response.status_code == 400
@@ -34,7 +28,7 @@ def test_update_project(self, client):
         # notice: should return 404 when doesen't exist insted of 400
         assert response.status_code == 404
 
-        project_id = self.create_project_for_test_cases()
+        project_id = create_project_for_test_cases(self.valid_data)
         response = client.post('/projects/{}'.format(project_id), json={'description': 'updated desc'})
         project = Project.query.filter_by(id=project_id).first()
         assert project.description == 'updated desc'

src/tests/api/views/test_userView.py

@@ -1,8 +1,14 @@
 from tests.conftest import client
 from tests import db, User
+from tests.api import create_user_for_test_cases
 
 class TestUserView(object):
 
+    """
+
+    """
+
+    # valid data for user creation
     valid_data = {
         'name': 'L Jone',
         'bio': 'coding...',
@@ -12,12 +18,6 @@ class TestUserView(object):
         'occupation': 'cashier'
     }
 
-    def create_user_for_test_cases(self):
-        new_user = User(**self.valid_data)
-        db.session.add(new_user)
-        db.session.commit()
-        return new_user.id
-
     def test_create_user(self, client):
         response = client.post('/users', json=self.valid_data)
         assert response.status_code == 201
@@ -26,7 +26,7 @@ def test_create_user(self, client):
         assert response.status_code == 400
 
     def test_update_user(self, client):
-        user_id = self.create_user_for_test_cases()
+        user_id = create_user_for_test_cases(self.valid_data)
 
         response = client.post('/users/1', json={})
         assert response.status_code == 400
@@ -46,7 +46,7 @@ def test_delete_user(self, client):
         response = client.delete('/users/{}'.format(user_id))
         assert response.status_code == 404
 
-        user_id = self.create_user_for_test_cases()
+        user_id = create_user_for_test_cases(self.valid_data)
         response = client.delete('/users/{}'.format(user_id))
         assert response.status_code == 200
 
@@ -55,15 +55,15 @@ def test_get_user(self, client):
         response = client.get('/users/{}'.format(user_id))
         assert response.status_code == 404
 
-        user_id = self.create_user_for_test_cases()
+        user_id = create_user_for_test_cases(self.valid_data)
         response = client.get('/users/{}'.format(user_id))
         assert response.status_code == 200
 
         created_user = User.query.filter_by(id=user_id).first()
         assert response.get_json() == created_user.as_dict()
 
     def test_get_all_users(self, client):
-        self.create_user_for_test_cases()
+        create_user_for_test_cases(self.valid_data)
 
         self.valid_data = {
             'name': 'Valid',
@@ -74,7 +74,7 @@ def test_get_all_users(self, client):
             'occupation': 'cashier2.1'
         }
 
-        self.create_user_for_test_cases()
+        create_user_for_test_cases(self.valid_data)
 
         response = client.get('/users')
         assert response.status_code == 200
@@ -89,3 +89,9 @@ def test_get_all_users(self, client):
         response = client.get('/users')
         assert response.status_code == 200
         assert response.get_json() == [users_dict[1]]
+
+        l = User(**self.valid_data)
+        db.session.add(l)
+        db.session.commit()
+
+        assert l.name == 1

src/tests/conftest.py

@@ -4,12 +4,7 @@
 from tests import app, db
 
 """
-todo: change this importing solution if the tests/ won't be under src/
-import sys
-import os
-sys.path.insert(0, os.getcwd()+'/src')
-import api
-sys.path.insert(0, os.getcwd()+'/tests')
+
 """
 
 @pytest.fixture