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.

Sign up for GitHub

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

Jump to bottom

test: change jest.setTimeout from 20000 to 30000 #1965

Merged
merged 1 commit into from
Jun 4, 2019
Merged

test: change jest.setTimeout from 20000 to 30000 #1965

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion setupTest.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
'use strict';

jest.setTimeout(20000);
jest.setTimeout(30000);
6 changes: 0 additions & 6 deletions test/ContentBase.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,6 @@ describe('ContentBase', () => {
describe('to directory', () => {
const nestedFile = path.join(contentBasePublic, 'assets/example.txt');

jest.setTimeout(30000);

beforeAll((done) => {
server = testServer.start(
config,
Expand Down Expand Up @@ -66,8 +64,6 @@ describe('ContentBase', () => {
});

describe('test ignoring node_modules folder by Default', () => {
jest.setTimeout(30000);

beforeAll((done) => {
server = testServer.start(config, {
contentBase: contentBasePublic,
Expand Down Expand Up @@ -103,8 +99,6 @@ describe('ContentBase', () => {
});

describe('test not ignoring node_modules folder', () => {
jest.setTimeout(30000);

beforeAll((done) => {
server = testServer.start(config, {
contentBase: contentBasePublic,
Expand Down
4 changes: 0 additions & 4 deletions test/LiveReload.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,6 @@ describe('liveReload', () => {
describe('Test disabling live reloading', () => {
const nestedFile = path.join(contentBasePublic, 'assets/example.txt');

jest.setTimeout(30000);

beforeAll((done) => {
server = testServer.start(
config,
Expand Down Expand Up @@ -64,8 +62,6 @@ describe('liveReload', () => {
describe('Testing live reloading', () => {
const nestedFile = path.join(contentBasePublic, 'assets/example.txt');

jest.setTimeout(30000);

beforeAll((done) => {
server = testServer.start(
config,
Expand Down
4 changes: 0 additions & 4 deletions test/e2e/Client.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,6 @@ describe('reload', () => {
});

describe('on browser client', () => {
jest.setTimeout(30000);

it('should hot reload without page refresh', (done) => {
runBrowser().then(({ page, browser }) => {
let refreshed = false;
Expand Down Expand Up @@ -116,8 +114,6 @@ describe('reload', () => {
});

describe('on browser client', () => {
jest.setTimeout(30000);

it('should reload with page refresh', (done) => {
runBrowser().then(({ page, browser }) => {
let refreshed = false;
Expand Down
12 changes: 0 additions & 12 deletions test/e2e/ClientOptions.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,6 @@ describe('Client code', () => {
describe('behind a proxy', () => {
let proxy;

jest.setTimeout(30000);

beforeAll(() => {
proxy = startProxy(9000);
});
Expand Down Expand Up @@ -99,8 +97,6 @@ describe('Client complex inline script path', () => {
afterAll(testServer.close);

describe('browser client', () => {
jest.setTimeout(30000);

it('uses the correct public hostname and sockPath', (done) => {
runBrowser().then(({ page, browser }) => {
page
Expand Down Expand Up @@ -137,8 +133,6 @@ describe('Client complex inline script path with sockPort', () => {
afterAll(testServer.close);

describe('browser client', () => {
jest.setTimeout(30000);

it('uses the correct sockPort', (done) => {
runBrowser().then(({ page, browser }) => {
page
Expand Down Expand Up @@ -177,8 +171,6 @@ describe('Client complex inline script path with sockPort, no sockPath', () => {
afterAll(testServer.close);

describe('browser client', () => {
jest.setTimeout(30000);

it('uses the correct sockPort and sockPath', (done) => {
runBrowser().then(({ page, browser }) => {
page
Expand Down Expand Up @@ -212,8 +204,6 @@ describe('Client complex inline script path with sockHost', () => {
afterAll(testServer.close);

describe('browser client', () => {
jest.setTimeout(30000);

it('uses the correct sockHost', (done) => {
runBrowser().then(({ page, browser }) => {
page
Expand All @@ -231,8 +221,6 @@ describe('Client complex inline script path with sockHost', () => {
});

describe('Client console.log', () => {
jest.setTimeout(30000);

const baseOptions = {
port: 9000,
host: '0.0.0.0',
Expand Down
4 changes: 0 additions & 4 deletions test/e2e/ProvidePlugin.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,6 @@ describe('ProvidePlugin', () => {
afterAll(testServer.close);

describe('on browser client', () => {
jest.setTimeout(30000);

it('should inject SockJS client implementation', (done) => {
runBrowser().then(({ page, browser }) => {
page.waitForNavigation({ waitUntil: 'load' }).then(() => {
Expand Down Expand Up @@ -57,8 +55,6 @@ describe('ProvidePlugin', () => {
afterAll(testServer.close);

describe('on browser client', () => {
jest.setTimeout(30000);

it('should not inject client implementation', (done) => {
runBrowser().then(({ page, browser }) => {
page.waitForNavigation({ waitUntil: 'load' }).then(() => {
Expand Down