Merge 9d12902 into 86a102f

app/templates/fromswagger/routers/router.js

@@ -1,7 +1,7 @@
-var express = require('express');
+const express = require('express');
 
 module.exports = function(app, basepath) {
-  var router = express.Router();
+  const router = express.Router();
 
 {{#if routes}}
 	{{#each routes}}
@@ -18,4 +18,3 @@ module.exports = function(app, basepath) {
 
 {{/if}}
 }
-

app/templates/public/swagger-ui/o2c.html

@@ -1,5 +1,5 @@
 <script>
-var qp = null;
+let qp = null;
 if(/code|token|error/.test(window.location.hash)) {
   qp = location.hash.substring(1);
 }

app/templates/server/routers/health.js

@@ -1,14 +1,11 @@
-var express = require('express');
+const express = require('express');
 
 module.exports = function(app) {
-  var router = express.Router();
+  const router = express.Router();
 
   router.get('/', function (req, res, next) {
     res.json({status: 'UP'});
   });
 
   app.use("/health", router);
 }
-
-
-

app/templates/server/routers/public.js

@@ -1,7 +1,7 @@
-var express = require('express');
+const express = require('express');
 
 module.exports = function(app){
-  var router = express.Router();
+  const router = express.Router();
   router.use(express.static(process.cwd() + '/public'));
   app.use(router);
 }

app/templates/server/routers/swagger.js

@@ -1,8 +1,8 @@
-var express = require('express');
+const express = require('express');
 
 module.exports = function(app){
-  var router = express.Router();
+  const router = express.Router();
   app.use("/swagger/api", express.static("./public/swagger.{{openApiFileType}}"));
   app.use("/explorer", express.static("./public/swagger-ui"));
   app.use(router);
-}
+}

app/templates/server/server.js

@@ -1,5 +1,5 @@
 // Uncomment following to enable zipkin tracing, tailor to fit your network configuration:
-// var appzip = require('appmetrics-zipkin')({
+// const appzip = require('appmetrics-zipkin')({
 //     host: 'localhost',
 //     port: 9411,
 //     serviceName:'frontend'
@@ -44,4 +44,4 @@ app.use(function (err, req, res, next) {
 	res.sendFile(path.join(__dirname, '../public', '500.html'));
 });
 
-module.exports = server;
+module.exports = server;

app/templates/test/resource.js

@@ -1,5 +1,5 @@
-var expect = require('chai').expect;
-var http = require('http');
+const expect = require('chai').expect;
+const http = require('http');
 
 before(function(done){
   require(process.cwd() + '/server/server');
@@ -12,23 +12,22 @@ before(function(done){
 {{#testing route method ../basepath}}
 	{{/testing}}
     it('Testing GET for {{route}} route',function(done){
-      var responseString = '';
+      let responseString = '';
 
-       var options = {
+       const options = {
           host: 'localhost',
           port: process.env.PORT || 3000,
           {{#path route ../basepath}}{{/path}}
        };
 
-       var callback = function(response){
+       const callback = function(response){
          response.on('data', function (chunk) {
          responseString += chunk;
        });
 
        response.on('end', function () {
          expect(responseString).to.equal('{}');
          done();
-
        });
       };
 
@@ -37,4 +36,3 @@ before(function(done){
   });
     {{/each}}
 {{/if}}
-

app/templates/test/test-demo.js

@@ -1,6 +1,6 @@
-var assert = require('chai').assert;
-var expect = require('chai').expect;
-var should = require('chai').should();
+const assert = require('chai').assert;
+const expect = require('chai').expect;
+const should = require('chai').should();
 
 // Below code demonstrates using various methods of testing
 describe('Demonstrating testing with various assertion methods', function() {
@@ -48,7 +48,7 @@ describe('Demonstrating testing with various assertion methods', function() {
       "asd".should.have.lengthOf(3);
     });
     it('Tests property existence and length using should', function() {
-      var obj = {
+      const obj = {
         arr:[1,2,3]
       };
       obj.should.have.property("arr").with.lengthOf(3);

app/templates/test/test-server.js

@@ -1,5 +1,5 @@
-var expect = require('chai').expect;
-var http = require('http');
+const expect = require('chai').expect;
+const http = require('http');
 
 // Below code demonstrates using various methods of testing
 describe('Testing Server', function() {
@@ -12,15 +12,15 @@ describe('Testing Server', function() {
   });
 
   it('Health endpoint shows status up', function(done){
-    var responseString = '';
+    let responseString = '';
 
-    var options = {
+    const options = {
       host: 'localhost',
       port: process.env.PORT || 3000,
       path: '/health'
     };
 
-    var callback = function(response){
+    const callback = function(response){
       response.on('data', function (chunk) {
         responseString += chunk;
       });