mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

Add specs for missing startDrag options

Browse source
This commit is contained in:
Kevin Sawicki 2017-01-26 10:34:27 -08:00
parent 2ee5f6f358
commit 8ce1930f0d
2 changed files with 18 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
atom/browser/api/atom_api_web_contents.cc
View file

@ -1327,7 +1327,7 @@ void WebContents::StartDrag(const mate::Dictionary& item,
// Error checking. // Error checking.
if (icon.IsEmpty()) { if (icon.IsEmpty()) {
args->ThrowError("icon must be set"); args->ThrowError("Must specify non-empty 'icon' option");
return; return;
} }
@ -1337,7 +1337,7 @@ void WebContents::StartDrag(const mate::Dictionary& item,
base::MessageLoop::current()); base::MessageLoop::current());
DragFileItems(files, icon->image(), web_contents()->GetNativeView()); DragFileItems(files, icon->image(), web_contents()->GetNativeView());
} else { } else {
args->ThrowError("There is nothing to drag"); args->ThrowError("Must specify either 'file' or 'files' option");
} }
} }

16
spec/api-web-contents-spec.js
View file

@ -285,4 +285,20 @@ describe('webContents module', function () {
}) })
w.webContents.inspectElement(10, 10) w.webContents.inspectElement(10, 10)
}) })
describe('startDrag({file, icon})', () => {
it('throws errors for a missing file or a missing/empty icon', () => {
assert.throws(() => {
w.webContents.startDrag({icon: path.join(__dirname, 'fixtures', 'assets', 'logo.png')})
}, /Must specify either 'file' or 'files' option/)
assert.throws(() => {
w.webContents.startDrag({file: __filename, icon: __filename})
}, /Must specify non-empty 'icon' option/)
assert.throws(() => {
w.webContents.startDrag({file: __filename})
}, /Must specify non-empty 'icon' option/)
})
})
}) })