Move from gcloud to google-cloud/bigquery

Author: Ace Nassri

bigquery/package.json

@@ -9,6 +9,7 @@
     "system-test": "mocha -R spec -t 120000 --require intelli-espower-loader ../system-test/_setup.js system-test/*.test.js"
   },
   "dependencies": {
+    "@google-cloud/bigquery": "^0.1.1",
     "async": "^1.5.2",
     "gcloud": "^0.37.0",
     "request": "^2.72.0"

bigquery/query.js

@@ -27,10 +27,10 @@
 // by the GOOGLE_APPLICATION_CREDENTIALS environment variable and use the
 // project specified by the GCLOUD_PROJECT environment variable. See
 // https://googlecloudplatform.github.io/gcloud-node/#/docs/guides/authentication
-var gcloud = require('gcloud');
+var BigQuery = require('@google-cloud/bigquery');
 
 // Instantiate the bigquery client
-var bigquery = gcloud.bigquery();
+var bigquery = BigQuery();
 // [END auth]
 
 // [START sync_query]

bigquery/test/query.test.js

@@ -24,6 +24,8 @@ function getSample () {
     { year: '2005' }
   ];
 
+  var BigQuery = require('@google-cloud/bigquery');
+
   var metadataMock = { status: { state: 'DONE' } };
 
   var jobId = 'abc';
@@ -39,15 +41,15 @@ function getSample () {
     startQuery: sinon.stub().callsArgWith(1, null, jobMock),
     query: sinon.stub().callsArgWith(1, null, natalityMock)
   };
-  var gcloudMock = {
-    bigquery: sinon.stub().returns(bigqueryMock)
-  };
+
+  var BigQueryMock = sinon.stub().returns(bigqueryMock);
+
   return {
     program: proxyquire('../query', {
-      gcloud: gcloudMock
+      '@google-cloud/bigquery': BigQueryMock
     }),
     mocks: {
-      gcloud: gcloudMock,
+      BigQuery: BigQueryMock,
       bigquery: bigqueryMock,
       natality: natalityMock,
       metadata: metadataMock,
@@ -215,8 +217,8 @@ describe('bigquery:query', function () {
       example.mocks.job.getMetadata = sinon.stub().callsArgWith(0, null, pendingState);
       example.program.asyncPoll(example.jobId, function (err, rows) {
         assert.deepEqual(err, Error('Job %s is not done', example.jobId));
-        assert(example.mocks.job.getMetadata.called);
         assert(console.log.calledWith('Job status: %s', pendingState.status.state));
+        assert(example.mocks.job.getMetadata.called);
         assert.equal(example.mocks.job.getQueryResults.called, false);
         assert.equal(rows, undefined);
       });
@@ -228,6 +230,7 @@ describe('bigquery:query', function () {
         assert(console.log.calledWith('Job status: %s', doneState.status.state));
         assert(example.mocks.job.getMetadata.called);
         assert(example.mocks.job.getQueryResults.called);
+        assert.equal(rows, example.mocks.natality);
       });
     });