Merge pull request #634 from stephenplusplus/spp--npm-test-fix

fix ordering of documentation tests

package.json

@@ -78,10 +78,10 @@
  "scripts": {
  "docs": "./scripts/docs.sh",
  "lint": "jshint lib/ system-test/ test/",
- "test": "npm run docs && mocha test/*",
+ "test": "npm run docs && mocha test/*/*.js test/docs.js",
  "system-test": "mocha system-test/* --timeout 30000",
- "cover": "istanbul cover -x 'system-test/*' _mocha -- --timeout 30000 test/* system-test/*",
- "coveralls": "istanbul cover -x 'system-test/*' _mocha --report lcovonly -- --timeout 30000 test/* system-test/* -R spec && cat ./coverage/lcov.info | ./node_modules/coveralls/bin/coveralls.js && rm -rf ./coverage"
+ "cover": "istanbul cover -x 'system-test/*' _mocha -- --timeout 30000 test/*/*.js test/docs.js system-test/*",
+ "coveralls": "istanbul cover -x 'system-test/*' _mocha --report lcovonly -- --timeout 30000 test/*/*.js test/docs.js system-test/* -R spec && cat ./coverage/lcov.info | ./node_modules/coveralls/bin/coveralls.js && rm -rf ./coverage"
  },
  "license": "Apache 2"
 }

test/common/docs.js → test/docs.js

@@ -20,7 +20,7 @@
 
 var vm = require('vm');
 var assert = require('assert');
-var gcloud = require('../../');
+var gcloud = require('../');
 var glob = require('glob');
 var mitm = require('mitm');
 var fs = require('fs');
@@ -89,8 +89,8 @@ describe('documentation', function() {
  // Replace all references to require('gcloud') with a relative
  // version so that the code can be passed into the VM directly.
  var code = tag.string
- .replace(/require\(\'gcloud\'\)/g, 'require(\'..\/..\/\')')
- .replace(/require\(\'gcloud/g, 'require(\'..\/..');
+ .replace(/require\(\'gcloud\'\)/g, 'require(\'..\/\')')
+ .replace(/require\(\'gcloud/g, 'require(\'..');
  assert.doesNotThrow(runCodeInSandbox.bind(null, code, sandbox));
  }
  });