added more tests and dependencies for testing

.gitignore

@@ -3,3 +3,5 @@ dist*
 umd*
 node_modules/*
 api/*
+coverage/*
+.coveralls.yml

.travis.yml

@@ -21,7 +21,7 @@ install:
 before_script:
   - npm run build
 
-script: npm run test
+script: npm run test:coverage
 
 #~ after_script:
   #~ - npm run coverage:travis

README.md

@@ -1,4 +1,4 @@
-
+[![Build Status](https://travis-ci.org/PommeVerte/gremlin-console-js.svg?branch=master)](https://travis-ci.org/PommeVerte/gremlin-console-js) [![Coverage Status](https://coveralls.io/repos/github/PommeVerte/gremlin-console-js/badge.svg?branch=master)](https://coveralls.io/github/PommeVerte/gremlin-console-js?branch=master)
 
 ## Gremlin Console
 

karma.conf.js

@@ -1,3 +1,4 @@
+var path = require('path');
 module.exports = function (config) {
     config.set({
 
@@ -7,10 +8,12 @@ module.exports = function (config) {
         singleRun: true, //just run once by default
 
         files: [
-            'tests.webpack.js' //just load this file
+            'tests.webpack.js', //just load this file
+            {pattern: 'test/index.html', watched: false, served:true} // load html file
         ],
         preprocessors: {
-            'tests.webpack.js': [ 'webpack', 'sourcemap' ] //preprocess with webpack and our sourcemap loader
+            'test/index.html': ['html2js'], // helps load html file for dom testing
+            'tests.webpack.js': [ 'webpack', 'sourcemap'] //preprocess with webpack and our sourcemap loader
         },
 
         webpack: { //kind of a copy of your webpack config
@@ -20,13 +23,26 @@ module.exports = function (config) {
                 libraryTarget: 'umd'
             },
             module: {
+                preLoaders: [
+                    // instrument only testing sources with Istanbul
+                    {
+                        test: /\.js$/,
+                        include: path.resolve('src/'),
+                        loader: 'isparta'
+                    }
+                ],
                 loaders: [
                     { test: /\.js$/, exclude: /node_modules/, loader: 'babel' }
                 ]
             }
         },
 
-        reporters: ['mocha'],
+        reporters: ['mocha', 'coverage', 'coveralls'],
+
+        coverageReporter: {
+            type: 'lcov', // lcov or lcovonly are required for generating lcov.info files
+            dir: 'coverage/'
+        },
 
         port: 9876,
         colors: true,
@@ -44,7 +60,10 @@ module.exports = function (config) {
             'karma-chai',
             'karma-webpack',
             'karma-sourcemap-loader',
-            'karma-mocha-reporter'
+            'karma-mocha-reporter',
+            'karma-coverage',
+            'karma-coveralls',
+            'karma-html2js-preprocessor'
         ]
 
     });

package.json

@@ -9,7 +9,8 @@
     "build:umd": "NODE_ENV=production webpack src/index.js umd/gremlin-console.js && cp -r static/* umd/",
     "build:min": "NODE_ENV=production webpack -p src/index.js umd/gremlin-console.min.js",
     "build:watch": "npm run build -- --watch",
-    "test": "karma start karma.conf.js --single-run"
+    "test": "karma start karma.conf.js --single-run --reporters mocha",
+    "test:coverage": "karma start karma.conf.js --single-run && rm -rf coverage"
   },
   "dependencies": {
     "babel-cli": "~6.6.5",
@@ -26,9 +27,13 @@
   },
   "devDependencies": {
     "chai": "^3.5.0",
+    "isparta-loader": "^2.0.0",
     "karma": "^0.13.22",
     "karma-chai": "^0.1.0",
+    "karma-coverage": "^0.5.5",
+    "karma-coveralls": "^1.1.2",
     "karma-firefox-launcher": "^0.1.7",
+    "karma-html2js-preprocessor": "^0.1.0",
     "karma-mocha": "^0.2.2",
     "karma-mocha-reporter": "^2.0.0",
     "karma-phantomjs-launcher": "^1.0.0",

src/Console.js

@@ -74,9 +74,7 @@ class Console extends EventEmitter {
         }
 
         //lets init the client
-        console.log("connection to ws://" + this.options.host + ":" + this.options.port);
-        console.log(this.options.driverOptions);
-        this.client = new Client(this.options.port, this.options.host, this.options.driverOptions);
+        this.client = new Client(this.options.host, this.options.port, this.options.driverOptions);
 
         this._attachHandlers();
 

test/ClientTest.js

@@ -3,10 +3,10 @@ import Client from '../src/DriverClient.js';
 describe('DriverClient.construct()', () => {
     it('should create a client with default options', () => {
         const client = new Client();
-        console.log(client);
-        client.should.be.a('Object');
-        client.client.should.be.a('Object');
+
+        client.constructor.name.should.equal('DriverClient');
         should.exist(client.client);
+        client.client.constructor.name.should.equal('GremlinClient');
 
         client.client.port.should.equal(8182);
         client.client.host.should.equal('localhost');
@@ -28,3 +28,65 @@ describe('DriverClient.construct()', () => {
     });
 });
 
+
+describe('DriverClient.buildResult()', () => {
+
+    it('should create and populate a Result object', () => {
+        const client = new Client();
+        const result = client.buildResult("raw error", "results");
+
+        result.constructor.name.should.equal('Result');
+        result._rawResults.should.equal('results');
+        result._rawError.should.equal('raw error');
+
+    });
+
+    it('should accept a Result object generated from undefined vars', () => {
+        const client = new Client();
+        const result = client.buildResult(undefined, undefined);
+
+        result.constructor.name.should.equal('Result');
+    });
+});
+
+describe('DriverClient.execute()', () => {
+
+    it('should execute correctly with: query', () => {
+        const client = new Client();
+        client.execute("5+5");
+    });
+
+    it('should execute correctly with: query + bindings', () => {
+        const client = new Client();
+        client.execute("5+variable", {variable:5});
+    });
+
+    it('should execute correctly with: query + callback', () => {
+        const client = new Client();
+        client.execute("5+5", () => {});
+    });
+
+    it('should execute correctly with: query + bindings + callback', () => {
+        const client = new Client();
+        client.execute("5+variable", {variable:5}, () => {});
+    });
+
+    //~ it('callback should receive query + Result object', () => {
+        //~ const client = new Client();
+        //~ client.execute("5+5", (query, result) => {
+            //~ console.log(query);console.log(result);
+            //~ query.should.be.a('string');
+            //~ result.constructor.name.should.equal('Result');
+        //~ });
+    //~ });
+//~
+    //~ it('output query and Result object should contain the correct information', () => {
+        //~ const client = new Client();
+        //~ let query, result;
+//~
+        //~ async client.execute("5+5", (q, r) => {
+            //~
+        //~ });
+//~
+    //~ });
+});

test/ConsoleTest.js

@@ -0,0 +1 @@
+import Console from '../src/Console.js';

test/HtmlTest.js

@@ -15,7 +15,7 @@ describe('Html.jsonSyntaxHighlight()', () => {
         highlighted.should.equal(expected);
     });
     it('should return a highlighted string from a json string', () => {
-        const highlighted = Html.jsonSyntaxHighlight(JSON.stringify(json));
-         highlighted.should.equal(expected.replace(/[\r\n]|  /g, "").replace(/\> \</g, "><")); // outputs differ to we normalize
+        const highlighted = Html.jsonSyntaxHighlight(JSON.stringify(json, undefined, 2));
+         highlighted.should.equal(expected);
     });
 });

test/IndexTest.js

@@ -0,0 +1,10 @@
+import create from '../src/index.js';
+
+describe('index.js .create()', () => {
+    it('should create a client with default options', () => {
+        document.body.innerHTML = __html__['test/index.html'];
+        const client = create("#window", "#input");
+
+        client.constructor.name.should.equal('Console');
+    });
+});

test/index.html

@@ -0,0 +1,2 @@
+<div id="window"></div>
+<input id="input" type="text" name="query" placeholder="Enter query here">

tests.webpack.js

@@ -1,3 +1,6 @@
 //tell karma which files to load.
-var context = require.context('./test', true, /Test\.js$/);
-context.keys().forEach(context);
+var testContext = require.context('./test', true, /Test\.js$/);
+testContext.keys().forEach(testContext);
+
+var allContext = require.context('./src', true, /\.js$/);
+allContext.keys().forEach(allContext);