Produced by Araxis Merge on 10/3/2017 11:16:02 AM Central Daylight Time. See www.araxis.com for information about Merge. This report uses XHTML and CSS2, and is best viewed with a modern standards-compliant browser. For optimum results when printing this report, use landscape orientation and enable printing of background images and colours in your browser.
| # | Location | File | Last Modified |
|---|---|---|---|
| 1 | ehmp.zip\ehmp\ehmp\product\production\vx-sync\tests\integrationtests\utils\osync | active-user-cleanup-util-itest-spec.js | Mon Aug 28 20:41:42 2017 UTC |
| 2 | ehmp.zip\ehmp\ehmp\product\production\vx-sync\tests\integrationtests\utils\osync | active-user-cleanup-util-itest-spec.js | Tue Oct 3 12:56:27 2017 UTC |
| Description | Between Files 1 and 2 |
|
|---|---|---|
| Text Blocks | Lines | |
| Unchanged | 3 | 346 |
| Changed | 2 | 8 |
| Inserted | 0 | 0 |
| Removed | 0 | 0 |
| Whitespace | |
|---|---|
| Character case | Differences in character case are significant |
| Line endings | Differences in line endings (CR and LF characters) are ignored |
| CR/LF characters | Not shown in the comparison detail |
No regular expressions were active.
| 1 | 'use stric t'; | |
| 2 | ||
| 3 | require('. ./../../.. /env-setup '); | |
| 4 | ||
| 5 | var _ = re quire('und erscore'); | |
| 6 | var moment = require ('moment') ; | |
| 7 | ||
| 8 | var logger = require (global.VX _DUMMIES + 'dummy-lo gger'); | |
| 9 | // NOTE: b e sure nex t lines ar e commente d out befo re pushing | |
| 10 | // var log Util = req uire(globa l.VX_UTILS + 'log'); | |
| 11 | // logger = logUtil. _createLog ger({ | |
| 12 | // nam e: 'test', | |
| 13 | // lev el: 'debug ', | |
| 14 | // chi ld: logUti l._createL ogger | |
| 15 | // }); | |
| 16 | ||
| 17 | var PjdsCl ient = req uire(globa l.VX_SUBSY STEMS + 'j ds/pjds-cl ient'); | |
| 18 | var JdsCli ent = requ ire(global .VX_SUBSYS TEMS + 'jd s/jds-clie nt'); | |
| 19 | var wConfi g = requir e(global.V X_ROOT + ' worker-con fig'); | |
| 20 | var val = require(gl obal.VX_UT ILS + 'obj ect-utils' ).getPrope rty; | |
| 21 | ||
| 22 | var Active UserCleanu pUtil = re quire(glob al.OSYNC_U TILS + 'ac tive-user- cleanup-ut il'); | |
| 23 | ||
| 24 | describe(' osync-acti ve-user-li st-util-it est-spec.j s', functi on() { | |
| 25 | fu nction set UpUsers(en vironment, pjdsUser, userScree nUser) { | |
| 26 | var pjdsDone = !pjdsUser ; | |
| 27 | var jdsDone = !userScree nUser; | |
| 28 | ||
| 29 | runs (function( ) { | |
| 30 | if (!p jdsDone) { | |
| 31 | environm ent.pjds.a ddActiveUs er(pjdsUse r, functio n(error, r esponse) { | |
| 32 | if (error) { | |
| 33 | ex pect(error ).toBeFals y(); | |
| 34 | } | |
| 35 | ||
| 36 | expect(res ponse.stat usCode).to Be(201); | |
| 37 | pjdsDone = true; | |
| 38 | }); | |
| 39 | } | |
| 40 | ||
| 41 | if (!j dsDone) { | |
| 42 | environm ent.jds.ge tActiveUse rs(functio n(error, r esponse, r esult) { | |
| 43 | if (error) { | |
| 44 | ex pect(error ).toBeFals y(); | |
| 45 | } | |
| 46 | ||
| 47 | expect(res ponse.stat usCode).to Be(200); | |
| 48 | expect(_.i sEmpty(res ult)).toBe Falsy(); | |
| 49 | ||
| 50 | var users = result.u sers || [] ; | |
| 51 | users.push (userScree nUser); | |
| 52 | ||
| 53 | environmen t.jds.save ActiveUser s(users, f unction(er ror, respo nse) { | |
| 54 | if (error) { | |
| 55 | expe ct(error). toBeFalsy( ); | |
| 56 | } | |
| 57 | ||
| 58 | ex pect(respo nse.status Code).toBe (200); | |
| 59 | jd sDone++; | |
| 60 | }); | |
| 61 | }); | |
| 62 | } | |
| 63 | }); | |
| 64 | ||
| 65 | wait sFor(funct ion() { | |
| 66 | return pjdsDone && jdsDone ; | |
| 67 | }, ' set up', 2 0000); | |
| 68 | } | |
| 69 | ||
| 70 | fu nction ver ifyUsersRe moved(envi ronment, p jdsUser, u serScreenU ser){ | |
| 71 | var pjdsDone = !pjdsUser ; | |
| 72 | var jdsDone = !userScree nUser; | |
| 73 | ||
| 74 | runs (function( ) { | |
| 75 | if (!p jdsDone) { | |
| 76 | environm ent.pjds.g etActiveUs ers(functi on(error, response, result) { | |
| 77 | if (error) { | |
| 78 | ex pect(error ).toBeFals y(); | |
| 79 | } | |
| 80 | ||
| 81 | expect(res ponse.stat usCode).to Be(200); | |
| 82 | ||
| 83 | var users = val(resu lt, 'items ') || []; | |
| 84 | var uids = _.pluck(u sers, 'uid '); | |
| 85 | ||
| 86 | expect(uid s).not.toC ontain(pjd sUser.uid) ; | |
| 87 | ||
| 88 | pjdsDone = true; | |
| 89 | }); | |
| 90 | } | |
| 91 | ||
| 92 | if (!j dsDone) { | |
| 93 | environm ent.jds.ge tActiveUse rs(functio n(error, r esponse, r esult) { | |
| 94 | if (error) { | |
| 95 | ex pect(error ).toBeFals y(); | |
| 96 | } | |
| 97 | ||
| 98 | expect(res ponse.stat usCode).to Be(200); | |
| 99 | expect(_.i sEmpty(res ult)).toBe Falsy(); | |
| 100 | ||
| 101 | var users = val(resu lt, 'users ') || []; | |
| 102 | var uids = _.pluck(u sers, 'uid '); | |
| 103 | ||
| 104 | expect(uid s).not.toC ontain(use rScreenUse r.uid); | |
| 105 | ||
| 106 | jdsDone = true; | |
| 107 | }); | |
| 108 | } | |
| 109 | }); | |
| 110 | ||
| 111 | wait sFor(funct ion() { | |
| 112 | return pjdsDone && jdsDone ; | |
| 113 | }, ' verify use rs removed ', 20000); | |
| 114 | } | |
| 115 | ||
| 116 | it ('removeIn activeUser s', functi on() { | |
| 117 | var config = { | |
| 118 | pjds: _.defaults (wConfig.p jds, { | |
| 119 | protocol : 'http', | |
| 120 | host: ' IP ', | |
| 121 | port: PORT | |
| 122 | }), | |
| 123 | jds: _ .defaults( wConfig.jd s, { | |
| 124 | protocol : 'http', | |
| 125 | host: ' IP ', | |
| 126 | port: PORT | |
| 127 | }), | |
| 128 | osync: { | |
| 129 | mixedEnv ironmentMo de: true, | |
| 130 | activeUs erThreshol dDays: 30 | |
| 131 | } | |
| 132 | }; | |
| 133 | ||
| 134 | var pjds = new PjdsClien t(logger, logger, co nfig); | |
| 135 | var jds = new JdsClient( logger, lo gger, conf ig); | |
| 136 | ||
| 137 | var environmen t = { | |
| 138 | jds: j ds, | |
| 139 | pjds: pjds | |
| 140 | }; | |
| 141 | ||
| 142 | var pjdsUser = { | |
| 143 | uid: ' urn:va:use r:ZYXW:45' , | |
| 144 | site: 'ZYXW', | |
| 145 | id: '4 5', | |
| 146 | lastSu ccessfulLo gin: momen t().subtra ct(config. osync.acti veUserThre sholdDays + 1, 'd'). format('YY YYMMDDHHmm ss') | |
| 147 | }; | |
| 148 | ||
| 149 | var userScreen User = { | |
| 150 | duz: { | |
| 151 | 'ZYXW': '46' | |
| 152 | }, | |
| 153 | uid: ' urn:va:use r:ZYXW:46' , | |
| 154 | site: 'ZYXW', | |
| 155 | id: '4 6', | |
| 156 | lastlo gin: momen t().subtra ct(config. osync.acti veUserThre sholdDays + 1, 'd'). format() | |
| 157 | }; | |
| 158 | ||
| 159 | var activeUser CleanupUti l = new Ac tiveUserCl eanupUtil( logger, co nfig, envi ronment); | |
| 160 | ||
| 161 | setU pUsers(env ironment, pjdsUser, userScreen User); | |
| 162 | ||
| 163 | var cleanUpDon e = false; | |
| 164 | runs (function( ) { | |
| 165 | active UserCleanu pUtil.remo veInactive Users(func tion(error ) { | |
| 166 | expect(e rror).toBe Falsy(); | |
| 167 | cleanUpD one = true ; | |
| 168 | }); | |
| 169 | }); | |
| 170 | ||
| 171 | wait sFor(funct ion(){ | |
| 172 | return cleanUpDo ne === tru e; | |
| 173 | }); | |
| 174 | ||
| 175 | veri fyUsersRem oved(envir onment, pj dsUser, us erScreenUs er); | |
| 176 | }) ; | |
| 177 | }); |
Araxis Merge (but not the data content of this report) is Copyright © 1993-2016 Araxis Ltd (www.araxis.com). All rights reserved.