Merge pull request #960 from stephenplusplus/spp--resource-tests-env

resource: use default method options & run system tests conditionally
googleapis · Nov 24, 2015 · 9681a03 · 9681a03
2 parents ed792fb + 91db968
commit 9681a03
Show file tree

Hide file tree

Showing 3 changed files with 73 additions and 49 deletions.
diff --git a/lib/resource/project.js b/lib/resource/project.js
@@ -180,7 +180,11 @@ function Project(resource, id) {
      *   }
      * });
      */
-    setMetadata: true
+    setMetadata: {
+      reqOpts: {
+        method: 'PUT'
+      }
+    }
   };
 
   ServiceObject.call(this, {

diff --git a/system-test/resource.js b/system-test/resource.js
@@ -17,56 +17,14 @@
 'use strict';
 
 var assert = require('assert');
+var googleAuth = require('google-auto-auth');
 
 var env = require('./env.js');
 var Resource = require('../lib/resource/index.js');
 
 describe('Resource', function() {
-  // -------------
-  // >> Attention!
-  // -------------
-  // As of 9/14/15, creating projects is not supported. Once we have support,
-  // the following description outlines how we should run our tests.
-  // -------------
-  //
-  // Before the tests run, we create a project. That acts as the test for being
-  // able to create a project. Similarly, the after hook deletes it, testing if
-  // a project can be deleted.
-  //
-  // ----------
-  // >> Notice!
-  // ----------
-  // All tests should only manipulate a short-lived project. NOT the project the
-  // user has been running our test suite with. That would just be rude.
-  // ----------
-
-  // var PROJECT_ID = 'gcloud-tests-' + Date.now();
-  var PROJECT_NAME = 'gcloud-tests-project-name';
-
   var resource = new Resource(env);
-  var project;
-
-  before(function(done) {
-    // Uncomment after we support creating a project.
-    // resource.createProject(PROJECT_ID, function(err, project_) {
-    //   if (err) {
-    //     done(err);
-    //     return;
-    //   }
-    //
-    //   project = project_;
-    // });
-
-    // ** SEE "Notice!" SECTION ABOVE **
-    // Remove once we support creating a project.
-    project = resource.project();
-    done();
-  });
-
-  // Uncomment after we support creating a project.
-  // after(function(done) {
-  //   project.delete(done);
-  // });
+  var project = resource.project();
 
   describe('resource', function() {
     it('should get a list of projects', function(done) {
@@ -100,15 +58,73 @@ describe('Resource', function() {
         done();
       });
     });
+  });
+
+  // Auth through the gcloud SDK is required to:
+  //
+  //   - Create a project
+  //   - Set metadata
+  //   - Restore a project
+  //   - Delete a project
+  describe('lifecycle', function() {
+    var CAN_RUN_TESTS = true;
+
+    var resource = new Resource({
+      projectId: env.projectId
+    });
+
+    var PROJECT_ID = 'gcloud-tests-' + Date.now();
+    var project = resource.project(PROJECT_ID);
+
+    before(function(done) {
+      var authClient = googleAuth();
+
+      // See if an auth token exists.
+      authClient.getToken(function(err) {
+        if (err) {
+          if (err.code === 400) {
+            CAN_RUN_TESTS = false;
+            done();
+          } else {
+            done(err);
+          }
+          return;
+        }
+
+        project.create(done);
+      });
+    });
+
+    beforeEach(function() {
+      if (!CAN_RUN_TESTS) {
+        this.skip();
+      }
+    });
+
+    after(function(done) {
+      if (!CAN_RUN_TESTS) {
+        this.skip();
+        return;
+      }
+
+      project.delete(done);
+    });
+
+    it('should have created the project', function() {
+      assert.strictEqual(project.metadata.projectId, PROJECT_ID);
+    });
+
+    it('should set metadata', function(done) {
+      var newProjectName = 'gcloud-tests-project-name';
 
-    it.skip('should set metadata', function(done) {
       project.getMetadata(function(err, metadata) {
         assert.ifError(err);
 
         var originalProjectName = metadata.name;
+        assert.notStrictEqual(originalProjectName, newProjectName);
 
         project.setMetadata({
-          name: PROJECT_NAME
+          name: newProjectName
         }, function(err) {
           assert.ifError(err);
 
@@ -119,7 +135,7 @@ describe('Resource', function() {
       });
     });
 
-    it.skip('should delete and restore a project', function(done) {
+    it('should restore the project', function(done) {
       project.delete(function(err) {
         assert.ifError(err);
         project.restore(done);

diff --git a/test/resource/project.js b/test/resource/project.js
@@ -85,7 +85,11 @@ describe('Project', function() {
         exists: true,
         get: true,
         getMetadata: true,
-        setMetadata: true
+        setMetadata: {
+          reqOpts: {
+            method: 'PUT'
+          }
+        }
       });
     });
   });