zydronium/google-nomulus
1
0
Fork 0
mirror of https://github.com/google/nomulus.git synced 2025-05-13 16:07:15 +02:00
Code Issues Projects Releases Packages Wiki Activity

Change from ES6 Map to old-fashioned object

Browse source 
This fixes the Kokoro tests broken by []

Unfortunately this means that the return type changes from a Map to an Object as well,
so all of the .get() lines need to turn into [].  Yay weakly typed languages. And
apparently in some error conditions this method could already return the Object type
anyway, even if you passed in a Map, so it's just poorly designed.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=213808477
This commit is contained in:
mcilwain 2018-09-20 07:30:42 -07:00 • committed by Ben McIlwain
parent 399cde1291
commit ae2c1071f1
4 changed files with 21 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

11
java/google/registry/ui/js/session.js
View file

@ -48,13 +48,14 @@ registry.Session = function(defaultUri, xsrfToken, contentType) {
/** /**
* XHR request headers. * XHR request headers.
* @private {!Map.<string, string>} * @private {!Object<string, string>}
* @const * @const
*/ */
this.headers_ = new Map([ this.headers_ = {
['Content-Type', contentType], 'Content-Type': contentType,
['X-CSRF-Token', xsrfToken], 'X-CSRF-Token': xsrfToken,
['X-Requested-With', 'XMLHttpRequest']]); 'X-Requested-With': 'XMLHttpRequest'
};
}; };

4
javatests/google/registry/ui/js/registrar/console_test.js
View file

