Merge branch 'master' into move-sms-notifications-into-celery

Conflicts:
	app/__init__.py
	tests/conftest.py

tests/app/job/test_job_rest.py

@@ -114,7 +114,7 @@ def test_create_job(notify_api, notify_db, notify_db_session, sample_template):
     assert resp_json['data']['original_file_name'] == original_file_name
 
     boto3.setup_default_session(region_name='eu-west-1')
-    q = boto3.resource('sqs').get_queue_by_name(QueueName='notify-jobs-queue')
+    q = boto3.resource('sqs').get_queue_by_name(QueueName=notify_api.config['NOTIFY_JOB_QUEUE'])
     messages = q.receive_messages()
     assert len(messages) == 1
 

tests/conftest.py

@@ -1,20 +1,20 @@
-import pytest
-import mock
 import os
+
 import boto3
-from config import configs
+import mock
+import pytest
 from alembic.command import upgrade
 from alembic.config import Config
 from flask.ext.migrate import Migrate, MigrateCommand
 from flask.ext.script import Manager
 from sqlalchemy.schema import MetaData
+
 from app import create_app, db
-from app import models
 
 
 @pytest.fixture(scope='session')
 def notify_api(request):
-    app = create_app('test')
+    app = create_app()
     ctx = app.app_context()
     ctx.push()