diff --git a/app/javascript/themes/glitch/components/__tests__/__snapshots__/avatar-test.js.snap b/app/javascript/themes/glitch/components/__tests__/__snapshots__/avatar-test.js.snap
deleted file mode 100644
index 4005c860f1..0000000000
--- a/app/javascript/themes/glitch/components/__tests__/__snapshots__/avatar-test.js.snap
+++ /dev/null
@@ -1,35 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[` Autoplay renders a animated avatar 1`] = `
-
-`;
-
-exports[` Still renders a still avatar 1`] = `
-
-`;
diff --git a/app/javascript/themes/glitch/components/__tests__/__snapshots__/avatar_overlay-test.js.snap b/app/javascript/themes/glitch/components/__tests__/__snapshots__/avatar_overlay-test.js.snap
deleted file mode 100644
index d9e5e52528..0000000000
--- a/app/javascript/themes/glitch/components/__tests__/__snapshots__/avatar_overlay-test.js.snap
+++ /dev/null
@@ -1,26 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`
-
-
-
-`;
diff --git a/app/javascript/themes/glitch/components/__tests__/__snapshots__/button-test.js.snap b/app/javascript/themes/glitch/components/__tests__/__snapshots__/button-test.js.snap
deleted file mode 100644
index 707cbf6739..0000000000
--- a/app/javascript/themes/glitch/components/__tests__/__snapshots__/button-test.js.snap
+++ /dev/null
@@ -1,130 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[` adds class "button-secondary" if props.secondary given 1`] = `
-
-`;
-
-exports[` renders a button element 1`] = `
-
-`;
-
-exports[` renders a disabled attribute if props.disabled given 1`] = `
-
-`;
-
-exports[` renders class="button--block" if props.block given 1`] = `
-
-`;
-
-exports[` renders the children 1`] = `
-
-`;
-
-exports[` renders the given text 1`] = `
-
-`;
-
-exports[` renders the props.text instead of children 1`] = `
-
-`;
-
-exports[` renders title if props.title is given 1`] = `
-
-`;
diff --git a/app/javascript/themes/glitch/components/__tests__/__snapshots__/display_name-test.js.snap b/app/javascript/themes/glitch/components/__tests__/__snapshots__/display_name-test.js.snap
deleted file mode 100644
index 533359ffea..0000000000
--- a/app/javascript/themes/glitch/components/__tests__/__snapshots__/display_name-test.js.snap
+++ /dev/null
@@ -1,23 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[` renders display name + account name 1`] = `
-
- Foo",
- }
- }
- />
-
-
- @
- bar@baz
-
-
-`;
diff --git a/app/javascript/themes/glitch/components/__tests__/avatar-test.js b/app/javascript/themes/glitch/components/__tests__/avatar-test.js
deleted file mode 100644
index dd3f7b7d21..0000000000
--- a/app/javascript/themes/glitch/components/__tests__/avatar-test.js
+++ /dev/null
@@ -1,36 +0,0 @@
-import React from 'react';
-import renderer from 'react-test-renderer';
-import { fromJS } from 'immutable';
-import Avatar from '../avatar';
-
-describe('', () => {
- const account = fromJS({
- username: 'alice',
- acct: 'alice',
- display_name: 'Alice',
- avatar: '/animated/alice.gif',
- avatar_static: '/static/alice.jpg',
- });
-
- const size = 100;
-
- describe('Autoplay', () => {
- it('renders a animated avatar', () => {
- const component = renderer.create();
- const tree = component.toJSON();
-
- expect(tree).toMatchSnapshot();
- });
- });
-
- describe('Still', () => {
- it('renders a still avatar', () => {
- const component = renderer.create();
- const tree = component.toJSON();
-
- expect(tree).toMatchSnapshot();
- });
- });
-
- // TODO add autoplay test if possible
-});
diff --git a/app/javascript/themes/glitch/components/__tests__/avatar_overlay-test.js b/app/javascript/themes/glitch/components/__tests__/avatar_overlay-test.js
deleted file mode 100644
index 44addea832..0000000000
--- a/app/javascript/themes/glitch/components/__tests__/avatar_overlay-test.js
+++ /dev/null
@@ -1,29 +0,0 @@
-import React from 'react';
-import renderer from 'react-test-renderer';
-import { fromJS } from 'immutable';
-import AvatarOverlay from '../avatar_overlay';
-
-describe(' {
- const account = fromJS({
- username: 'alice',
- acct: 'alice',
- display_name: 'Alice',
- avatar: '/animated/alice.gif',
- avatar_static: '/static/alice.jpg',
- });
-
- const friend = fromJS({
- username: 'eve',
- acct: 'eve@blackhat.lair',
- display_name: 'Evelyn',
- avatar: '/animated/eve.gif',
- avatar_static: '/static/eve.jpg',
- });
-
- it('renders a overlay avatar', () => {
- const component = renderer.create();
- const tree = component.toJSON();
-
- expect(tree).toMatchSnapshot();
- });
-});
diff --git a/app/javascript/themes/glitch/components/__tests__/button-test.js b/app/javascript/themes/glitch/components/__tests__/button-test.js
deleted file mode 100644
index 924ba39dc6..0000000000
--- a/app/javascript/themes/glitch/components/__tests__/button-test.js
+++ /dev/null
@@ -1,82 +0,0 @@
-import { shallow } from 'enzyme';
-import React from 'react';
-import renderer from 'react-test-renderer';
-import Button from '../button';
-
-describe('', () => {
- it('renders a button element', () => {
- const component = renderer.create();
- const tree = component.toJSON();
-
- expect(tree).toMatchSnapshot();
- });
-
- it('renders the given text', () => {
- const text = 'foo';
- const component = renderer.create();
- const tree = component.toJSON();
-
- expect(tree).toMatchSnapshot();
- });
-
- it('handles click events using the given handler', () => {
- const handler = jest.fn();
- const button = shallow();
- button.find('button').simulate('click');
-
- expect(handler.mock.calls.length).toEqual(1);
- });
-
- it('does not handle click events if props.disabled given', () => {
- const handler = jest.fn();
- const button = shallow();
- button.find('button').simulate('click');
-
- expect(handler.mock.calls.length).toEqual(0);
- });
-
- it('renders a disabled attribute if props.disabled given', () => {
- const component = renderer.create();
- const tree = component.toJSON();
-
- expect(tree).toMatchSnapshot();
- });
-
- it('renders the children', () => {
- const children = children
;
- const component = renderer.create();
- const tree = component.toJSON();
-
- expect(tree).toMatchSnapshot();
- });
-
- it('renders the props.text instead of children', () => {
- const text = 'foo';
- const children = children
;
- const component = renderer.create();
- const tree = component.toJSON();
-
- expect(tree).toMatchSnapshot();
- });
-
- it('renders class="button--block" if props.block given', () => {
- const component = renderer.create();
- const tree = component.toJSON();
-
- expect(tree).toMatchSnapshot();
- });
-
- it('adds class "button-secondary" if props.secondary given', () => {
- const component = renderer.create();
- const tree = component.toJSON();
-
- expect(tree).toMatchSnapshot();
- });
-
- it('renders title if props.title is given', () => {
- const component = renderer.create();
- const tree = component.toJSON();
-
- expect(tree).toMatchSnapshot();
- });
-});
diff --git a/app/javascript/themes/glitch/components/__tests__/display_name-test.js b/app/javascript/themes/glitch/components/__tests__/display_name-test.js
deleted file mode 100644
index 0d040c4cd8..0000000000
--- a/app/javascript/themes/glitch/components/__tests__/display_name-test.js
+++ /dev/null
@@ -1,18 +0,0 @@
-import React from 'react';
-import renderer from 'react-test-renderer';
-import { fromJS } from 'immutable';
-import DisplayName from '../display_name';
-
-describe('', () => {
- it('renders display name + account name', () => {
- const account = fromJS({
- username: 'bar',
- acct: 'bar@baz',
- display_name_html: 'Foo
',
- });
- const component = renderer.create();
- const tree = component.toJSON();
-
- expect(tree).toMatchSnapshot();
- });
-});
diff --git a/app/javascript/themes/glitch/features/ui/components/__tests__/column-test.js b/app/javascript/themes/glitch/features/ui/components/__tests__/column-test.js
deleted file mode 100644
index 1e5e1d8dc5..0000000000
--- a/app/javascript/themes/glitch/features/ui/components/__tests__/column-test.js
+++ /dev/null
@@ -1,34 +0,0 @@
-import React from 'react';
-import { mount } from 'enzyme';
-import Column from '../column';
-import ColumnHeader from '../column_header';
-
-describe('', () => {
- describe(' click handler', () => {
- const originalRaf = global.requestAnimationFrame;
-
- beforeEach(() => {
- global.requestAnimationFrame = jest.fn();
- });
-
- afterAll(() => {
- global.requestAnimationFrame = originalRaf;
- });
-
- it('runs the scroll animation if the column contains scrollable content', () => {
- const wrapper = mount(
-
-
-
- );
- wrapper.find(ColumnHeader).simulate('click');
- expect(global.requestAnimationFrame.mock.calls.length).toEqual(1);
- });
-
- it('does not try to scroll if there is no scrollable content', () => {
- const wrapper = mount();
- wrapper.find(ColumnHeader).simulate('click');
- expect(global.requestAnimationFrame.mock.calls.length).toEqual(0);
- });
- });
-});
diff --git a/app/javascript/themes/glitch/util/emoji/__tests__/emoji-test.js b/app/javascript/themes/glitch/util/emoji/__tests__/emoji-test.js
deleted file mode 100644
index d43dd005c7..0000000000
--- a/app/javascript/themes/glitch/util/emoji/__tests__/emoji-test.js
+++ /dev/null
@@ -1,77 +0,0 @@
-import emojify from '..';
-
-describe('emoji', () => {
- describe('.emojify', () => {
- it('ignores unknown shortcodes', () => {
- expect(emojify(':foobarbazfake:')).toEqual(':foobarbazfake:');
- });
-
- it('ignores shortcodes inside of tags', () => {
- expect(emojify('')).toEqual('');
- });
-
- it('works with unclosed tags', () => {
- expect(emojify('hello>')).toEqual('hello>');
- expect(emojify(' {
- expect(emojify('smile:')).toEqual('smile:');
- expect(emojify(':smile')).toEqual(':smile');
- });
-
- it('does unicode', () => {
- expect(emojify('\uD83D\uDC69\u200D\uD83D\uDC69\u200D\uD83D\uDC66\u200D\uD83D\uDC66')).toEqual(
- '');
- expect(emojify('π¨βπ©βπ§βπ§')).toEqual(
- '');
- expect(emojify('π©βπ©βπ¦')).toEqual('');
- expect(emojify('\u2757')).toEqual(
- '');
- });
-
- it('does multiple unicode', () => {
- expect(emojify('\u2757 #\uFE0F\u20E3')).toEqual(
- ' ');
- expect(emojify('\u2757#\uFE0F\u20E3')).toEqual(
- '');
- expect(emojify('\u2757 #\uFE0F\u20E3 \u2757')).toEqual(
- ' ');
- expect(emojify('foo \u2757 #\uFE0F\u20E3 bar')).toEqual(
- 'foo bar');
- });
-
- it('ignores unicode inside of tags', () => {
- expect(emojify('')).toEqual('');
- });
-
- it('does multiple emoji properly (issue 5188)', () => {
- expect(emojify('πππ')).toEqual('');
- expect(emojify('π π π')).toEqual(' ');
- });
-
- it('does an emoji that has no shortcode', () => {
- expect(emojify('ποΈ')).toEqual('');
- });
-
- it('does an emoji whose filename is irregular', () => {
- expect(emojify('βοΈ')).toEqual('');
- });
-
- it('avoid emojifying on invisible text', () => {
- expect(emojify('http://example.com/testπ'))
- .toEqual('http://example.com/testπ');
- expect(emojify(':luigi:', { ':luigi:': { static_url: 'luigi.exe' } }))
- .toEqual(':luigi:');
- });
-
- it('avoid emojifying on invisible text with nested tags', () => {
- expect(emojify('πbarπ΄π'))
- .toEqual('πbarπ΄');
- expect(emojify('πππ΄π'))
- .toEqual('πππ΄');
- expect(emojify('π
π΄π'))
- .toEqual('π
π΄');
- });
- });
-});
diff --git a/app/javascript/themes/glitch/util/emoji/__tests__/emoji_index-test.js b/app/javascript/themes/glitch/util/emoji/__tests__/emoji_index-test.js
deleted file mode 100644
index 53efa57434..0000000000
--- a/app/javascript/themes/glitch/util/emoji/__tests__/emoji_index-test.js
+++ /dev/null
@@ -1,130 +0,0 @@
-import { pick } from 'lodash';
-import { emojiIndex } from 'emoji-mart';
-import { search } from '../emoji_mart_search_light';
-
-const trimEmojis = emoji => pick(emoji, ['id', 'unified', 'native', 'custom']);
-
-describe('emoji_index', () => {
- it('should give same result for emoji_index_light and emoji-mart', () => {
- const expected = [
- {
- id: 'pineapple',
- unified: '1f34d',
- native: 'π',
- },
- ];
- expect(search('pineapple').map(trimEmojis)).toEqual(expected);
- expect(emojiIndex.search('pineapple').map(trimEmojis)).toEqual(expected);
- });
-
- it('orders search results correctly', () => {
- const expected = [
- {
- id: 'apple',
- unified: '1f34e',
- native: 'π',
- },
- {
- id: 'pineapple',
- unified: '1f34d',
- native: 'π',
- },
- {
- id: 'green_apple',
- unified: '1f34f',
- native: 'π',
- },
- {
- id: 'iphone',
- unified: '1f4f1',
- native: 'π±',
- },
- ];
- expect(search('apple').map(trimEmojis)).toEqual(expected);
- expect(emojiIndex.search('apple').map(trimEmojis)).toEqual(expected);
- });
-
- it('handles custom emoji', () => {
- const custom = [
- {
- id: 'mastodon',
- name: 'mastodon',
- short_names: ['mastodon'],
- text: '',
- emoticons: [],
- keywords: ['mastodon'],
- imageUrl: 'http://example.com',
- custom: true,
- },
- ];
- search('', { custom });
- emojiIndex.search('', { custom });
- const expected = [
- {
- id: 'mastodon',
- custom: true,
- },
- ];
- expect(search('masto').map(trimEmojis)).toEqual(expected);
- expect(emojiIndex.search('masto').map(trimEmojis)).toEqual(expected);
- });
-
- it('should filter only emojis we care about, exclude pineapple', () => {
- const emojisToShowFilter = unified => unified !== '1F34D';
- expect(search('apple', { emojisToShowFilter }).map((obj) => obj.id))
- .not.toContain('pineapple');
- expect(emojiIndex.search('apple', { emojisToShowFilter }).map((obj) => obj.id))
- .not.toContain('pineapple');
- });
-
- it('can include/exclude categories', () => {
- expect(search('flag', { include: ['people'] })).toEqual([]);
- expect(emojiIndex.search('flag', { include: ['people'] })).toEqual([]);
- });
-
- it('does an emoji whose unified name is irregular', () => {
- const expected = [
- {
- 'id': 'water_polo',
- 'unified': '1f93d',
- 'native': 'π€½',
- },
- {
- 'id': 'man-playing-water-polo',
- 'unified': '1f93d-200d-2642-fe0f',
- 'native': 'π€½ββοΈ',
- },
- {
- 'id': 'woman-playing-water-polo',
- 'unified': '1f93d-200d-2640-fe0f',
- 'native': 'π€½ββοΈ',
- },
- ];
- expect(search('polo').map(trimEmojis)).toEqual(expected);
- expect(emojiIndex.search('polo').map(trimEmojis)).toEqual(expected);
- });
-
- it('can search for thinking_face', () => {
- const expected = [
- {
- id: 'thinking_face',
- unified: '1f914',
- native: 'π€',
- },
- ];
- expect(search('thinking_fac').map(trimEmojis)).toEqual(expected);
- expect(emojiIndex.search('thinking_fac').map(trimEmojis)).toEqual(expected);
- });
-
- it('can search for woman-facepalming', () => {
- const expected = [
- {
- id: 'woman-facepalming',
- unified: '1f926-200d-2640-fe0f',
- native: 'π€¦ββοΈ',
- },
- ];
- expect(search('woman-facep').map(trimEmojis)).toEqual(expected);
- expect(emojiIndex.search('woman-facep').map(trimEmojis)).toEqual(expected);
- });
-});
diff --git a/jest.config.js b/jest.config.js
index 50bde57e65..dc61b9a9dc 100644
--- a/jest.config.js
+++ b/jest.config.js
@@ -9,6 +9,7 @@ module.exports = {
'/log/',
'/public/',
'/tmp/',
+ '/app/javascript/themes/',
],
setupFiles: [
'raf/polyfill',