From dfcc882dccf7f08423422074046e26dac3ec9506 Mon Sep 17 00:00:00 2001 From: renaesop Date: Tue, 9 May 2017 10:38:03 +0800 Subject: [PATCH] Add a test for `webcontents.printerList`. --- atom/browser/api/atom_api_web_contents.cc | 8 ++++---- spec/api-browser-window-spec.js | 17 +++++++++++++++++ 2 files changed, 21 insertions(+), 4 deletions(-) diff --git a/atom/browser/api/atom_api_web_contents.cc b/atom/browser/api/atom_api_web_contents.cc index 5f7b23f1d02a..b40deaee1c6c 100644 --- a/atom/browser/api/atom_api_web_contents.cc +++ b/atom/browser/api/atom_api_web_contents.cc @@ -1282,10 +1282,10 @@ void WebContents::Print(mate::Arguments* args) { std::vector WebContents::GetPrinterList( mate::Arguments* args) { - std::vector printerList; - auto printBackend = printing::PrintBackend::CreateInstance(nullptr); - printBackend->EnumeratePrinters(&printerList); - return printerList; + std::vector printers; + auto print_backend = printing::PrintBackend::CreateInstance(nullptr); + print_backend->EnumeratePrinters(&printers); + return printers; } void WebContents::PrintToPDF(const base::DictionaryValue& setting, diff --git a/spec/api-browser-window-spec.js b/spec/api-browser-window-spec.js index 0acbd4dd770b..059aa9089401 100644 --- a/spec/api-browser-window-spec.js +++ b/spec/api-browser-window-spec.js @@ -1114,6 +1114,23 @@ describe('BrowserWindow module', function () { }) }) + it('can get printer list', function (done) { + w.destroy() + w = new BrowserWindow({ + show: false, + webPreferences: { + sandbox: true, + preload: preload + } + }) + w.loadURL('data:text/html,%3Ch1%3EHello%2C%20World!%3C%2Fh1%3E') + w.webContents.once('did-finish-load', function () { + const pl = w.webContents.printerList() + assert.equal(Array.isArray(pl), true) + done() + }) + }) + it('can print to PDF', function (done) { w.destroy() w = new BrowserWindow({