mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web synced 2024-10-22 18:55:47 +03:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'dbkr/dont_put_src_in_resolve_root' into dbkr/translations

Browse source
This commit is contained in:
David Baker 2017-05-25 23:16:39 +01:00
commit dfc8cf3f54
4 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
karma.conf.js
View file

@ -166,7 +166,6 @@ module.exports = function (config) {
'sinon': 'sinon/pkg/sinon.js',
},
root: [
path.resolve('./src'),
path.resolve('./test'),
],
},

2
test/components/views/dialogs/InteractiveAuthDialog-test.js
View file

@ -22,7 +22,7 @@ import ReactTestUtils from 'react-addons-test-utils';
import sinon from 'sinon';
import sdk from 'matrix-react-sdk';
import MatrixClientPeg from 'MatrixClientPeg';
import MatrixClientPeg from '../../../../src/MatrixClientPeg';
import * as test_utils from '../../../test-utils';

2
test/components/views/rooms/MessageComposerInput-test.js
View file

@ -8,7 +8,7 @@ import * as testUtils from '../../../test-utils';
import sdk from 'matrix-react-sdk';
import UserSettingsStore from '../../../../src/UserSettingsStore';
const MessageComposerInput = sdk.getComponent('views.rooms.MessageComposerInput');
import MatrixClientPeg from 'MatrixClientPeg';
import MatrixClientPeg from '../../../../src/MatrixClientPeg';
function addTextToDraft(text) {
const components = document.getElementsByClassName('public-DraftEditor-content');

2
test/utils/MegolmExportEncryption-test.js
View file

@ -16,7 +16,7 @@ limitations under the License.
"use strict";
import * as MegolmExportEncryption from 'utils/MegolmExportEncryption';
import * as MegolmExportEncryption from '../../src/utils/MegolmExportEncryption';
import * as testUtils from '../test-utils';
import expect from 'expect';