Merge branch 'master' of github.com:coralproject/talk into e2e-tests

tests/client/coral-framework/store/itemActions.spec.js

@@ -74,7 +74,7 @@ describe('itemActions', () => {
     });
   });
 
-  //Disabling tests for this function until is is used again.
+  // Disabling tests for this function until is is used again.
   xdescribe('getItemsArray', () => {
     const response = {items: [{type: 'comment', id: '123'}, {type: 'comment', id: '456'}]};
     const ids = [1, 2];

tests/client/coral-plugin-history/Comment.spec.js

@@ -0,0 +1,31 @@
+import React from 'react';
+import {shallow, mount} from 'enzyme';
+import {expect} from 'chai';
+import Comment from '../../../client/coral-plugin-history/Comment';
+
+describe('coral-plugin-history/Comment', () => {
+  let render;
+  const comment = {body: 'this is a comment', id: '123'};
+  const asset = {url: 'https://google.com'};
+
+  beforeEach(() => {
+    render = shallow(<Comment asset={asset} comment={comment} />);
+  });
+
+  it('should render the provided comment body', () => {
+    const wrapper = mount(<Comment asset={asset} comment={comment} />);
+    expect(wrapper.find('.myCommentBody')).to.have.length(1);
+    expect(wrapper.find('.myCommentBody').text()).to.equal('this is a comment');
+  });
+
+  it('should render the asset url as a link', () => {
+    const wrapper = mount(<Comment asset={asset} comment={comment} />);
+    expect(wrapper.find('.myCommentAnchor')).to.have.length(1);
+    expect(wrapper.find('.myCommentAnchor').text()).to.equal('https://google.com');
+    expect(wrapper.find('.myCommentAnchor').props().href).to.equal('https://google.com#123');
+  });
+
+  it('should render the comment with styles', () => {
+    expect(render.props().style).to.be.defined;
+  });
+});

tests/client/coral-plugin-history/CommentHistory.spec.js

@@ -0,0 +1,24 @@
+import React from 'react';
+import {shallow, mount} from 'enzyme';
+import {expect} from 'chai';
+import CommentHistory from '../../../client/coral-plugin-history/CommentHistory';
+
+describe('coral-plugin-history/CommentHistory', () => {
+  let render;
+  const comments = [{body: 'a comment or something', 'status_history':[{'type':'premod', 'created_at':'2016-12-09T01:40:53.327Z', 'assigned_by':null}, {'created_at':'2016-12-09T22:52:44.888Z', 'type':'accepted', 'assigned_by':'92256159-1164-4f66-9970-c7f23de7e461'}], 'asset_id':'96fddf96-7c83-4008-80ad-50091997d006', 'created_at':'2016-12-09T01:40:53.360Z', 'author_id':'92256159-1164-4f66-9970-c7f23de7e461', 'status':'accepted', '__v':0, 'updated_at':'2016-12-09T22:52:44.893Z', 'id':'3962c2ea-4ec4-42e4-b9bd-c571ff30f56b'}, {'body':'another comment', 'status_history':[{'type':'premod', 'created_at':'2016-12-09T22:53:43.148Z', 'assigned_by':null}], 'asset_id':'96fddf96-7c83-4008-80ad-50091997d006', 'created_at':'2016-12-09T22:53:43.158Z', 'author_id':'92256159-1164-4f66-9970-c7f23de7e461', 'status':'premod', '__v':0, 'updated_at':'2016-12-09T22:53:43.158Z', 'id':'b51e27af-bcfd-4932-91be-e3f01a4802e6'}, {'body':'can I comment?', 'status_history':[{'type':'premod', 'created_at':'2016-12-13T23:23:47.123Z', 'assigned_by':null}, {'created_at':'2016-12-13T23:23:58.487Z', 'type':'accepted', 'assigned_by':'92256159-1164-4f66-9970-c7f23de7e461'}], 'asset_id':'cef81015-1b53-4d70-b9af-6eca680f22fc', 'created_at':'2016-12-13T23:23:47.131Z', 'author_id':'92256159-1164-4f66-9970-c7f23de7e461', 'status':'accepted', '__v':0, 'updated_at':'2016-12-13T23:23:58.493Z', 'id':'dc9d7be1-b911-4dc3-8e1e-400e8b8d110e'}, {'body':'pre-mod comment', 'status_history':[{'type':'premod', 'created_at':'2016-12-08T21:34:56.994Z', 'assigned_by':null}, {'created_at':'2016-12-08T21:38:04.961Z', 'type':'rejected', 'assigned_by':'92256159-1164-4f66-9970-c7f23de7e461'}], 'asset_id':'96fddf96-7c83-4008-80ad-50091997d006', 'created_at':'2016-12-08T21:34:56.997Z', 'author_id':'92256159-1164-4f66-9970-c7f23de7e461', 'status':'rejected', '__v':0, 'updated_at':'2016-12-08T21:38:04.965Z', 'id':'6f02af16-a8f8-4ead-80ea-0d48824eb74d'}, {'body':'a flagged  commetn', 'status_history':[{'type':'premod', 'created_at':'2016-12-08T21:38:26.342Z', 'assigned_by':null}, {'created_at':'2016-12-09T23:47:27.009Z', 'type':'accepted', 'assigned_by':'92256159-1164-4f66-9970-c7f23de7e461'}], 'asset_id':'96fddf96-7c83-4008-80ad-50091997d006', 'created_at':'2016-12-08T21:38:26.344Z', 'author_id':'92256159-1164-4f66-9970-c7f23de7e461', 'status':'accepted', '__v':0, 'updated_at':'2016-12-09T23:47:27.018Z', 'id':'784c5f91-36b9-4bda-b4ca-a114cef2c9f0'}, {'body':'a post mod comment', 'status_history':[{'type':'premod', 'created_at':'2016-12-08T22:19:05.870Z', 'assigned_by':null}, {'created_at':'2016-12-09T23:26:41.427Z', 'type':'accepted', 'assigned_by':'92256159-1164-4f66-9970-c7f23de7e461'}], 'asset_id':'96fddf96-7c83-4008-80ad-50091997d006', 'created_at':'2016-12-08T22:19:05.874Z', 'author_id':'92256159-1164-4f66-9970-c7f23de7e461', 'status':'accepted', '__v':0, 'updated_at':'2016-12-09T23:26:41.450Z', 'id':'e8b86039-f850-4e53-bd9d-f8c9186a9637'}, {'body':'an actual post-mod comment here', 'status_history':[], 'asset_id':'96fddf96-7c83-4008-80ad-50091997d006', 'created_at':'2016-12-08T22:20:11.147Z', 'author_id':'92256159-1164-4f66-9970-c7f23de7e461', 'status':null, '__v':0, 'updated_at':'2016-12-08T22:20:11.147Z', 'id':'cff1a318-50c6-431e-9a63-de7a7b7136bf'}];
+  const assets = [{'settings': null, 'created_at':'2016-12-06T21:36:09.302Z', 'url':'localhost:3000/', 'scraped':null, 'status':'open', 'updated_at':'2016-12-08T02:11:15.943Z', '_id':'58472f499e775a38f23d5da0', 'type':'article', 'closedMessage':null, 'id':'7302e637-f884-47c0-9723-02cc10a18617', 'closedAt':null}, {'settings':null, 'created_at':'2016-12-07T02:25:31.983Z', 'url':'http://localhost:3000/', 'scraped':null, 'status':'open', 'updated_at':'2016-12-13T22:58:36.061Z', '_id':'5847731b9e775a38f23d5da1', 'type':'article', 'closedMessage':null, 'id':'96fddf96-7c83-4008-80ad-50091997d006', 'closedAt':null}, {'settings':null, 'created_at':'2016-12-12T19:04:05.770Z', 'url':'http://localhost:3000/embed/stream', 'scraped':null, 'updated_at':'2016-12-14T20:13:21.934Z', '_id':'584ef4a59e775a38f23d5e86', 'type':'article', 'closedMessage':null, 'id':'cef81015-1b53-4d70-b9af-6eca680f22fc', 'closedAt':null}];
+
+  beforeEach(() => {
+    render = shallow(<CommentHistory comments={comments} assets={assets} />);
+  });
+
+  it('should render Comments as children when given comments and assets', () => {
+    const wrapper = mount(<CommentHistory comments={comments} assets={assets} />);
+    expect(wrapper.find('.commentHistory__list').children()).to.have.length(7);
+  });
+
+  it('should render with styles', () => {
+    expect(render.props().style).to.be.defined;
+  });
+});
+

tests/e2e/tests/EmbedStreamTests.js

@@ -18,12 +18,13 @@ module.exports = {
     client.perform((client, done) => {
       mocks.settings({moderation: 'post'})
       .then(() => {
-        //Load Page
+
+        // Load Page
         client.resizeWindow(1200, 800)
           .url(client.globals.baseUrl)
           .frame('coralStreamIframe')
 
-          //Register and Log In
+          // Register and Log In
           .waitForElementVisible('#commentBox', 1000)
           .waitForElementVisible('#coralSignInButton', 2000)
           .click('#coralSignInButton')
@@ -44,7 +45,7 @@ module.exports = {
           .click('.coral-plugin-commentbox-button')
           .waitForElementVisible('.comment', 1000)
 
-          //Verify that it appears
+          // Verify that it appears
           .assert.containsText('.comment', mockComment);
         done();
       })
@@ -58,7 +59,8 @@ module.exports = {
     client.perform((client, done) => {
       mocks.settings({moderation: 'pre'})
       .then(() => {
-        //Load Page
+
+        // Load Page
         client.url(client.globals.baseUrl)
           .frame('coralStreamIframe');
 
@@ -68,7 +70,7 @@ module.exports = {
           .click('.coral-plugin-commentbox-button')
           .waitForElementVisible('#coral-notif', 1000)
 
-          //Verify that it appears
+          // Verify that it appears
           .assert.containsText('#coral-notif', 'moderation team');
         done();
       })
@@ -82,7 +84,8 @@ module.exports = {
     client.perform((client, done) => {
       mocks.settings({moderation: 'post'})
       .then(() => {
-        //Load Page
+
+        // Load Page
         client.resizeWindow(1200, 800)
           .url(client.globals.baseUrl)
           .frame('coralStreamIframe');
@@ -100,7 +103,7 @@ module.exports = {
           .click('.coral-plugin-replies-textarea button')
           .waitForElementVisible('.reply', 2000)
 
-          //Verify that it appears
+          // Verify that it appears
           .assert.containsText('.reply', mockReply);
         done();
       })
@@ -132,7 +135,8 @@ module.exports = {
         }]);
       })
       .then(() => {
-        //Load Page
+
+        // Load Page
         client.resizeWindow(1200, 800)
           .url(client.globals.baseUrl)
           .frame('coralStreamIframe');
@@ -145,7 +149,7 @@ module.exports = {
           .click('.coral-plugin-replies-textarea button')
           .waitForElementVisible('#coral-notif', 1000)
 
-          //Verify that it appears
+          // Verify that it appears
           .assert.containsText('#coral-notif', 'moderation team');
         done();
       })

tests/helpers/browser.js

@@ -0,0 +1,49 @@
+const jsdom = require('jsdom').jsdom;
+const fs = require('fs');
+const path = require('path');
+
+// Storage Mock
+function storageMock() {
+  const storage = {};
+
+  return {
+    setItem: function(key, value) {
+      storage[key] = value || '';
+    },
+    getItem: function(key) {
+      return storage[key] || null;
+    },
+    removeItem: function(key) {
+      delete storage[key];
+    },
+    get length() {
+      return Object.keys(storage).length;
+    },
+    key: function(i) {
+      const keys = Object.keys(storage);
+      return keys[i] || null;
+    }
+  };
+}
+
+global.document = jsdom(fs.readFileSync(path.resolve(__dirname, 'index.test.html')));
+global.window = document.defaultView;
+
+// these lines are required for react-mdl
+global.window.CustomEvent = undefined;
+require('react-mdl/extra/material');
+
+global.Element = global.window.Element;
+
+global.navigator = {
+  userAgent: 'node.js'
+};
+
+global.documentRef = document;
+global.localStorage = {};
+global.sessionStorage = storageMock();
+global.XMLHttpRequest = storageMock();
+
+global.Headers = function(headers) {
+  return headers;
+};

tests/routes/api/comments/index.js

@@ -85,6 +85,29 @@ describe('/api/v1/comments', () => {
       ]);
     });
 
+    it('should return only the owner’s comments if the user is not an admin', () => {
+      return chai.request(app)
+        .get('/api/v1/comments?user_id=456')
+        .set(passport.inject({id: '456', roles: []}))
+        .then(res => {
+          expect(res).to.have.status(200);
+          expect(res.body.comments).to.have.length(2);
+          expect(res.body.comments[1]).to.have.property('author_id', '456');
+        });
+    });
+
+    it('should fail if a non-admin requests comments not owned by them', () => {
+      return chai.request(app)
+        .get('/api/v1/comments?user_id=456')
+        .set(passport.inject({id: '123', roles: []}))
+        .then((res) => {
+          expect(res).to.be.empty;
+        })
+        .catch((err) => {
+          expect(err).to.have.property('status', 401);
+        });
+    });
+
     it('should return all the comments', () => {
       return chai.request(app)
         .get('/api/v1/comments')

tests/utils/e2e-mongoose.js

@@ -3,8 +3,10 @@ const mongoose = require('../../services/mongoose');
 // Ensure the NODE_ENV is set to 'test',
 // this is helpful when you would like to change behavior when testing.
 function clearDB() {
+
   // console.log('Clearing DB', mongoose.connection);
   for (let i in mongoose.connection.collections) {
+
     // console.log('Clearing', i);
     mongoose.connection.collections[i].remove(function() {});
   }