[minor] minor adjustments to pull request 3rd-Eden#65 and started on travis-ci integration

Author: 3rd-Eden

.travis.yml

@@ -0,0 +1,16 @@
+# ensure that we only run ci test on the Node.js enabled servers
+language: node_js
+node_js:
+  - 0.8
+
+# create a travis enabled environment for the test suite to run in
+script: "make travisci"
+services: memcache
+
+# the `sevices: memcache` will start a memcached service on localhost
+# and on the default port, but in order to test against multiple memcache
+# instances we need to spawn a couple more, so we do that during the before
+# script
+before_script:
+  - memcached -p 11212 -h 127.0.0.1 -d
+  - memcached -p 11213 -h 127.0.0.1 -d

Makefile

@@ -1,15 +1,10 @@
-ALL_TESTS = $(shell find tests -name '*.test.js')
-REPORTER = spec
-UI = bdd
+ALL_TESTS = $(shell find test -name '*.test.js')
 
 test:
-	@./node_modules/.bin/mocha \
-		--require should \
-		--reporter $(REPORTER) \
-		--ui $(UI) \
-		--growl \
-		$(ALL_TESTS)
+	@./node_modules/.bin/mocha $(ALL_TESTS)
 
+travis:
+	MEMCACHED__HOST=localhost $(MAKE) test
 doc:
 	dox --title "node-memcached" lib/* > doc/index.html
 

package.json

@@ -42,6 +42,6 @@
       , "should": "*"
     }
   , "scripts": {
-      "test": "./node_modules/.bin/mocha tests/"
+      "test": "./node_modules/.bin/mocha $(shell find test -name '*.test.js')"
     }
 }

tests/common.js renamed to test/common.js

@@ -1,27 +1,28 @@
-
-/**
- * Make should available in all test cases.
- */
-var should = require('should');
+'use strict';
 
 /**
  * Server ip addresses that get used during the tests
  * NOTE! Make sure you configure empty servers as they
  * will get flushed!.
- * 
+ *
  * If your memcache hosts is not the default one
  * (10.211.55.5), you can pass another one using the
  * environment variable MEMCACHED__HOST. E.g.:
- * 
+ *
  * MEMCACHED__HOST=localhost npm test
  *
  * @type {Object}
  * @api public
  */
-var testMemcachedHost = process.env['MEMCACHED__HOST'] || '10.211.55.5';
+var testMemcachedHost = process.env.MEMCACHED__HOST || '10.211.55.5';
+
 exports.servers = {
-  single: testMemcachedHost + ':11211'
-, multi: [testMemcachedHost + ':11211', testMemcachedHost + ':11212', testMemcachedHost + ':11213']
+    single: testMemcachedHost + ':11211'
+  , multi: [
+      testMemcachedHost + ':11211'
+    , testMemcachedHost + ':11212'
+    , testMemcachedHost + ':11213'
+  ]
 };
 
 /**
@@ -31,15 +32,22 @@ exports.servers = {
  * @returns {String} a random generated string
  * @api public
  */
-exports.alphabet = function(n){
+exports.alphabet = function alphabet(n){
   for (var a = '', i = 0; i < n; i++) {
     a += String.fromCharCode(97 + Math.floor(Math.random() * 26));
   }
 
   return a;
 };
 
-exports.numbers = function(n){
+/**
+ * Generate a bunch of random numbers
+ *
+ * @param {Number} n the amount of numbers
+ * @returns {Number}
+ * @api public
+ */
+exports.numbers = function numbers(n){
   for (var a = 0, i = 0; i < n; i++) {
     a += Math.floor(Math.random() * 26);
   }