X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=common%2Ftests%2Ffunctional%2FtestHelpCommands.js;h=912545ba0266c94181163d2ad1aa953b64178304;hb=9044153cb63835e39b9de8ec4ade237c03e3888a;hp=dd0afe96aa69d69f8a2af1f7ade654509980be1d;hpb=eeed0be1a8abf7e3c97f43b63c1d595e940fef21;p=dactyl.git diff --git a/common/tests/functional/testHelpCommands.js b/common/tests/functional/testHelpCommands.js index dd0afe9..912545b 100644 --- a/common/tests/functional/testHelpCommands.js +++ b/common/tests/functional/testHelpCommands.js @@ -21,10 +21,17 @@ var setupTest = function (test) { function urlTarget(url) Services.io.newChannel(url, null, null).name; -__defineGetter__("doesNotExist", function () { - delete this.doesNotExist; - return this.doesNotExist = urlTarget("dactyl://help-tag/non-existent-help-tag-url-thingy"); -}); +function urlExists(url) { + try { + let chan = Services.io.newChannel(url); + chan.open(); + try { chan.cancel(Cr.NS_BINDING_ABORTED) } catch (e) {} + return true; + } + catch (e) { + return false; + } +} const HELP_FILES = ["all", "tutorial", "intro", "starting", "browsing", "buffer", "cmdline", "editing", "options", "pattern", "tabs", "hints", @@ -70,7 +77,7 @@ var testExHelpCommand_PageTagArg_OpensHelpPageContainingTag = function () { let links = controller.tabs.activeTab.querySelectorAll("a[href^='dactyl:']"); - let missing = Array.filter(links, function (link) urlTarget(link.href) === doesNotExist) + let missing = Array.filter(links, function (link) urlExists(link.href)) .map(function (link) link.textContent + " -> " + link.href); utils.assertEqual("testHelpCommands.assertNoDeadLinks", 0, missing.length,