Merge pull request GoogleCloudPlatform#43 from GoogleCloudPlatform/tests

Re-organized tests. Added more tests.

Author: jmdobry

.travis.yml

@@ -30,7 +30,13 @@ cache:
   - 7-gce/node_modules/
 
 env:
-  - PATH=$PATH:$HOME/gcloud/google-cloud-sdk/bin GOOGLE_APPLICATION_CREDENTIALS=$TRAVIS_BUILD_DIR/test/encrypted/nodejs-docs-samples.json CLOUD_BUCKET=nodejs-docs-samples GCLOUD_PROJECT=nodejs-docs-samples OAUTH_CLIENT_ID=test-id OAUTH_CLIENT_SECRET=test-secret#Other environment variables on same line
+  global:
+    - PATH=$PATH:$HOME/gcloud/google-cloud-sdk/bin
+    - GOOGLE_APPLICATION_CREDENTIALS=$TRAVIS_BUILD_DIR/test/encrypted/nodejs-docs-samples.json
+    - CLOUD_BUCKET=nodejs-docs-samples
+    - GCLOUD_PROJECT=nodejs-docs-samples
+    - OAUTH_CLIENT_ID=test-id
+    - OAUTH_CLIENT_SECRET=test-secret
 
 before_install:
   - if [ ! -d $HOME/gcloud/google-cloud-sdk ]; then

1-hello-world/package.json

@@ -9,7 +9,7 @@
     "monitor": "nodemon app.js",
     "deploy": "gcloud preview app deploy app.yaml",
     "lint": "jshint --exclude-path=../.gitignore .",
-    "mocha": "mocha test/*.test.js -t 30000",
+    "mocha": "mocha test/index.js -t 30000",
     "test": "npm run lint && npm run mocha"
   },
   "author": "Google Inc.",

1-hello-world/test/1-hello-world.test.js 1-hello-world/test/app.test.js1-hello-world/test/1-hello-world.test.js renamed to 1-hello-world/test/app.test.js

@@ -14,25 +14,14 @@
 'use strict';
 
 var assert = require('assert');
-var path = require('path');
+var config = require('./config');
 var request = require('supertest');
 var utils = require('../../test/utils');
 
