From 640da8412448a3f0d23aa65e7f984200c05585e0 Mon Sep 17 00:00:00 2001
From: Ian Gulliver <ian@isinglasstheater.org>
Date: Sun, 18 May 2014 22:13:48 +0300
Subject: [PATCH] Make message ordering test more comprehensive and fix a
 message ordering bug.

---
 static/cosmopolite.js | 2 +-
 static/test.js        | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/static/cosmopolite.js b/static/cosmopolite.js
index 6b810aa..b9b05cd 100644
--- a/static/cosmopolite.js
+++ b/static/cosmopolite.js
@@ -629,7 +629,7 @@ Cosmopolite.prototype.onMessage_ = function(e) {
   for (var insertAfter = subscription.messages.length - 1;
        insertAfter >= 0; insertAfter--) {
     var message = subscription.messages[insertAfter];
-    if (message['id'] < e['message']['id']) {
+    if (message['id'] < e['id']) {
       break;
     }
   }
diff --git a/static/test.js b/static/test.js
index 1a97d63..88d7771 100644
--- a/static/test.js
+++ b/static/test.js
@@ -332,8 +332,8 @@ asyncTest('Message ordering', function() {
       cosmo.sendMessage(subject, messages.shift(), keys.shift()).then(sendNextMessage);
     } else {
       cosmo.subscribe(subject, 1).then(function() {
-        cosmo.subscribe(subject, 2).then(function() {
-          cosmo.subscribe(subject, 0, null, ['X']).then(function() {
+        cosmo.subscribe(subject, 0, null, ['X']).then(function() {
+          cosmo.subscribe(subject, 2).then(function() {
             var fetched = cosmo.getMessages(subject);
             equal(fetched.length, 3, 'three messages');
             equal(fetched[0]['message'], 'C', 'message 0: C matches');