diff --git a/.babelrc b/.babelrc
index 3dcf42eb7..92a64c2a4 100644
--- a/.babelrc
+++ b/.babelrc
@@ -10,5 +10,12 @@
"transform-async-to-generator",
"transform-react-jsx",
"syntax-dynamic-import"
- ]
+ ],
+ "env": {
+ "test": {
+ "plugins": [
+ ["transform-es2015-modules-commonjs", "dynamic-import-node"]
+ ]
+ }
+ }
}
diff --git a/client/talk-plugin-infobox/__tests__/markdown.spec.js b/client/coral-framework/components/__tests__/Markdown.spec.js
similarity index 81%
rename from client/talk-plugin-infobox/__tests__/markdown.spec.js
rename to client/coral-framework/components/__tests__/Markdown.spec.js
index 1d98dabae..ab2c1afd1 100644
--- a/client/talk-plugin-infobox/__tests__/markdown.spec.js
+++ b/client/coral-framework/components/__tests__/Markdown.spec.js
@@ -1,6 +1,5 @@
import React from 'react';
import {shallow} from 'enzyme';
-import {expect} from 'chai';
import Markdown from '../Markdown';
const render = (props) => shallow();
@@ -9,12 +8,12 @@ describe('Markdown', () => {
it('should convert Markdown to html', () => {
const wrapper = render({content: '*test*'});
const html = wrapper.html();
- expect(html).to.contain('');
+ expect(html).toMatch('');
});
it('should set target="_parent" for links', () => {
const wrapper = render({content: '[link](https://coralproject.net)'});
const html = wrapper.html();
- expect(html).to.contain('target="_parent"');
+ expect(html).toMatch('target="_parent"');
});
});
diff --git a/client/coral-framework/services/i18n.js b/client/coral-framework/services/i18n.js
index 1a4910b21..87e375853 100644
--- a/client/coral-framework/services/i18n.js
+++ b/client/coral-framework/services/i18n.js
@@ -13,7 +13,7 @@ import pt_BR from '../../../locales/pt_BR.yml';
// Translations are happening at https://translate.lingohub.com/the-coral-project/dashboard
-const defaultLanguage = 'en';
+const defaultLanguage = process.env.TALK_DEFAULT_LANG;
const translations = {...en, ...es, ...fr, ...pt_BR};
let lang;
diff --git a/client/talk-plugin-commentbox/__tests__/commentBox.spec.js b/client/talk-plugin-commentbox/__tests__/commentBox.spec.js
deleted file mode 100644
index 6ae09e786..000000000
--- a/client/talk-plugin-commentbox/__tests__/commentBox.spec.js
+++ /dev/null
@@ -1,26 +0,0 @@
-import React from 'react';
-import {shallow} from 'enzyme';
-import {expect} from 'chai';
-import CommentBox from '../CommentBox';
-
-describe('CommentBox', () => {
- let comment;
- let render;
- beforeEach(() => {
- comment = {};
- const postItem = (item) => {
- comment.posted = item;
- return Promise.resolve(4);
- };
- render = shallow( comment.text = e.target.value}
- item_id={'1'}
- comments={['1', '2', '3']}/>);
- });
-
- it('should render the CommentBox appropriately', () => {
- expect(render.contains('