Circle CI (#113)

Circle CI

circle.yml

@@ -0,0 +1,24 @@
+machine:
+  node:
+    version: 7.6
+  services:
+    - redis
+  environment:
+    ENVIRONMENT: test
+    PATH: "${PATH}:${HOME}/${CIRCLE_PROJECT_REPONAME}/node_modules/.bin"
+    SEQUELIZE_SECRET: F0E5AD933D7F6FD8F4DBB3E038C501C052DC0593C686D21ACB30AE205D2F634B
+    DATABASE_URL_TEST: postgres://ubuntu@localhost:5432/circle_test
+    DATABASE_URL: postgres://ubuntu@localhost:5432/circle_test
+
+dependencies:
+  override:
+    - yarn
+  cache_directories:
+    - ~/.cache/yarn
+
+test:
+  pre:
+    - sequelize db:migrate --url postgres://ubuntu@localhost:5432/circle_test
+  override:
+    - yarn test
+    - yarn lint

frontend/models/Document.test.js

@@ -5,8 +5,7 @@ describe('Document model', () => {
   test('should initialize with data', () => {
     const document = new Document({
       id: 123,
-      title: 'Onboarding',
+      text: '# Onboarding\nSome body text',
-      text: 'Some body text'
     });
     expect(document.title).toBe('Onboarding');
   });

server/.jestconfig.json

@@ -5,8 +5,7 @@
     "<rootDir>/server"
   ],
   "setupFiles": [
-    "<rootDir>/__mocks__/console.js",
+    "<rootDir>/__mocks__/console.js"
-    "./server/test/helper.js"
   ],
   "testEnvironment": "node"
 }

server/migrations/20170603185012-add-collection-documentStructure-migration.js

@@ -1,14 +1,16 @@
 module.exports = {
   up: (queryInterface, Sequelize) => {
-    queryInterface.renameTable('atlases', 'collections');
+    queryInterface.renameTable('atlases', 'collections').then(() => {
       queryInterface.addColumn('collections', 'documentStructure', {
         type: Sequelize.JSONB,
         allowNull: true,
       });
+    });
   },
 
   down: (queryInterface, _Sequelize) => {
-    queryInterface.renameTable('collections', 'atlases');
+    queryInterface.renameTable('collections', 'atlases').then(() => {
       queryInterface.removeColumn('atlases', 'documentStructure');
+    });
   },
 };

server/migrations/20170604052346-add-views.js

@@ -1,6 +1,7 @@
 module.exports = {
   up: function(queryInterface, Sequelize) {
-    queryInterface.createTable('views', {
+    queryInterface
+      .createTable('views', {
         id: {
           type: Sequelize.UUID,
           allowNull: false,
@@ -27,14 +28,17 @@ module.exports = {
           type: Sequelize.DATE,
           allowNull: false,
         },
-    });
+      })
+      .then(() => {
         queryInterface.addIndex('views', ['documentId', 'userId'], {
           indicesType: 'UNIQUE',
         });
+      });
   },
 
   down: function(queryInterface, Sequelize) {
-    queryInterface.removeIndex('views', ['documentId', 'userId']);
+    queryInterface.removeIndex('views', ['documentId', 'userId']).then(() => {
       queryInterface.dropTable('views');
+    });
   },
 };

server/migrations/20170604052347-add-stars.js

@@ -1,6 +1,7 @@
 module.exports = {
   up: function(queryInterface, Sequelize) {
-    queryInterface.createTable('stars', {
+    queryInterface
+      .createTable('stars', {
         id: {
           type: Sequelize.UUID,
           allowNull: false,
@@ -22,14 +23,17 @@ module.exports = {
           type: Sequelize.DATE,
           allowNull: false,
         },
-    });
+      })
+      .then(() => {
         queryInterface.addIndex('stars', ['documentId', 'userId'], {
           indicesType: 'UNIQUE',
         });
+      });
   },
 
   down: function(queryInterface, Sequelize) {
-    queryInterface.removeIndex('stars', ['documentId', 'userId']);
+    queryInterface.removeIndex('stars', ['documentId', 'userId']).then(() => {
       queryInterface.dropTable('stars');
+    });
   },
 };

server/test/helper.js

@@ -1,4 +1,5 @@
-require('dotenv').config({ silent: true });
+// @flow
+require('../../init');
 
 // test environment variables
 process.env.DATABASE_URL = process.env.DATABASE_URL_TEST;