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

Fix deprecated suppresses and Map type in JS

Browse source 
This properly fixes the issue that was suppressed in [] and
just started breaking today thanks to []

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=213510500
This commit is contained in:
mcilwain 2018-09-18 13:54:27 -07:00 • committed by Ben McIlwain
parent 1f80f58336
commit 9bcd5579ef
2 changed files with 5 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -16,7 +16,6 @@ goog.provide('registry.Session');
goog.require('goog.json'); goog.require('goog.json');
goog.require('goog.net.XhrIo'); goog.require('goog.net.XhrIo');
goog.require('goog.structs.Map');
goog.require('registry.util'); goog.require('registry.util');
goog.forwardDeclare('goog.Uri'); goog.forwardDeclare('goog.Uri');
@ -30,7 +29,6 @@ goog.forwardDeclare('goog.Uri');
* @param {!registry.Session.ContentType} contentType Payload mode. * @param {!registry.Session.ContentType} contentType Payload mode.
* @constructor * @constructor
* @template REQUEST, RESPONSE * @template REQUEST, RESPONSE
* @suppress {deprecated}
*/ */
registry.Session = function(defaultUri, xsrfToken, contentType) { registry.Session = function(defaultUri, xsrfToken, contentType) {
@ -50,13 +48,13 @@ registry.Session = function(defaultUri, xsrfToken, contentType) {
/** /**
* XHR request headers. * XHR request headers.
* @private {!goog.structs.Map.<string, string>} * @private {!Map.<string, string>}
* @const * @const
*/ */
this.headers_ = new goog.structs.Map( this.headers_ = new Map([
'Content-Type', contentType, ['Content-Type', contentType],
'X-CSRF-Token', xsrfToken, ['X-CSRF-Token', xsrfToken],
'X-Requested-With', 'XMLHttpRequest'); ['X-Requested-With', 'XMLHttpRequest']]);
}; };

2
javatests/google/registry/ui/js/registrar/console_test_util.js
View file

@ -34,10 +34,8 @@ registry.registrar.ConsoleTestUtil.setup = function(test) {
test.historyMock = test.mockControl.createLooseMock(goog.History, true); test.historyMock = test.mockControl.createLooseMock(goog.History, true);
test.sessionMock = test.mockControl.createLooseMock( test.sessionMock = test.mockControl.createLooseMock(
registry.registrar.EppSession, true); registry.registrar.EppSession, true);
/** @suppress {missingRequire} */
test.mockControl.createConstructorMock(goog, 'History')() test.mockControl.createConstructorMock(goog, 'History')()
.$returns(test.historyMock); .$returns(test.historyMock);
/** @suppress {missingRequire} */
test.mockControl test.mockControl
.createConstructorMock(registry.registrar, 'EppSession')( .createConstructorMock(registry.registrar, 'EppSession')(
goog.testing.mockmatchers.isObject) goog.testing.mockmatchers.isObject)