Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor: removed IE leftovers from test\functional\fixtures #7968

Merged
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -81,8 +81,7 @@ function run (pathToTest, filter, initializeConnection = initializeConnectionLow
}

if (config.useLocalBrowsers) {
// TODO: make tests stable for IE and Windows
(config.hasBrowser('ie') ? describe.skip : describe)('Browser reconnect', function () {
describe('Browser reconnect', function () {
it('Should restart browser when it does not respond', function () {
return run('./testcafe-fixtures/index-test.js', 'Should restart browser when it does not respond')
.then(() => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ const osFamily = require('os-family');


// TODO: Refactor tests to avoid using shared browsers
if (config.useLocalBrowsers && !config.useHeadlessBrowsers && !config.hasBrowser('ie') && !osFamily.mac) {
if (config.useLocalBrowsers && !config.useHeadlessBrowsers && !osFamily.mac) {
describe('Browser Provider - Custom User Profile', () => {
it('Should run tests in userProfile mode', () => {
return testCafe
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ const { noop } = require('lodash');


// TODO: Refactor tests to avoid shared browsers
if (config.useLocalBrowsers && !config.hasBrowser('ie')) {
if (config.useLocalBrowsers) {
describe('Browser Provider - Job Results Reporting', function () {
const BROWSER_OPENING_DELAY = 4000;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
let scriptsCount = 0;

function iterate () {
// HACK: we should request different URLs to avoid caching of response in IE 10
// HACK: we should request different URLs to avoid caching of response
const addedScript = appendScript(1000 + scriptsCount);

addedScript.onload = function () {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
<meta charset="UTF-8">
<meta name="viewport"
content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0">
<meta http-equiv="X-UA-Compatible" content="ie=edge">
<title>Document</title>
</head>
<body>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
<meta charset="UTF-8">
<meta name="viewport"
content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0">
<meta http-equiv="X-UA-Compatible" content="ie=edge">
<title>Document</title>
</head>
<body>
Expand Down
2 changes: 1 addition & 1 deletion test/functional/fixtures/hammerhead/worker/test.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
describe('Worker', function () {
it('Basic Worker', function () {
return runTests('testcafe-fixtures/index.js', null, { skip: 'ie' });
return runTests('testcafe-fixtures/index.js', null);
});
});
2 changes: 1 addition & 1 deletion test/functional/fixtures/page-js-errors/test.js
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ describe('Customize SkipJSErrors (GH-2775)', () => {
});

it('Should skip JS errors with callback function returning Promise', async () => {
return runTests('./testcafe-fixtures/test-controller.js', 'Should skip JS errors with callback function returning Promise', { skip: ['ie'] });
return runTests('./testcafe-fixtures/test-controller.js', 'Should skip JS errors with callback function returning Promise');
});

it('Should skip first error and fail on second error when skipJsError method called twice', async () => {
Expand Down
2 changes: 1 addition & 1 deletion test/functional/fixtures/ui/test.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ describe('TestCafe UI', () => {
describe('Selector Inspector', () => {
function runTestCafeTest (testName) {
it (testName, function () {
return runTests('./testcafe-fixtures/selector-inspector-test.js', testName, { skip: ['ie', 'android', 'ipad', 'iphone'] });
return runTests('./testcafe-fixtures/selector-inspector-test.js', testName, { skip: ['android', 'ipad', 'iphone'] });
});
}

Expand Down
2 changes: 1 addition & 1 deletion test/functional/setup.js
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ function openRemoteBrowsers () {

const openBrowserPromises = browsersInfo.map(browserInfo => {
return connector.startBrowser(browserInfo.settings, browserInfo.connection.url, buildInfo,
isBrowserStack ? { openingTimeout: BROWSER_OPENING_TIMEOUT } : null);
{ openingTimeout: BROWSER_OPENING_TIMEOUT });
});

return Promise.all(openBrowserPromises);
Expand Down