running same mocha tests on browser and node

Author: Devendra

node.js/Makefile

@@ -12,6 +12,7 @@ build: $(PUBNUB_JS)
 $(PUBNUB_JS): $(PUBNUB_COMMON_JS) $(PUBNUB_NODE_JS)
 	$(ECHO) "// Version: $(VERSION)" > $(PUBNUB_JS)
 	cat $(PUBNUB_COMMON_JS) $(PUBNUB_PLATFORM_JS) >> $(PUBNUB_JS)
+	cat tests/tests-include.js tests/test.js > tests/tests.js
 	sed -i -e "s/VERSION/\'$(VERSION)\'/g" $(PUBNUB_JS)
 	sed -i -e "s/PLATFORM/\'$(PLATFORM)\'/g" $(PUBNUB_JS)
 
@@ -21,6 +22,6 @@ clean:
 
 .PHONY: test
 test:
-	mocha -R spec tests/test.js
+	mocha -R spec tests/tests.js
 
 include ../Makefile.post

node.js/tests/test.js

@@ -1,7 +1,3 @@
-var assert = require('assert');
-var PUBNUB = require('../pubnub.js');
-var _ = require("underscore");
-
 var pubnub = PUBNUB.init({
     publish_key     : 'ds',
     subscribe_key   : 'ds',
@@ -2245,17 +2241,19 @@ describe('Pubnub', function() {
                                 assert.deepEqual(channels.split(','), r.channels);
                                 pubnub.channel_group_remove_channel({
                                     callback : function(r) {
-                                        pubnub.channel_group_list_channels({
-                                            channel_group : channel_group,
-                                            callback : function(r) {
-                                                assert.deepEqual([], r.channels);
-                                                done();
-                                            },
-                                            error    : function(r) {
-                                                assert.ok(false, "Error occurred in getting group " + JSON.stringify(r));
-                                                done();
-                                            } 
-                                        });
+                                        setTimeout(function(){
+                                            pubnub.channel_group_list_channels({
+                                                channel_group : channel_group,
+                                                callback : function(r) {
+                                                    assert.deepEqual([], r.channels);
+                                                    done();
+                                                },
+                                                error    : function(r) {
+                                                    assert.ok(false, "Error occurred in getting group " + JSON.stringify(r));
+                                                    done();
+                                                } 
+                                            });
+                                        }, 5000);
                                     },
                                     error    : function(r) {
                                         assert.ok(false, "Error occurred in adding channel to group " + JSON.stringify(r));
@@ -2296,17 +2294,19 @@ describe('Pubnub', function() {
                                 assert.deepEqual(channels.split(','), r.channels);
                                 pubnub.channel_group_remove_channel({
                                     callback : function(r) {
-                                        pubnub.channel_group_list_channels({
-                                            channel_group : channel_group,
-                                            callback : function(r) {
-                                                assert.deepEqual([], r.channels);
-                                                done();
-                                            },
-                                            error    : function(r) {
-                                                assert.ok(false, "Error occurred in getting group " + JSON.stringify(r));
-                                                done();
-                                            } 
-                                        });
+                                        setTimeout(function(){
+                                            pubnub.channel_group_list_channels({
+                                                channel_group : channel_group,
+                                                callback : function(r) {
+                                                    assert.deepEqual([], r.channels);
+                                                    done();
+                                                },
+                                                error    : function(r) {
+                                                    assert.ok(false, "Error occurred in getting group " + JSON.stringify(r));
+                                                    done();
+                                                } 
+                                            });
+                                        }, 5000);
                                     },
                                     error    : function(r) {
                                         assert.ok(false, "Error occurred in adding channel to group " + JSON.stringify(r));
@@ -2449,16 +2449,18 @@ describe('Pubnub', function() {
                                 pubnub.channel_group_remove_namespace({
                                     namespace : namespace,
                                     callback : function(r) {
-                                        pubnub.channel_group_list_namespaces({
-                                            callback : function(r) {
-                                                assert.ok(!in_list_deep(r.namespaces, namespace), "namespace not deleted");
-                                                done();
-                                            },
-                                            error    : function(r) {
-                                                assert.ok(false, "Error occurred in getting all registry " + JSON.stringify(r));
-                                                done();
-                                            } 
-                                        });
+                                        setTimeout(function(){
+                                            pubnub.channel_group_list_namespaces({
+                                                callback : function(r) {
+                                                    assert.ok(!in_list_deep(r.namespaces, namespace), "namespace not deleted");
+                                                    done();
+                                                },
+                                                error    : function(r) {
+                                                    assert.ok(false, "Error occurred in getting all registry " + JSON.stringify(r));
+                                                    done();
+                                                } 
+                                            });
+                                        }, 5000);
                                     },
                                     error    : function(r) {
                                         assert.ok(false, "Error occurred in getting all registry " + JSON.stringify(r));

node.js/tests/tests-include.js

@@ -0,0 +1,4 @@
+
+var assert = require('assert');
+var PUBNUB = require('../pubnub.js');
+var _ = require("underscore");