@ -135,7 +135,7 @@ function testNavToResources() {
assertTrue(xhr.isActive()); assertTrue(xhr.isActive());
assertEquals('/registrar-settings', xhr.getLastUri()); assertEquals('/registrar-settings', xhr.getLastUri());
assertEquals(test.testXsrfToken, assertEquals(test.testXsrfToken,
xhr.getLastRequestHeaders().get('X-CSRF-Token')); xhr.getLastRequestHeaders()['X-CSRF-Token']);
xhr.simulateResponse(200, goog.json.serialize({ xhr.simulateResponse(200, goog.json.serialize({
status: 'SUCCESS', status: 'SUCCESS',
message: 'OK', message: 'OK',
@ -161,7 +161,7 @@ function testNavToContactUs() {
assertTrue(xhr.isActive()); assertTrue(xhr.isActive());
assertEquals('/registrar-settings', xhr.getLastUri()); assertEquals('/registrar-settings', xhr.getLastUri());
assertEquals(test.testXsrfToken, assertEquals(test.testXsrfToken,
xhr.getLastRequestHeaders().get('X-CSRF-Token')); xhr.getLastRequestHeaders()['X-CSRF-Token']);
var passcode = '5-5-5-5-5'; var passcode = '5-5-5-5-5';
xhr.simulateResponse(200, goog.json.serialize({ xhr.simulateResponse(200, goog.json.serialize({
status: 'SUCCESS', status: 'SUCCESS',

12
javatests/google/registry/ui/js/registrar/domain_test.js
View file

@ -117,7 +117,7 @@ function handleLogin() {
var xhr = goog.testing.net.XhrIo.getSendInstances().pop(); var xhr = goog.testing.net.XhrIo.getSendInstances().pop();
assertTrue(xhr.isActive()); assertTrue(xhr.isActive());
assertEquals('/registrar-xhr', xhr.getLastUri()); assertEquals('/registrar-xhr', xhr.getLastUri());
assertEquals('☢', xhr.getLastRequestHeaders().get('X-CSRF-Token')); assertEquals('☢', xhr.getLastRequestHeaders()['X-CSRF-Token']);
registry.testing.assertXmlEquals(request, xhr.getLastContent()); registry.testing.assertXmlEquals(request, xhr.getLastContent());
xhr.simulateResponse(200, response); xhr.simulateResponse(200, response);
} }
@ -183,7 +183,7 @@ function testView() {
var xhr = goog.testing.net.XhrIo.getSendInstances().pop(); var xhr = goog.testing.net.XhrIo.getSendInstances().pop();
assertTrue('XHR is inactive.', xhr.isActive()); assertTrue('XHR is inactive.', xhr.isActive());
assertEquals('/registrar-xhr', xhr.getLastUri()); assertEquals('/registrar-xhr', xhr.getLastUri());
assertEquals('☢', xhr.getLastRequestHeaders().get('X-CSRF-Token')); assertEquals('☢', xhr.getLastRequestHeaders()['X-CSRF-Token']);
registry.testing.assertXmlEquals(request, xhr.getLastContent()); registry.testing.assertXmlEquals(request, xhr.getLastContent());
xhr.simulateResponse(200, response); xhr.simulateResponse(200, response);
assertEquals('We require more vespene gas.', assertEquals('We require more vespene gas.',
@ -252,7 +252,7 @@ function testEdit() {
var xhr = goog.testing.net.XhrIo.getSendInstances().pop(); var xhr = goog.testing.net.XhrIo.getSendInstances().pop();
assertTrue('XHR is inactive.', xhr.isActive()); assertTrue('XHR is inactive.', xhr.isActive());
assertEquals('/registrar-xhr', xhr.getLastUri()); assertEquals('/registrar-xhr', xhr.getLastUri());
assertEquals('☢', xhr.getLastRequestHeaders().get('X-CSRF-Token')); assertEquals('☢', xhr.getLastRequestHeaders()['X-CSRF-Token']);
registry.testing.assertXmlEquals(request, xhr.getLastContent()); registry.testing.assertXmlEquals(request, xhr.getLastContent());
xhr.simulateResponse(200, response); xhr.simulateResponse(200, response);
@ -307,7 +307,7 @@ function testEdit() {
xhr = goog.testing.net.XhrIo.getSendInstances().pop(); xhr = goog.testing.net.XhrIo.getSendInstances().pop();
assertTrue('XHR is inactive.', xhr.isActive()); assertTrue('XHR is inactive.', xhr.isActive());
assertEquals('/registrar-xhr', xhr.getLastUri()); assertEquals('/registrar-xhr', xhr.getLastUri());
assertEquals('☢', xhr.getLastRequestHeaders().get('X-CSRF-Token')); assertEquals('☢', xhr.getLastRequestHeaders()['X-CSRF-Token']);
registry.testing.assertXmlEquals(request, xhr.getLastContent()); registry.testing.assertXmlEquals(request, xhr.getLastContent());
xhr.simulateResponse(200, response); xhr.simulateResponse(200, response);
assertEquals('We require more vespene gas.', assertEquals('We require more vespene gas.',
@ -414,7 +414,7 @@ function testCreate() {
var xhr = goog.testing.net.XhrIo.getSendInstances().pop(); var xhr = goog.testing.net.XhrIo.getSendInstances().pop();
assertTrue('XHR is inactive.', xhr.isActive()); assertTrue('XHR is inactive.', xhr.isActive());
assertEquals('/registrar-xhr', xhr.getLastUri()); assertEquals('/registrar-xhr', xhr.getLastUri());
assertEquals('☢', xhr.getLastRequestHeaders().get('X-CSRF-Token')); assertEquals('☢', xhr.getLastRequestHeaders()['X-CSRF-Token']);
registry.testing.assertXmlEquals(request, xhr.getLastContent()); registry.testing.assertXmlEquals(request, xhr.getLastContent());
xhr.simulateResponse(200, response); xhr.simulateResponse(200, response);
@ -469,7 +469,7 @@ function testCreate() {
xhr = goog.testing.net.XhrIo.getSendInstances().pop(); xhr = goog.testing.net.XhrIo.getSendInstances().pop();
assertTrue('XHR is inactive.', xhr.isActive()); assertTrue('XHR is inactive.', xhr.isActive());
assertEquals('/registrar-xhr', xhr.getLastUri()); assertEquals('/registrar-xhr', xhr.getLastUri());
assertEquals('☢', xhr.getLastRequestHeaders().get('X-CSRF-Token')); assertEquals('☢', xhr.getLastRequestHeaders()['X-CSRF-Token']);
registry.testing.assertXmlEquals(request, xhr.getLastContent()); registry.testing.assertXmlEquals(request, xhr.getLastContent());
xhr.simulateResponse(200, response); xhr.simulateResponse(200, response);
assertEquals('We require more vespene gas.', assertEquals('We require more vespene gas.',

14
javatests/google/registry/ui/js/registrar/host_test.js
View file

@ -117,7 +117,7 @@ function handleLogin() {
var xhr = goog.testing.net.XhrIo.getSendInstances().pop(); var xhr = goog.testing.net.XhrIo.getSendInstances().pop();
assertTrue(xhr.isActive()); assertTrue(xhr.isActive());
assertEquals('/registrar-xhr', xhr.getLastUri()); assertEquals('/registrar-xhr', xhr.getLastUri());
assertEquals('☢', xhr.getLastRequestHeaders().get('X-CSRF-Token')); assertEquals('☢', xhr.getLastRequestHeaders()['X-CSRF-Token']);
registry.testing.assertXmlEquals(request, xhr.getLastContent()); registry.testing.assertXmlEquals(request, xhr.getLastContent());
xhr.simulateResponse(200, response); xhr.simulateResponse(200, response);
} }
@ -174,8 +174,8 @@ function testView() {
assertTrue('XHR is inactive.', xhr.isActive()); assertTrue('XHR is inactive.', xhr.isActive());
assertEquals('/registrar-xhr', xhr.getLastUri()); assertEquals('/registrar-xhr', xhr.getLastUri());
assertEquals('application/epp+xml', assertEquals('application/epp+xml',
xhr.getLastRequestHeaders().get('Content-Type')); xhr.getLastRequestHeaders()['Content-Type']);
assertEquals('☢', xhr.getLastRequestHeaders().get('X-CSRF-Token')); assertEquals('☢', xhr.getLastRequestHeaders()['X-CSRF-Token']);
registry.testing.assertXmlEquals(request, xhr.getLastContent()); registry.testing.assertXmlEquals(request, xhr.getLastContent());
xhr.simulateResponse(200, response); xhr.simulateResponse(200, response);
assertEquals('We require more vespene gas.', assertEquals('We require more vespene gas.',
@ -242,7 +242,7 @@ function testEditFirstAddr_ignoreSecond_addThird() {
var xhr = goog.testing.net.XhrIo.getSendInstances().pop(); var xhr = goog.testing.net.XhrIo.getSendInstances().pop();
assertTrue('XHR is inactive.', xhr.isActive()); assertTrue('XHR is inactive.', xhr.isActive());
assertEquals('/registrar-xhr', xhr.getLastUri()); assertEquals('/registrar-xhr', xhr.getLastUri());
assertEquals('☢', xhr.getLastRequestHeaders().get('X-CSRF-Token')); assertEquals('☢', xhr.getLastRequestHeaders()['X-CSRF-Token']);
registry.testing.assertXmlEquals(request, xhr.getLastContent()); registry.testing.assertXmlEquals(request, xhr.getLastContent());
xhr.simulateResponse(200, response); xhr.simulateResponse(200, response);
@ -288,7 +288,7 @@ function testEditFirstAddr_ignoreSecond_addThird() {
xhr = goog.testing.net.XhrIo.getSendInstances().pop(); xhr = goog.testing.net.XhrIo.getSendInstances().pop();
assertTrue('XHR is inactive.', xhr.isActive()); assertTrue('XHR is inactive.', xhr.isActive());
assertEquals('/registrar-xhr', xhr.getLastUri()); assertEquals('/registrar-xhr', xhr.getLastUri());
assertEquals('☢', xhr.getLastRequestHeaders().get('X-CSRF-Token')); assertEquals('☢', xhr.getLastRequestHeaders()['X-CSRF-Token']);
registry.testing.assertXmlEquals(request, xhr.getLastContent()); registry.testing.assertXmlEquals(request, xhr.getLastContent());
xhr.simulateResponse(200, response); xhr.simulateResponse(200, response);
assertEquals('We require more vespene gas.', assertEquals('We require more vespene gas.',
@ -364,7 +364,7 @@ function testCreate() {
var xhr = goog.testing.net.XhrIo.getSendInstances().pop(); var xhr = goog.testing.net.XhrIo.getSendInstances().pop();
assertTrue('XHR is inactive.', xhr.isActive()); assertTrue('XHR is inactive.', xhr.isActive());
assertEquals('/registrar-xhr', xhr.getLastUri()); assertEquals('/registrar-xhr', xhr.getLastUri());
assertEquals('☢', xhr.getLastRequestHeaders().get('X-CSRF-Token')); assertEquals('☢', xhr.getLastRequestHeaders()['X-CSRF-Token']);
registry.testing.assertXmlEquals(request, xhr.getLastContent()); registry.testing.assertXmlEquals(request, xhr.getLastContent());
xhr.simulateResponse(200, response); xhr.simulateResponse(200, response);
@ -413,7 +413,7 @@ function testCreate() {
xhr = goog.testing.net.XhrIo.getSendInstances().pop(); xhr = goog.testing.net.XhrIo.getSendInstances().pop();
assertTrue('XHR is inactive.', xhr.isActive()); assertTrue('XHR is inactive.', xhr.isActive());
assertEquals('/registrar-xhr', xhr.getLastUri()); assertEquals('/registrar-xhr', xhr.getLastUri());
assertEquals('☢', xhr.getLastRequestHeaders().get('X-CSRF-Token')); assertEquals('☢', xhr.getLastRequestHeaders()['X-CSRF-Token']);
registry.testing.assertXmlEquals(request, xhr.getLastContent()); registry.testing.assertXmlEquals(request, xhr.getLastContent());
xhr.simulateResponse(200, response); xhr.simulateResponse(200, response);
assertEquals('We require more vespene gas.', assertEquals('We require more vespene gas.',