[Pkg-mozext-commits] [requestpolicy] 38/100: [refactoring] change mozmill directory structure

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository requestpolicy.

commit ab1a9f82fe3be03e033313dfe4daee5d7ecd487b
Author: myrdd <myrdd at users.noreply.github.com>
Date:   Sat Sep 27 12:13:28 2014 +0200

    [refactoring] change mozmill directory structure
---
 src/components/requestpolicyService.js                       |  8 ++++----
 tests/mozmill/tests/manifest.ini                             |  2 +-
 tests/mozmill/tests/testLinks/manifest.ini                   |  3 +++
 .../testHTMLAnchorElement}/manifest.ini                      |  2 +-
 .../testHTMLAnchorElement/testLinkClick.js}                  | 12 ++++++------
 .../testHTMLAnchorElement}/testOpenInNewTab.js               | 10 +++++-----
 .../testHTMLAnchorElement}/testOpenInNewWindow.js            | 12 ++++++------
 7 files changed, 26 insertions(+), 23 deletions(-)

diff --git a/src/components/requestpolicyService.js b/src/components/requestpolicyService.js
index 8e35bff..b7ebc51 100644
--- a/src/components/requestpolicyService.js
+++ b/src/components/requestpolicyService.js
@@ -700,19 +700,19 @@ RequestPolicyService.prototype = {
   },
 
   registerHistoryRequest : function(destinationUrl) {
-    this._requestProcessor.registerHistoryRequest;
+    this._requestProcessor.registerHistoryRequest(destinationUrl);
   },
 
   registerFormSubmitted : function(originUrl, destinationUrl) {
-    this._requestProcessor.registerFormSubmitted;
+    this._requestProcessor.registerFormSubmitted(originUrl, destinationUrl);
   },
 
   registerLinkClicked : function(originUrl, destinationUrl) {
-    this._requestProcessor.registerLinkClicked;
+    this._requestProcessor.registerLinkClicked(originUrl, destinationUrl);
   },
 
   registerAllowedRedirect : function(originUrl, destinationUrl) {
-    this._requestProcessor.registerAllowedRedirect;
+    this._requestProcessor.registerAllowedRedirect(originUrl, destinationUrl);
   },
 
   setBlockingDisabled : function(disabled) {
diff --git a/tests/mozmill/tests/manifest.ini b/tests/mozmill/tests/manifest.ini
index f857451..2c390e1 100644
--- a/tests/mozmill/tests/manifest.ini
+++ b/tests/mozmill/tests/manifest.ini
@@ -1,3 +1,3 @@
 [parent:../manifest.ini]
 
-[include:testLinkClicks/manifest.ini]
+[include:testLinks/manifest.ini]
diff --git a/tests/mozmill/tests/testLinks/manifest.ini b/tests/mozmill/tests/testLinks/manifest.ini
new file mode 100644
index 0000000..9bfbaef
--- /dev/null
+++ b/tests/mozmill/tests/testLinks/manifest.ini
@@ -0,0 +1,3 @@
+[parent:../manifest.ini]
+
+[include:testHTMLAnchorElement/manifest.ini]
diff --git a/tests/mozmill/tests/testLinkClicks/manifest.ini b/tests/mozmill/tests/testLinks/testHTMLAnchorElement/manifest.ini
similarity index 74%
rename from tests/mozmill/tests/testLinkClicks/manifest.ini
rename to tests/mozmill/tests/testLinks/testHTMLAnchorElement/manifest.ini
index 2446c79..f5579f9 100644
--- a/tests/mozmill/tests/testLinkClicks/manifest.ini
+++ b/tests/mozmill/tests/testLinks/testHTMLAnchorElement/manifest.ini
@@ -1,5 +1,5 @@
 [parent:../manifest.ini]
 
-[testNormalLinkClick.js]
+[testLinkClick.js]
 [testOpenInNewTab.js]
 [testOpenInNewWindow.js]
diff --git a/tests/mozmill/tests/testLinkClicks/testNormalLinkClick.js b/tests/mozmill/tests/testLinks/testHTMLAnchorElement/testLinkClick.js
similarity index 82%
rename from tests/mozmill/tests/testLinkClicks/testNormalLinkClick.js
rename to tests/mozmill/tests/testLinks/testHTMLAnchorElement/testLinkClick.js
index 8c863b5..3076a35 100644
--- a/tests/mozmill/tests/testLinkClicks/testNormalLinkClick.js
+++ b/tests/mozmill/tests/testLinks/testHTMLAnchorElement/testLinkClick.js
@@ -4,13 +4,13 @@
 
 "use strict";
 
-var {assert, expect} = require("../../../../../../lib/assertions");
-var prefs = require("../../../../../lib/prefs");
-var tabs = require("../../../../../lib/tabs");
-var utils = require("../../../../../../lib/utils");
+var {assert, expect} = require("../../../../../../../lib/assertions");
+var prefs = require("../../../../../../lib/prefs");
+var tabs = require("../../../../../../lib/tabs");
+var utils = require("../../../../../../../lib/utils");
 
-var rpUtils = require("../../lib/rp-utils");
-var rpConst = require("../../lib/constants");
+var rpUtils = require("../../../lib/rp-utils");
+var rpConst = require("../../../lib/constants");
 
 const TEST_URL = "http://www.maindomain.test/link_1.html";
 
diff --git a/tests/mozmill/tests/testLinkClicks/testOpenInNewTab.js b/tests/mozmill/tests/testLinks/testHTMLAnchorElement/testOpenInNewTab.js
similarity index 90%
rename from tests/mozmill/tests/testLinkClicks/testOpenInNewTab.js
rename to tests/mozmill/tests/testLinks/testHTMLAnchorElement/testOpenInNewTab.js
index 6884fbd..f3534fe 100644
--- a/tests/mozmill/tests/testLinkClicks/testOpenInNewTab.js
+++ b/tests/mozmill/tests/testLinks/testHTMLAnchorElement/testOpenInNewTab.js
@@ -4,12 +4,12 @@
 
 "use strict";
 
-var {assert, expect} = require("../../../../../../lib/assertions");
-var prefs = require("../../../../../lib/prefs");
-var tabs = require("../../../../../lib/tabs");
-var utils = require("../../../../../../lib/utils");
+var {assert, expect} = require("../../../../../../../lib/assertions");
+var prefs = require("../../../../../../lib/prefs");
+var tabs = require("../../../../../../lib/tabs");
+var utils = require("../../../../../../../lib/utils");
 
-var rpConst = require("../../lib/constants");
+var rpConst = require("../../../lib/constants");
 
 const TEST_URL = "http://www.maindomain.test/link_1.html";
 
diff --git a/tests/mozmill/tests/testLinkClicks/testOpenInNewWindow.js b/tests/mozmill/tests/testLinks/testHTMLAnchorElement/testOpenInNewWindow.js
similarity index 92%
rename from tests/mozmill/tests/testLinkClicks/testOpenInNewWindow.js
rename to tests/mozmill/tests/testLinks/testHTMLAnchorElement/testOpenInNewWindow.js
index ffef45d..925f745 100644
--- a/tests/mozmill/tests/testLinkClicks/testOpenInNewWindow.js
+++ b/tests/mozmill/tests/testLinks/testHTMLAnchorElement/testOpenInNewWindow.js
@@ -4,13 +4,13 @@
 
 "use strict";
 
-var {assert, expect} = require("../../../../../../lib/assertions");
-var prefs = require("../../../../../lib/prefs");
-var tabs = require("../../../../../lib/tabs");
-var utils = require("../../../../../../lib/utils");
+var {assert, expect} = require("../../../../../../../lib/assertions");
+var prefs = require("../../../../../../lib/prefs");
+var tabs = require("../../../../../../lib/tabs");
+var utils = require("../../../../../../../lib/utils");
 
-var rpUtils = require("../../lib/rp-utils");
-var rpConst = require("../../lib/constants");
+var rpUtils = require("../../../lib/rp-utils");
+var rpConst = require("../../../lib/constants");
 
 const TEST_URL = "http://www.maindomain.test/link_1.html";
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mozext/requestpolicy.git