Make init_for call implicit.

.travis.yml

@@ -12,8 +12,8 @@ install:
   - pip install -r test_requirements.txt
   - pip install -r requirements.txt
 script:
-  - nosetests -v tests
-  - nohup python runtestserver.py &
+  - FLASK_ENV=testing nosetests -v tests
+  - FLASK_ENV=testing nohup python runtestserver.py &
   - sleep 10
 addons:
   postgresql: "9.4"

outreach/__init__.py

@@ -48,19 +48,18 @@ def init_flask_admin():
 
 
 # Configure the app
-def init_for(env):
-    coaster.app.init_app(app, env)
-    db.init_app(app)
-    db.app = app
+coaster.app.init_app(app)
+db.init_app(app)
+db.app = app
 
-    RQ(app)
+RQ(app)
 
-    lastuser.init_app(app)
-    lastuser.init_usermanager(UserManager(db, User))
-    app.config['tz'] = timezone(app.config['TIMEZONE'])
-    baseframe.init_app(app, requires=['outreach'], ext_requires=['baseframe-bs3', 'fontawesome>=4.0.0', 'ractive', 'ractive-transitions-fly', 'validate', 'nprogress', 'baseframe-footable'])
+lastuser.init_app(app)
+lastuser.init_usermanager(UserManager(db, User))
+app.config['tz'] = timezone(app.config['TIMEZONE'])
+baseframe.init_app(app, requires=['outreach'], ext_requires=['baseframe-bs3', 'fontawesome>=4.0.0', 'ractive', 'ractive-transitions-fly', 'validate', 'nprogress', 'baseframe-footable'])
 
-    mail.init_app(app)
-    wtforms_json.init()
+mail.init_app(app)
+wtforms_json.init()
 
-    init_flask_admin()
+init_flask_admin()

rq.sh

@@ -1,3 +1,3 @@
 #!/bin/bash
 
-rqworker -c rqdev outreach 
+rqworker -c rqinit outreach 

rqinit.py

@@ -1,8 +1,7 @@
 from urlparse import urlparse
 
-from outreach import init_for, app
+from outreach import app
 
-init_for('prod')
 REDIS_URL = app.config.get('REDIS_URL', 'redis://localhost:6379/0')
 
 # REDIS_URL is not taken by setup_default_arguments function of rq/scripts/__init__.py

runserver.py

@@ -1,5 +1,4 @@
 #!/usr/bin/env python
-from outreach import app, init_for
+from outreach import app
 from outreach.models import *
-init_for('dev')
 app.run('0.0.0.0', debug=True, port=4000)

runtests.sh

@@ -0,0 +1,3 @@
+#!/bin/sh
+export FLASK_ENV="TESTING"
+coverage run `nosetests -v tests`

tests/test_kharcha.py

@@ -1,7 +1,7 @@
 import json
 import unittest
 from flask import url_for
-from outreach import app, init_for
+from outreach import app
 from outreach.models import (db, SaleItem)
 from fixtures import init_data
 
@@ -11,7 +11,6 @@ class TestKharchaAPI(unittest.TestCase):
     def setUp(self):
         self.ctx = app.test_request_context()
         self.ctx.push()
-        init_for('test')
         db.drop_all()
         db.create_all()
         init_data()

tests/test_order.py

@@ -1,6 +1,6 @@
 import unittest
 import json
-from outreach import app, init_for
+from outreach import app
 from outreach.models import *
 from fixtures import init_data
 
@@ -10,7 +10,6 @@ class TestOrder(unittest.TestCase):
     def setUp(self):
         self.ctx = app.test_request_context()
         self.ctx.push()
-        init_for('test')
         db.create_all()
         init_data()
         self.client = app.test_client()

website.wsgi

@@ -1,5 +1,4 @@
 import sys
 import os.path
 sys.path.insert(0, os.path.dirname(__file__))
-from outreach import app as application, init_for
-init_for('production')
+from outreach import app as application