Merge pull request #24 from epochtalk/user-profile-role-mk2

akinsey · web-flow · commit 1fd8aa41866b · 2020-05-15T11:28:53.000-10:00
User profile role mk2
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -2,7 +2,7 @@ version: 2
 jobs:
   build:
     docker:
-      - image: circleci/node:10.16.0
+      - image: circleci/node:12.14.1
     working_directory: ~/repo
     steps:
       - checkout
@@ -20,7 +20,7 @@ jobs:
           key: v1-dependencies-{{ checksum "package.json" }}
   release:
     docker:
-      - image: circleci/node:10.16.0
+      - image: circleci/node:12.14.1
     steps:
       - checkout
       - run: yarn install
diff --git a/.tool-versions b/.tool-versions
@@ -1 +1 @@
-nodejs 10.16.3
+nodejs 12.14.1
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:10.16.3
+FROM node:12.14.1
 
 WORKDIR /usr/src/app
 
diff --git a/test/users.js b/test/users.js
@@ -255,6 +255,8 @@ describe("User Find", function() {
         'created_at',
         'id',
         'priority',
+        'role_name',
+        'role_highlight_color',
         'roles',
         'updated_at',
         'username',
