From e6dbb6ffb1aeb5731a038069fa3a83ed19d3791d Mon Sep 17 00:00:00 2001
From: JC Brand <jc@opkode.com>
Date: Mon, 31 Aug 2015 08:50:34 +0200
Subject: [PATCH] update changelog for next release.

Remove superfluous whitespace.
---
 CHANGELOG.md          |  7 +++++--
 release_checklist.txt |  2 +-
 tests/tests.js        | 22 ----------------------
 3 files changed, 6 insertions(+), 25 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2f2991de..5b2c7d91 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,7 +1,10 @@
 # Strophe.js Change Log
 
-## Version 1.2.3 - Unreleased
-* #127 IE-Fix: error on setting null value with setAttributet
+## Version 1.2.3 - 2015-09-01
+* Bugfix. Check if JID is null when restoring a session.
+* #127 IE-Fix: error on setting null value with setAttributes
+* #138 New stub method nextValidRid
+* #144 Change ID generator to generate UUIDs
 
 ## Version 1.2.2 - 2015-06-20
 * #109 Explicitly define AMD modules to prevent errors with AlmondJS and AngularJS.
diff --git a/release_checklist.txt b/release_checklist.txt
index 77eb9da7..d48a1e99 100644
--- a/release_checklist.txt
+++ b/release_checklist.txt
@@ -1,7 +1,7 @@
 # -*- mode: org -*-
 
 * Release Checklist
-*** Make sure all tests pass (run 'make check' or 'Grunt qunit')
+*** Make sure all tests pass (run 'make check')
 *** Decide on version number
 *** Update CHANGELOG.txt
 *** Check for correct version number in package.json and bower,json
diff --git a/tests/tests.js b/tests/tests.js
index 9c5a36c2..564f2e17 100644
--- a/tests/tests.js
+++ b/tests/tests.js
@@ -595,10 +595,8 @@ define([
             Strophe.Connection.prototype.nextValidRid = function (rid) {
                equal(rid, 43, "RID is valid");
             };
-
             var conn = new Strophe.Connection("http://fake");
             var spy = sinon.spy(conn, 'nextValidRid');
-
             var req = {id: 43,
                   sends: 1,
                   xhr: {
@@ -607,20 +605,15 @@ define([
                   },
                   rid: 42
             };
-
             conn._requests = [req];
-
             conn._proto._onRequestStateChange(function(){}, req);
-
             equal(spy.calledOnce, true, "nextValidRid was called only once");
          });
 
          test("nextValidRid is not called after failed request", function () {
             Strophe.Connection.prototype._onIdle = function () {};
-
             var conn = new Strophe.Connection("http://fake");
             var spy = sinon.spy(conn, 'nextValidRid');
-
             var req = {id: 43,
                   sends: 1,
                   xhr: {
@@ -629,11 +622,8 @@ define([
                   },
                   rid: 42
             };
-
             conn._requests = [req];
-
             conn._proto._onRequestStateChange(function(){}, req);
-
             equal(spy.called, false, "nextValidRid was not called");
          });
 
@@ -641,15 +631,12 @@ define([
             sinon.stub(Math, "random", function(){
                return 1;
             });
-
             Strophe.Connection.prototype._onIdle = function () {};
             Strophe.Connection.prototype.nextValidRid = function (rid) {
                equal(rid, 4294967295, "RID is valid");
             };
-
             var conn = new Strophe.Connection("http://fake");
             var spy = sinon.spy(conn, 'nextValidRid');
-
             var req = {id: 43,
                   sends: 1,
                   xhr: {
@@ -658,13 +645,9 @@ define([
                   },
                   rid: 42
             };
-
             conn._requests = [req];
-
             conn._proto._onRequestStateChange(function(){}, req);
-
             equal(spy.calledOnce, true, "nextValidRid was called only once");
-
             Math.random.restore();
          });
 
@@ -672,19 +655,14 @@ define([
             sinon.stub(Math, "random", function(){
                return 1;
             });
-
             Strophe.Connection.prototype._onIdle = function () {};
             Strophe.Connection.prototype.nextValidRid = function (rid) {
                equal(rid, 4294967295, "RID is valid");
             };
-
             var conn = new Strophe.Connection("http://fake");
             var spy = sinon.spy(conn, 'nextValidRid');
-
             conn.reset();
-
             equal(spy.calledOnce, true, "nextValidRid was called only once");
-
             Math.random.restore();
          });
    };