@@ -2,6 +2,7 @@ var chai = require('chai'),
22 assert = chai . assert ,
33 SMSAPI = require ( '../lib/smsapi' ) ,
44 config = require ( './config' ) ,
5+ randomString = require ( 'randomstring' ) . generate ,
56 _ = require ( 'lodash' ) ;
67
78var optionsByAuth = {
@@ -17,7 +18,8 @@ var optionsByAuth = {
1718_ . forEach ( optionsByAuth , function ( options , authName ) {
1819
1920 describe ( 'user (' + authName + ')' , function ( ) {
20- var smsapi = new SMSAPI ( options ) ;
21+ var smsapi = new SMSAPI ( options ) ,
22+ userName = ( 'test-' + randomString ( ) ) . substring ( 0 , 10 ) ;
2123
2224 if ( authName === 'AuthenticationSimple' ) {
2325 before ( function ( done ) {
@@ -41,7 +43,7 @@ _.forEach(optionsByAuth, function (options, authName) {
4143 it ( 'should add new subuser' , function ( done ) {
4244 smsapi . user
4345 . add ( )
44- . name ( 'TestSubuser' )
46+ . name ( userName )
4547 . pass ( 'SubuserPassword' )
4648 . execute ( )
4749 . then ( function ( result ) {
@@ -64,7 +66,7 @@ _.forEach(optionsByAuth, function (options, authName) {
6466
6567 it ( 'should get details of the added subuser' , function ( done ) {
6668 smsapi . user
67- . get ( 'TestSubuser' )
69+ . get ( userName )
6870 . execute ( )
6971 . then ( function ( result ) {
7072 assert . property ( result , 'username' ) ;
@@ -74,16 +76,18 @@ _.forEach(optionsByAuth, function (options, authName) {
7476 assert . property ( result , 'phonebook' ) ;
7577 assert . property ( result , 'active' ) ;
7678 assert . property ( result , 'info' ) ;
77- assert . match ( result . username , / T e s t S u b u s e r / ) ;
79+ assert . match ( result . username , new RegExp ( userName , 'g' ) ) ;
7880 done ( ) ;
7981 } )
8082 . catch ( done ) ;
8183 } ) ;
8284
8385 it ( 'should edit added subuser' , function ( done ) {
86+ var infoContent = 'Test' ;
87+
8488 smsapi . user
85- . update ( 'TestSubuser' )
86- . limit ( 100 )
89+ . update ( userName )
90+ . info ( infoContent )
8791 . execute ( )
8892 . then ( function ( result ) {
8993 assert . property ( result , 'username' ) ;
@@ -93,8 +97,8 @@ _.forEach(optionsByAuth, function (options, authName) {
9397 assert . property ( result , 'phonebook' ) ;
9498 assert . property ( result , 'active' ) ;
9599 assert . property ( result , 'info' ) ;
96- assert . match ( result . username , / T e s t S u b u s e r / ) ;
97- assert . equal ( result . limit , 100 ) ;
100+ assert . match ( result . username , new RegExp ( userName , 'g' ) ) ;
101+ assert . equal ( result . info , infoContent ) ;
98102 done ( ) ;
99103 } )
100104 . catch ( done ) ;
0 commit comments