Skip to content

Commit

Permalink
Some whitespace cleanup in the tests
Browse files Browse the repository at this point in the history
  • Loading branch information
arlolra committed May 5, 2015
1 parent efedac8 commit c96ace9
Showing 1 changed file with 78 additions and 78 deletions.
156 changes: 78 additions & 78 deletions test/spec/unit/otr.js
Original file line number Diff line number Diff line change
Expand Up @@ -637,90 +637,90 @@ describe('OTR', function () {
assert.equal(userB.msgstate, CONST.MSGSTATE_PLAINTEXT)
userA.sendMsg(m)
})

it('should passthrough meta data in plaintext mode', function(done) {
var m1 = 'text message'
var m2 = 'meta data'
var m1 = 'text message'
var m2 = 'meta data'

var userA = new OTR({ priv: keys.userA })
userA.on('io', function (msg, meta) {
assert.equal(msg, m1)
assert.equal(meta, m2)
done()
})
var userA = new OTR({ priv: keys.userA })
userA.on('io', function (msg, meta) {
assert.equal(msg, m1)
assert.equal(meta, m2)
done()
})

userA.sendMsg(m1, m2)
userA.sendMsg(m1, m2)
})

it('should passthrough meta data in encrypted mode', function(done) {
var m1 = 'text message'
var m2 = 'meta data'

var userA = new OTR({ priv: keys.userA })
var userB = new OTR({ priv: keys.userB })
userA.on('io', function (msg, meta) {
if (userA.msgstate === CONST.MSGSTATE_ENCRYPTED){
assert.equal(meta, m2)
done()
}
userB.receiveMsg(msg)
})
userA.on('status', function(state){
if (state === CONST.STATUS_AKE_SUCCESS) {
userA.sendMsg(m1, m2)
}
})
userB.on('io', userA.receiveMsg)

userB.sendQueryMsg()
var m1 = 'text message'
var m2 = 'meta data'

var userA = new OTR({ priv: keys.userA })
var userB = new OTR({ priv: keys.userB })
userA.on('io', function (msg, meta) {
if (userA.msgstate === CONST.MSGSTATE_ENCRYPTED) {
assert.equal(meta, m2)
done()
}
userB.receiveMsg(msg)
})
userA.on('status', function(state) {
if (state === CONST.STATUS_AKE_SUCCESS) {
userA.sendMsg(m1, m2)
}
})
userB.on('io', userA.receiveMsg)

userB.sendQueryMsg()
})

it('should passthrough meta data for stored messages', function(done) {
var m1 = 'text message'
var m2 = 'meta data'
var m1 = 'text message'
var m2 = 'meta data'

var userA = new OTR({ priv: keys.userA })
var userB = new OTR({ priv: keys.userB })
userA.msgstate = CONST.MSGSTATE_FINISHED;
userA.on('io', function (msg, meta) {
if (userA.msgstate === CONST.MSGSTATE_ENCRYPTED){
assert.equal(meta, m2)
done()
}
userB.receiveMsg(msg)
})
userB.on('io', userA.receiveMsg)
var userA = new OTR({ priv: keys.userA })
var userB = new OTR({ priv: keys.userB })
userA.msgstate = CONST.MSGSTATE_FINISHED;
userA.on('io', function (msg, meta) {
if (userA.msgstate === CONST.MSGSTATE_ENCRYPTED) {
assert.equal(meta, m2)
done()
}
userB.receiveMsg(msg)
})
userB.on('io', userA.receiveMsg)

userA.sendMsg(m1, m2)
userB.sendQueryMsg()
userA.sendMsg(m1, m2)
userB.sendQueryMsg()
})

it('should passthrough meta data for fragmented messages', function(done) {
var m1 = 'Lalalala alal allaallal alal al alalal alalaaall lal lal la lal ala al ala l al a al al al alalalalal alalal a lal la aal ala lalala l lala lal lala lal la l alal lalaall la lal la'
var m2 = 'meta data'
var m1 = 'Lalalala alal allaallal alal al alalal alalaaall lal lal la lal ala al ala l al a al al al alalalalal alalal a lal la aal ala lalala l lala lal lala lal la l alal lalaall la lal la'
var m2 = 'meta data'

var userA = new OTR({
priv: keys.userA
, fragment_size: 200
, send_interval: 40
})
var userB = new OTR({ priv: keys.userB, send_interval: 20 })
userA.on('io', function (msg, meta) {
if (userA.msgstate === CONST.MSGSTATE_ENCRYPTED){
assert.equal(meta, m2)
if (msg.replace(/^\?OTR[^,]+,(\d),(\d)/, '$1') == msg.replace(/^\?OTR[^,]+,(\d),(\d)/, '$2'))
done()
}
userB.receiveMsg(msg)
})
userA.on('status', function(state){
if (state === CONST.STATUS_AKE_SUCCESS) {
userA.sendMsg(m1, m2)
}
})
userB.on('io', userA.receiveMsg)
userB.sendQueryMsg()
var userA = new OTR({
priv: keys.userA
, fragment_size: 200
, send_interval: 40
})
var userB = new OTR({ priv: keys.userB, send_interval: 20 })
userA.on('io', function (msg, meta) {
if (userA.msgstate === CONST.MSGSTATE_ENCRYPTED) {
assert.equal(meta, m2)
if (msg.replace(/^\?OTR[^,]+,(\d),(\d)/, '$1') == msg.replace(/^\?OTR[^,]+,(\d),(\d)/, '$2'))
done()
}
userB.receiveMsg(msg)
})
userA.on('status', function(state) {
if (state === CONST.STATUS_AKE_SUCCESS) {
userA.sendMsg(m1, m2)
}
})
userB.on('io', userA.receiveMsg)

userB.sendQueryMsg()
})

it('should check for DH pubkey equality before skipping key replacement', function (done) {
Expand Down Expand Up @@ -772,17 +772,17 @@ describe('OTR', function () {
})

it('should passthrough meta data for received message', function (done) {
var m1 = 'text message'
var m2 = 'meta data'
var m1 = 'text message'
var m2 = 'meta data'

var userA = new OTR({ priv: keys.userA })
userA.on('ui', function (msg, encrypted, meta) {
assert.equal(msg, m1)
assert.equal(meta, m2)
done()
})
var userA = new OTR({ priv: keys.userA })
userA.on('ui', function (msg, encrypted, meta) {
assert.equal(msg, m1)
assert.equal(meta, m2)
done()
})

userA.receiveMsg(m1, m2)
userA.receiveMsg(m1, m2)
})

})

0 comments on commit c96ace9

Please sign in to comment.