585779 - Make Mozmill-test testDisabledPermissions local

Status: RESOLVED FIXED

(Mozilla QA Graveyard :: Mozmill Tests, defect)

Description

[u279076]

Module: testPrivateBrowsing/testDisabledPermissions.js
Test-page: Use any 1 page from test-files/layout/mozilla*

Comment 1

[u279076]

Attachment: Patch v1 (default)

Comment 2

[Aaron Train [:aaronmt]]

Comment on attachment 465017 [details] [diff] [review]
Patch v1 (default)

>-const localTestFolder = collector.addHttpResource('../test-files/');
>+const LOCAL_TEST_FOLDER = collector.addHttpResource('../test-files/');
>+const LOCAL_TEST_PAGES = [
>+                          LOCAL_TEST_FOLDER + 'popups/popups_2.html',
>+                          LOCAL_TEST_FOLDER + 'cookies/cookie_single.html'
>+                         ];

Nit: Indentation, two spaces

Comment 3

[u279076]

Attachment: Patch v2 (default)

Comment 4

[u279076]

(In reply to comment #3)
> Created attachment 465462 [details] [diff] [review]
> Patch v2 (default)

I forgot to add "r=aaronmt" to the qrefresh message.  I'll be sure to add that prior to check-in.

Comment 5

[Aaron Train [:aaronmt]]

Comment on attachment 465462 [details] [diff] [review]
Patch v2 (default)

(In reply to comment #4)
> (In reply to comment #3)
> > Created attachment 465462 [details] [diff] [review] [details]
> > Patch v2 (default)
> 
> I forgot to add "r=aaronmt" to the qrefresh message.  I'll be sure to add that
> prior to check-in.

Thanks. r+, no issues I can see - on to Henrik

Comment 6

[Henrik Skupin [:whimboo][⌚️UTC+2]]

Comment on attachment 465462 [details] [diff] [review]
Patch v2 (default)

> var setupModule = function(module)
> {

nit: Move up the opening brackets.

>   var allow = new elementslib.XPath(controller.window.document, 
>-                                    "/*[name()='window']/*[name()='popupset'][1]/*[name()='menupopup'][4]/*[name()='menuitem'][1]");
>+                                    '/*[name()="window"]' +
>+                                    '/*[name()="popupset"][1]' +
>+                                    '/*[name()="menupopup"][4]' +
>+                                    '/*[name()="menuitem"][1]');

Looking forward to our shared module refactoring which will eliminate all those kinds of wonky strings from the tests.

r=me for the little nit update.

Comment 7

[u279076]

> Comment on attachment 465462 [details] [diff] [review]
> Patch v2 (default)

Landed on default:
http://hg.mozilla.org/qa/mozmill-tests/rev/e4511cd65637

Does not cleanly apply to mozilla1.9.2 or mozilla1.9.1, patches forthcoming

Comment 8

[u279076]

Attachment: Patch v2 (mozilla1.9.2)

Comment 9

[u279076]

Attachment: Patch v2 (mozilla1.9.1)

Comment 10

[u279076]

Attachment: Patch v2 (mozilla1.9.2)

Comment 11

[Henrik Skupin [:whimboo][⌚️UTC+2]]

Comment on attachment 465786 [details] [diff] [review]
Patch v2 (mozilla1.9.1)

>+var setupModule = function(module) {
>+var teardownModule = function(module) {

nit: please remove the module parameters from both functions

>-  var property = mozmill.isWindows ? "popupWarningButton.accesskey" : "popupWarningButtonUnix.accesskey";
>-  var accessKey = UtilsAPI.getProperty("chrome://browser/locale/browser.properties", property);
>+  var property = mozmill.isWindows ? "popupWarningButton.accesskey" 
>+                                   : "popupWarningButtonUnix.accesskey";
>+  var accessKey = UtilsAPI.getProperty(
>+    "chrome://browser/locale/browser.properties", 
>+    property
>+  );
>-  controller.keypress(null, accessKey, {ctrlKey: mozmill.isMac, altKey: !mozmill.isMac});
>+  controller.keypress(null, accessKey, 
>+                      {ctrlKey: mozmill.isMac, altKey: !mozmill.isMac});
[..]
>-  var blockImages = new elementslib.ID(controller.window.document, "context-blockimage");
>+  var blockImages = new elementslib.ID(controller.window.document, 
>+                                       "context-blockimage");

Please revert this change to be consistent with default. If you want to change that please file a follow-up bug (before we should get a style guide setup). But don't add new stuff to backported patches.

>-  var historyMode = new elementslib.ID(controller.window.document, "historyMode");
>-  controller.waitForElement(historyMode, gTimeout);
>+  var historyMode = new elementslib.ID(controller.window.document, 
>+                                       "historyMode");
>+  controller.waitForElement(historyMode, TIMEOUT);
>   controller.select(historyMode, null, null, "custom");
>-  controller.sleep(gDelay);
> 
>-  var acceptCookies = new elementslib.ID(controller.window.document, "acceptCookies");
>+  var acceptCookies = new elementslib.ID(controller.window.document, 
>+                                         "acceptCookies");
>   controller.assertChecked(acceptCookies);
> 
>   // Select "ask me every time"
>-  var keepCookies = new elementslib.ID(controller.window.document, "keepCookiesUntil");
>-  controller.waitForElement(keepCookies, gTimeout);
>+  var keepCookies = new elementslib.ID(controller.window.document, 
>+                                       "keepCookiesUntil");
>+  controller.waitForElement(keepCookies, TIMEOUT);
>   controller.select(keepCookies, null, null, 1);
>-  controller.sleep(gDelay);

Same here.

Comment 12

[Henrik Skupin [:whimboo][⌚️UTC+2]]

Comment on attachment 465788 [details] [diff] [review]
Patch v2 (mozilla1.9.2)

Same comments as for the 1.9.1 patch.

Comment 13

[u279076]

Attachment: Patch v3 (1.9.2)

Comment 14

[u279076]

Comment on attachment 478141 [details] [diff] [review]
Patch v3 (1.9.2)

Noticed some cleanup for this patch...new one coming.

Comment 15

[u279076]

Attachment: Patch v3.1 (1.9.2)

Comment 16

[u279076]

(In reply to comment #15)
> Created attachment 478143 [details] [diff] [review]
> Patch v3.1 (1.9.2)

Landed:
http://hg.mozilla.org/qa/mozmill-tests/rev/b07ed23483e6 [mozilla1.9.2]

Comment 17

[u279076]

Attachment: Patch v3.1 (1.9.1)

1.9.2 didn't apply cleanly.  Here is the 1.9.1 backport.

Comment 18

[u279076]

Attachment: Patch v3.2 (default)

Final suggested revisions made.

Comment 19

[u279076]

(In reply to comment #18)
> Created attachment 478442 [details] [diff] [review]
> Patch v3.2 (default)
> 
> Final suggested revisions made.

Wrong bug...sorry...

Comment 20

[u279076]

(In reply to comment #17)
> Created attachment 478386 [details] [diff] [review]
> Patch v3.1 (1.9.1)
> 
> 1.9.2 didn't apply cleanly.  Here is the 1.9.1 backport.

Landed:
http://hg.mozilla.org/qa/mozmill-tests/rev/bdf38b387ce5 [mozilla1.9.1]

Comment 21

[Henrik Skupin [:whimboo][⌚️UTC+2]]

Move of Mozmill Test related project bugs to newly created components. You can
filter out those emails by using "Mozmill-Tests-to-MozillaQA" as criteria.