diff --git a/package.json b/package.json index ab7a789e0..909452231 100644 --- a/package.json +++ b/package.json @@ -10,7 +10,7 @@ "build-watch": "NODE_ENV=development webpack --progress --config webpack.config.js --watch", "lint": "eslint bin/* .", "lint-fix": "eslint bin/* . --fix", - "test": "TEST_MODE=unit NODE_ENV=test mocha -r jsdom-global/register ${MOCHA_REPORTER:-spec}", + "test": "TEST_MODE=unit NODE_ENV=test mocha -R ${MOCHA_REPORTER:-spec}", "test-cover": "TEST_MODE=unit NODE_ENV=test istanbul cover _mocha --report text --check-coverage -- -R spec", "pree2e": "NODE_ENV=test TALK_PORT=3011 scripts/pree2e.sh", "e2e": "NODE_ENV=test nightwatch", @@ -62,15 +62,14 @@ "env-rewrite": "^1.0.2", "express": "^4.14.0", "express-session": "^1.14.2", - "form-data": "^2.1.2", "gql-merge": "^0.0.4", + "form-data": "^2.1.2", "graphql": "^0.8.2", "graphql-errors": "^2.1.0", "graphql-server-express": "^0.5.0", "graphql-tools": "^0.9.0", "helmet": "^3.1.0", "inquirer": "^3.0.1", - "jsdom-global": "^2.1.1", "jsonwebtoken": "^7.1.9", "kue": "^0.11.5", "linkify-it": "^2.0.3", @@ -134,7 +133,7 @@ "immutable": "^3.8.1", "imports-loader": "^0.6.5", "istanbul": "^1.1.0-alpha.1", - "jsdom": "^9.12.0", + "jsdom": "^9.8.3", "json-loader": "^0.5.4", "keymaster": "^1.6.2", "license-webpack-plugin": "^0.4.2", diff --git a/test/client/coral-plugin-history/Comment.spec.js b/test/client/coral-plugin-history/Comment.spec.js deleted file mode 100644 index 6d69d54cd..000000000 --- a/test/client/coral-plugin-history/Comment.spec.js +++ /dev/null @@ -1,30 +0,0 @@ -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({}}/>); - }); - - it('should render the provided comment body', () => { - const wrapper = mount({}}/>); - 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({}}/>); - expect(wrapper.find('.myCommentAnchor')).to.have.length(1); - expect(wrapper.find('.myCommentAnchor').text()).to.equal('https://google.com'); - }); - - it('should render the comment with styles', () => { - expect(render.props().style).to.be.defined; - }); -}); diff --git a/test/client/coral-plugin-history/CommentHistory.spec.js b/test/client/coral-plugin-history/CommentHistory.spec.js deleted file mode 100644 index 671a50137..000000000 --- a/test/client/coral-plugin-history/CommentHistory.spec.js +++ /dev/null @@ -1,39 +0,0 @@ -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 asset = { - '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 - }; - - comments.forEach((comment) => { - comment.asset = asset; - }); - - beforeEach(() => { - render = shallow({}}/>); - }); - - it('should render Comments as children when given comments and assets', () => { - const wrapper = mount({}}/>); - expect(wrapper.find('.commentHistory__list').children()).to.have.length(7); - }); - - it('should render with styles', () => { - expect(render.props().style).to.be.defined; - }); -});