From b6d7d007be16fc03a33122b0898531e8918032b2 Mon Sep 17 00:00:00 2001
From: Bobby Holley <bobbyholley@gmail.com>
Date: Fri, 17 May 2013 10:44:25 -0700
Subject: [PATCH] Bug 872772 - Tests. r=gabor

---
 js/xpconnect/tests/unit/test_bug872772.js | 41 +++++++++++++++++++++++
 js/xpconnect/tests/unit/xpcshell.ini      |  1 +
 2 files changed, 42 insertions(+)
 create mode 100644 js/xpconnect/tests/unit/test_bug872772.js

diff --git a/js/xpconnect/tests/unit/test_bug872772.js b/js/xpconnect/tests/unit/test_bug872772.js
new file mode 100644
index 000000000000..636493d65c0a
--- /dev/null
+++ b/js/xpconnect/tests/unit/test_bug872772.js
@@ -0,0 +1,41 @@
+const Cu = Components.utils;
+function run_test() {
+
+  // Make a content sandbox with an Xrayable object.
+  var contentSB = new Cu.Sandbox('http://www.google.com',
+                                 {wantXHRConstructor: true, wantComponents: true});
+
+  // Make an XHR in the content sandbox.
+  Cu.evalInSandbox('xhr = new XMLHttpRequest();', contentSB);
+
+  // Make sure that waivers can be set as Xray expandos.
+  var xhr = contentSB.xhr;
+  do_check_true(Cu.isXrayWrapper(xhr));
+  xhr.unwaivedExpando = xhr;
+  do_check_true(Cu.isXrayWrapper(xhr.unwaivedExpando));
+  var waived = xhr.wrappedJSObject;
+  do_check_true(!Cu.isXrayWrapper(waived));
+  xhr.waivedExpando = waived;
+  do_check_true(!Cu.isXrayWrapper(xhr.waivedExpando));
+
+  // Try the same thing for getters/setters, even though that's kind of
+  // contrived.
+  Cu.evalInSandbox('function f() {}', contentSB);
+  var f = contentSB.f;
+  var fWaiver = Cu.waiveXrays(f);
+  do_check_true(f != fWaiver);
+  do_check_true(Cu.unwaiveXrays(fWaiver) === f);
+  Object.defineProperty(xhr, 'waivedAccessors', {get: fWaiver, set: fWaiver});
+  var desc = Object.getOwnPropertyDescriptor(xhr, 'waivedAccessors');
+  do_check_true(desc.get === fWaiver);
+  do_check_true(desc.set === fWaiver);
+
+  // Make sure we correctly handle same-compartment security wrappers.
+  var unwaivedC = contentSB.Components;
+  do_check_true(Cu.isXrayWrapper(unwaivedC));
+  var waivedC = unwaivedC.wrappedJSObject;
+  do_check_true(waivedC && unwaivedC && (waivedC != unwaivedC));
+  xhr.waivedC = waivedC;
+  do_check_true(xhr.waivedC === waivedC);
+  do_check_true(Cu.unwaiveXrays(xhr.waivedC) === unwaivedC);
+}
diff --git a/js/xpconnect/tests/unit/xpcshell.ini b/js/xpconnect/tests/unit/xpcshell.ini
index 3db8ba3d330b..471fbdc82aa9 100644
--- a/js/xpconnect/tests/unit/xpcshell.ini
+++ b/js/xpconnect/tests/unit/xpcshell.ini
@@ -22,6 +22,7 @@ tail =
 [test_bug851895.js]
 [test_bug854558.js]
 [test_bug868675.js]
+[test_bug872772.js]
 [test_bug_442086.js]
 [test_file.js]
 [test_blob.js]