jjkiers/cloudron-box
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Fix j2xml usage

Browse Source
This commit is contained in:
Girish Ramakrishnan
2017-11-13 11:10:42 -08:00
parent e65230b833
commit 527eace8f8
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/routes/test/apps-test.js
View File

@@ -22,7 +22,7 @@ var appdb = require('../../appdb.js'),
hock = require('hock'), hock = require('hock'),
http = require('http'), http = require('http'),
https = require('https'), https = require('https'),
js2xml = require('js2xmlparser'), js2xml = require('js2xmlparser').parse,
ldap = require('../../ldap.js'), ldap = require('../../ldap.js'),
net = require('net'), net = require('net'),
nock = require('nock'), nock = require('nock'),
@@ -648,7 +648,7 @@ describe('App installation', function () {
awsHockInstance awsHockInstance
.get('/2013-04-01/hostedzone') .get('/2013-04-01/hostedzone')
.max(Infinity) .max(Infinity)
.reply(200, js2xml('ListHostedZonesResponse', awsHostedZones, { arrayMap: { HostedZones: 'HostedZone'} }), { 'Content-Type': 'application/xml' }) .reply(200, js2xml('ListHostedZonesResponse', awsHostedZones, { wrapHandlers: { HostedZones: () => 'HostedZone'} }), { 'Content-Type': 'application/xml' })
.filteringPathRegEx(/name=[^&]*/, 'name=location') .filteringPathRegEx(/name=[^&]*/, 'name=location')
.get('/2013-04-01/hostedzone/ZONEID/rrset?maxitems=1&name=location&type=A') .get('/2013-04-01/hostedzone/ZONEID/rrset?maxitems=1&name=location&type=A')
.max(Infinity) .max(Infinity)

6
src/test/apptask-test.js
View File

@@ -13,7 +13,7 @@ var addons = require('../addons.js'),
database = require('../database.js'), database = require('../database.js'),
expect = require('expect.js'), expect = require('expect.js'),
fs = require('fs'), fs = require('fs'),
js2xml = require('js2xmlparser'), js2xml = require('js2xmlparser').parse,
net = require('net'), net = require('net'),
nock = require('nock'), nock = require('nock'),
paths = require('../paths.js'), paths = require('../paths.js'),
@@ -224,7 +224,7 @@ describe('apptask', function () {
var awsScope = nock('http://localhost:5353') var awsScope = nock('http://localhost:5353')
.get('/2013-04-01/hostedzone') .get('/2013-04-01/hostedzone')
.times(2) .times(2)
.reply(200, js2xml('ListHostedZonesResponse', awsHostedZones, { arrayMap: { HostedZones: 'HostedZone'} })) .reply(200, js2xml('ListHostedZonesResponse', awsHostedZones, { wrapHandlers: { HostedZones: () => 'HostedZone'} }))
.get('/2013-04-01/hostedzone/ZONEID/rrset?maxitems=1&name=applocation.' + config.fqdn() + '.&type=A') .get('/2013-04-01/hostedzone/ZONEID/rrset?maxitems=1&name=applocation.' + config.fqdn() + '.&type=A')
.reply(200, js2xml('ListResourceRecordSetsResponse', { ResourceRecordSets: [ ] }, { 'Content-Type': 'application/xml' })) .reply(200, js2xml('ListResourceRecordSetsResponse', { ResourceRecordSets: [ ] }, { 'Content-Type': 'application/xml' }))
.post('/2013-04-01/hostedzone/ZONEID/rrset/') .post('/2013-04-01/hostedzone/ZONEID/rrset/')
@@ -242,7 +242,7 @@ describe('apptask', function () {
var awsScope = nock('http://localhost:5353') var awsScope = nock('http://localhost:5353')
.get('/2013-04-01/hostedzone') .get('/2013-04-01/hostedzone')
.reply(200, js2xml('ListHostedZonesResponse', awsHostedZones, { arrayMap: { HostedZones: 'HostedZone'} })) .reply(200, js2xml('ListHostedZonesResponse', awsHostedZones, { wrapHandlers: { HostedZones: () => 'HostedZone'} }))
.post('/2013-04-01/hostedzone/ZONEID/rrset/') .post('/2013-04-01/hostedzone/ZONEID/rrset/')
.reply(200, js2xml('ChangeResourceRecordSetsResponse', { ChangeInfo: { Id: 'RRID', Status: 'INSYNC' } })); .reply(200, js2xml('ChangeResourceRecordSetsResponse', { ChangeInfo: { Id: 'RRID', Status: 'INSYNC' } }));