Merge pull request #4781 from withspectrum/2.8.0

2.8.0

Author: brianlovin

.circleci/config.yml

@@ -80,13 +80,24 @@ jobs:
           root: .
           paths: .
 
-  # Start db and servers, then run e2e and unit tests
-  test_web:
+  build_web:
+    <<: *js_defaults
+    steps:
+      - attach_workspace:
+          at: ~/spectrum
+      - run: *setup-and-build-web
+      - run: *build-api
+      - persist_to_workspace:
+          root: .
+          paths:
+            - build-api
+            - build
+
+  test_unit:
     <<: *defaults
     docker:
-      - image: circleci/node:8-browsers
+      - image: circleci/node:8
       - image: redis:3.2.7
-      - image: cypress/base:6
       - image: rethinkdb:2.3.5
     environment:
       TERM: xterm
@@ -98,42 +109,40 @@ jobs:
       - run:
           name: Run Unit Tests
           command: yarn run test:ci
-      - run: *setup-and-build-web
-      - run: *build-api
+
+
+  # Start db and servers, then run e2e and unit tests
+  test_e2e:
+    <<: *defaults
+    docker:
+      - image: circleci/node:8-browsers
+      - image: redis:3.2.7
+      - image: cypress/base:6
+      - image: rethinkdb:2.3.5
+    parallel: true
+    parallelism: 9
+    environment:
+      TERM: xterm
+    steps:
+      - attach_workspace:
+          at: ~/spectrum
+      - run: yarn run db:migrate
+      - run: yarn run db:seed
       - run: *start-api
       - run: *start-web
       # 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: Install Cypress
           command: yarn run cypress:install
       - run:
           name: Run E2E Tests
-          command: test $CYPRESS_RECORD_KEY && yarn run test:e2e -- --record || yarn run test:e2e
-      - run:
-          name: Test desktop apps
-          command: yarn run test:desktop
-
-  # deploy_alpha:
-    # <<: *js_defaults
-    # docker:
-      # - image: circleci/node:8-browsers
-    # steps:
-      # - attach_workspace:
-          # at: ~/spectrum
-      # - run: *build-api
-      # - run:
-          # name: Deploy and alias API
-          # command: |
-            # cd build-api
-            # npx now-cd --alias "alpha=api.alpha.spectrum.chat" --team space-program
-            # cd ..
-      # - run:
-          # name: Deploy and alias Hyperion
-          # command: npx now-cd --alias "alpha=hyperion.alpha.spectrum.chat" --team space-program
+          command: |
+            if [ $CYPRESS_RECORD_KEY ]; then 
+              yarn run test:e2e -- --record --parallel
+            else
+              yarn run test:e2e
+            fi
 
   # Run eslint, flow etc.
   test_static_js:
@@ -154,20 +163,15 @@ workflows:
   test:
     jobs:
       - checkout_environment
-
-      # Testing
-      - test_web:
+      - test_unit:
           requires:
             - checkout_environment
       - test_static_js:
           requires:
             - checkout_environment
-
-      # Deployment
-      # - deploy_alpha:
-          # requires:
-            # - test_static_js
-            # - test_web
-          # filters:
-            # branches:
-              # only: alpha
+      - build_web:
+          requires:
+            - checkout_environment
+      - test_e2e:
+          requires:
+            - build_web

api/index.js

@@ -44,13 +44,16 @@ app.use(statsd);
 // Trust the now proxy
 app.set('trust proxy', true);
 app.use(toobusy);
-// Allow bursts of up to 40 req for initial page loads, but block more than 40 / 10s
-app.use(
-  rateLimiter({
-    max: 40,
-    duration: '10s',
-  })
-);
+
+if (!process.env.TEST_DB) {
+  // Allow bursts of up to 40 req for initial page loads, but block more than 40 / 10s
+  app.use(
+    rateLimiter({
+      max: 40,
+      duration: '10s',
+    })
+  );
+}
 
 // Security middleware.
 addSecurityMiddleware(app, { enableNonce: false, enableCSP: false });

api/migrations/20190226085909-bot-user-sam.js

