Merge pull request #2882 from withspectrum/2.2.6

2.2.6

Author: brianlovin

.circleci/config.yml

@@ -39,13 +39,12 @@ aliases:
     name: Setup and build
     command:
       |
-        node -e "const setup = require('./shared/testing/setup.js')().then(() => process.exit())"
         yarn run build:web
         yarn run build:api
 
   - &start-api
     name: Start the API in the background
-    command: TEST_DB=true yarn run dev:api
+    command: yarn run start:api:test
     background: true
 
   - &start-web
@@ -90,28 +89,28 @@ jobs:
       - image: circleci/node:8-browsers
       - image: redis:3.2.7
       - image: cypress/base:6
+      - image: rethinkdb:2.3.5
     environment:
       TERM: xterm
     steps:
       - attach_workspace:
           at: ~/spectrum
-      - run: *install-rethinkdb
-      - run: *start-rethinkdb
-      - run: sleep 10
+      - run: node -e "const setup = require('./shared/testing/setup.js')().then(() => process.exit())"
       - run: *setup-and-build-web
       - run: *start-api
       - run: *start-web
-      - run: sleep 60
+      # Wait for the API and webserver to start
+      - run: ./node_modules/.bin/wait-on http://localhost:3000 http://localhost:3001
       - run:
           name: Run Unit Tests
           command: yarn run test:ci
-      - run:
-          name: Run E2E Tests
-          command: yarn run test:e2e
       - run:
           name: Danger
           when: always
-          command: yarn run danger ci
+          command: test -z $DANGER_GITHUB_API_TOKEN && yarn run danger ci || echo "forks are not allowed to run danger"
+      - run:
+          name: Run E2E Tests
+          command: yarn run test:e2e
 
   # Run eslint, flow etc.
   test_static_js:
@@ -170,6 +169,7 @@ workflows:
       - test_mobile_js:
           requires:
             - checkout_environment
+
       # Disabled as Expo is fixing their critical issue with Detox
       # - test_mobile_native:
       #     requires:

.flowconfig

@@ -1,8 +1,20 @@
 [ignore]
-.*/node_modules/.*
 .*/build.*
 .*/*.test.js
 .*/.expo
+.*/node_modules/expo
+.*/node_modules/react-native
+.*/node_modules/cypress
+.*/node_modules/draft-js
+.*/node_modules/graphql
+.*/node_modules/protobufjs-no-cli
+.*/node_modules/react-navigation
+.*/node_modules/reqwest
+.*/node_modules/sentry-expo
+
+.*/node_modules/react-apollo
+.*/node_modules/dataloader
+
 
 [include]
 
@@ -13,7 +25,7 @@ suppress_comment=.*\\$FlowFixMe
 suppress_comment=.*\\$FlowIssue
 esproposal.class_instance_fields=enable
 module.system.node.resolve_dirname=node_modules
-module.system.node.resolve_dirname=spectrum
+module.system.node.resolve_dirname=.
 module.file_ext=.ios.js
 module.file_ext=.android.js
 module.file_ext=.native.js

.github/PULL_REQUEST_TEMPLATE.md

@@ -20,3 +20,8 @@ YES
 **Release notes for users (delete if codebase-only change)**
 -
 
+<!--
+
+If your pull request introduces changes to the user interface on Spectrum, please share before and after screenshots of the changes (gifs or videos are encouraged for interaction changes). Please include screenshots of desktop and mobile viewports to ensure that all responsive cases are reviewed.
+
+-->

.gitignore

@@ -5,6 +5,7 @@ build
 .DS_Store
 src/config/FirebaseConfig.js
 npm-debug.log
+yarn-error.log
 rethinkdb_data
 debug
 now-secrets.json

README.md

