summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCosimo Cecchi <cosimoc@gnome.org>2015-05-18 16:13:21 -0700
committerCosimo Cecchi <cosimoc@gnome.org>2015-05-18 16:13:21 -0700
commitc5fb8c6538f101d9051b05d4f3d21a1b924dfd2e (patch)
tree4a858796c0426a297a4c65755e2bd0257f3a8114
parent4f65022c488db67049bf9e9b95ca43995472e913 (diff)
parent72be0a64eaef42d473ffea2d240ad784243d4dde (diff)
Merge pull request #3176 from endlessm/sdk/3171
Jasmine improvements
-rw-r--r--jasmine.json7
-rw-r--r--test/webhelper/testTranslate.js6
-rw-r--r--test/webhelper/testUpdateFontSize.js6
-rw-r--r--test/webhelper/testWebActions.js6
4 files changed, 6 insertions, 19 deletions
diff --git a/jasmine.json b/jasmine.json
index aebe0bd..ff0e666 100644
--- a/jasmine.json
+++ b/jasmine.json
@@ -1,5 +1,10 @@
{
"include_paths": ["webhelper", "."],
"options": "--verbose",
- "spec_files": ["test/webhelper", "test/tools/eos-application-manifest"]
+ "spec_files": ["test/webhelper", "test/tools/eos-application-manifest"],
+ "environment": {
+ "GI_TYPELIB_PATH": ".",
+ "LD_LIBRARY_PATH": ".libs",
+ "XDG_CONFIG_HOME": "/tmp"
+ }
}
diff --git a/test/webhelper/testTranslate.js b/test/webhelper/testTranslate.js
index f4d4f68..da8c77a 100644
--- a/test/webhelper/testTranslate.js
+++ b/test/webhelper/testTranslate.js
@@ -33,12 +33,6 @@ const WebHelperApplicationWithTranslatableText = new Lang.Class({
this.quit();
}
}));
-
- // Add an upper bound on how long the app runs, in case app.quit() does
- // not get called
- GLib.timeout_add_seconds(GLib.PRIORITY_HIGH, 5, Lang.bind(this, function() {
- this.quit();
- }));
}
});
diff --git a/test/webhelper/testUpdateFontSize.js b/test/webhelper/testUpdateFontSize.js
index 4aaaefb..8bd26be 100644
--- a/test/webhelper/testUpdateFontSize.js
+++ b/test/webhelper/testUpdateFontSize.js
@@ -33,12 +33,6 @@ const WebUpdateFontSizeTestApplication = new Lang.Class({
if (this.accept_callback !== null)
this.accept_callback(this.win, this.websettings.default_font_size);
-
- // Add an upper bound on how long the app runs, in case app.quit() does
- // not get called
- GLib.timeout_add_seconds(GLib.PRIORITY_HIGH, 5, Lang.bind(this, function () {
- this.quit();
- }));
},
accept_callback: null,
diff --git a/test/webhelper/testWebActions.js b/test/webhelper/testWebActions.js
index c543a43..e937fb6 100644
--- a/test/webhelper/testWebActions.js
+++ b/test/webhelper/testWebActions.js
@@ -24,12 +24,6 @@ const WebActionTestApplication = new Lang.Class({
this.scrolled = new Gtk.ScrolledWindow();
this.scrolled.add(this.webview);
this.win.page_manager.add(this.scrolled);
-
- // Add an upper bound on how long the app runs, in case app.quit() does
- // not get called
- GLib.timeout_add_seconds(GLib.PRIORITY_HIGH, 5, Lang.bind(this, function() {
- this.quit();
- }));
}
});