summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorPhilip Chimento <philip@endlessm.com>2013-10-25 17:38:48 -0700
committerPhilip Chimento <philip@endlessm.com>2013-10-25 17:38:48 -0700
commit94aeaa82b10986acf448395f68cd5d13068db5da (patch)
tree537ff8036514e5a93f60223e755301d03fbf72bd /test
parent7bca2402f08e718181c8996bd63d1cdcc5e2c9a3 (diff)
Fix search paths so tests run uninstalled
The current GJS search paths were inadvertently running the tests from the installed JS modules, so that was causing Jenkins to fail.
Diffstat (limited to 'test')
-rw-r--r--test/Makefile.am2
-rw-r--r--test/wikipedia/models/testArticleModel.js2
-rw-r--r--test/wikipedia/models/testCategoryModel.js2
-rw-r--r--test/wikipedia/models/testDomainWikiModel.js2
4 files changed, 4 insertions, 4 deletions
diff --git a/test/Makefile.am b/test/Makefile.am
index 53ff6ff..dc8b662 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -49,8 +49,8 @@ TESTS = \
TEST_EXTENSIONS = .js
JS_LOG_COMPILER = tools/eos-run-test
AM_JS_LOG_FLAGS = \
- --include-path=$(top_srcdir)/wikipedia \
--include-path=$(top_srcdir)/webhelper \
+ --include-path=$(top_srcdir) \
$(NULL)
LOG_COMPILER = gtester
AM_LOG_FLAGS = -k --verbose
diff --git a/test/wikipedia/models/testArticleModel.js b/test/wikipedia/models/testArticleModel.js
index bea76dc..9c7669c 100644
--- a/test/wikipedia/models/testArticleModel.js
+++ b/test/wikipedia/models/testArticleModel.js
@@ -1,4 +1,4 @@
-const ArticleModel = imports.models.article_model;
+const ArticleModel = imports.wikipedia.models.article_model;
let mockJsonData = {
title: 'Article Title',
diff --git a/test/wikipedia/models/testCategoryModel.js b/test/wikipedia/models/testCategoryModel.js
index 9314e84..8d15665 100644
--- a/test/wikipedia/models/testCategoryModel.js
+++ b/test/wikipedia/models/testCategoryModel.js
@@ -1,4 +1,4 @@
-const CategoryModel = imports.models.category_model;
+const CategoryModel = imports.wikipedia.models.category_model;
let mockJsonData = {
category_name: 'Category Name',
diff --git a/test/wikipedia/models/testDomainWikiModel.js b/test/wikipedia/models/testDomainWikiModel.js
index f476b16..9bdca02 100644
--- a/test/wikipedia/models/testDomainWikiModel.js
+++ b/test/wikipedia/models/testDomainWikiModel.js
@@ -1,4 +1,4 @@
-const DomainWikiModel = imports.models.domain_wiki_model;
+const DomainWikiModel = imports.wikipedia.models.domain_wiki_model;
let model;