Fix test_gcm_send

Pushjet · Aug 26, 2016 · 4256f60 · 4256f60
1 parent 2173347
commit 4256f60
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/controllers/message.py b/controllers/message.py
@@ -1,4 +1,6 @@
 from flask import Blueprint, jsonify, request
+from flask import current_app
+
 from utils import Error, has_uuid, has_secret, queue_zmq_message
 from shared import db
 from models import Subscription, Message, Gcm
@@ -30,7 +32,7 @@ def message_send(service):
     db.session.add(msg)
     db.session.commit()
 
-    if google_api_key:
+    if google_api_key or current_app.config['TESTING']:
         Gcm.send_message(msg)
 
     if zeromq_relay_uri:

diff --git a/models/gcm.py b/models/gcm.py
@@ -62,6 +62,6 @@ def gcm_send(ids, data):
         data = dict(registration_ids=ids, data=data)
 
         if current_app.config['TESTING'] is True:
-            current_app.config['TESTING_GCM'](data)
+            current_app.config['TESTING_GCM'].append(data)
         else:
             requests.post(url, json=data, headers=headers)
diff --git a/tests.py b/tests.py
@@ -20,12 +20,13 @@ class PushjetTestCase(unittest.TestCase):
     def setUp(self):
         config.google_api_key = config.google_api_key or 'PLACEHOLDER'
         self.uuid = str(uuid4())
-        self.gcm = []
 
         app.config['TESTING'] = True
-        app.config['TESTING_GCM'] = lambda x: self.gcm.append(x)
+        app.config['TESTING_GCM'] = []
 
+        self.gcm = app.config['TESTING_GCM']
         self.app = app.test_client()
+        self.app_real = app
 
     def _random_str(self, length=10, unicode=True):
         # A random string with the "cupcake" in Japanese appended to it
@@ -207,7 +208,7 @@ def test_gcm_register_double(self):
         self.test_gcm_register()
         self.test_gcm_register()
 
-    def test_gmc_send(self):
+    def test_gcm_send(self):
         reg_id = self.test_gcm_register()
         public, secret, data = self.test_message_send()