diff options
Diffstat (limited to 'test')
28 files changed, 53 insertions, 47 deletions
diff --git a/test/mock/mock_nodes.js b/test/mock/mock_nodes.js index 3ef1fbc..abd29a4 100644 --- a/test/mock/mock_nodes.js +++ b/test/mock/mock_nodes.js @@ -19,7 +19,7 @@ * along with GNU LibreJS. If not, see <http://www.gnu.org/licenses/>. */ -const types = require("js_checker/constant_types").token; +const types = require("../../lib/js_checker/constant_types").token; exports.mockNodes = { diff --git a/test/test-accepted_scripts.js b/test/test-accepted_scripts.js index 4e5ee16..812f538 100644 --- a/test/test-accepted_scripts.js +++ b/test/test-accepted_scripts.js @@ -20,7 +20,7 @@ * along with GNU LibreJS. If not, see <http://www.gnu.org/licenses/>. */ -var acceptedScripts = require('script_entries/accepted_scripts') +var acceptedScripts = require('../lib/script_entries/accepted_scripts') .acceptedScripts; exports.testAddAScript = function (assert) { diff --git a/test/test-all_scripts.js b/test/test-all_scripts.js index d26963d..56759a6 100644 --- a/test/test-all_scripts.js +++ b/test/test-all_scripts.js @@ -20,7 +20,7 @@ * along with GNU LibreJS. If not, see <http://www.gnu.org/licenses/>. */ -var allScripts = require('script_entries/all_scripts').allScripts; +var allScripts = require('../lib/script_entries/all_scripts').allScripts; exports.truncateDataTest = function(test) { var str = "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Pellentesque ultricies molestie tellus, eu ullamcorper dui luctus sit amet. Morbi sed urna eu justo malesuada bibendum nec non est. Sed sagittis sodales ullamcorper. Mauris dolor arcu, dignissim ac sollicitudin ac, tempus at orci. Curabitur pretium risus id urna congue cursus. Nulla ullamcorper faucibus nibh, eget ultrices ante vestibulum id. Vestibulum elementum ullamcorper mi, id ultrices lacus faucibus et. Nullam lectus augue, suscipit a elementum at, malesuada eget nulla. Aenean tempus ultrices elit ut vulputate. Ut congue magna ultricies felis rutrum eget ultricies nibh vehicula. In id pellentesque risus. Pellentesque aliquam quam eros, quis placerat eros. Cras molestie, turpis et consectetur sollicitudin, magna enim mattis lectus, et adipiscing erat urna in risus. Vestibulum sed arcu vitae mauris ornare ultricies a sit amet leo. Praesent pharetra, urna in varius fermentum, neque nibh tempor justo, id ullamcorper magna amet.…"; diff --git a/test/test-allowed_referrers.js b/test/test-allowed_referrers.js index 6be8d27..47256b9 100644 --- a/test/test-allowed_referrers.js +++ b/test/test-allowed_referrers.js @@ -20,7 +20,7 @@ * along with GNU LibreJS. If not, see <http://www.gnu.org/licenses/>. */ -const allowedRef = require('http_observer/allowed_referrers').allowedReferrers; +const allowedRef = require('../lib/http_observer/allowed_referrers').allowedReferrers; var addUrls = function () { allowedRef.addPage('http://www.example.org'); diff --git a/test/test-bug-frozen.js b/test/test-bug-frozen.js index f02f6cf..215182b 100644 --- a/test/test-bug-frozen.js +++ b/test/test-bug-frozen.js @@ -20,7 +20,7 @@ * along with GNU LibreJS. If not, see <http://www.gnu.org/licenses/>. */ -var main = require('main'); +var main = require('../lib/main'); var tabs = require('sdk/tabs'); /*exports.testBug = function (assert, done) { diff --git a/test/test-crypto-a.js b/test/test-crypto-a.js index caa12f8..4a2dd6e 100644 --- a/test/test-crypto-a.js +++ b/test/test-crypto-a.js @@ -19,7 +19,7 @@ * You should have received a copy of the GNU General Public License * along with GNU LibreJS. If not, see <http://www.gnu.org/licenses/>. */ -var crypto = require("script_entries/crypto"); +var crypto = require("../lib/script_entries/crypto"); exports.testSha1EncryptTest = function(assert) { var str = "This is my test string"; diff --git a/test/test-crypto-b.js b/test/test-crypto-b.js index 3326724..65a9699 100644 --- a/test/test-crypto-b.js +++ b/test/test-crypto-b.js @@ -323,7 +323,8 @@ var list = [ ]; list = ["http://code.jquery.com/jquery-1.8.2.min.js"]; -const scriptsCached = require("script_entries/scripts_cache").scriptsCached; +const scriptsCached = require("../lib/script_entries/scripts_cache") + .scriptsCached; var counter = 0; @@ -333,16 +334,13 @@ var popAndEncryptRemoteScript = function (test) { try { var currentUrl = list.pop(); var script = {url: currentUrl}; - require('html_script_finder/dom_handler/request').request(script, - function (script, data) { - //console.log('"',scriptsCached.getHash(data), '": - //{"filename": "', currentUrl, '", "result": 6}'); - counter++; - popAndEncryptRemoteScript(test); - - - }).request(); - + require('../lib/html_script_finder/dom_handler/request').request( + script, function (script, data) { + //console.log('"',scriptsCached.getHash(data), '": + //{"filename": "', currentUrl, '", "result": 6}'); + counter++; + popAndEncryptRemoteScript(test); + }).request(); } catch (e) { test.assertEqual(counter, totalScripts); test.done(); diff --git a/test/test-domHandler.js b/test/test-domHandler.js index c5eaa50..5095d97 100644 --- a/test/test-domHandler.js +++ b/test/test-domHandler.js @@ -24,7 +24,7 @@ // using following command to run after placing nightly is /usr/local/: // cfx --binary=/usr/local/bin/firefox-nightly test -f domHandler -var domHandler = require("html_script_finder/dom_handler"); +var domHandler = require("../lib/html_script_finder/dom_handler"); var mockDom = require("./mock/mock_dom"); //var loader = test.makeSandboxedLoader(); diff --git a/test/test-free_libraries.js b/test/test-free_libraries.js index 523deb1..11f8f7a 100644 --- a/test/test-free_libraries.js +++ b/test/test-free_libraries.js @@ -23,7 +23,7 @@ forget this test for now. -var main = require("main"); +var main = require("../lib/main"); var pageMod = require("sdk/page-mod"); var tabs = require("sdk/tabs"); diff --git a/test/test-html_parser.js b/test/test-html_parser.js index 30c08bc..1c3e0ef 100644 --- a/test/test-html_parser.js +++ b/test/test-html_parser.js @@ -20,7 +20,7 @@ * along with GNU LibreJS. If not, see <http://www.gnu.org/licenses/>. */ -var htmlParser = require("html_script_finder/html_parser"); +var htmlParser = require("../lib/html_script_finder/html_parser"); var {Cc, Ci, Cu, Cm, Cr} = require("chrome"); diff --git a/test/test-js_checker.js b/test/test-js_checker.js index 61a3a15..e786d62 100644 --- a/test/test-js_checker.js +++ b/test/test-js_checker.js @@ -20,8 +20,8 @@ * along with GNU LibreJS. If not, see <http://www.gnu.org/licenses/>. */ -const jsChecker = require("js_checker/js_checker"); -const constants = require("js_checker/constant_types"); +const jsChecker = require("../lib/js_checker/js_checker"); +const constants = require("../lib/js_checker/constant_types"); var checkTypes = constants.checkTypes; var init = function() { diff --git a/test/test-js_load_observer_1.js b/test/test-js_load_observer_1.js index 54b4674..b0d66f3 100644 --- a/test/test-js_load_observer_1.js +++ b/test/test-js_load_observer_1.js @@ -20,12 +20,14 @@ * along with GNU LibreJS. If not, see <http://www.gnu.org/licenses/>. */ -var jsLoadObserver = require("js_load_observer/js_load_observer"); +var jsLoadObserver = require("../lib/js_load_observer/js_load_observer"); var tabs = require("sdk/tabs"); // use the two buckets. -var removedScripts = require("script_entries/removed_scripts").removedScripts; -var acceptedScripts = require("script_entries/accepted_scripts").acceptedScripts; +var removedScripts = require("../lib/script_entries/removed_scripts") + .removedScripts; +var acceptedScripts = require("../lib/script_entries/accepted_scripts") + .acceptedScripts; var mockDom = require("./mock/mock_dom"); // FIXME diff --git a/test/test-js_load_observer_3.js b/test/test-js_load_observer_3.js index a6f1840..1448a56 100644 --- a/test/test-js_load_observer_3.js +++ b/test/test-js_load_observer_3.js @@ -24,10 +24,12 @@ var tabs = require("sdk/tabs"); var pageMod = require("sdk/page-mod"); // use the two buckets. -var removedScripts = require("script_entries/removed_scripts").removedScripts; -var acceptedScripts = require("script_entries/accepted_scripts").acceptedScripts; +var removedScripts = require("../lib/script_entries/removed_scripts") + .removedScripts; +var acceptedScripts = require("../lib/script_entries/accepted_scripts") + .acceptedScripts; -var jsLoadObserver = require("js_load_observer/js_load_observer"); +var jsLoadObserver = require("../lib/js_load_observer/js_load_observer"); var reset = function(url) { acceptedScripts.clearScripts(url); diff --git a/test/test-license_definitions.js b/test/test-license_definitions.js index f20299c..8f6cc93 100644 --- a/test/test-license_definitions.js +++ b/test/test-license_definitions.js @@ -20,7 +20,7 @@ * along with GNU LibreJS. If not, see <http://www.gnu.org/licenses/>. */ -const licenses = require('js_checker/license_definitions'); +const licenses = require('../lib/js_checker/license_definitions'); exports.testGetLicenseName = function (test) { diff --git a/test/test-nonfree_checker.js b/test/test-nonfree_checker.js index 0c4d85d..a2d2818 100644 --- a/test/test-nonfree_checker.js +++ b/test/test-nonfree_checker.js @@ -20,8 +20,8 @@ * along with GNU LibreJS. If not, see <http://www.gnu.org/licenses/>. */ -const check = require("js_checker/free_checker"); -const licenses = require("js_checker/license_definitions"); +const check = require("../lib/js_checker/free_checker"); +const licenses = require("../lib/js_checker/license_definitions"); const mockNodes = require("./mock/mock_nodes_with_comments"); var mockLicense = function () { @@ -95,7 +95,7 @@ exports.testCheckNodeFreeLicenseNotFree = function (test) { /* exports.testLicenseToRegexp = function (test) { var loader = test.makeSandboxedLoader(); - var module = loader.require('js_checker/free_checker'); + var module = loader.require('../lib/js_checker/free_checker'); var privateScope = loader.findSandboxForModule('js_checker/free_checker'.toString()).globalScope; // ensure the regex values are truthy. test.assert(privateScope.licenses.licenses.gplv2.licenseFragments[0].regex); diff --git a/test/test-nontrivial_checker.js b/test/test-nontrivial_checker.js index c93166f..3998fc3 100644 --- a/test/test-nontrivial_checker.js +++ b/test/test-nontrivial_checker.js @@ -20,12 +20,12 @@ * along with GNU LibreJS. If not, see <http://www.gnu.org/licenses/>. */ -const nonTrivialCheckModule = require("js_checker/nontrivial_checker"); +const nonTrivialCheckModule = require("../lib/js_checker/nontrivial_checker"); const check = nonTrivialCheckModule.nonTrivialChecker(false, false); const mn = require("./mock/mock_nodes"); var testRunner; -const constants = require("js_checker/constant_types"); +const constants = require("../lib/js_checker/constant_types"); var checkTypes = constants.checkTypes; var testCheckNontrivial = function (assert, n) { diff --git a/test/test-privacy_checker.js b/test/test-privacy_checker.js index 974b379..9062f58 100644 --- a/test/test-privacy_checker.js +++ b/test/test-privacy_checker.js @@ -20,7 +20,8 @@ * along with GNU LibreJS. If not, see <http://www.gnu.org/licenses/>. */ -const privacyCheck = require("js_checker/privacy_checker").privacyCheck; +const privacyCheck = require("../lib/js_checker/privacy_checker") + .privacyCheck; exports.testPrivacyCheckerGoogleAnalyticsRegex = function(assert) { // original analytics code this was designed for diff --git a/test/test-relation_checker.js b/test/test-relation_checker.js index 97d6f4e..a8a07ed 100644 --- a/test/test-relation_checker.js +++ b/test/test-relation_checker.js @@ -20,7 +20,8 @@ * along with GNU LibreJS. If not, see <http://www.gnu.org/licenses/>. */ -var relationChecker = require('js_checker/relation_checker').relationChecker('b'); +var relationChecker = require('../lib/js_checker/relation_checker') + .relationChecker('b'); const mn = require("./mock/mock_nodes"); // the fake node. @@ -62,7 +63,8 @@ exports.testCheckMethodNotAdded = function (test) { exports.testStoreNodeGlobalDeclarations = function (test) { - var check = require('js_checker/relation_checker').relationChecker('b'); + var check = require('../lib/js_checker/relation_checker') + .relationChecker('b'); check.storeNodeGlobalDeclarations(nVar); test.assertEqual('def' in check.variableDeclarations, true); check.storeNodeGlobalDeclarations(nFunc); diff --git a/test/test-removed_scripts.js b/test/test-removed_scripts.js index 78dd8c4..fbe2780 100644 --- a/test/test-removed_scripts.js +++ b/test/test-removed_scripts.js @@ -20,7 +20,8 @@ * along with GNU LibreJS. If not, see <http://www.gnu.org/licenses/>. */ -var removedScripts = require('script_entries/removed_scripts').removedScripts; +var removedScripts = require('../lib/script_entries/removed_scripts') + .removedScripts; exports.truncateDataTest = function(test) { var str = "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Pellentesque ultricies molestie tellus, eu ullamcorper dui luctus sit amet. Morbi sed urna eu justo malesuada bibendum nec non est. Sed sagittis sodales ullamcorper. Mauris dolor arcu, dignissim ac sollicitudin ac, tempus at orci. Curabitur pretium risus id urna congue cursus. Nulla ullamcorper faucibus nibh, eget ultrices ante vestibulum id. Vestibulum elementum ullamcorper mi, id ultrices lacus faucibus et. Nullam lectus augue, suscipit a elementum at, malesuada eget nulla. Aenean tempus ultrices elit ut vulputate. Ut congue magna ultricies felis rutrum eget ultricies nibh vehicula. In id pellentesque risus. Pellentesque aliquam quam eros, quis placerat eros. Cras molestie, turpis et consectetur sollicitudin, magna enim mattis lectus, et adipiscing erat urna in risus. Vestibulum sed arcu vitae mauris ornare ultricies a sit amet leo. Praesent pharetra, urna in varius fermentum, neque nibh tempor justo, id ullamcorper magna amet.…"; diff --git a/test/test-request.js b/test/test-request.js index ba66bbf..040ea8c 100644 --- a/test/test-request.js +++ b/test/test-request.js @@ -20,7 +20,7 @@ * along with GNU LibreJS. If not, see <http://www.gnu.org/licenses/>. */ -var xhr2 = require("html_script_finder/dom_handler/request"); +var xhr2 = require("../lib/html_script_finder/dom_handler/request"); var Request = require("sdk/request").Request; exports.testHttpsEverywhere = function (test) { diff --git a/test/test-script_object.js b/test/test-script_object.js index aceaa89..ce7802a 100644 --- a/test/test-script_object.js +++ b/test/test-script_object.js @@ -20,7 +20,7 @@ * along with GNU LibreJS. If not, see <http://www.gnu.org/licenses/>. */ -var scriptObject = require("html_script_finder/dom_handler/script_object"); +var scriptObject = require("../lib/html_script_finder/dom_handler/script_object"); exports.testCreateNewScript = function(assert) { var script1, script2; diff --git a/test/test-script_properties.js b/test/test-script_properties.js index 1a58ca0..c65275c 100644 --- a/test/test-script_properties.js +++ b/test/test-script_properties.js @@ -19,7 +19,7 @@ * You should have received a copy of the GNU General Public License * along with GNU LibreJS. If not, see <http://www.gnu.org/licenses/>. */ -var scriptProperties = require("html_script_finder/dom_handler/script_properties"); +var scriptProperties = require("../lib/html_script_finder/dom_handler/script_properties"); const scriptTypes = scriptProperties.scriptTypes; const statusTypes = scriptProperties.statusTypes; diff --git a/test/test-stream_loader.js b/test/test-stream_loader.js index a75683e..cb549c7 100644 --- a/test/test-stream_loader.js +++ b/test/test-stream_loader.js @@ -20,7 +20,7 @@ * along with GNU LibreJS. If not, see <http://www.gnu.org/licenses/>. */ -var streamLoader = require("http_observer/stream_loader.js"); +var streamLoader = require("../lib/http_observer/stream_loader.js"); var {Cc, Ci, Cu, Cm, Cr} = require("chrome"); exports.testListener = function (assert) { diff --git a/test/test-ui_info.js b/test/test-ui_info.js index f17ca98..eac14ee 100644 --- a/test/test-ui_info.js +++ b/test/test-ui_info.js @@ -20,7 +20,7 @@ * along with GNU LibreJS. If not, see <http://www.gnu.org/licenses/>. */ -var uiInfo = require("ui/ui_info").testModule; +var uiInfo = require("../lib/ui/ui_info").testModule; exports.testFoundInContactList = function (test) { diff --git a/test/test-url_handler.js b/test/test-url_handler.js index 54f4171..457c6c7 100644 --- a/test/test-url_handler.js +++ b/test/test-url_handler.js @@ -19,7 +19,7 @@ * You should have received a copy of the GNU General Public License * along with GNU LibreJS. If not, see <http://www.gnu.org/licenses/>. */ -const urlHandler = require('url_handler/url_handler'); +const urlHandler = require('../lib/url_handler/url_handler'); exports.testRemoveFragment1 = function (test) { var url = 'http://example.org/blah.html#section'; diff --git a/test/test-web-label-finder.js b/test/test-web-label-finder.js index 30cff01..1733f5a 100644 --- a/test/test-web-label-finder.js +++ b/test/test-web-label-finder.js @@ -24,7 +24,7 @@ const {Cc,Ci} = require('chrome'); var parser = Cc["@mozilla.org/xmlextras/domparser;1"] .createInstance(Ci.nsIDOMParser); -var WebLabelFinder = require('html_script_finder/web_labels/js_web_labels') +var WebLabelFinder = require('../lib/html_script_finder/web_labels/js_web_labels') .WebLabelFinder; exports.testSearchForJsLinkEmpty = function (assert) { diff --git a/test/test-web-labels.js b/test/test-web-labels.js index 1fc39b0..0cc3919 100644 --- a/test/test-web-labels.js +++ b/test/test-web-labels.js @@ -29,7 +29,7 @@ var mockLicenseList = [{ 'free': true }]; -var dom_handler = require('html_script_finder/dom_handler'); +var dom_handler = require('../lib/html_script_finder/dom_handler'); exports.testScriptHasJsWebLabel = function (assert) { var dm = new dom_handler.DomHandler(); diff --git a/test/test-windowProperty.js b/test/test-windowProperty.js index 64f944e..dd653f9 100644 --- a/test/test-windowProperty.js +++ b/test/test-windowProperty.js @@ -20,7 +20,7 @@ * along with GNU LibreJS. If not, see <http://www.gnu.org/licenses/>. */ -var relationChecker = require('js_checker/relation_checker'); +var relationChecker = require('../lib/js_checker/relation_checker'); const mn = require("./mock/mock_nodes"); exports.testCheckIdentifierIsWindowProperty = function (assert) { |