Fix browser manipulation issues (closes #2150, closes #2146)

src/screenshots/crop.js

@@ -3,6 +3,7 @@ import Promise from 'pinkie';
 import { PNG } from 'pngjs';
 import promisifyEvent from 'promisify-event';
 import limitNumber from '../utils/limit-number';
+import { deleteFile } from '../utils/promisified-functions';
 import { InvalidElementScreenshotDimensionsError } from '../errors/test-run/';
 
 
@@ -59,8 +60,10 @@ export default async function (screenshotPath, markSeed, clientAreaDimensions, c
     var width  = right - left;
     var height = bottom - top;
 
-    if (width <= 0 || height <= 0)
+    if (width <= 0 || height <= 0) {
+        await deleteFile(screenshotPath);
         throw new InvalidElementScreenshotDimensionsError(width, height);
+    }
 
     var dstImage = new PNG({ width, height });
     var stride   = dstImage.width * 4;

src/test-run/commands/utils.js

@@ -28,8 +28,7 @@ function isWindowSwitchingCommand (command) {
 }
 
 export function canSetDebuggerBreakpointBeforeCommand (command) {
-    return command.type !== TYPE.debug && !isClientFunctionCommand(command) && !isBrowserManipulationCommand(command) &&
-           !isServiceCommand(command);
+    return command.type !== TYPE.debug && !isClientFunctionCommand(command) && !isServiceCommand(command);
 }
 
 export function isBrowserManipulationCommand (command) {
@@ -41,28 +40,19 @@ export function isBrowserManipulationCommand (command) {
            command.type === TYPE.maximizeWindow;
 }
 
-export function isScreenshotCommand (command) {
-    return command.type === TYPE.takeScreenshot ||
-               command.type === TYPE.takeScreenshotOnFail;
-}
-
 function isRejectableBrowserManipulationCommand (command) {
     return command.type === TYPE.resizeWindow ||
             command.type === TYPE.resizeWindowToFitDevice ||
             command.type === TYPE.maximizeWindow;
 }
 
-function isServiceBrowserManipulationCommand (command) {
-    return command.type === TYPE.takeScreenshotOnFail;
-}
-
 export function isServiceCommand (command) {
     return command.type === TYPE.testDone ||
            command.type === TYPE.takeScreenshotOnFail ||
            command.type === TYPE.showAssertionRetriesStatus ||
            command.type === TYPE.hideAssertionRetriesStatus ||
            command.type === TYPE.setBreakpoint ||
-           isServiceBrowserManipulationCommand(command);
+           command.type === TYPE.takeScreenshotOnFail;
 }
 
 export function isExecutableInTopWindowOnly (command) {

src/utils/promisified-functions.js

@@ -5,10 +5,11 @@ import psNode from 'ps-node';
 import promisify from './promisify';
 
 
-export const ensureDir = promisify(mkdirp);
-export const stat      = promisify(fs.stat);
-export const writeFile = promisify(fs.writeFile);
-export const readFile  = promisify(fs.readFile);
+export const ensureDir  = promisify(mkdirp);
+export const stat       = promisify(fs.stat);
+export const writeFile  = promisify(fs.writeFile);
+export const readFile   = promisify(fs.readFile);
+export const deleteFile = promisify(fs.unlink);
 
 export const findProcess = promisify(psNode.lookup);
 export const killProcess = promisify(psNode.kill);

test/functional/fixtures/api/es-next/take-screenshot/test.js

@@ -238,6 +238,7 @@ describe('[API] t.takeElementScreenshot()', function () {
                 only:              'chrome'
             })
                 .catch(function (errs) {
+                    expect(assertionHelper.checkScreenshotsCreated(false, 2, 'custom')).eql(false);
                     expect(errs[0]).to.contains('Unable to capture an element image because the resulting image width is zero or negative.');
                     expect(errs[0]).to.contains(
                         ' 37 |test(\'Invalid dimensions\', async t => {' +