Revision: 5458
Author: [email protected]
Date: Fri Jun 21 14:57:00 2013
Log: Use minified frame JS in tests.
https://codereview.appspot.com/10450043
Previously, all test drivers always configured caja.js with
'debug: true', which disables using minified source files. Therefore,
the minified files are never exercised. While our minifier for those
does not do identifier renaming like Closure does to caja.js and is
therefore not as hazardous, we should still be testing what we expect
to be deployed.
* In test drivers, set caja config option 'debug' (which currently
controls only minification) to the negation of the 'minified' URL
parameter.
* For test drivers which do nothing special in this area,
browser-test-case.js now provieds 'basicCajaConfig' which gives
cajaServer, debug, and forceES5Mode appropriate values.
* Fix a pattern match in es53-test-scan-guest to be compatible with
minified code.
See <https://code.google.com/p/google-caja/issues/detail?id=1774>.
[email protected]
http://code.google.com/p/google-caja/source/detail?r=5458
Modified:
/trunk/tests/com/google/caja/plugin/browser-test-case.js
/trunk/tests/com/google/caja/plugin/cajajs-bare-test.html
/trunk/tests/com/google/caja/plugin/default-test-driver.js
/trunk/tests/com/google/caja/plugin/es53-test-apitaming.js
/trunk/tests/com/google/caja/plugin/es53-test-automode1.js
/trunk/tests/com/google/caja/plugin/es53-test-automode2.js
/trunk/tests/com/google/caja/plugin/es53-test-automode3.js
/trunk/tests/com/google/caja/plugin/es53-test-automode4.js
/trunk/tests/com/google/caja/plugin/es53-test-cajajs-invocation.js
/trunk/tests/com/google/caja/plugin/es53-test-cajajs-minor-version-skew-cajoled-module.js
/trunk/tests/com/google/caja/plugin/es53-test-cajajs-version-skew-cajoled-module.js
/trunk/tests/com/google/caja/plugin/es53-test-client-uri-rewriting.js
/trunk/tests/com/google/caja/plugin/es53-test-container-overflow.js
/trunk/tests/com/google/caja/plugin/es53-test-custom-cajoling-service-client.js
/trunk/tests/com/google/caja/plugin/es53-test-defensible-objects.js
/trunk/tests/com/google/caja/plugin/es53-test-domado-events.js
/trunk/tests/com/google/caja/plugin/es53-test-domado-foreign.js
/trunk/tests/com/google/caja/plugin/es53-test-domado-global.js
/trunk/tests/com/google/caja/plugin/es53-test-domado-special.js
/trunk/tests/com/google/caja/plugin/es53-test-mitigating-url-rewriter.js
/trunk/tests/com/google/caja/plugin/es53-test-proxies.js
/trunk/tests/com/google/caja/plugin/es53-test-relative-urls.js
/trunk/tests/com/google/caja/plugin/es53-test-scan-guest.js
/trunk/tests/com/google/caja/plugin/es53-test-taming-advice.js
/trunk/tests/com/google/caja/plugin/es53-test-taming-errors.js
/trunk/tests/com/google/caja/plugin/es53-test-taming-inout.js
/trunk/tests/com/google/caja/plugin/es53-test-taming-primitives.js
/trunk/tests/com/google/caja/plugin/es53-test-taming-tamed.js
/trunk/tests/com/google/caja/plugin/es53-test-taming-untamed.js
/trunk/tests/com/google/caja/plugin/es53-test-unicode.js
/trunk/tests/com/google/caja/plugin/qunit-test-driver.js
=======================================
--- /trunk/tests/com/google/caja/plugin/browser-test-case.js Thu May 23
10:22:00 2013
+++ /trunk/tests/com/google/caja/plugin/browser-test-case.js Fri Jun 21
14:57:00 2013
@@ -73,11 +73,20 @@
*
* Boolean whether we are running in pure ES5 or ES5/3 translation
mode.
*
+ * minifiedMode
+ *
+ * Boolean whether we want to load minified files.
+ *
* caja
*
* At the time the test driver is running, an instance of the "caja"
* object, as defined in "c/g/c/caja.js", will be available.
*
+ * basicCajaConfig
+ *
+ * An appropriate set of parameters to caja.initialize or
+ * caja.makeFrameGroup.
+ *
* setUp(), tearDown()
*
* Functions expected by jsUnit that the test driver may override.
@@ -106,7 +115,9 @@
* JsUnitException, assertFailsSafe, fail,
* bridalMaker
* @provides cajaBuildVersion, getUrlParam, withUrlParam, readyToTest,
- * createDiv, createExtraImportsForTesting, inES5Mode, setUp, tearDown,
+ * createDiv, createExtraImportsForTesting, inES5Mode, minifiedMode,
+* basicCajaConfig
+ * setUp, tearDown,
* asyncRequirements,
* canonInnerHtml, assertStringContains, assertStringDoesNotContain,
* splitHtmlAndScript, pageLoaded___, urlParamPattern, fetch
@@ -169,6 +180,21 @@
} else {
throw new Error('es5 parameter is not "true" or "false"');
}
+
+var minifiedMode;
+if (getUrlParam('minified', 'true') === 'true') {
+ minifiedMode = true;
+} else if (getUrlParam('minified', 'true') === 'false') {
+ minifiedMode = false;
+} else {
+ throw new Error('minified parameter is not "true" or "false"');
+}
+
+var basicCajaConfig = {
+ cajaServer: '/caja',
+ debug: !minifiedMode,
+ forceES5Mode: inES5Mode
+};
// Construct test case navigation toolbar
window.addEventListener('load', function() {
=======================================
--- /trunk/tests/com/google/caja/plugin/cajajs-bare-test.html Fri Mar 1
15:16:31 2013
+++ /trunk/tests/com/google/caja/plugin/cajajs-bare-test.html Fri Jun 21
14:57:00 2013
@@ -41,7 +41,7 @@
caja.initialize({
cajaServer: '/caja',
- debug: true,
+ debug: /minified=false/.test(location.search),
forceES5Mode: /es5=true/.test(location.search)
});
=======================================
--- /trunk/tests/com/google/caja/plugin/default-test-driver.js Wed May 22
16:28:32 2013
+++ /trunk/tests/com/google/caja/plugin/default-test-driver.js Fri Jun 21
14:57:00 2013
@@ -15,7 +15,7 @@
/**
* @fileoverview
*
- * @requires html4, getUrlParam, inES5Mode, URI, readyToTest, jsunitRun,
+ * @requires html4, getUrlParam, basicCajaConfig, URI, readyToTest,
jsunitRun,
* asyncRequirements, console, createDiv, caja,
createExtraImportsForTesting
*/
@@ -37,11 +37,7 @@
var testCase = getUrlParam('test-case');
if (testCase) {
- caja.makeFrameGroup({
- cajaServer: '/caja',
- debug: true,
- forceES5Mode: inES5Mode
- }, function(frameGroup) {
+ caja.makeFrameGroup(basicCajaConfig, function(frameGroup) {
frameGroup.makeES5Frame(
createDiv(),
{
=======================================
--- /trunk/tests/com/google/caja/plugin/es53-test-apitaming.js Sat Nov 24
10:50:17 2012
+++ /trunk/tests/com/google/caja/plugin/es53-test-apitaming.js Fri Jun 21
14:57:00 2013
@@ -16,7 +16,7 @@
* @fileoverview Google API taming tests.
*
* @author [email protected]
- * @requires caja, jsunitRun, readyToTest
+ * @requires caja, jsunitRun, readyToTest, basicCajaConfig
*/
@@ -89,11 +89,7 @@
function runtests() {
- caja.initialize({
- cajaServer: '/caja',
- debug: true,
- forceES5Mode: inES5Mode
- });
+ caja.initialize(basicCajaConfig);
var uriPolicy = {
rewrite: function (uri, uriEffect, loaderType, hints) { return uri; }
=======================================
--- /trunk/tests/com/google/caja/plugin/es53-test-automode1.js Sat Mar 23
08:20:01 2013
+++ /trunk/tests/com/google/caja/plugin/es53-test-automode1.js Fri Jun 21
14:57:00 2013
@@ -29,7 +29,7 @@
caja.initialize({
cajaServer: '/caja',
- debug: true,
+ debug: !minifiedMode,
es5Mode: undefined,
// Unachievable level of security - should cause es5 => es53 failover
maxAcceptableSeverity: 'MAGICAL_UNICORN'
=======================================
--- /trunk/tests/com/google/caja/plugin/es53-test-automode2.js Sat Mar 23
08:20:01 2013
+++ /trunk/tests/com/google/caja/plugin/es53-test-automode2.js Fri Jun 21
14:57:00 2013
@@ -29,7 +29,7 @@
caja.initialize({
cajaServer: '/caja',
- debug: true,
+ debug: !minifiedMode,
disableSecurityForDebugger: true,
es5Mode: undefined,
// Guaranteed achievable level of insecurity - should cause es5 to run
=======================================
--- /trunk/tests/com/google/caja/plugin/es53-test-automode3.js Sat Mar 23
08:20:01 2013
+++ /trunk/tests/com/google/caja/plugin/es53-test-automode3.js Fri Jun 21
14:57:00 2013
@@ -28,7 +28,7 @@
caja.initialize({
cajaServer: '/caja',
- debug: true,
+ debug: !minifiedMode,
es5Mode: true,
// Unachievable level of security - should cause es5 to refuse to run
maxAcceptableSeverity: 'MAGICAL_UNICORN'
=======================================
--- /trunk/tests/com/google/caja/plugin/es53-test-automode4.js Sat Mar 23
08:20:01 2013
+++ /trunk/tests/com/google/caja/plugin/es53-test-automode4.js Fri Jun 21
14:57:00 2013
@@ -28,7 +28,7 @@
caja.initialize({
cajaServer: '/caja',
- debug: true,
+ debug: !minifiedMode,
es5Mode: true,
// Unachievable level of security - should cause es5 not to run
maxAcceptableSeverity: 'MAGICAL_UNICORN'
@@ -40,7 +40,7 @@
// Try again using es53 explicitly this time
caja.initialize({
cajaServer: '/caja',
- debug: true,
+ debug: !minifiedMode,
es5Mode: false
},
function(details) { assertFalse("Ran wrong mode", details['es5Mode']);
},
=======================================
--- /trunk/tests/com/google/caja/plugin/es53-test-cajajs-invocation.js Wed
May 22 16:28:32 2013
+++ /trunk/tests/com/google/caja/plugin/es53-test-cajajs-invocation.js Fri
Jun 21 14:57:00 2013
@@ -17,7 +17,8 @@
* create an ES53 frame.
*
* @author [email protected]
- * @requires caja, jsunitRun, readyToTest
+ * @requires caja, jsunitRun, readyToTest, inES5Mode, minifiedMode,
+ * basicCajaConfig
*/
(function () {
@@ -80,25 +81,16 @@
rewrite: caja.policy.net.rewriter.ALL
};
- caja.initialize({
- cajaServer: '/caja',
- debug: true,
- forceES5Mode: inES5Mode
- });
+ caja.initialize(basicCajaConfig);
jsunitRegister('testCorrectMinified', function testCorrectMinified() {
- assertEquals(
- getUrlParam('minified', 'PARAM MISSING'),
- String(!caja.closureCanary));
+ assertEquals(minifiedMode, !caja.closureCanary);
jsunitPass('testCorrectMinified');
});
jsunitRegister('testReinitialization', function testReinitialization() {
try {
- caja.initialize({
- cajaServer: '/caja',
- debug: true
- });
+ caja.initialize(basicCajaConfig);
} catch (e) {
assertStringContains('Caja cannot be initialized more than once',
String(e));
@@ -430,11 +422,7 @@
});
});
- caja.makeFrameGroup({
- cajaServer: '/caja',
- debug: true,
- forceES5Mode: inES5Mode
- }, function (frameGroup) {
+ caja.makeFrameGroup(basicCajaConfig, function (frameGroup) {
// TODO(ihab.awad): Test 'base url' functionality, esp. for "content"
cases
if (!inES5Mode)
=======================================
---
/trunk/tests/com/google/caja/plugin/es53-test-cajajs-minor-version-skew-cajoled-module.js
Tue Jun 4 12:28:48 2013
+++
/trunk/tests/com/google/caja/plugin/es53-test-cajajs-minor-version-skew-cajoled-module.js
Fri Jun 21 14:57:00 2013
@@ -30,7 +30,7 @@
cajaBuildVersion + 'M2');
caja.initialize({
cajaServer: '/caja',
- debug: true,
+ debug: !minifiedMode,
es5Mode: false
});
caja.load(undefined, undefined, function (frame) {
=======================================
---
/trunk/tests/com/google/caja/plugin/es53-test-cajajs-version-skew-cajoled-module.js
Tue Jun 4 12:28:48 2013
+++
/trunk/tests/com/google/caja/plugin/es53-test-cajajs-version-skew-cajoled-module.js
Fri Jun 21 14:57:00 2013
@@ -29,7 +29,7 @@
'0000');
caja.initialize({
cajaServer: '/caja',
- debug: true,
+ debug: !minifiedMode,
es5Mode: false
});
caja.load(undefined, undefined, function (frame) {
=======================================
--- /trunk/tests/com/google/caja/plugin/es53-test-client-uri-rewriting.js
Mon Apr 29 12:40:55 2013
+++ /trunk/tests/com/google/caja/plugin/es53-test-client-uri-rewriting.js
Fri Jun 21 14:57:00 2013
@@ -18,7 +18,7 @@
*
* @author [email protected]
* @author [email protected]
- * @requires caja, jsunitRun, readyToTest
+ * @requires caja, jsunitRun, readyToTest, basicCajaConfig
*/
(function () {
@@ -49,11 +49,7 @@
return o;
}
- caja.initialize({
- cajaServer: '/caja',
- debug: true,
- forceES5Mode: inES5Mode
- });
+ caja.initialize(basicCajaConfig);
jsunitRegister('testUriInAttr', function testUriInAttr() {
var div = createDiv();
=======================================
--- /trunk/tests/com/google/caja/plugin/es53-test-container-overflow.js Fri
Mar 15 11:08:12 2013
+++ /trunk/tests/com/google/caja/plugin/es53-test-container-overflow.js Fri
Jun 21 14:57:00 2013
@@ -14,7 +14,7 @@
/**
* @author [email protected]
- * @requires caja, jsunitRun, readyToTest
+ * @requires caja, jsunitRun, readyToTest, minifiedMode, inES5Mode
*/
(function () {
@@ -23,7 +23,7 @@
caja.initialize({
cajaServer: origin + '/caja',
- debug: true,
+ debug: !minifiedMode,
forceES5Mode: inES5Mode
});
=======================================
---
/trunk/tests/com/google/caja/plugin/es53-test-custom-cajoling-service-client.js
Sat Mar 23 08:20:01 2013
+++
/trunk/tests/com/google/caja/plugin/es53-test-custom-cajoling-service-client.js
Fri Jun 21 14:57:00 2013
@@ -68,7 +68,7 @@
caja.initialize({
cajaServer: '/caja',
- debug: true,
+ debug: !minifiedMode,
forceES5Mode: inES5Mode,
cajolingServiceClient: cajolingServiceClient
});
=======================================
--- /trunk/tests/com/google/caja/plugin/es53-test-defensible-objects.js Sun
Aug 19 17:44:26 2012
+++ /trunk/tests/com/google/caja/plugin/es53-test-defensible-objects.js Fri
Jun 21 14:57:00 2013
@@ -20,11 +20,7 @@
(function () {
- caja.initialize({
- cajaServer: '/caja',
- debug: true,
- forceES5Mode: inES5Mode
- });
+ caja.initialize(basicCajaConfig);
// Set up basic stuff
var uriPolicy = {
=======================================
--- /trunk/tests/com/google/caja/plugin/es53-test-domado-events.js Mon Apr
29 12:40:55 2013
+++ /trunk/tests/com/google/caja/plugin/es53-test-domado-events.js Fri Jun
21 14:57:00 2013
@@ -13,11 +13,7 @@
// limitations under the License.
(function() {
- caja.initialize({
- cajaServer: '/caja',
- debug: true,
- forceES5Mode: inES5Mode
- });
+ caja.initialize(basicCajaConfig);
var container = createDiv();
caja.load(
container,
=======================================
--- /trunk/tests/com/google/caja/plugin/es53-test-domado-foreign.js Mon Apr
29 12:40:55 2013
+++ /trunk/tests/com/google/caja/plugin/es53-test-domado-foreign.js Fri Jun
21 14:57:00 2013
@@ -12,11 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-caja.initialize({
- cajaServer: '/caja',
- debug: true,
- forceES5Mode: inES5Mode
-});
+caja.initialize(basicCajaConfig);
var guestDiv = createDiv();
=======================================
--- /trunk/tests/com/google/caja/plugin/es53-test-domado-global.js Wed Jun
19 13:54:01 2013
+++ /trunk/tests/com/google/caja/plugin/es53-test-domado-global.js Fri Jun
21 14:57:00 2013
@@ -16,15 +16,11 @@
* @fileoverview Tests which require a complete document to be loaded for
each.
*
* @author [email protected]
- * @requires caja, jsunitRun, readyToTest
+ * @requires caja, jsunitRun, readyToTest, basicCajaConfig
*/
(function () {
- caja.initialize({
- cajaServer: '/caja',
- debug: true,
- forceES5Mode: inES5Mode
- });
+ caja.initialize(basicCajaConfig);
function registerGlobalTest(cond, testName, url, html, callback) {
jsunitRegisterIf(cond, testName, function globalTestWrapper() {
=======================================
--- /trunk/tests/com/google/caja/plugin/es53-test-domado-special.js Mon Apr
29 12:40:55 2013
+++ /trunk/tests/com/google/caja/plugin/es53-test-domado-special.js Fri Jun
21 14:57:00 2013
@@ -24,11 +24,7 @@
}
function initFrame(div, frameCallback) {
- caja.initialize({
- cajaServer: '/caja',
- debug: true,
- forceES5Mode: inES5Mode
- });
+ caja.initialize(basicCajaConfig);
caja.load(
document.getElementById('untrusted_content'),
{
=======================================
---
/trunk/tests/com/google/caja/plugin/es53-test-mitigating-url-rewriter.js
Wed May 8 09:50:54 2013
+++
/trunk/tests/com/google/caja/plugin/es53-test-mitigating-url-rewriter.js
Fri Jun 21 14:57:00 2013
@@ -16,7 +16,8 @@
* @fileoverview Tests using a mitigating url rewriter for SES.
*
* @author [email protected]
- * @requires caja, jsunitRun, readyToTest, document, jsunitRegister
+ * @requires caja, jsunitRun, readyToTest, document, jsunitRegister,
+ * basicCajaConfig
*/
(function () {
@@ -33,11 +34,7 @@
}
};
- caja.initialize({
- cajaServer: '/caja',
- debug: true,
- forceES5Mode: inES5Mode
- });
+ caja.initialize(basicCajaConfig);
jsunitRegister('testPrecajole', function testPrecajole() {
caja.load(createDiv(), cachingUriPolicy, function (frame) {
=======================================
--- /trunk/tests/com/google/caja/plugin/es53-test-proxies.js Thu May 2
17:59:26 2013
+++ /trunk/tests/com/google/caja/plugin/es53-test-proxies.js Fri Jun 21
14:57:00 2013
@@ -16,7 +16,7 @@
* @fileoverview Runs Tom van Cutsem's ES5 Proxy tests.
*
* @author [email protected]
- * @requires caja, jsunitRun, readyToTest
+ * @requires caja, jsunitRun, readyToTest, basicCajaConfig
*/
(function () {
@@ -26,11 +26,7 @@
}
};
- caja.initialize({
- cajaServer: '/caja',
- debug: true,
- forceES5Mode: inES5Mode
- });
+ caja.initialize(basicCajaConfig);
jsunitRegister('testProxies', function testProxies() {
=======================================
--- /trunk/tests/com/google/caja/plugin/es53-test-relative-urls.js Mon Apr
29 12:40:55 2013
+++ /trunk/tests/com/google/caja/plugin/es53-test-relative-urls.js Fri Jun
21 14:57:00 2013
@@ -15,15 +15,11 @@
/**
* @fileoverview Tests how relative urls are resolved
* @author [email protected]
- * @requires caja, jsunitRun, readyToTest
+ * @requires caja, jsunitRun, readyToTest, basicCajaConfig
*/
(function () {
- caja.initialize({
- cajaServer: '/caja',
- debug: true,
- forceES5Mode: inES5Mode
- });
+ caja.initialize(basicCajaConfig);
fetch('es53-test-relative-urls.html', function(testHtml) {
jsunitRegister('testRelativeUrls', function testRelativeUrls () {
=======================================
--- /trunk/tests/com/google/caja/plugin/es53-test-scan-guest.js Thu Jun 20
09:19:45 2013
+++ /trunk/tests/com/google/caja/plugin/es53-test-scan-guest.js Fri Jun 21
14:57:00 2013
@@ -165,7 +165,8 @@
function shouldTreatAccessorAsValue(object, name, desc) {
return (
// work around SES patching frozen value properties into accessors
- /defProp\(this, name, \{/.exec(String(desc.set)) ||
+ // Note: pattern must match minified or unminified code
+ /defProp\(this, ?name, ?\{/.exec(String(desc.set)) ||
// or Domado doing the same, slightly differently
getFunctionName(desc.get) === 'overrideGetter');
}
=======================================
--- /trunk/tests/com/google/caja/plugin/es53-test-taming-advice.js Sun Aug
19 17:44:26 2012
+++ /trunk/tests/com/google/caja/plugin/es53-test-taming-advice.js Fri Jun
21 14:57:00 2013
@@ -16,16 +16,12 @@
* @fileoverview ES53 tests of advice around functions.
*
* @author [email protected]
- * @requires caja, jsunitRun, readyToTest
+ * @requires caja, jsunitRun, readyToTest, basicCajaConfig
*/
(function () {
- caja.initialize({
- cajaServer: '/caja',
- debug: true,
- forceES5Mode: inES5Mode
- });
+ caja.initialize(basicCajaConfig);
// Set up basic stuff
var div = createDiv();
=======================================
--- /trunk/tests/com/google/caja/plugin/es53-test-taming-errors.js Sat Mar
23 08:20:01 2013
+++ /trunk/tests/com/google/caja/plugin/es53-test-taming-errors.js Fri Jun
21 14:57:00 2013
@@ -17,7 +17,7 @@
* This file is written in JavaScript, not ES53, and is loaded by the host
page
*
* @author [email protected]
- * @requires caja, jsunitRun, readyToTest
+ * @requires caja, jsunitRun, readyToTest, basicCajaConfig
*/
(function () {
@@ -41,11 +41,7 @@
}, 0);
});
- caja.makeFrameGroup({
- cajaServer: '/caja',
- debug: true,
- forceES5Mode: inES5Mode
- }, function (frameGroup) {
+ caja.makeFrameGroup(basicCajaConfig, function (frameGroup) {
jsunitRegister('testInitFeralFrameSelf',
function testInitFeralFrameSelf() {
=======================================
--- /trunk/tests/com/google/caja/plugin/es53-test-taming-inout.js Sun Aug
19 17:44:26 2012
+++ /trunk/tests/com/google/caja/plugin/es53-test-taming-inout.js Fri Jun
21 14:57:00 2013
@@ -31,15 +31,11 @@
* * methods of constructed objects
*
* @author [email protected]
- * @requires caja, jsunitRun, readyToTest
+ * @requires caja, jsunitRun, readyToTest, basicCajaConfig
*/
(function () {
- caja.initialize({
- cajaServer: '/caja',
- debug: true,
- forceES5Mode: inES5Mode
- });
+ caja.initialize(basicCajaConfig);
// Set up basic stuff
var uriPolicy = {
=======================================
--- /trunk/tests/com/google/caja/plugin/es53-test-taming-primitives.js Sat
Mar 23 08:20:01 2013
+++ /trunk/tests/com/google/caja/plugin/es53-test-taming-primitives.js Fri
Jun 21 14:57:00 2013
@@ -16,16 +16,12 @@
* @fileoverview ES53 tests of taming and untaming of language primitives.
*
* @author [email protected]
- * @requires caja, jsunitRun, readyToTest
+ * @requires caja, jsunitRun, readyToTest, basicCajaConfig
*/
(function() {
- caja.initialize({
- cajaServer: '/caja',
- debug: true,
- forceES5Mode: inES5Mode
- });
+ caja.initialize(basicCajaConfig);
// Set up basic stuff
=======================================
--- /trunk/tests/com/google/caja/plugin/es53-test-taming-tamed.js Mon Mar
11 13:26:53 2013
+++ /trunk/tests/com/google/caja/plugin/es53-test-taming-tamed.js Fri Jun
21 14:57:00 2013
@@ -16,16 +16,12 @@
* @fileoverview ES53 tests of taming host objects for use by guest.
*
* @author [email protected]
- * @requires caja, jsunitRun, readyToTest
+ * @requires caja, jsunitRun, readyToTest, basicCajaConfig
*/
(function () {
- caja.initialize({
- cajaServer: '/caja',
- debug: true,
- forceES5Mode: inES5Mode
- });
+ caja.initialize(basicCajaConfig);
// Set up basic stuff
=======================================
--- /trunk/tests/com/google/caja/plugin/es53-test-taming-untamed.js Wed Apr
24 13:13:05 2013
+++ /trunk/tests/com/google/caja/plugin/es53-test-taming-untamed.js Fri Jun
21 14:57:00 2013
@@ -16,16 +16,12 @@
* @fileoverview ES53 tests of un-taming guest objects for use by host.
*
* @author [email protected]
- * @requires caja, jsunitRun, readyToTest
+ * @requires caja, jsunitRun, readyToTest, basicCajaConfig
*/
(function () {
- caja.initialize({
- cajaServer: '/caja',
- debug: true,
- forceES5Mode: inES5Mode
- });
+ caja.initialize(basicCajaConfig);
// Set up basic stuff
var div = createDiv();
=======================================
--- /trunk/tests/com/google/caja/plugin/es53-test-unicode.js Sat Mar 23
08:20:01 2013
+++ /trunk/tests/com/google/caja/plugin/es53-test-unicode.js Fri Jun 21
14:57:00 2013
@@ -19,11 +19,7 @@
}
};
- caja.initialize({
- cajaServer: '/caja',
- debug: true,
- forceES5Mode: inES5Mode
- });
+ caja.initialize(basicCajaConfig);
function basicPassingTest(name, code, result) {
var ipc = { result: 'untouched' };
=======================================
--- /trunk/tests/com/google/caja/plugin/qunit-test-driver.js Tue May 14
14:13:11 2013
+++ /trunk/tests/com/google/caja/plugin/qunit-test-driver.js Fri Jun 21
14:57:00 2013
@@ -23,11 +23,7 @@
throw new Error('Parameter "test-case" not specified in URL');
}
-caja.makeFrameGroup({
- cajaServer: '/caja',
- debug: true,
- forceES5Mode: inES5Mode
-}, function(frameGroup) {
+caja.makeFrameGroup(basicCajaConfig, function(frameGroup) {
frameGroup.makeES5Frame(
createDiv(),
caja.policy.net.ALL,
--
---
You received this message because you are subscribed to the Google Groups "Google Caja Discuss" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
For more options, visit https://groups.google.com/groups/opt_out.
