Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[core-http] fix browser tests on Firefox #9091

Merged
merged 2 commits into from
May 27, 2020
Merged

[core-http] fix browser tests on Firefox #9091

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
33545e5
[core-http] fix browser tests on Firefox
jeremymeng May 22, 2020
e2fcd52
use 2020 Jan 01 for the date time serialization test
jeremymeng May 27, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions sdk/core/core-http/test/msRestUserAgentPolicyTests.browser.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,10 +60,10 @@ describe("MsRestUserAgentPolicy (browser)", () => {
userAgentHeader.should.be.equal(customUserAgent);
});

it("should be space delimited and contain two fields", async () => {
it("should be space delimited and contain at least two fields", async () => {
const userAgent = await getUserAgent();
const userAgentParts = userAgent.split(" ");
userAgentParts.length.should.be.equal(2);
userAgentParts.length.should.be.greaterThan(1);
});

it("should contain runtime information", async () => {
Expand Down
4 changes: 2 additions & 2 deletions sdk/core/core-http/test/serializationTests.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -286,9 +286,9 @@ describe("msrest", function() {
required: false,
serializedName: "DateTimeRfc1123"
};
const rfc = new Date("Mon, 01 Jan 0001 00:00:00 GMT");
const rfc = new Date("Thu, 01 Jan 3001 00:00:00 GMT");
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

bizarre to me that we're worried about times thousands of years from the present

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yeah, I will update to some date in 2020

const serializedDateString = Serializer.serialize(mapper, rfc, "dateTimeObj");
serializedDateString.should.equal("Mon, 01 Jan 2001 00:00:00 GMT");
serializedDateString.should.equal("Thu, 01 Jan 3001 00:00:00 GMT");
done();
});

Expand Down
18 changes: 10 additions & 8 deletions sdk/core/core-http/test/xmlTests.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,20 +9,22 @@ describe("XML serializer", function() {
describe("parseXML(string)", function() {
it("with undefined", async function() {
const error: Error = await msAssert.throwsAsync(parseXML(undefined as any));
assert.notStrictEqual(
error.message.indexOf("Document is empty"),
-1,
`error.message ("${error.message}") should have contained "Document is empty"`
assert.ok(
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is it worth checking this message? Should we just assert that it throws?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I wanted to keep the old behavior of verifying that it's a parsing error.

error.message.indexOf("Document is empty") !== -1 || // Chrome
(error.message.startsWith("XML Parsing Error: syntax error") &&
error.message.indexOf("undefined") !== -1), // Firefox
`error.message ("${error.message}") should have contained "Document is empty" or "undefined"`
);
});

it("with null", async function() {
// tslint:disable-next-line:no-null-keyword
const error: Error = await msAssert.throwsAsync(parseXML(null as any));
assert.notStrictEqual(
error.message.indexOf("Document is empty"),
-1,
`error.message ("${error.message}") should have contained "Document is empty"`
assert.ok(
error.message.indexOf("Document is empty") !== -1 || // Chrome
(error.message.startsWith("XML Parsing Error: syntax error") &&
error.message.indexOf("null") !== -1), // Firefox
`error.message ("${error.message}") should have contained "Document is empty" or "null"`
);
});

Expand Down