Fix populate_tables path and attribute order on technologies

api/models/technology.py

@@ -22,8 +22,7 @@ class TechnologyModel(db.Model):
 
     structure = db.relationship('StructureModel', lazy='dynamic', uselist=True)
 
-    def __init__(self, name, description, expansion, age, develops_in, cost, build_time,
-                 applies_to):
+    def __init__(self, name, expansion, age, develops_in, cost, build_time, applies_to, description):
         self.name = name
         self.description = description
         self.expansion = expansion

db/populate_tables.py

@@ -1,11 +1,11 @@
 from numpy import genfromtxt
-from os import listdir
+import os
 from db import db
 
 from api.models.factory import get_model
 
 def populate_db():
-    for filename in listdir('../data/'):
+    for filename in os.listdir(os.path.abspath('./data')):
         if not filename.endswith('.csv'):
             continue
 

requirements.txt

@@ -5,4 +5,5 @@ flask_sqlalchemy
 numpy
 python-coveralls
 coverage
-flasgger
+flasgger
+pytest

tests/test_api.py

@@ -17,8 +17,8 @@ def test_create_instances(client):
         instance_strct = get_model("structures", ("AmazingStructure", "expansion", "age",
                                    "{'cost':'null'}", 30, 1000, 5, "3/4", "1-8", None, None, None))
 
-        instance_tech = get_model("technologies", ("GroundbreakingTech", "description", "expansion", "age",
-                                  "develops_in", "{'cost': 'null'}", 30, "Someone"))
+        instance_tech = get_model("technologies", ("GroundbreakingTech", "expansion", "age", "develops_in",
+                                  "{'cost': 'null'}", 30, "Someone", "description"))
 
         assert instance_civ is not None and repr(instance_civ) == "<Civilization: ExampleCiv>"
         assert instance_unit is not None and repr(instance_unit) == "<Unit: SampleUnit>"