update changelog for next release.

Remove superfluous whitespace.
strophe · Aug 31, 2015 · e6dbb6f · e6dbb6f
1 parent ec29f5d
commit e6dbb6f
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 25 deletions.
diff --git 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
@@ -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
@@ -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,27 +622,21 @@ define([
                   },
                   rid: 42
             };
-
             conn._requests = [req];
-
             conn._proto._onRequestStateChange(function(){}, req);
-
             equal(spy.called, false, "nextValidRid was not called");
          });
 
          test("nextValidRid is called after failed request with disconnection", function () {
             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,33 +645,24 @@ define([
                   },
                   rid: 42
             };
-
             conn._requests = [req];
-
             conn._proto._onRequestStateChange(function(){}, req);
-
             equal(spy.calledOnce, true, "nextValidRid was called only once");
-
             Math.random.restore();
          });
 
          test("nextValidRid is called after connection reset", function () {
             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();
          });
    };