OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'dbkr/dont_put_src_in_resolve_root' into dbkr/translations

pull/4035/head
David Baker 2017-05-26 14:02:44 +01:00
parent ee2a49ad41 9c7731e141
commit 0ab9486829
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

@ -47,7 +47,6 @@ webpack_config.module.noParse.push(/sinon\/pkg\/sinon\.js$/);
webpack_config.resolve.alias['sinon'] = 'sinon/pkg/sinon.js';
webpack_config.resolve.root = [
path.resolve('./src'),
path.resolve('./test'),
];

2
test/skin-sdk.js
View File

@ -5,4 +5,4 @@
*/
var sdk = require('matrix-react-sdk');
sdk.loadSkin(require('component-index'));
sdk.loadSkin(require('../src/component-index'));

2
test/unit-tests/notifications/ContentRules-test.js
View File

@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
var notifications = require('notifications');
var notifications = require('../../../src/notifications');
var ContentRules = notifications.ContentRules;
var PushRuleVectorState = notifications.PushRuleVectorState;

2
test/unit-tests/notifications/PushRuleVectorState-test.js
View File

@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
var notifications = require('notifications');
var notifications = require('../../../src/notifications');
var prvs = notifications.PushRuleVectorState;