@@ -0,0 +1,31 @@
+exports.up = function(r, conn) {
+  return r
+    .table('users')
+    .insert({
+      id: 'sam',
+      description: "Spectrum's automated bot.",
+      createdAt: new Date(),
+      email: null,
+      providerId: null,
+      fbProviderId: null,
+      githubProviderId: null,
+      githubUsername: 'withspectrum',
+      googleProviderId: null,
+      isOnline: true,
+      lastSeen: new Date(),
+      modifiedAt: new Date(),
+      name: 'Spectrum Bot',
+      termsLastAcceptedAt: new Date(),
+      username: 'spectrumbot',
+      website: 'https://spectrum.chat',
+      profilePhoto: '/default_images/sam.png',
+    })
+    .run(conn);
+};
+exports.down = function(r, conn) {
+  return r
+    .table('users')
+    .get('sam')
+    .delete()
+    .run(conn);
+};

api/migrations/seed/default/channels.js

@@ -6,15 +6,18 @@ const {
   PAYMENTS_COMMUNITY_ID,
   DELETED_COMMUNITY_ID,
   PRIVATE_COMMUNITY_ID,
+  SINGLE_CHANNEL_COMMUNITY_ID,
   SPECTRUM_GENERAL_CHANNEL_ID,
   SPECTRUM_PRIVATE_CHANNEL_ID,
   PAYMENTS_GENERAL_CHANNEL_ID,
   PAYMENTS_PRIVATE_CHANNEL_ID,
+  PAYMENTS_FEATURES_CHANNEL_ID,
   SPECTRUM_ARCHIVED_CHANNEL_ID,
   SPECTRUM_DELETED_CHANNEL_ID,
   DELETED_COMMUNITY_DELETED_CHANNEL_ID,
   MODERATOR_CREATED_CHANNEL_ID,
   PRIVATE_GENERAL_CHANNEL_ID,
+  SINGLE_CHANNEL_COMMUNITY_GENERAL_CHANNEL_ID,
 } = constants;
 
 module.exports = [
@@ -66,6 +69,18 @@ module.exports = [
     memberCount: 5,
   },
 
+  {
+    id: PAYMENTS_FEATURES_CHANNEL_ID,
+    communityId: PAYMENTS_COMMUNITY_ID,
+    createdAt: new Date(DATE),
+    name: 'Payments Features',
+    description: 'Payments Features',
+    slug: 'features',
+    isPrivate: false,
+    isDefault: false,
+    memberCount: 5,
+  },
+
   {
     id: SPECTRUM_ARCHIVED_CHANNEL_ID,
     communityId: SPECTRUM_COMMUNITY_ID,
@@ -128,4 +143,16 @@ module.exports = [
     isDefault: false,
     memberCount: 1,
   },
+
+  {
+    id: SINGLE_CHANNEL_COMMUNITY_GENERAL_CHANNEL_ID,
+    communityId: SINGLE_CHANNEL_COMMUNITY_ID,
+    createdAt: new Date(DATE),
+    name: 'General',
+    description: 'General',
+    slug: 'general',
+    isPrivate: false,
+    isDefault: false,
+    memberCount: 1,
+  },
 ];

api/migrations/seed/default/communities.js

@@ -6,6 +6,7 @@ const {
   PAYMENTS_COMMUNITY_ID,
   DELETED_COMMUNITY_ID,
   PRIVATE_COMMUNITY_ID,
+  SINGLE_CHANNEL_COMMUNITY_ID,
 } = constants;
 
 module.exports = [
@@ -66,4 +67,18 @@ module.exports = [
     slug: 'private',
     memberCount: 1,
   },
+  {
+    id: SINGLE_CHANNEL_COMMUNITY_ID,
+    createdAt: new Date(DATE),
+    isPrivate: false,
+    name: 'Single channel community',
+    description: 'Single channel community',
+    website: 'https://spectrum.chat',
+    profilePhoto:
+      'https://spectrum.imgix.net/communities/-Kh6RfPYjmSaIWbkck8i/Twitter Profile.png.0.6225566835336693',
+    coverPhoto:
+      'https://spectrum.imgix.net/communities/-Kh6RfPYjmSaIWbkck8i/Twitter Header.png.0.3303118636071434',
+    slug: 'single',
+    memberCount: 1,
+  },
 ];

api/migrations/seed/default/constants.js

@@ -17,23 +17,29 @@ const PENDING_USER_ID = '7';
 const CHANNEL_MODERATOR_USER_ID = '8';
 // this user is moderator in all communities
 const COMMUNITY_MODERATOR_USER_ID = '9';
+// this user is only a member of one community, and that community only has
+// one channel - use for testing the composer community+channel selection
+const SINGLE_CHANNEL_COMMUNITY_USER_ID = '10';
 
 // communities
 const SPECTRUM_COMMUNITY_ID = '1';
 const PAYMENTS_COMMUNITY_ID = '2';
 const DELETED_COMMUNITY_ID = '3';
 const PRIVATE_COMMUNITY_ID = '4';
+const SINGLE_CHANNEL_COMMUNITY_ID = '5';
 
 // channels
 const SPECTRUM_GENERAL_CHANNEL_ID = '1';
 const SPECTRUM_PRIVATE_CHANNEL_ID = '2';
 const PAYMENTS_GENERAL_CHANNEL_ID = '3';
 const PAYMENTS_PRIVATE_CHANNEL_ID = '4';
+const PAYMENTS_FEATURES_CHANNEL_ID = '10';
 const SPECTRUM_ARCHIVED_CHANNEL_ID = '5';
 const SPECTRUM_DELETED_CHANNEL_ID = '6';
 const DELETED_COMMUNITY_DELETED_CHANNEL_ID = '7';
 const MODERATOR_CREATED_CHANNEL_ID = '8';
 const PRIVATE_GENERAL_CHANNEL_ID = '9';
+const SINGLE_CHANNEL_COMMUNITY_GENERAL_CHANNEL_ID = '11';
 
 module.exports = {
   DATE,
@@ -46,17 +52,21 @@ module.exports = {
   PENDING_USER_ID,
   CHANNEL_MODERATOR_USER_ID,
   COMMUNITY_MODERATOR_USER_ID,
+  SINGLE_CHANNEL_COMMUNITY_USER_ID,
   SPECTRUM_COMMUNITY_ID,
   PAYMENTS_COMMUNITY_ID,
   DELETED_COMMUNITY_ID,
   PRIVATE_COMMUNITY_ID,
+  SINGLE_CHANNEL_COMMUNITY_ID,
   SPECTRUM_GENERAL_CHANNEL_ID,
   SPECTRUM_PRIVATE_CHANNEL_ID,
   PAYMENTS_GENERAL_CHANNEL_ID,
   PAYMENTS_PRIVATE_CHANNEL_ID,
+  PAYMENTS_FEATURES_CHANNEL_ID,
   SPECTRUM_ARCHIVED_CHANNEL_ID,
   SPECTRUM_DELETED_CHANNEL_ID,
   DELETED_COMMUNITY_DELETED_CHANNEL_ID,
   MODERATOR_CREATED_CHANNEL_ID,
   PRIVATE_GENERAL_CHANNEL_ID,
+  SINGLE_CHANNEL_COMMUNITY_GENERAL_CHANNEL_ID,
 };

api/migrations/seed/default/messages.js

@@ -186,4 +186,21 @@ module.exports = [
     senderId: BRYN_ID,
     timestamp: new Date(DATE + 300000),
   },
+  {
+    id: '14',
+    threadId: 'thread-6',
+    threadType: 'story',
+    content: {
+      body: JSON.stringify(
+        toJSON(
+          fromPlainText(
+            'http://localhost:3000/spectrum/general/yet-another-thread~thread-9'
+          )
+        )
+      ),
+    },
+    messageType: 'draftjs',
+    senderId: BRIAN_ID,
+    timestamp: new Date(DATE + 300000),
+  },
 ];

api/migrations/seed/default/users.js

@@ -9,6 +9,7 @@ const {
   PREVIOUS_MEMBER_USER_ID,
   CHANNEL_MODERATOR_USER_ID,
   COMMUNITY_MODERATOR_USER_ID,
+  SINGLE_CHANNEL_COMMUNITY_USER_ID,
   DATE,
 } = constants;
 
@@ -128,4 +129,18 @@ module.exports = [
     createdAt: new Date(DATE),
     lastSeen: new Date(DATE),
   },
+  {
+    id: SINGLE_CHANNEL_COMMUNITY_USER_ID,
+    name: 'Single community person',
+    description: 'Im a member of one community',
+    website: '',
+    username: 'single-community-user',
+    profilePhoto:
+      'https://pbs.twimg.com/profile_images/848823167699230721/-9CbPtto_bigger.jpg',
+    coverPhoto:
+      'https://pbs.twimg.com/profile_banners/17106008/1491444958/1500x500',
+    email: '[email protected]',
+    createdAt: new Date(DATE),
+    lastSeen: new Date(DATE),
+  },
 ];