Skip to content

Commit ff1170d

Browse files
pdziewapdziewa
committed
Test fix
1 parent 6a74cf7 commit ff1170d

File tree

4 files changed

+64
-29
lines changed

4 files changed

+64
-29
lines changed

‎lib/template.js

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ Template.prototype.add = function () {
2626
};
2727

2828
/**
29-
* add new template
29+
* update template
3030
* @param {String} templateId
3131
* @return {TemplateUpdate}
3232
*/
@@ -35,7 +35,7 @@ Template.prototype.update = function (templateId) {
3535
};
3636

3737
/**
38-
* delete existing sender
38+
* get template for specific id
3939
* @param {String} templateId
4040
* @return {TemplateUpdate}
4141
*/
@@ -44,12 +44,12 @@ Template.prototype.get = function (templateId) {
4444
};
4545

4646
/**
47-
* delete existing sender
48-
* @param {String} name
47+
* delete template
48+
* @param {String} templateId
4949
* @return {TemplateDelete}
5050
*/
51-
Template.prototype.delete = function (name) {
52-
return this.createAction(TemplateDelete, name);
51+
Template.prototype.delete = function (templateId) {
52+
return this.createAction(TemplateDelete, templateId);
5353
};
5454

5555
/**

‎test/contacts.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ var RSVP = require('rsvp');
88

99
var optionsByAuth = {
1010
AuthenticationSimple: {
11-
server: config.serverContacts
11+
server: config.server
1212
},
1313
AuthenticationOAuth: {
14-
server: config.serverContacts,
14+
server: config.server,
1515
oauth: config.oauth
1616
}
1717
};

‎test/login-oauth.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,10 @@ var assert = chai.assert;
33
var SMSAPI = require('../index');
44
var config = require('./config');
55

6-
var options = {oauth: config.oauth};
6+
var options = {
7+
oauth: config.oauth,
8+
server: config.server,
9+
};
710

811
describe('authentication-oauth', function () {
912
it('should login', function (done) {

‎test/template.js

Lines changed: 52 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,6 @@ _.forEach(optionsByAuth, function (options, authName) {
1919

2020
describe('template (' + authName + ')', function () {
2121
var smsapi = new SMSAPI(options);
22-
var template = {
23-
name: ('test-' + randomString()).substring(0, 10),
24-
template: ('template-' + randomString()).substring(0, 20),
25-
};
2622

2723
if (authName === 'AuthenticationSimple') {
2824
before(function (done) {
@@ -35,7 +31,7 @@ _.forEach(optionsByAuth, function (options, authName) {
3531
it('should get template list', function (done) {
3632
var createdTemplate;
3733

38-
createTemplate(smsapi, template)
34+
createTemplate(smsapi, generateTemplateData())
3935
.then(function (result) {
4036
createdTemplate = result;
4137

@@ -48,16 +44,17 @@ _.forEach(optionsByAuth, function (options, authName) {
4844
assert.isArray(result['collection']);
4945
})
5046
.then(function () {
51-
return deleteTemplate(smsapi, createdTemplate.id);
47+
deleteTemplate(smsapi, createdTemplate.id);
48+
49+
done();
5250
})
53-
.then(done.bind(null, null))
5451
.catch(done);
5552
});
5653

5754
it('should get single template', function (done) {
5855
var createdTemplate;
5956

60-
createTemplate(smsapi, template)
57+
createTemplate(smsapi, generateTemplateData())
6158
.then(function (result) {
6259
createdTemplate = result;
6360

@@ -69,15 +66,18 @@ _.forEach(optionsByAuth, function (options, authName) {
6966
assert.deepEqual(result, createdTemplate);
7067
})
7168
.then(function () {
72-
return deleteTemplate(smsapi, createdTemplate.id);
69+
deleteTemplate(smsapi, createdTemplate.id);
70+
71+
done();
7372
})
74-
.then(done.bind(null, null))
7573
.catch(done);
7674
});
7775

7876
it('should add new template', function (done) {
7977
var createdTemplate;
8078

79+
var template = generateTemplateData();
80+
8181
smsapi.template
8282
.add()
8383
.name(template.name)
@@ -98,16 +98,17 @@ _.forEach(optionsByAuth, function (options, authName) {
9898
assert.deepEqual(result, createdTemplate);
9999
})
100100
.then(function () {
101-
return deleteTemplate(smsapi, createdTemplate.id);
101+
deleteTemplate(smsapi, createdTemplate.id);
102+
103+
done();
102104
})
103-
.then(done.bind(null, null))
104105
.catch(done);
105106
});
106107

107108
it('should update template', function (done) {
108109
var createdTemplate;
109110

110-
createTemplate(smsapi, template)
111+
createTemplate(smsapi, generateTemplateData())
111112
.then(function (result) {
112113
createdTemplate = result;
113114
createdTemplate['name'] = 'updated-' + result['name'];
@@ -132,34 +133,54 @@ _.forEach(optionsByAuth, function (options, authName) {
132133
assert.deepEqual(result, createdTemplate);
133134
})
134135
.then(function () {
135-
return deleteTemplate(smsapi, createdTemplate.id);
136+
deleteTemplate(smsapi, createdTemplate.id);
137+
138+
done();
136139
})
137-
.then(done.bind(null, null))
138140
.catch(done);
139141
});
140142

141143
it('should delete template', function (done) {
142144
var createdTemplate;
143145

144-
createTemplate(smsapi, template)
146+
createTemplate(smsapi, generateTemplateData())
145147
.then(function (result) {
146148
createdTemplate = result;
147149

148-
return smsapi.template
150+
smsapi.template
149151
.delete(result.id)
150152
.execute();
151153
})
152154
.then(function () {
153-
getTemplate(smsapi, createdTemplate.id)
154-
.then(done) // will fail if template has been found
155-
.catch(done.bind(null, null));
155+
getTemplatesList(smsapi)
156+
.then(function (result) {
157+
if (result.size > 0) {
158+
assert.isFalse(result.collection.some(function (template) {
159+
return template.id === createdTemplate.id;
160+
}));
161+
}
162+
163+
done();
164+
})
165+
.catch(done)
156166
})
157167
.catch(done);
158168
});
159169
});
160170

161171
});
162172

173+
/**
174+
*
175+
* @param {SMSAPI} smsapi
176+
* @returns {Promise<Object>}
177+
*/
178+
function getTemplatesList(smsapi) {
179+
return smsapi.template
180+
.list()
181+
.execute();
182+
}
183+
163184
/**
164185
*
165186
* @param {SMSAPI} smsapi
@@ -199,3 +220,14 @@ function deleteTemplate(smsapi, templateId) {
199220
.delete(templateId)
200221
.execute();
201222
}
223+
224+
/**
225+
*
226+
* @returns {Object}
227+
*/
228+
function generateTemplateData() {
229+
return {
230+
name: ('test-' + randomString()).substring(0, 10),
231+
template: ('template-' + randomString()).substring(0, 20),
232+
};
233+
}

0 commit comments

Comments
 (0)