add phantomjs tests

.travis.yml

@@ -1,11 +1,11 @@
 language: node_js
 node_js:
+  - 6
   - 5
-  - 4
   - "0.12"
   - "0.10"
 cache:
   directories:
-  - $HOME/.npm
+    - $HOME/.npm
 script: "./coverage.sh"
 sudo: false

coverage.sh

@@ -4,4 +4,5 @@
   -- -R spec && \
   cat ./coverage/coverage.json |\
   ./node_modules/codecov.io/bin/codecov.io.js && \
-  rm -rf .coverage
+  rm -rf .coverage && \
+  ./node_modules/.bin/mochify -R spec

package.json

@@ -1,6 +1,6 @@
 {
   "name": "ip-address",
-  "description": "A library for parsing IPv6 and IPv4 IP addresses in node and the browser.",
+  "description": "A library for parsing IPv4 and IPv6 IP addresses in node and the browser.",
   "keywords": [
     "ipv6",
     "ipv4",
@@ -45,6 +45,7 @@
     "codecov.io": "^0.1.6",
     "documentation": "^4.0.0-beta9",
     "istanbul": "^0.4.4",
-    "mocha": "^2.5.3"
+    "mocha": "^2.5.3",
+    "mochify": "^2.18.1"
   }
 }

test/address-test.js

@@ -7,6 +7,12 @@ var ip = require('..');
 var Address4 = ip.Address4;
 var Address6 = ip.Address6;
 
+var valid4 = require('./data/valid-ipv4-addresses.json');
+var valid6 = require('./data/valid-ipv6-addresses.json');
+
+var invalid4 = require('./data/invalid-ipv4-addresses.json');
+var invalid6 = require('./data/invalid-ipv6-addresses.json');
+
 function addressIs(addressString, descriptors) {
   var address4 = new Address4(addressString);
   var address6 = new Address6(addressString);
@@ -145,10 +151,7 @@ function addressIs(addressString, descriptors) {
   });
 }
 
-function loadJsonBatch(file, classes, noMerge) {
-  // Load the list of test addresses
-  var addresses = require(file);
-
+function loadJsonBatch(addresses, classes, noMerge) {
   addresses.forEach(function (address) {
     if (address.conditions === undefined ||
       !address.conditions.length || noMerge) {
@@ -162,19 +165,19 @@ function loadJsonBatch(file, classes, noMerge) {
 }
 
 describe('Valid IPv4 addresses', function () {
-  loadJsonBatch('./data/valid-ipv4-addresses.json', ['valid-ipv4']);
-  loadJsonBatch('./data/valid-ipv4-addresses.json', ['invalid-ipv6'], true);
+  loadJsonBatch(valid4, ['valid-ipv4']);
+  loadJsonBatch(valid4, ['invalid-ipv6'], true);
 });
 
 describe('Valid IPv6 addresses', function () {
-  loadJsonBatch('./data/valid-ipv6-addresses.json', ['valid-ipv6']);
-  loadJsonBatch('./data/valid-ipv6-addresses.json', ['invalid-ipv4'], true);
+  loadJsonBatch(valid6, ['valid-ipv6']);
+  loadJsonBatch(valid6, ['invalid-ipv4'], true);
 });
 
 describe('Invalid IPv4 addresses', function () {
-  loadJsonBatch('./data/invalid-ipv4-addresses.json', ['invalid-ipv4']);
+  loadJsonBatch(invalid4, ['invalid-ipv4']);
 });
 
 describe('Invalid IPv6 addresses', function () {
-  loadJsonBatch('./data/invalid-ipv6-addresses.json', ['invalid-ipv6']);
+  loadJsonBatch(invalid6, ['invalid-ipv6']);
 });