Skip to content

Commit

Permalink
Print Preview: Migrate policy and preview area/generation tests to TS
Browse files Browse the repository at this point in the history
Bug: 1245834
Change-Id: I7c9376d5f6388a3e7e41946aec341092e33e6cc2
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3318610
Reviewed-by: Demetrios Papadopoulos <dpapad@chromium.org>
Commit-Queue: Rebekah Potter <rbpotter@chromium.org>
Cr-Commit-Position: refs/heads/main@{#949379}
  • Loading branch information
rbpotter authored and Chromium LUCI CQ committed Dec 8, 2021
1 parent a26c2b2 commit 7c89043
Show file tree
Hide file tree
Showing 7 changed files with 256 additions and 235 deletions.
9 changes: 7 additions & 2 deletions chrome/browser/resources/print_preview/data/model.ts
Expand Up @@ -93,6 +93,12 @@ export type PolicyEntry = {
applyOnDestinationUpdate: boolean,
};

export type PolicyObjectEntry = {
defaultMode?: any,
allowedMode?: any,
value?: number,
};

export type PolicySettings = {
headerFooter?: PolicyEntry,
cssBackground?: PolicyEntry,
Expand Down Expand Up @@ -1189,8 +1195,7 @@ export class PrintPreviewModelElement extends PolymerElement {
if (policies === undefined) {
return;
}
const policiesObject = policies as
{[key: string]: {defaultMode?: any, allowedMode?: any, value?: number}};
const policiesObject = policies as {[key: string]: PolicyObjectEntry};
['headerFooter', 'cssBackground', 'mediaSize'].forEach(settingName => {
if (!policiesObject[settingName]) {
return;
Expand Down
4 changes: 2 additions & 2 deletions chrome/browser/resources/print_preview/print_preview.ts
Expand Up @@ -19,7 +19,7 @@ export {PageLayoutInfo} from './data/document_info.js';
export {LocalDestinationInfo, ProvisionalDestinationInfo} from './data/local_parsers.js';
export {CustomMarginsOrientation, Margins, MarginsSetting, MarginsType} from './data/margins.js';
export {MeasurementSystem, MeasurementSystemUnitType} from './data/measurement_system.js';
export {DuplexMode, DuplexType, getInstance, PrintPreviewModelElement, PrintTicket, whenReady} from './data/model.js';
export {DuplexMode, DuplexType, getInstance, PolicyObjectEntry, PrintPreviewModelElement, PrintTicket, SerializedSettings, whenReady} from './data/model.js';
// <if expr="chromeos or lacros">
export {PrintServerStore, PrintServerStoreEventType} from './data/print_server_store.js';
// </if>
Expand Down Expand Up @@ -77,7 +77,7 @@ export {PagesValue, PrintPreviewPagesSettingsElement} from './ui/pages_settings.
export {PrintPreviewPinSettingsElement} from './ui/pin_settings.js';
// </if>
export {PluginProxy, PluginProxyImpl, ViewportChangedCallback} from './ui/plugin_proxy.js';
export {PreviewAreaState, PrintPreviewPreviewAreaElement} from './ui/preview_area.js';
export {PreviewAreaState, PreviewTicket, PrintPreviewPreviewAreaElement} from './ui/preview_area.js';
export {PrintPreviewSearchBoxElement} from './ui/print_preview_search_box.js';
export {PrintPreviewScalingSettingsElement} from './ui/scaling_settings.js';
export {SelectMixin} from './ui/select_mixin.js';
Expand Down
12 changes: 11 additions & 1 deletion chrome/browser/resources/print_preview/ui/preview_area.ts
Expand Up @@ -33,7 +33,7 @@ import {MARGIN_KEY_MAP, MarginObject, PrintPreviewMarginControlContainerElement}
import {PluginProxy, PluginProxyImpl} from './plugin_proxy.js';
import {SettingsMixin} from './settings_mixin.js';

type PreviewTicket = Ticket&{
export type PreviewTicket = Ticket&{
headerFooterEnabled: boolean;
pageRange: Array<{to: number, from: number}>;
pagesPerSheet: number;
Expand Down Expand Up @@ -147,6 +147,10 @@ export class PrintPreviewPreviewAreaElement extends
return this.documentReady_ && this.pluginLoadComplete_;
}

getLastTicketForTest(): PreviewTicket|null {
return this.lastTicket_;
}

previewLoaded(): boolean {
return this.previewLoaded_;
}
Expand Down Expand Up @@ -783,5 +787,11 @@ export class PrintPreviewPreviewAreaElement extends
}
}

declare global {
interface HTMLElementTagNameMap {
'print-preview-preview-area': PrintPreviewPreviewAreaElement;
}
}

customElements.define(
PrintPreviewPreviewAreaElement.is, PrintPreviewPreviewAreaElement);
6 changes: 3 additions & 3 deletions chrome/test/data/webui/print_preview/BUILD.gn
Expand Up @@ -21,8 +21,8 @@ preprocessed_tests = [
"model_settings_policy_test.ts",
"model_test.ts",
"native_layer_stub.ts",
"policy_test.js",
"preview_generation_test.js",
"policy_test.ts",
"preview_generation_test.ts",
"print_button_test.js",
"print_preview_app_test.js",
"print_preview_sidebar_test.js",
Expand Down Expand Up @@ -58,7 +58,7 @@ non_preprocessed_tests = [
# "pdf_toolbar_manager_test.js",
# "pdf_viewer_test.js",
# "pdf_zoom_toolbar_test.js",
"preview_area_test.js",
"preview_area_test.ts",
"scaling_settings_interactive_test.js",
"scaling_settings_test.js",
"select_behavior_test.js",
Expand Down

0 comments on commit 7c89043

Please sign in to comment.