From 9c7731e1418ad3b906213f2a9e0c3e3e786ea39a Mon Sep 17 00:00:00 2001 From: David Baker Date: Fri, 26 May 2017 14:02:03 +0100 Subject: [PATCH] Don't include src in the test resolve root As https://github.com/matrix-org/matrix-react-sdk/pull/931 --- karma.conf.js | 1 - test/skin-sdk.js | 2 +- test/unit-tests/notifications/ContentRules-test.js | 2 +- test/unit-tests/notifications/PushRuleVectorState-test.js | 2 +- 4 files changed, 3 insertions(+), 4 deletions(-) diff --git a/karma.conf.js b/karma.conf.js index b0a48c92b..1e0436631 100644 --- a/karma.conf.js +++ b/karma.conf.js @@ -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'), ]; diff --git a/test/skin-sdk.js b/test/skin-sdk.js index a5a7233c3..3421d5d07 100644 --- a/test/skin-sdk.js +++ b/test/skin-sdk.js @@ -5,4 +5,4 @@ */ var sdk = require('matrix-react-sdk'); -sdk.loadSkin(require('component-index')); +sdk.loadSkin(require('../src/component-index')); diff --git a/test/unit-tests/notifications/ContentRules-test.js b/test/unit-tests/notifications/ContentRules-test.js index e7928147f..c1cdc40a8 100644 --- a/test/unit-tests/notifications/ContentRules-test.js +++ b/test/unit-tests/notifications/ContentRules-test.js @@ -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; diff --git a/test/unit-tests/notifications/PushRuleVectorState-test.js b/test/unit-tests/notifications/PushRuleVectorState-test.js index 6b0f81c60..68e7044f6 100644 --- a/test/unit-tests/notifications/PushRuleVectorState-test.js +++ b/test/unit-tests/notifications/PushRuleVectorState-test.js @@ -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;