Skip to content

Commit c8bebeb

Browse files
authored
Remove base64 encoding of resume tokens in spec tests. (#2760)
Fixes: #2759
1 parent ff7be4b commit c8bebeb

File tree

2 files changed

+4
-12
lines changed

2 files changed

+4
-12
lines changed

packages/firestore/test/unit/specs/spec_builder.ts

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@ import {
5454
SpecWriteAck,
5555
SpecWriteFailure
5656
} from './spec_test_runner';
57-
import { PlatformSupport } from '../../../src/platform/platform';
5857

5958
// These types are used in a protected API by SpecBuilder and need to be
6059
// exported.
@@ -952,21 +951,18 @@ export class SpecBuilder {
952951
// `query` is not added yet.
953952
this.activeTargets[targetId] = {
954953
queries: [SpecBuilder.queryToSpec(query), ...activeQueries],
955-
// Convert to base64 string so it can later be parsed into ByteString.
956-
resumeToken: PlatformSupport.getPlatform().btoa(resumeToken || '')
954+
resumeToken: resumeToken || ''
957955
};
958956
} else {
959957
this.activeTargets[targetId] = {
960958
queries: activeQueries,
961-
// Convert to base64 string so it can later be parsed into ByteString.
962-
resumeToken: PlatformSupport.getPlatform().btoa(resumeToken || '')
959+
resumeToken: resumeToken || ''
963960
};
964961
}
965962
} else {
966963
this.activeTargets[targetId] = {
967964
queries: [SpecBuilder.queryToSpec(query)],
968-
// Convert to base64 string so it can later be parsed into ByteString.
969-
resumeToken: PlatformSupport.getPlatform().btoa(resumeToken || '')
965+
resumeToken: resumeToken || ''
970966
};
971967
}
972968
}

packages/firestore/test/unit/specs/spec_test_runner.ts

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1151,11 +1151,7 @@ abstract class TestRunner {
11511151
expect(actualTarget.query).to.deep.equal(expectedTarget.query);
11521152
expect(actualTarget.targetId).to.equal(expectedTarget.targetId);
11531153
expect(actualTarget.readTime).to.equal(expectedTarget.readTime);
1154-
// actualTarget's resumeToken is a string, but the serialized
1155-
// resumeToken will be a base64 string, so we need to convert it back.
1156-
expect(actualTarget.resumeToken || '').to.equal(
1157-
this.platform.atob(expectedTarget.resumeToken || '')
1158-
);
1154+
expect(actualTarget.resumeToken || '').to.equal(expectedTarget.resumeToken || '');
11591155
delete actualTargets[targetId];
11601156
});
11611157
expect(obj.size(actualTargets)).to.equal(

0 commit comments

Comments
 (0)