From bcddc149876de658662e46a74b6168ea7ee6bf7d Mon Sep 17 00:00:00 2001 From: LavrovArtem Date: Fri, 22 Dec 2017 11:43:34 +0300 Subject: [PATCH] 0.18.6-dev2017122 (#2001) --- Gulpfile.js | 14 ++++---------- package.json | 6 +++--- src/client/automation/playback/click/index.js | 2 +- .../automation/playback/press/shortcuts.js | 2 +- src/client/automation/playback/select/utils.js | 5 +++-- test/client/config-qunit-server-app.js | 5 ++--- .../index-test.js | 5 +++++ .../fixtures/automation/select-element-test.js | 13 ------------- .../fixtures/automation/submit-on-enter-test.js | 13 +++++++------ .../client/fixtures/core/request-barrier-test.js | 11 ++++++++++- test/functional/config.js | 16 ++++++++-------- 11 files changed, 44 insertions(+), 48 deletions(-) diff --git a/Gulpfile.js b/Gulpfile.js index a236e3c58f1..52544ef1c51 100644 --- a/Gulpfile.js +++ b/Gulpfile.js @@ -85,9 +85,9 @@ var CLIENT_TESTS_DESKTOP_BROWSERS = [ version: '11.0' }, { - platform: 'OS X 10.11', + platform: 'OS X 10.12', browserName: 'safari', - version: '9.0' + version: '11.0' }, { platform: 'OS X 10.11', @@ -119,20 +119,14 @@ var CLIENT_TESTS_MOBILE_BROWSERS = [ version: '5.1', deviceName: 'Android Emulator' }, - { - platform: 'OS X 10.10', - browserName: 'iphone', - version: '8.1', - deviceName: 'iPad Simulator' - }, { platform: 'iOS', browserName: 'Safari', // NOTE: https://github.com/DevExpress/testcafe/issues/471 // problem with extra scroll reproduced only on saucelabs // virtual machines with ios device emulators - version: '9.3', - deviceName: 'iPhone 6 Plus' + version: '10.3', + deviceName: 'iPhone 7 Plus Simulator' } ]; diff --git a/package.json b/package.json index c53ff740db8..9600fa9541f 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "testcafe", "description": "Automated browser testing for the modern web development stack.", "license": "MIT", - "version": "0.18.6-dev20171211", + "version": "0.18.6-dev20171222", "author": { "name": "Developer Express Inc.", "url": "https://www.devexpress.com/" @@ -102,7 +102,7 @@ "stack-chain": "^1.3.6", "strip-bom": "^2.0.0", "testcafe-browser-tools": "1.4.6", - "testcafe-hammerhead": "12.1.5", + "testcafe-hammerhead": "12.1.6", "testcafe-legacy-api": "3.1.2", "testcafe-reporter-json": "^2.1.0", "testcafe-reporter-list": "^2.1.0", @@ -145,7 +145,7 @@ "gulp-mocha": "^3.0.1", "gulp-mustache": "^1.1.1", "gulp-prompt": "^0.2.0", - "gulp-qunit-harness": "^0.1.10", + "gulp-qunit-harness": "^1.0.1", "gulp-rename": "^1.2.2", "gulp-uglify": "^1.5.1", "gulp-util": "^3.0.7", diff --git a/src/client/automation/playback/click/index.js b/src/client/automation/playback/click/index.js index de293fbbb57..235b658bed6 100644 --- a/src/client/automation/playback/click/index.js +++ b/src/client/automation/playback/click/index.js @@ -82,7 +82,7 @@ export default class ClickAutomation extends VisibleElementAutomation { // NOTE: In WebKit and IE, the mousedown event opens the select element's dropdown; // therefore, we should prevent mousedown and hide the dropdown (B236416). var needCloseSelectDropDown = (browserUtils.isWebKit || browserUtils.isIE) && - domUtils.isSelectElement(this.element); + domUtils.isSelectElement(this.mouseDownElement); if (needCloseSelectDropDown) this._bindMousedownHandler(); diff --git a/src/client/automation/playback/press/shortcuts.js b/src/client/automation/playback/press/shortcuts.js index 3e494c35837..3081ab8fc8e 100644 --- a/src/client/automation/playback/press/shortcuts.js +++ b/src/client/automation/playback/press/shortcuts.js @@ -163,7 +163,7 @@ function submitFormOnEnterPressInInput (form, inputElement) { // NOTE: the form is submitted on enter press if there is only one input of the following types on it // and this input is focused (http://www.w3.org/TR/html5/forms.html#implicit-submission) if (textInputs.length === 1 && textInputs[0] === inputElement) { - var isInputValid = browserUtils.isSafari || !inputElement.validity || inputElement.validity.valid; + var isInputValid = inputElement.validity.valid; if (isInputValid && eventSimulator.submit(form)) form.submit(); diff --git a/src/client/automation/playback/select/utils.js b/src/client/automation/playback/select/utils.js index 9ef03e9be28..21033a69201 100644 --- a/src/client/automation/playback/select/utils.js +++ b/src/client/automation/playback/select/utils.js @@ -85,7 +85,8 @@ function getSelectionRectangle (element, position) { var range = document.createRange(); //B254723 range.setStart(fakeDiv.firstChild, Math.min(position, element.value.length)); - range.setEnd(fakeDiv.firstChild, Math.min(position, element.value.length)); + // NOTE: The range.getClientRects function returns wrong result if range length is 0 in Safari 11 + range.setEnd(fakeDiv.firstChild, Math.min(position + 1, element.value.length + 1)); if (domUtils.isTextAreaElement(element)) { rect = range.getBoundingClientRect(); @@ -137,7 +138,7 @@ function createFakeDiv (element) { height: element.scrollHeight + 'px' }); - fakeDiv.textContent = !element.value.length ? ' ' : element.value; + fakeDiv.textContent = element.value + ' '; body.appendChild(fakeDiv); diff --git a/test/client/config-qunit-server-app.js b/test/client/config-qunit-server-app.js index 23028251e6f..e569439dcea 100644 --- a/test/client/config-qunit-server-app.js +++ b/test/client/config-qunit-server-app.js @@ -62,8 +62,7 @@ module.exports = function (app) { }); }); - app.get('/respond-500', function (req, res) { - res.statusCode = 500; - res.send('Server error'); + app.get('/close-request', function (req) { + req.destroy(); }); }; diff --git a/test/client/fixtures/automation/content-editable/api-actions-content-editable-test/index-test.js b/test/client/fixtures/automation/content-editable/api-actions-content-editable-test/index-test.js index a301ba04023..42a25d3ab26 100644 --- a/test/client/fixtures/automation/content-editable/api-actions-content-editable-test/index-test.js +++ b/test/client/fixtures/automation/content-editable/api-actions-content-editable-test/index-test.js @@ -20,6 +20,11 @@ var parseKeySequence = testCafeCore.get('./utils/parse-key-sequence'); testCafeCore.preventRealEvents(); $(document).ready(function () { + // NOTE: https://github.com/DevExpress/testcafe/issues/2008 + // Remove this condition when the issue will be fixed. + if (browserUtils.isSafari && browserUtils.version === 11) + return; + var $el = null; var $parent = null; diff --git a/test/client/fixtures/automation/select-element-test.js b/test/client/fixtures/automation/select-element-test.js index ca6a4dde4dd..1e4a699acf9 100644 --- a/test/client/fixtures/automation/select-element-test.js +++ b/test/client/fixtures/automation/select-element-test.js @@ -1273,20 +1273,7 @@ $(document).ready(function () { notEqual($(shadowUI.select('.' + OPTION_LIST_CLASS)).is(':visible'), true); equal(shadowUI.select('.' + OPTION_LIST_CLASS).length, 0); equal(select.selectedIndex, 0); - startNext(); - }); - }); - asyncTest('B237794 - Select options list doesn\'t close after dblclick in Chrome and Opera (dblclick)', function () { - var select = createSelect(); - - equal(shadowUI.select('.' + OPTION_LIST_CLASS).length, 0); - - runDblClickAutomation(select, {}, function () { - equal(select, document.activeElement); - notEqual($(shadowUI.select('.' + OPTION_LIST_CLASS)).is(':visible'), true); - equal(shadowUI.select('.' + OPTION_LIST_CLASS).length, 0); - equal(select.selectedIndex, 0); startNext(); }); }); diff --git a/test/client/fixtures/automation/submit-on-enter-test.js b/test/client/fixtures/automation/submit-on-enter-test.js index 73e7d6a8e24..ab10409ca6f 100644 --- a/test/client/fixtures/automation/submit-on-enter-test.js +++ b/test/client/fixtures/automation/submit-on-enter-test.js @@ -34,7 +34,7 @@ $(document).ready(function () { function isInputValueValid ($el) { var el = $el[0]; - return browserUtils.isSafari || !el.validity || el.validity.valid; + return el.validity.valid; } function runPressAutomation (keys, callback) { @@ -302,6 +302,7 @@ $(document).ready(function () { var inputKeyupHandlerExecuted = false; var inputKeypressHandlerExecuted = false; var submitFunctionCalled = false; + var needToPreventEvent = browserUtils.isFirefox || browserUtils.isSafari && browserUtils.version > 9; $input.bind('keydown', function () { inputKeydownHandlerExecuted = true; @@ -325,13 +326,13 @@ $(document).ready(function () { $form[0].addEventListener('submit', function (e) { submitHandlerExecuted = true; - if (browserUtils.isFirefox) + if (needToPreventEvent) e.preventDefault(); }); - //submit event dispatching leads to form submit in FireFox - //in other browsers we call submit function after submit event dispatched (if there are no submit buttons on form) - if (!browserUtils.isFirefox) { + // NOTE: submit event dispatching leads to form submit in FireFox and Safari version 10 or higher + // in other browsers we call submit function after submit event dispatched (if there are no submit buttons on form) + if (!needToPreventEvent) { $form[0].submit = function () { submitFunctionCalled = true; }; @@ -344,7 +345,7 @@ $(document).ready(function () { ok(inputKeydownHandlerExecuted, 'input keydown handler executed'); ok(inputKeypressHandlerExecuted, 'input keydown handler executed'); ok(inputKeyupHandlerExecuted, 'input keydown handler executed'); - if (!browserUtils.isFirefox) + if (!needToPreventEvent) ok(submitFunctionCalled, 'submit function called'); start(); diff --git a/test/client/fixtures/core/request-barrier-test.js b/test/client/fixtures/core/request-barrier-test.js index 8e5fa916622..8c592523733 100644 --- a/test/client/fixtures/core/request-barrier-test.js +++ b/test/client/fixtures/core/request-barrier-test.js @@ -311,10 +311,19 @@ $(document).ready(function () { var requestBarrier = new RequestBarrier(); - fetch('/respond-500') + fetch('/close-request') .then(function (response) { return response.text(); }) + .then(function (text) { + // NOTE: On the SauceLab, requests from browser to a destination server is passed via Squid proxy. + // If destination server aborts a request then Squid respond with service error web page. + // In this case we should manually raise an error. + if (text.indexOf('Zero Sized Reply') !== -1) + throw new Error(); + + ok(false, text); + }) .catch(function () { requestIsFailed = true; }); diff --git a/test/functional/config.js b/test/functional/config.js index 09e6cac8be9..d6c6f936a3a 100644 --- a/test/functional/config.js +++ b/test/functional/config.js @@ -63,15 +63,15 @@ testingEnvironments[testingEnvironmentNames.mobileBrowsers] = { accessKey: process.env.BROWSER_STACK_ACCESS_KEY }, + // NOTE: Android tests are temporary disabled due to ERR_CONNECTION_REFUSED on Browserstack browsers: [ - { - realMobile: true, - os: 'android', - osVersion: '7.1', - device: 'Google Pixel', - name: 'Android', - alias: 'android' - }, + // { + // os: 'android', + // osVersion: '7.1', + // device: 'Google Pixel', + // name: 'Android Browser', + // alias: 'android' + // }, { os: 'ios', osVersion: '10.0',