tweaks to make the install successful & tests run (#2)

stephenplusplus · jmdobry · commit 618c2382e593 · 2016-08-03T15:49:36.000-07:00
diff --git a/package.json b/package.json
@@ -20,11 +20,13 @@
     "through2": "^2.0.0"
   },
   "scripts": {
+    "link-modules": "node ./scripts/link",
+    "install-module-dependencies": "node ./scripts/install",
+    "postinstall": "npm run link-modules && npm run install-module-dependencies",
     "docs": "node ./scripts/docs.js",
     "lint": "jshint packages/ system-test/ test/ && jscs packages/ system-test/ test/",
     "test": "npm run docs && mocha test/docs.js packages/*/test/*.js",
     "system-test": "mocha packages/*/system-test/*.js --no-timeouts --bail",
-    "postinstall": "node ./scripts/install",
     "coveralls": "istanbul cover _mocha --report lcovonly -- --no-timeouts --bail packages/*/test/*.js -R spec && cat ./coverage/lcov.info | ./node_modules/coveralls/bin/coveralls.js && rm -rf ./coverage"
   },
   "license": "Apache-2.0",
diff --git a/packages/common/src/util.js b/packages/common/src/util.js
@@ -547,7 +547,9 @@ util.extendGlobalConfig = extendGlobalConfig;
 function normalizeArguments(globalContext, localConfig, options) {
   options = options || {};
 
-  var config = util.extendGlobalConfig(globalContext.config_, localConfig);
+  var globalConfig = globalContext && globalContext.config_;
+
+  var config = util.extendGlobalConfig(globalConfig, localConfig);
 
   if (options.projectIdRequired !== false && !config.projectId) {
     throw util.missingProjectIdError;
diff --git a/packages/google-cloud/system-test/google-cloud.js b/packages/google-cloud/system-test/google-cloud.js
@@ -18,7 +18,7 @@
 
 var assert = require('assert');
 var env = require('../../../system-test/env.js');
-var gcloud = require('../lib');
+var gcloud = require('../');
 var path = require('path');
 
 // Test used to confirm we can perform a successful API operation.
diff --git a/packages/logging/system-test/logging.js b/packages/logging/system-test/logging.js
@@ -25,10 +25,10 @@ var prop = require('propprop');
 var uuid = require('node-uuid');
 
 var env = require('../../../system-test/env.js');
-var BigQuery = require('@google-cloud/bigquery/index.js');
+var BigQuery = require('@google-cloud/bigquery');
 var Logging = require('../');
-var PubSub = require('@google-cloud/pubsub/index.js');
-var Storage = require('@google-cloud/storage/index.js');
+var PubSub = require('@google-cloud/pubsub');
+var Storage = require('@google-cloud/storage');
 
 describe('Logging', function() {
   var TESTS_PREFIX = 'gcloud-logging-test';
diff --git a/packages/translate/system-test/translate.js b/packages/translate/system-test/translate.js
@@ -21,7 +21,7 @@ var extend = require('extend');
 var prop = require('propprop');
 
 var env = require('../../../system-test/env.js');
-var Translate = require('../lib/translate/index.js').Translate;
+var Translate = require('../').Translate;
 
 var API_KEY = process.env.GCLOUD_TESTS_API_KEY;
 