-var config = {
-  test: '1-hello-world',
-  path: path.resolve(path.join(__dirname,  '../')),
-  cmd: 'node',
-  args: ['app.js'],
-  msg: 'Hello, world!'
-};
-
-describe(config.test, function () {
-
-  it('should install dependencies', function (done) {
-    this.timeout(60 * 1000); // Allow 1 minute to test installation
-    utils.testInstallation(config, done);
+describe('app.js', function () {
+  it('should run', function (done) {
+    utils.testLocalApp(config, done);
   });
-
   it('should create an express app', function (done) {
     request(require('../app'))
       .get('/')
@@ -42,8 +31,4 @@ describe(config.test, function () {
       })
       .end(done);
   });
-
-  it('should run', function (done) {
-    utils.testLocalApp(config, done);
-  });
 });

1-hello-world/test/config.js

@@ -0,0 +1,24 @@
+// Copyright 2015-2016, Google, Inc.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//    http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+'use strict';
+
+var path = require('path');
+
+module.exports = {
+  test: '1-hello-world',
+  path: path.resolve(path.join(__dirname,  '../')),
+  cmd: 'node',
+  args: ['app.js'],
+  msg: 'Hello, world!'
+};

1-hello-world/test/index.js

@@ -0,0 +1,25 @@
+// Copyright 2015-2016, Google, Inc.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//    http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+'use strict';
+
+var config = require('./config');
+var utils = require('../../test/utils');
+
+describe(config.test + '/', function () {
+  it('should install dependencies', function (done) {
+    this.timeout(60 * 1000); // Allow 1 minute to test installation
+    utils.testInstallation(config, done);
+  });
+  require('./app.test');
+});

2-structured-data/app.js

@@ -15,7 +15,7 @@
 
 var path = require('path');
 var express = require('express');
-var config = require('./config');
+var config = require('./config')();
 
 var app = express();
 
@@ -25,7 +25,7 @@ app.set('view engine', 'jade');
 app.set('trust proxy', true);
 
 // Books
-var model = require('./books/model-' + config.dataBackend)(config);
+var model = require('./books/model')(config);
 app.use('/books', require('./books/crud')(model));
 app.use('/api/books', require('./books/api')(model));
 

2-structured-data/books/model-cloudsql.js

@@ -16,7 +16,6 @@
 var extend = require('lodash').assign;
 var mysql = require('mysql');
 
-
 module.exports = function(config) {
 
   function getConnection() {
@@ -25,7 +24,6 @@ module.exports = function(config) {
     }, config.mysql));
   }
 
-
   // [START list]
   function list(limit, token, cb) {
     token = token ? parseInt(token, 10) : 0;
@@ -42,7 +40,6 @@ module.exports = function(config) {
   }
   // [END list]
 
-
   // [START create]
   function create(data, cb) {
     var connection = getConnection();
@@ -54,7 +51,6 @@ module.exports = function(config) {
   }
   // [END create]
 
-
   function read(id, cb) {
     var connection = getConnection();
     connection.query(
@@ -71,7 +67,6 @@ module.exports = function(config) {
     connection.end();
   }
 
-
   // [START update]
   function update(id, data, cb) {
     var connection = getConnection();
@@ -84,14 +79,12 @@ module.exports = function(config) {
   }
   // [END update]
 
-
   function _delete(id, cb) {
     var connection = getConnection();
     connection.query('DELETE FROM `books` WHERE `id` = ?', id, cb);
     connection.end();
   }
 
-
   return {
     createSchema: createSchema,
     list: list,
@@ -100,7 +93,6 @@ module.exports = function(config) {
     update: update,
     delete: _delete
   };
-
 };
 
 
@@ -118,7 +110,6 @@ if (!module.parent) {
   });
 }
 
-
 function createSchema(config) {
   var connection = mysql.createConnection(extend({
     multipleStatements: true

2-structured-data/books/model.js

@@ -0,0 +1,24 @@
+// Copyright 2015-2016, Google, Inc.
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//    http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+'use strict';
+
+var models = {
+  cloudsql: require('./model-cloudsql'),
+  datastore: require('./model-datastore'),
+  mongodb: require('./model-mongodb')
+};
+
+module.exports = function (config) {
+  return models[config.dataBackend](config);
+};

2-structured-data/config.js

@@ -13,32 +13,35 @@
 
 'use strict';
 
-var config = module.exports = {
-  port: process.env.PORT || 8080,
-
-  // dataBackend can be 'datastore', 'cloudsql', or 'mongodb'. Be sure to
-  // configure the appropriate settings for each storage engine below.
-  // If you are unsure, use datastore as it requires no additional
-  // configuration.
-  dataBackend: 'datastore',
-
-  // This is the id of your project in the Google Developers Console.
-  gcloud: {
-    projectId: process.env.GCLOUD_PROJECT || 'your-project-id'
-  },
-
-  mysql: {
-    user: process.env.MYSQL_USER || 'your-mysql-user',
-    password: process.env.MYSQL_PASSWORD || 'your-mysql-password',
-    host: process.env.MYSQL_HOST || 'your-mysql-host'
-  },
-
-  mongodb: {
-    url: process.env.MONGO_URL || 'mongodb://localhost:27017',
-    collection: process.env.MONGO_COLLECTION || 'books'
-  }
+var getConfig = module.exports = function () {
+  return {
+    port: process.env.PORT || 8080,
+
+    // dataBackend can be 'datastore', 'cloudsql', or 'mongodb'. Be sure to
+    // configure the appropriate settings for each storage engine below.
+    // If you are unsure, use datastore as it requires no additional
+    // configuration.
+    dataBackend: process.env.BACKEND || 'datastore',
+
+    // This is the id of your project in the Google Developers Console.
+    gcloud: {
+      projectId: process.env.GCLOUD_PROJECT || 'your-project-id'
+    },
+
+    mysql: {
+      user: process.env.MYSQL_USER || 'your-mysql-user',
+      password: process.env.MYSQL_PASSWORD || 'your-mysql-password',
+      host: process.env.MYSQL_HOST || 'your-mysql-host'
+    },
+
+    mongodb: {
+      url: process.env.MONGO_URL || 'mongodb://localhost:27017',
+      collection: process.env.MONGO_COLLECTION || 'books'
+    }
+  };
 };
 
+var config = getConfig();
 var projectId = config.gcloud.projectId;
 
 if (!projectId || projectId === 'your-project-id') {

2-structured-data/package.json

@@ -9,7 +9,7 @@
     "monitor": "nodemon app.js",
     "deploy": "gcloud preview app deploy app.yaml",
     "lint": "jshint --exclude-path=../.gitignore .",
-    "mocha": "mocha test/*.test.js -t 30000",
+    "mocha": "mocha test/index.js -t 30000",
     "test": "npm run lint && npm run mocha",
     "init-cloudsql": "node books/model-cloudsql.js"
   },