Merge pull request #37 from fabrix-app/v1.6

[feat] node 12
fabrix-app · Jun 7, 2019 · dafb58f · dafb58f
2 parents dd1b497 + b30be02
commit dafb58f
Show file tree

Hide file tree

Showing 2 changed files with 54 additions and 5 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -7,11 +7,11 @@ version: 2
 
 defaults: &defaults
   working_directory: ~/fabrix
-  docker:
-    - image: circleci/node:10.0.0
 
 jobs:
   test:
+    docker:
+      - image: circleci/node:10.0.0
     <<: *defaults
     steps:
       - checkout
@@ -51,6 +51,8 @@ jobs:
           root: ~/fabrix
           paths: .
   deploy:
+    docker:
+      - image: circleci/node:12.0.0
     <<: *defaults
     steps:
       - attach_workspace:
@@ -62,6 +64,49 @@ jobs:
           name: Publish package
           command: npm publish
 
+  test-node12:
+    docker:
+      - image: circleci/node:10.0.0
+    <<: *defaults
+    steps:
+      - run: echo "Running node v12"
+      - checkout
+      - run:
+          name: update-npm
+          command: 'sudo npm install -g npm@5'
+      - restore_cache:
+          key: dependency-cache-{{ checksum "package.json" }}
+      - run:
+          name: install-npm-wee
+          command: npm install
+      - save_cache:
+          key: dependency-cache-{{ checksum "package.json" }}
+          paths:
+            - ./node_modules
+      - run:
+          name: test
+          command: npm test
+      - run:
+          name: test performance
+          command: npm run test-performance
+      - run:
+          name: test archetype
+          command: npm run test-archetype
+      - run:
+          name: code-coverage
+          command: './node_modules/.bin/nyc report --reporter=text-lcov'
+      - store_artifacts:
+          path: test-results.xml
+          prefix: tests
+      - store_artifacts:
+          path: coverage
+          prefix: coverage
+      - store_test_results:
+          path: test-results.xml
+      - persist_to_workspace:
+          root: ~/fabrix
+          paths: .
+
 workflows:
   version: 2
   test-deploy:
@@ -70,6 +115,10 @@ workflows:
           filters:
             tags:
               only: /^v.*/
+      - test-node12:
+          filters:
+            tags:
+              only: /^v.*/
       - deploy:
           requires:
             - test

diff --git a/lib/Templates.ts b/lib/Templates.ts
@@ -31,9 +31,9 @@ export const Templates = {
       return (
         ` Database Info
           Stores            : ${Object.keys(app.config.get('stores') || { })}
-        Web Server Info
-          Server            : ${app.config.get('web.server') || 'NOT INSTALLED'}
-          Port              : ${app.config.get('web.port') || 'N/A'}
+        Web Servers Info
+          Servers           : ${app.config.get('web.server') || 'NOT INSTALLED'}
+          Ports             : ${app.config.get('web.port') || 'N/A'}
           Routes            : ${(app.routes || new Map()).size}`
       )
     }