@@ -40,9 +40,9 @@ Spectrum has been under full-time development since March, 2017. See [the roadma
   - [Running the app locally](#running-the-app-locally)
   - [Roadmap](https://github.com/withspectrum/spectrum/projects/19)
 - [Technical](docs/)
-  - [Testing](docs/testing.md)
+  - [Testing](docs/testing/intro.md)
   - [Background Jobs](docs/backend/background-jobs.md)
-  - [Deployment](docs/backend/deployment.md)
+  - [Deployment](docs/deployments.md)
   - [API](docs/backend/api/)
     - [Fragments](docs/backend/api/fragments.md)
     - [Pagination](docs/backend/api/pagination.md)
@@ -151,6 +151,11 @@ The first step to running Spectrum locally is downloading the code by cloning th
 
 ```sh
 git clone [email protected]:withspectrum/spectrum.git
+```
+ If you get `Permission denied` error using `ssh` refer [here](https://help.github.com/articles/error-permission-denied-publickey/)
+or use `https` link as a fallback.
+```sh
+git clone https://github.com/withspectrum/spectrum.git
 ```
 
 #### Installation

api/index.js

@@ -2,9 +2,9 @@
 /**
  * The entry point for the server, this is where everything starts
  */
-console.log('Server starting...');
 const compression = require('compression');
 const debug = require('debug')('api');
+debug('Server starting...');
 debug('logging with debug enabled!');
 import { createServer } from 'http';
 import express from 'express';
@@ -62,6 +62,14 @@ app.use(
   }
 );
 
+app.use('/', (req: express$Request, res: express$Response) => {
+  res.redirect(
+    process.env.NODE_ENV === 'production' && !process.env.FORCE_DEV
+      ? 'https://spectrum.chat'
+      : 'http://localhost:3000'
+  );
+});
+
 import type { Loader } from './loaders/types';
 export type GraphQLContext = {
   user: DBUser,
@@ -96,7 +104,7 @@ const subscriptionsServer = createSubscriptionsServer(server, '/websocket');
 //   graphqlPaths: ['/api'],
 // });
 server.listen(PORT);
-console.log(`GraphQL server running at http://localhost:${PORT}/api`);
+debug(`GraphQL server running at http://localhost:${PORT}/api`);
 
 process.on('unhandledRejection', async err => {
   console.error('Unhandled rejection', err);

api/migrations/20180411183454-lowercase-all-the-slugs.js

@@ -0,0 +1,27 @@
+exports.up = async (r, conn) => {
+  return Promise.all([
+    r
+      .table('users')
+      .update({
+        username: r.row('username').downcase(),
+        email: r.row('email').downcase(),
+      })
+      .run(conn),
+    r
+      .table('communities')
+      .update({
+        slug: r.row('slug').downcase(),
+      })
+      .run(conn),
+    r
+      .table('channels')
+      .update({
+        slug: r.row('slug').downcase(),
+      })
+      .run(conn),
+  ]);
+};
+
+exports.down = function(r, conn) {
+  return Promise.resolve();
+};

api/migrations/seed/default/index.js

@@ -9,6 +9,7 @@ const defaultDirectMessageThreads = require('./directMessageThreads');
 const defaultUsersDirectMessageThreads = require('./usersDirectMessageThreads');
 const defaultUsersCommunities = require('./usersCommunities');
 const defaultUsersChannels = require('./usersChannels');
+const defaultUsersSettings = require('./usersSettings')();
 const defaultMessages = require('./messages');
 
 module.exports = {
@@ -23,8 +24,8 @@ module.exports = {
   defaultUsersCommunities,
   defaultUsersChannels,
   defaultMessages,
+  defaultUsersSettings,
   defaultNotifications: [],
   defaultCommunitySettings: [],
   defaultChannelSettings: [],
-  defaultUsersSettings: [],
 };

api/migrations/seed/default/usersSettings.js

@@ -0,0 +1,33 @@
+// @flow
+
+module.exports = () => {
+  let settings = [];
+  for (let step = 0; step < 10; step++) {
+    settings.push({
+      userId: step.toString(),
+      notifications: {
+        types: {
+          newMessageInThreads: {
+            email: true,
+          },
+          newMention: {
+            email: true,
+          },
+          newDirectMessage: {
+            email: true,
+          },
+          newThreadCreated: {
+            email: true,
+          },
+          dailyDigest: {
+            email: true,
+          },
+          weeklyDigest: {
+            email: true,
+          },
+        },
+      },
+    });
+  }
+  return settings;
+};

api/models/db.js

@@ -29,6 +29,15 @@ const config = IS_PROD
 
 var r = require('rethinkdbdash')(config);
 
+// Exit the process on unhealthy db in test env
+if (process.env.TEST_DB) {
+  r.getPoolMaster().on('healthy', healthy => {
+    if (!healthy) {
+      process.exit(1);
+    }
+  });
+}
+
 if (process.env.NODE_ENV === 'development') {
   const fs = require('fs');
   const inspect = require('rethinkdb-inspector');