Merge pull request #165 from Backendless/vupirov/push-templates-data

- fix PushWithTemplates API

Author: Valodya

backendless.d.ts

@@ -526,7 +526,7 @@ declare module Backendless {
 
         function getPushTemplates(deviceType: string): Promise<Object>;
 
-        function pushWithTemplate(templateName: string): Promise<Object>;
+        function pushWithTemplate(templateName: string, templateValues?: object): Promise<Object>;
     }
 
     /**

src/messaging/methods/push-with-template.js

@@ -1,16 +1,26 @@
 import Utils from '../../utils'
+import Async from '../../request/async'
 
-export function pushWithTemplate(templateName) {
-  const responder = Utils.extractResponder(arguments)
-  const isAsync = !!responder
+export function pushWithTemplate(templateName, templateValues, asyncHandler) {
+  if (templateValues instanceof Async) {
+    asyncHandler = templateValues
+    templateValues = undefined
+  }
 
   if (!templateName || !Utils.isString(templateName)) {
     throw new Error('Push Template Name must be non empty string!')
   }
 
+  const data = {}
+
+  if (templateValues) {
+    data.templateValues = templateValues
+  }
+
   return this.app.request.post({
-    url         : this.app.urls.messagingPushWithTemplate(templateName),
-    isAsync     : isAsync,
-    asyncHandler: responder
+    url    : this.app.urls.messagingPushWithTemplate(templateName),
+    isAsync: !!asyncHandler,
+    asyncHandler,
+    data
   })
 }

test/e2e/helpers/sandbox.js

@@ -1,3 +1,4 @@
+import Request from 'backendless-request'
 import { createClient } from 'backendless-console-sdk'
 import { TablesAPI } from './tables'
 import { wait } from './promise'
@@ -95,10 +96,50 @@ const waitUntilAppIsConfigured = async app => {
   app.ready = true
 }
 
+let mockRequests = []
+const nativeRequestSend = Request.send
+
+Request.send = function fakeRequestSend(path, method, headers, body, encoding) {
+  const mockRequest = mockRequests.shift()
+
+  if (!mockRequest) {
+    return nativeRequestSend.call(Request, path, method, headers, body, encoding)
+  }
+
+  Object.assign(mockRequest, { path, method, headers, body, encoding })
+
+  try {
+    mockRequest.body = JSON.parse(body)
+  } catch (e) {
+    //
+  }
+
+  const responseFn = mockRequest.responseFn || Promise.resolve()
+
+  return responseFn
+    .then(response => {
+      return Object.assign({ status: 200, body: undefined, headers: {} }, response)
+    })
+}
+
+function prepareMockRequest(responseFn) {
+  const mockRequest = {
+    responseFn
+  }
+
+  mockRequests.push(mockRequest)
+
+  return mockRequest
+}
+
 const createSandboxFor = each => () => {
   const beforeHook = each ? beforeEach : before
   const afterHook = each ? afterEach : after
 
+  beforeEach(() => {
+    mockRequests = []
+  })
+
   beforeHook(function() {
     this.timeout(120000)
     this.consoleApi = createClient(CONSOLE_SERVER)
@@ -130,6 +171,7 @@ const createSandboxFor = each => () => {
 
 export default {
   Backendless,
+  prepareMockRequest,
   forTest : createSandboxFor(true),
   forSuite: createSandboxFor(false)
 }

test/e2e/specs/messaging.js

@@ -29,4 +29,25 @@ describe('Messaging', function() {
     expect(error.message).to.equal('Email Template with name \'nonexistent-template\' doesn\'t exist.')
   })
 
+  describe('Push Templates', function() {
+
+    const templateName = 'MY_PUSH_TEMPLATE'
+
+    it('send push with template', async () => {
+      const req1 = sandbox.prepareMockRequest()
+      const req2 = sandbox.prepareMockRequest()
+
+      await Backendless.Messaging.pushWithTemplate(templateName)
+      await Backendless.Messaging.pushWithTemplate(templateName, { customValue: 'customValue' })
+
+      expect(req1.path).to.equal(`${Backendless.appPath}/messaging/push/${templateName}`)
+      expect(req1.method).to.equal('POST')
+      expect(Object.keys(req1.body)).to.eql([])
+
+      expect(req2.path).to.equal(`${Backendless.appPath}/messaging/push/${templateName}`)
+      expect(req2.method).to.equal('POST')
+      expect(Object.keys(req2.body)).to.eql(['templateValues'])
+      expect(req2.body.templateValues.customValue).to.eql('customValue')
+    })
+  })
 })

test/tsd.ts

@@ -11,7 +11,7 @@ function testMain() {
     const browser: { browser: string, version: string } = Backendless.browser;
 
     Backendless.initApp('APPLICATION_ID', 'JS_SECRET_KEY');
-    Backendless.initApp({ appId: 'APPLICATION_ID', apiKey: 'JS_SECRET_KEY'});
+    Backendless.initApp({appId: 'APPLICATION_ID', apiKey: 'JS_SECRET_KEY'});
 }
 
 function testLocalCache() {
@@ -75,13 +75,13 @@ function testDataQueryBuilderClass() {
     str = dataQuery.getWhereClause();
 
     dataQuery = dataQuery.setProperties('abc');
-    dataQuery = dataQuery.setProperties(['abc','abc','abc']);
+    dataQuery = dataQuery.setProperties(['abc', 'abc', 'abc']);
     dataQuery = dataQuery.addProperty(str);
     dataQuery = dataQuery.addProperties(str, str, str, str);
-    dataQuery = dataQuery.addProperties(['abc','abc','abc'], ['abc','abc','abc'], ['abc','abc','abc']);
-    dataQuery = dataQuery.addProperties(['abc','abc','abc'], str, str);
+    dataQuery = dataQuery.addProperties(['abc', 'abc', 'abc'], ['abc', 'abc', 'abc'], ['abc', 'abc', 'abc']);
+    dataQuery = dataQuery.addProperties(['abc', 'abc', 'abc'], str, str);
     dataQuery = dataQuery.addProperties(str);
-    dataQuery = dataQuery.addProperties(['abc','abc','abc']);
+    dataQuery = dataQuery.addProperties(['abc', 'abc', 'abc']);
 
     strs = dataQuery.getProperties();
 
@@ -790,7 +790,7 @@ function testMessaging() {
     promiseObject = Backendless.Messaging.getPushTemplates('ios');
 
     promiseObject = Backendless.Messaging.pushWithTemplate('templateName');
-
+    promiseObject = Backendless.Messaging.pushWithTemplate('templateName', {foo: 'bar'});
 }
 
 function testFilesService() {