*
*/
-var debug_level = mkws.debug_level;
-var debug = mkws.debug_function;
+// get references from mkws.js, lazy evaluation
+var debug = function (text) {
+ mkws.debug_function(text)
+ }
var get_hit_counter = function () {
// not yet here
debug("set search query: " + search_query)
expect($("input#mkwsQuery").val()).toMatch("^" + search_query + "$");
- // wait for service proxy auth
- waitsFor(function () {
- return mkws.authenticated;
- }, "SP auth done", 10 * 1000);
+ if (mkws_config.use_service_proxy) {
+ // wait for service proxy auth
+ waitsFor(function () {
+ return mkws.authenticated;
+ }, "SP auth done", 10 * 1000);
+ } else {
+ debug("running raw pp2, don't wait for mkws auth");
+ }
runs(function () {
debug("Click on submit button");
it("check status clients", function () {
waitsFor(function () {
var clients = $("div#mkwsStat span.clients");
- if (clients.length == 1 && clients.text() == "0/1") {
+ if (clients.length == 1 && clients.text().match("0/1$")) {
return true;
} else {
return false;
}
- }, "wait for status", 4 * 1000);
+ }, "wait for Active clients: 0/1", 4 * 1000);
+/*
runs(function () {
var clients = $("div#mkwsStat span.clients");
debug("span.clients: " + clients.text());
expect(clients.text()).toEqual("0/1");
});
+ */
});