diff options
author | wolfbeast <mcwerewolf@wolfbeast.com> | 2019-04-06 12:12:20 +0200 |
---|---|---|
committer | wolfbeast <mcwerewolf@wolfbeast.com> | 2019-04-06 12:14:14 +0200 |
commit | a9682a32af09f2fb8ae39c66fdc19ecdee24e591 (patch) | |
tree | 738033a7ad68a052403875d43ade1bf26ee2edf7 /testing | |
parent | cc07da9cb4d6e7a53f8d953427ffc2bca2e0c2df (diff) | |
parent | a5d22aa6106fbd3c8cec12333b14d4c65cd98647 (diff) | |
download | UXP-a9682a32af09f2fb8ae39c66fdc19ecdee24e591.tar UXP-a9682a32af09f2fb8ae39c66fdc19ecdee24e591.tar.gz UXP-a9682a32af09f2fb8ae39c66fdc19ecdee24e591.tar.lz UXP-a9682a32af09f2fb8ae39c66fdc19ecdee24e591.tar.xz UXP-a9682a32af09f2fb8ae39c66fdc19ecdee24e591.zip |
Merge branch '816'
This merges both the JS Front-end parser changes to better structure
the parser code, and the TC39 `toString()` revision proposal with
the exception of ES6 classes.
Diffstat (limited to 'testing')
-rw-r--r-- | testing/web-platform/tests/webstorage/storage_string_conversion.html | 6 | ||||
-rwxr-xr-x | testing/xpcshell/selftest.py | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/testing/web-platform/tests/webstorage/storage_string_conversion.html b/testing/web-platform/tests/webstorage/storage_string_conversion.html index 518b27521..c76eddfec 100644 --- a/testing/web-platform/tests/webstorage/storage_string_conversion.html +++ b/testing/web-platform/tests/webstorage/storage_string_conversion.html @@ -22,21 +22,21 @@ storage.b = 0; assert_equals(storage.b, "0"); storage.c = function(){}; - assert_equals(storage.c, "function (){}"); + assert_equals(storage.c, "function(){}"); storage.setItem('d', null); assert_equals(storage.d, "null"); storage.setItem('e', 0); assert_equals(storage.e, "0"); storage.setItem('f', function(){}); - assert_equals(storage.f, "function (){}"); + assert_equals(storage.f, "function(){}"); storage['g'] = null; assert_equals(storage.g, "null"); storage['h'] = 0; assert_equals(storage.h, "0"); storage['i'] = function(){}; - assert_equals(storage.f, "function (){}"); + assert_equals(storage.f, "function(){}"); }, name + " only stores strings"); }); diff --git a/testing/xpcshell/selftest.py b/testing/xpcshell/selftest.py index 856f505fc..071ab5eda 100755 --- a/testing/xpcshell/selftest.py +++ b/testing/xpcshell/selftest.py @@ -1162,7 +1162,7 @@ add_test({ self.assertTestResult(False) self.assertInLog(TEST_FAIL_STRING) - self.assertInLog("TypeError: generator function run_test returns a value at") + self.assertInLog("TypeError: generator function can't return a value at") self.assertInLog("test_error.js:4") self.assertNotInLog(TEST_PASS_STRING) |