Skip to content

Commit

Permalink
Change from ES6 Map to old-fashioned object
Browse files Browse the repository at this point in the history 
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
  • Loading branch information
@CydeWeys
CydeWeys committed Sep 20, 2018
1 parent 399cde1 commit ae2c107
Show file tree
Hide file tree
Showing 4 changed files with 21 additions and 20 deletions.
11 changes: 6 additions & 5 deletions java/google/registry/ui/js/session.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,13 +48,14 @@ registry.Session = function(defaultUri, xsrfToken, contentType) {

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


Expand Down
4 changes: 2 additions & 2 deletions javatests/google/registry/ui/js/registrar/console_test.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ function testNavToResources() {
assertTrue(xhr.isActive());
assertEquals('/registrar-settings', xhr.getLastUri());
assertEquals(test.testXsrfToken,
xhr.getLastRequestHeaders().get('X-CSRF-Token'));
xhr.getLastRequestHeaders()['X-CSRF-Token']);
xhr.simulateResponse(200, goog.json.serialize({
status: 'SUCCESS',
message: 'OK',
Expand All @@ -161,7 +161,7 @@ function testNavToContactUs() {
assertTrue(xhr.isActive());
assertEquals('/registrar-settings', xhr.getLastUri());
assertEquals(test.testXsrfToken,
xhr.getLastRequestHeaders().get('X-CSRF-Token'));
xhr.getLastRequestHeaders()['X-CSRF-Token']);
var passcode = '5-5-5-5-5';
xhr.simulateResponse(200, goog.json.serialize({
status: 'SUCCESS',
Expand Down
12 changes: 6 additions & 6 deletions javatests/google/registry/ui/js/registrar/domain_test.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ function handleLogin() {
var xhr = goog.testing.net.XhrIo.getSendInstances().pop();
assertTrue(xhr.isActive());
assertEquals('/registrar-xhr', xhr.getLastUri());
assertEquals('☢', xhr.getLastRequestHeaders().get('X-CSRF-Token'));
assertEquals('☢', xhr.getLastRequestHeaders()['X-CSRF-Token']);
registry.testing.assertXmlEquals(request, xhr.getLastContent());
xhr.simulateResponse(200, response);
}
Expand Down Expand Up @@ -183,7 +183,7 @@ function testView() {
var xhr = goog.testing.net.XhrIo.getSendInstances().pop();
assertTrue('XHR is inactive.', xhr.isActive());
assertEquals('/registrar-xhr', xhr.getLastUri());
assertEquals('☢', xhr.getLastRequestHeaders().get('X-CSRF-Token'));
assertEquals('☢', xhr.getLastRequestHeaders()['X-CSRF-Token']);
registry.testing.assertXmlEquals(request, xhr.getLastContent());
xhr.simulateResponse(200, response);
assertEquals('We require more vespene gas.',
Expand Down Expand Up @@ -252,7 +252,7 @@ function testEdit() {
var xhr = goog.testing.net.XhrIo.getSendInstances().pop();
assertTrue('XHR is inactive.', xhr.isActive());
assertEquals('/registrar-xhr', xhr.getLastUri());
assertEquals('☢', xhr.getLastRequestHeaders().get('X-CSRF-Token'));
assertEquals('☢', xhr.getLastRequestHeaders()['X-CSRF-Token']);
registry.testing.assertXmlEquals(request, xhr.getLastContent());
xhr.simulateResponse(200, response);

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

Expand Down Expand Up @@ -469,7 +469,7 @@ function testCreate() {
xhr = goog.testing.net.XhrIo.getSendInstances().pop();
assertTrue('XHR is inactive.', xhr.isActive());
assertEquals('/registrar-xhr', xhr.getLastUri());
assertEquals('☢', xhr.getLastRequestHeaders().get('X-CSRF-Token'));
assertEquals('☢', xhr.getLastRequestHeaders()['X-CSRF-Token']);
registry.testing.assertXmlEquals(request, xhr.getLastContent());
xhr.simulateResponse(200, response);
assertEquals('We require more vespene gas.',
Expand Down
14 changes: 7 additions & 7 deletions javatests/google/registry/ui/js/registrar/host_test.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ function handleLogin() {
var xhr = goog.testing.net.XhrIo.getSendInstances().pop();
assertTrue(xhr.isActive());
assertEquals('/registrar-xhr', xhr.getLastUri());
assertEquals('☢', xhr.getLastRequestHeaders().get('X-CSRF-Token'));
assertEquals('☢', xhr.getLastRequestHeaders()['X-CSRF-Token']);
registry.testing.assertXmlEquals(request, xhr.getLastContent());
xhr.simulateResponse(200, response);
}
Expand Down Expand Up @@ -174,8 +174,8 @@ function testView() {
assertTrue('XHR is inactive.', xhr.isActive());
assertEquals('/registrar-xhr', xhr.getLastUri());
assertEquals('application/epp+xml',
xhr.getLastRequestHeaders().get('Content-Type'));
assertEquals('☢', xhr.getLastRequestHeaders().get('X-CSRF-Token'));
xhr.getLastRequestHeaders()['Content-Type']);
assertEquals('☢', xhr.getLastRequestHeaders()['X-CSRF-Token']);
registry.testing.assertXmlEquals(request, xhr.getLastContent());
xhr.simulateResponse(200, response);
assertEquals('We require more vespene gas.',
Expand Down Expand Up @@ -242,7 +242,7 @@ function testEditFirstAddr_ignoreSecond_addThird() {
var xhr = goog.testing.net.XhrIo.getSendInstances().pop();
assertTrue('XHR is inactive.', xhr.isActive());
assertEquals('/registrar-xhr', xhr.getLastUri());
assertEquals('☢', xhr.getLastRequestHeaders().get('X-CSRF-Token'));
assertEquals('☢', xhr.getLastRequestHeaders()['X-CSRF-Token']);
registry.testing.assertXmlEquals(request, xhr.getLastContent());
xhr.simulateResponse(200, response);

Expand Down Expand Up @@ -288,7 +288,7 @@ function testEditFirstAddr_ignoreSecond_addThird() {
xhr = goog.testing.net.XhrIo.getSendInstances().pop();
assertTrue('XHR is inactive.', xhr.isActive());
assertEquals('/registrar-xhr', xhr.getLastUri());
assertEquals('☢', xhr.getLastRequestHeaders().get('X-CSRF-Token'));
assertEquals('☢', xhr.getLastRequestHeaders()['X-CSRF-Token']);
registry.testing.assertXmlEquals(request, xhr.getLastContent());
xhr.simulateResponse(200, response);
assertEquals('We require more vespene gas.',
Expand Down Expand Up @@ -364,7 +364,7 @@ function testCreate() {
var xhr = goog.testing.net.XhrIo.getSendInstances().pop();
assertTrue('XHR is inactive.', xhr.isActive());
assertEquals('/registrar-xhr', xhr.getLastUri());
assertEquals('☢', xhr.getLastRequestHeaders().get('X-CSRF-Token'));
assertEquals('☢', xhr.getLastRequestHeaders()['X-CSRF-Token']);
registry.testing.assertXmlEquals(request, xhr.getLastContent());
xhr.simulateResponse(200, response);

Expand Down Expand Up @@ -413,7 +413,7 @@ function testCreate() {
xhr = goog.testing.net.XhrIo.getSendInstances().pop();
assertTrue('XHR is inactive.', xhr.isActive());
assertEquals('/registrar-xhr', xhr.getLastUri());
assertEquals('☢', xhr.getLastRequestHeaders().get('X-CSRF-Token'));
assertEquals('☢', xhr.getLastRequestHeaders()['X-CSRF-Token']);
registry.testing.assertXmlEquals(request, xhr.getLastContent());
xhr.simulateResponse(200, response);
assertEquals('We require more vespene gas.',
Expand Down

0 comments on commit ae2c107

Please sign in to comment.